diff --git a/quickfixj-messages/quickfixj-messages-all/pom.xml b/quickfixj-messages/quickfixj-messages-all/pom.xml
index 01216365ac..dd7833d937 100644
--- a/quickfixj-messages/quickfixj-messages-all/pom.xml
+++ b/quickfixj-messages/quickfixj-messages-all/pom.xml
@@ -13,6 +13,18 @@
 	<name>QuickFIX/J Message classes for all FIX specs including Fix Latest</name>
 	<description>QuickFIX/J Field classes</description>
 	<url>http://www.quickfixj.org</url>
+	
+	<properties>
+		<!-- Properties for conditional code generation -->
+		<fix40.spec.uptodate>false</fix40.spec.uptodate>
+		<fix41.spec.uptodate>false</fix41.spec.uptodate>
+		<fix42.spec.uptodate>false</fix42.spec.uptodate>
+		<fix43.spec.uptodate>false</fix43.spec.uptodate>
+		<fix44.spec.uptodate>false</fix44.spec.uptodate>
+		<fix50.spec.uptodate>false</fix50.spec.uptodate>
+		<fix50sp1.spec.uptodate>false</fix50sp1.spec.uptodate>
+		<fix50sp2.spec.uptodate>false</fix50sp2.spec.uptodate>
+	</properties>
 
 	<dependencies>
 		<dependency>
@@ -122,6 +134,271 @@
 				</plugins>
 			</build>
 		</profile>
+		
+		<!-- Profiles for conditional code generation based on FIX spec changes -->
+		<profile>
+			<id>generate-fix40</id>
+			<activation>
+				<property>
+					<name>fix40.spec.uptodate</name>
+					<value>false</value>
+				</property>
+			</activation>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.quickfixj</groupId>
+						<artifactId>quickfixj-codegenerator</artifactId>
+						<version>${project.version}</version>
+						<executions>
+							<execution>
+								<id>fix40</id>
+								<goals>
+									<goal>generate</goal>
+								</goals>
+								<configuration>
+									<dictFile>../quickfixj-messages-fix40/src/main/resources/FIX40.xml</dictFile>
+									<packaging>quickfix.fix40</packaging>
+									<fieldPackage>quickfix.field</fieldPackage>
+									<decimal>${generator.decimal}</decimal>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+		
+		<profile>
+			<id>generate-fix41</id>
+			<activation>
+				<property>
+					<name>fix41.spec.uptodate</name>
+					<value>false</value>
+				</property>
+			</activation>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.quickfixj</groupId>
+						<artifactId>quickfixj-codegenerator</artifactId>
+						<version>${project.version}</version>
+						<executions>
+							<execution>
+								<id>fix41</id>
+								<goals>
+									<goal>generate</goal>
+								</goals>
+								<configuration>
+									<dictFile>../quickfixj-messages-fix41/src/main/resources/FIX41.xml</dictFile>
+									<packaging>quickfix.fix41</packaging>
+									<fieldPackage>quickfix.field</fieldPackage>
+									<decimal>${generator.decimal}</decimal>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+		
+		<profile>
+			<id>generate-fix42</id>
+			<activation>
+				<property>
+					<name>fix42.spec.uptodate</name>
+					<value>false</value>
+				</property>
+			</activation>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.quickfixj</groupId>
+						<artifactId>quickfixj-codegenerator</artifactId>
+						<version>${project.version}</version>
+						<executions>
+							<execution>
+								<id>fix42</id>
+								<goals>
+									<goal>generate</goal>
+								</goals>
+								<configuration>
+									<dictFile>../quickfixj-messages-fix42/src/main/resources/FIX42.xml</dictFile>
+									<packaging>quickfix.fix42</packaging>
+									<fieldPackage>quickfix.field</fieldPackage>
+									<decimal>${generator.decimal}</decimal>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+		
+		<profile>
+			<id>generate-fix43</id>
+			<activation>
+				<property>
+					<name>fix43.spec.uptodate</name>
+					<value>false</value>
+				</property>
+			</activation>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.quickfixj</groupId>
+						<artifactId>quickfixj-codegenerator</artifactId>
+						<version>${project.version}</version>
+						<executions>
+							<execution>
+								<id>fix43</id>
+								<goals>
+									<goal>generate</goal>
+								</goals>
+								<configuration>
+									<dictFile>../quickfixj-messages-fix43/src/main/resources/FIX43.xml</dictFile>
+									<packaging>quickfix.fix43</packaging>
+									<fieldPackage>quickfix.field</fieldPackage>
+									<decimal>${generator.decimal}</decimal>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+		
+		<profile>
+			<id>generate-fix44</id>
+			<activation>
+				<property>
+					<name>fix44.spec.uptodate</name>
+					<value>false</value>
+				</property>
+			</activation>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.quickfixj</groupId>
+						<artifactId>quickfixj-codegenerator</artifactId>
+						<version>${project.version}</version>
+						<executions>
+							<execution>
+								<id>fix44</id>
+								<goals>
+									<goal>generate</goal>
+								</goals>
+								<configuration>
+									<dictFile>../quickfixj-messages-fix44/src/main/resources/FIX44.modified.xml</dictFile>
+									<packaging>quickfix.fix44</packaging>
+									<fieldPackage>quickfix.field</fieldPackage>
+									<decimal>${generator.decimal}</decimal>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+		
+		<profile>
+			<id>generate-fix50</id>
+			<activation>
+				<property>
+					<name>fix50.spec.uptodate</name>
+					<value>false</value>
+				</property>
+			</activation>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.quickfixj</groupId>
+						<artifactId>quickfixj-codegenerator</artifactId>
+						<version>${project.version}</version>
+						<executions>
+							<execution>
+								<id>fix50</id>
+								<goals>
+									<goal>generate</goal>
+								</goals>
+								<configuration>
+									<dictFile>../quickfixj-messages-fix50/src/main/resources/FIX50.xml</dictFile>
+									<packaging>quickfix.fix50</packaging>
+									<fieldPackage>quickfix.field</fieldPackage>
+									<decimal>${generator.decimal}</decimal>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+		
+		<profile>
+			<id>generate-fix50sp1</id>
+			<activation>
+				<property>
+					<name>fix50sp1.spec.uptodate</name>
+					<value>false</value>
+				</property>
+			</activation>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.quickfixj</groupId>
+						<artifactId>quickfixj-codegenerator</artifactId>
+						<version>${project.version}</version>
+						<executions>
+							<execution>
+								<id>fix50sp1</id>
+								<goals>
+									<goal>generate</goal>
+								</goals>
+								<configuration>
+									<dictFile>../quickfixj-messages-fix50sp1/src/main/resources/FIX50SP1.modified.xml</dictFile>
+									<packaging>quickfix.fix50sp1</packaging>
+									<fieldPackage>quickfix.field</fieldPackage>
+									<decimal>${generator.decimal}</decimal>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+		
+		<profile>
+			<id>generate-fix50sp2</id>
+			<activation>
+				<property>
+					<name>fix50sp2.spec.uptodate</name>
+					<value>false</value>
+				</property>
+			</activation>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.quickfixj</groupId>
+						<artifactId>quickfixj-codegenerator</artifactId>
+						<version>${project.version}</version>
+						<executions>
+							<execution>
+								<id>fix50sp2</id>
+								<goals>
+									<goal>generate</goal>
+								</goals>
+								<configuration>
+									<dictFile>../quickfixj-messages-fix50sp2/src/main/resources/FIX50SP2.modified.xml</dictFile>
+									<packaging>quickfix.fix50sp2</packaging>
+									<fieldPackage>quickfix.field</fieldPackage>
+									<decimal>${generator.decimal}</decimal>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
 	</profiles>
 	<build>
 		<pluginManagement>
@@ -243,109 +520,7 @@
 					</execution>
 				</executions>
 			</plugin>
-			<plugin>
-				<groupId>org.quickfixj</groupId>
-				<artifactId>quickfixj-codegenerator</artifactId>
-				<version>${project.version}</version>
-				<executions>
-					<execution>
-						<id>fix40</id>
-						<goals>
-							<goal>generate</goal>
-						</goals>
-						<configuration>
-							<dictFile>../quickfixj-messages-fix40/src/main/resources/FIX40.xml</dictFile>
-							<packaging>quickfix.fix40</packaging>
-							<fieldPackage>quickfix.field</fieldPackage>
-							<decimal>${generator.decimal}</decimal>
-						</configuration>
-					</execution>
-					<execution>
-						<id>fix41</id>
-						<goals>
-							<goal>generate</goal>
-						</goals>
-						<configuration>
-							<dictFile>../quickfixj-messages-fix41/src/main/resources/FIX41.xml</dictFile>
-							<packaging>quickfix.fix41</packaging>
-							<fieldPackage>quickfix.field</fieldPackage>
-							<decimal>${generator.decimal}</decimal>
-						</configuration>
-					</execution>
-					<execution>
-						<id>fix42</id>
-						<goals>
-							<goal>generate</goal>
-						</goals>
-						<configuration>
-							<dictFile>../quickfixj-messages-fix42/src/main/resources/FIX42.xml</dictFile>
-							<packaging>quickfix.fix42</packaging>
-							<fieldPackage>quickfix.field</fieldPackage>
-							<decimal>${generator.decimal}</decimal>
-						</configuration>
-					</execution>
-					<execution>
-						<id>fix43</id>
-						<goals>
-							<goal>generate</goal>
-						</goals>
-						<configuration>
-							<dictFile>../quickfixj-messages-fix43/src/main/resources/FIX43.xml</dictFile>
-							<packaging>quickfix.fix43</packaging>
-							<fieldPackage>quickfix.field</fieldPackage>
-							<decimal>${generator.decimal}</decimal>
-						</configuration>
-					</execution>
-					<execution>
-						<id>fix44</id>
-						<goals>
-							<goal>generate</goal>
-						</goals>
-						<configuration>
-							<dictFile>../quickfixj-messages-fix44/src/main/resources/FIX44.modified.xml</dictFile>
-							<packaging>quickfix.fix44</packaging>
-							<fieldPackage>quickfix.field</fieldPackage>
-							<decimal>${generator.decimal}</decimal>
-						</configuration>
-					</execution>
-					<execution>
-						<id>fix50</id>
-						<goals>
-							<goal>generate</goal>
-						</goals>
-						<configuration>
-							<dictFile>../quickfixj-messages-fix50/src/main/resources/FIX50.xml</dictFile>
-							<packaging>quickfix.fix50</packaging>
-							<fieldPackage>quickfix.field</fieldPackage>
-							<decimal>${generator.decimal}</decimal>
-						</configuration>
-					</execution>
-					<execution>
-						<id>fix50sp1</id>
-						<goals>
-							<goal>generate</goal>
-						</goals>
-						<configuration>
-							<dictFile>../quickfixj-messages-fix50sp1/src/main/resources/FIX50SP1.modified.xml</dictFile>
-							<packaging>quickfix.fix50sp1</packaging>
-							<fieldPackage>quickfix.field</fieldPackage>
-							<decimal>${generator.decimal}</decimal>
-						</configuration>
-					</execution>
-					<execution>
-						<id>fix50sp2</id>
-						<goals>
-							<goal>generate</goal>
-						</goals>
-						<configuration>
-							<dictFile>../quickfixj-messages-fix50sp2/src/main/resources/FIX50SP2.modified.xml</dictFile>
-							<packaging>quickfix.fix50sp2</packaging>
-							<fieldPackage>quickfix.field</fieldPackage>
-							<decimal>${generator.decimal}</decimal>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
+			<!-- Code generation moved to profiles for conditional execution based on FIX spec changes -->
 			<!-- exclude classes that are provided by the quickfixj-base dependency -->
 			<plugin>
 			  <groupId>org.apache.maven.plugins</groupId>
@@ -419,7 +594,193 @@
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>build-helper-maven-plugin</artifactId>
 				<executions>
+					<!-- Check if FIX40 spec has changed -->
+					<execution>
+						<id>check-fix40-spec</id>
+						<phase>generate-sources</phase>
+						<goals>
+							<goal>uptodate-property</goal>
+						</goals>
+						<configuration>
+							<name>fix40.spec.uptodate</name>
+							<fileSet>
+								<directory>../quickfixj-messages-fix40/src/main/resources</directory>
+								<outputDirectory>../quickfixj-messages-fix40/target</outputDirectory>
+								<includes>
+									<include>FIX40.xml</include>
+								</includes>
+								<mapper>
+									<type>glob</type>
+									<from>FIX40.xml</from>
+									<to>quickfixj-messages-fix40-${project.version}.jar</to>
+								</mapper>
+							</fileSet>
+						</configuration>
+					</execution>
+					<!-- Check if FIX41 spec has changed -->
+					<execution>
+						<id>check-fix41-spec</id>
+						<phase>generate-sources</phase>
+						<goals>
+							<goal>uptodate-property</goal>
+						</goals>
+						<configuration>
+							<name>fix41.spec.uptodate</name>
+							<fileSet>
+								<directory>../quickfixj-messages-fix41/src/main/resources</directory>
+								<outputDirectory>../quickfixj-messages-fix41/target</outputDirectory>
+								<includes>
+									<include>FIX41.xml</include>
+								</includes>
+								<mapper>
+									<type>glob</type>
+									<from>FIX41.xml</from>
+									<to>quickfixj-messages-fix41-${project.version}.jar</to>
+								</mapper>
+							</fileSet>
+						</configuration>
+					</execution>
+					<!-- Check if FIX42 spec has changed -->
+					<execution>
+						<id>check-fix42-spec</id>
+						<phase>generate-sources</phase>
+						<goals>
+							<goal>uptodate-property</goal>
+						</goals>
+						<configuration>
+							<name>fix42.spec.uptodate</name>
+							<fileSet>
+								<directory>../quickfixj-messages-fix42/src/main/resources</directory>
+								<outputDirectory>../quickfixj-messages-fix42/target</outputDirectory>
+								<includes>
+									<include>FIX42.xml</include>
+								</includes>
+								<mapper>
+									<type>glob</type>
+									<from>FIX42.xml</from>
+									<to>quickfixj-messages-fix42-${project.version}.jar</to>
+								</mapper>
+							</fileSet>
+						</configuration>
+					</execution>
+					<!-- Check if FIX43 spec has changed -->
+					<execution>
+						<id>check-fix43-spec</id>
+						<phase>generate-sources</phase>
+						<goals>
+							<goal>uptodate-property</goal>
+						</goals>
+						<configuration>
+							<name>fix43.spec.uptodate</name>
+							<fileSet>
+								<directory>../quickfixj-messages-fix43/src/main/resources</directory>
+								<outputDirectory>../quickfixj-messages-fix43/target</outputDirectory>
+								<includes>
+									<include>FIX43.xml</include>
+								</includes>
+								<mapper>
+									<type>glob</type>
+									<from>FIX43.xml</from>
+									<to>quickfixj-messages-fix43-${project.version}.jar</to>
+								</mapper>
+							</fileSet>
+						</configuration>
+					</execution>
+					<!-- Check if FIX44 spec has changed -->
+					<execution>
+						<id>check-fix44-spec</id>
+						<phase>generate-sources</phase>
+						<goals>
+							<goal>uptodate-property</goal>
+						</goals>
+						<configuration>
+							<name>fix44.spec.uptodate</name>
+							<fileSet>
+								<directory>../quickfixj-messages-fix44/src/main/resources</directory>
+								<outputDirectory>../quickfixj-messages-fix44/target</outputDirectory>
+								<includes>
+									<include>FIX44.modified.xml</include>
+								</includes>
+								<mapper>
+									<type>glob</type>
+									<from>FIX44.modified.xml</from>
+									<to>quickfixj-messages-fix44-${project.version}.jar</to>
+								</mapper>
+							</fileSet>
+						</configuration>
+					</execution>
+					<!-- Check if FIX50 spec has changed -->
+					<execution>
+						<id>check-fix50-spec</id>
+						<phase>generate-sources</phase>
+						<goals>
+							<goal>uptodate-property</goal>
+						</goals>
+						<configuration>
+							<name>fix50.spec.uptodate</name>
+							<fileSet>
+								<directory>../quickfixj-messages-fix50/src/main/resources</directory>
+								<outputDirectory>../quickfixj-messages-fix50/target</outputDirectory>
+								<includes>
+									<include>FIX50.xml</include>
+								</includes>
+								<mapper>
+									<type>glob</type>
+									<from>FIX50.xml</from>
+									<to>quickfixj-messages-fix50-${project.version}.jar</to>
+								</mapper>
+							</fileSet>
+						</configuration>
+					</execution>
+					<!-- Check if FIX50SP1 spec has changed -->
+					<execution>
+						<id>check-fix50sp1-spec</id>
+						<phase>generate-sources</phase>
+						<goals>
+							<goal>uptodate-property</goal>
+						</goals>
+						<configuration>
+							<name>fix50sp1.spec.uptodate</name>
+							<fileSet>
+								<directory>../quickfixj-messages-fix50sp1/src/main/resources</directory>
+								<outputDirectory>../quickfixj-messages-fix50sp1/target</outputDirectory>
+								<includes>
+									<include>FIX50SP1.modified.xml</include>
+								</includes>
+								<mapper>
+									<type>glob</type>
+									<from>FIX50SP1.modified.xml</from>
+									<to>quickfixj-messages-fix50sp1-${project.version}.jar</to>
+								</mapper>
+							</fileSet>
+						</configuration>
+					</execution>
+					<!-- Check if FIX50SP2 spec has changed -->
+					<execution>
+						<id>check-fix50sp2-spec</id>
+						<phase>generate-sources</phase>
+						<goals>
+							<goal>uptodate-property</goal>
+						</goals>
+						<configuration>
+							<name>fix50sp2.spec.uptodate</name>
+							<fileSet>
+								<directory>../quickfixj-messages-fix50sp2/src/main/resources</directory>
+								<outputDirectory>../quickfixj-messages-fix50sp2/target</outputDirectory>
+								<includes>
+									<include>FIX50SP2.modified.xml</include>
+								</includes>
+								<mapper>
+									<type>glob</type>
+									<from>FIX50SP2.modified.xml</from>
+									<to>quickfixj-messages-fix50sp2-${project.version}.jar</to>
+								</mapper>
+							</fileSet>
+						</configuration>
+					</execution>
+					<!-- Add generated sources -->
 					<execution>
+						<id>add-source</id>
 						<phase>process-sources</phase>
 						<goals><goal>add-source</goal></goals>
 						<configuration>