Skip to content

Commit b4f6847

Browse files
manurenoGuido Medina
manureno
authored and
Guido Medina
committed
QFJ-884 Change the source and classes used to build the messageXX.jars.
1 parent 18b5b71 commit b4f6847

File tree

13 files changed

+131
-206
lines changed

13 files changed

+131
-206
lines changed

‎pom.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,9 @@
155155
<groupId>org.apache.maven.plugins</groupId>
156156
<artifactId>maven-javadoc-plugin</artifactId>
157157
<version>${maven-javadoc-plugin-version}</version>
158+
<configuration>
159+
<excludePackageNames>quickfix.fix*</excludePackageNames>
160+
</configuration>
158161
<executions>
159162
<execution>
160163
<id>attach-javadocs</id>

‎quickfixj-core/pom.xml‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,36 @@
102102
</dependencies>
103103

104104
<build>
105+
<resources>
106+
<resource>
107+
<directory>../quickfixj-messages/quickfixj-messages-fixt11/src/main/resources</directory>
108+
</resource>
109+
<resource>
110+
<directory>../quickfixj-messages/quickfixj-messages-fix50/src/main/resources</directory>
111+
</resource>
112+
<resource>
113+
<directory>../quickfixj-messages/quickfixj-messages-fix44/src/main/resources</directory>
114+
</resource>
115+
<resource>
116+
<directory>../quickfixj-messages/quickfixj-messages-fix43/src/main/resources</directory>
117+
</resource>
118+
<resource>
119+
<directory>../quickfixj-messages/quickfixj-messages-fix42/src/main/resources</directory>
120+
</resource>
121+
<resource>
122+
<directory>../quickfixj-messages/quickfixj-messages-fix41/src/main/resources</directory>
123+
</resource>
124+
<resource>
125+
<directory>../quickfixj-messages/quickfixj-messages-fix40/src/main/resources</directory>
126+
</resource>
127+
<resource>
128+
<directory>../quickfixj-messages/quickfixj-messages-fix50sp1/src/main/resources</directory>
129+
</resource>
130+
<resource>
131+
<directory>../quickfixj-messages/quickfixj-messages-fix50sp2/src/main/resources</directory>
132+
</resource>
133+
</resources>
134+
105135
<testResources>
106136
<testResource>
107137
<directory>src/test/resources</directory>
@@ -230,6 +260,30 @@
230260
<fieldPackage>quickfix.field</fieldPackage>
231261
<decimal>${generator.decimal}</decimal>
232262
</configuration>
263+
</execution>
264+
<execution>
265+
<id>fix50sp2</id>
266+
<goals>
267+
<goal>generate</goal>
268+
</goals>
269+
<configuration>
270+
<dictFile>../quickfixj-messages/quickfixj-messages-fix50sp2/src/main/resources/FIX50SP2.modified.xml</dictFile>
271+
<packaging>quickfix.fix50sp2</packaging>
272+
<fieldPackage>quickfix.field</fieldPackage>
273+
<decimal>${generator.decimal}</decimal>
274+
</configuration>
275+
</execution>
276+
<execution>
277+
<id>fix50sp1</id>
278+
<goals>
279+
<goal>generate</goal>
280+
</goals>
281+
<configuration>
282+
<dictFile>../quickfixj-messages/quickfixj-messages-fix50sp1/src/main/resources/FIX50SP1.modified.xml</dictFile>
283+
<packaging>quickfix.fix50sp1</packaging>
284+
<fieldPackage>quickfix.field</fieldPackage>
285+
<decimal>${generator.decimal}</decimal>
286+
</configuration>
233287
</execution>
234288
</executions>
235289
</plugin>

‎quickfixj-messages/quickfixj-messages-all/pom.xml‎

Lines changed: 47 additions & 118 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,6 @@
2020
<artifactId>quickfixj-core</artifactId>
2121
<version>${project.version}</version>
2222
</dependency>
23-
24-
<dependency>
25-
<groupId>junit</groupId>
26-
<artifactId>junit</artifactId>
27-
<version>${junit.version}</version>
28-
<scope>test</scope>
29-
</dependency>
3023
</dependencies>
3124

3225
<build>
@@ -59,140 +52,76 @@
5952
<directory>../quickfixj-messages-fix50sp2/src/main/resources</directory>
6053
</resource>
6154
</resources>
62-
55+
6356
<plugins>
64-
<plugin>
65-
<groupId>org.quickfixj</groupId>
66-
<artifactId>quickfixj-codegenerator</artifactId>
67-
<version>${project.version}</version>
57+
<plugin>
58+
<groupId>org.codehaus.mojo</groupId>
59+
<artifactId>build-helper-maven-plugin</artifactId>
60+
<version>${build-helper-maven-plugin-version}</version>
6861
<executions>
6962
<execution>
70-
<id>fixt11</id>
71-
<goals>
72-
<goal>generate</goal>
73-
</goals>
74-
<configuration>
75-
<dictFile>../quickfixj-messages-fixt11/src/main/resources/FIXT11.xml</dictFile>
76-
<packaging>quickfix.fixt11</packaging>
77-
<fieldPackage>quickfix.field</fieldPackage>
78-
<decimal>${generator.decimal}</decimal>
79-
</configuration>
80-
</execution>
81-
<execution>
82-
<id>fix50</id>
83-
<goals>
84-
<goal>generate</goal>
85-
</goals>
86-
<configuration>
87-
<dictFile>../quickfixj-messages-fix50/src/main/resources/FIX50.xml</dictFile>
88-
<packaging>quickfix.fix50</packaging>
89-
<fieldPackage>quickfix.field</fieldPackage>
90-
<decimal>${generator.decimal}</decimal>
91-
</configuration>
92-
</execution>
93-
<execution>
94-
<id>fix44</id>
95-
<goals>
96-
<goal>generate</goal>
97-
</goals>
98-
<configuration>
99-
<dictFile>../quickfixj-messages-fix44/src/main/resources/FIX44.modified.xml</dictFile>
100-
<packaging>quickfix.fix44</packaging>
101-
<fieldPackage>quickfix.field</fieldPackage>
102-
<decimal>${generator.decimal}</decimal>
103-
</configuration>
104-
</execution>
105-
<execution>
106-
<id>fix43</id>
107-
<goals>
108-
<goal>generate</goal>
109-
</goals>
110-
<configuration>
111-
<dictFile>../quickfixj-messages-fix43/src/main/resources/FIX43.xml</dictFile>
112-
<packaging>quickfix.fix43</packaging>
113-
<fieldPackage>quickfix.field</fieldPackage>
114-
<decimal>${generator.decimal}</decimal>
115-
</configuration>
116-
</execution>
117-
<execution>
118-
<id>fix42</id>
119-
<goals>
120-
<goal>generate</goal>
121-
</goals>
122-
<configuration>
123-
<dictFile>../quickfixj-messages-fix42/src/main/resources/FIX42.xml</dictFile>
124-
<packaging>quickfix.fix42</packaging>
125-
<fieldPackage>quickfix.field</fieldPackage>
126-
<decimal>${generator.decimal}</decimal>
127-
</configuration>
128-
</execution>
129-
<execution>
130-
<id>fix41</id>
131-
<goals>
132-
<goal>generate</goal>
133-
</goals>
134-
<configuration>
135-
<dictFile>../quickfixj-messages-fix41/src/main/resources/FIX41.xml</dictFile>
136-
<packaging>quickfix.fix41</packaging>
137-
<fieldPackage>quickfix.field</fieldPackage>
138-
<decimal>${generator.decimal}</decimal>
139-
</configuration>
140-
</execution>
141-
<execution>
142-
<id>fix40</id>
143-
<goals>
144-
<goal>generate</goal>
145-
</goals>
63+
<phase>prepare-package</phase>
64+
<goals><goal>add-source</goal></goals>
14665
<configuration>
147-
<dictFile>../quickfixj-messages-fix40/src/main/resources/FIX40.xml</dictFile>
148-
<packaging>quickfix.fix40</packaging>
149-
<fieldPackage>quickfix.field</fieldPackage>
150-
<decimal>${generator.decimal}</decimal>
151-
</configuration>
152-
</execution>
153-
<execution>
154-
<id>fix50sp2</id>
155-
<goals>
156-
<goal>generate</goal>
157-
</goals>
158-
<configuration>
159-
<dictFile>../quickfixj-messages-fix50sp2/src/main/resources/FIX50SP2.modified.xml</dictFile>
160-
<packaging>quickfix.fix50sp2</packaging>
161-
<fieldPackage>quickfix.field</fieldPackage>
162-
<decimal>${generator.decimal}</decimal>
66+
<sources>
67+
<source>${project.basedir}/../../quickfixj-core/target/generated-sources/</source>
68+
</sources>
16369
</configuration>
16470
</execution>
71+
</executions>
72+
</plugin>
73+
74+
<plugin>
75+
<groupId>org.apache.felix</groupId>
76+
<artifactId>maven-bundle-plugin</artifactId>
77+
<executions>
16578
<execution>
166-
<id>fix50sp1</id>
167-
<goals>
168-
<goal>generate</goal>
169-
</goals>
79+
<id>bundle-manifest</id>
80+
<phase>process-classes</phase>
81+
<goals>
82+
<goal>manifest</goal>
83+
</goals>
17084
<configuration>
171-
<dictFile>../quickfixj-messages-fix50sp1/src/main/resources/FIX50SP1.modified.xml</dictFile>
172-
<packaging>quickfix.fix50sp1</packaging>
173-
<fieldPackage>quickfix.field</fieldPackage>
174-
<decimal>${generator.decimal}</decimal>
85+
<instructions>
86+
<Export-Package>quickfix.field;version="${project.version}";uses:=quickfix,quickfix.fix41;version="${project.version}";uses:=quickfix,quickfix.field;version="${project.version}"</Export-Package>
87+
<Import-Package>quickfix,quickfix.field;version="${project.version}"</Import-Package>
88+
<Require-Capability>osgi.ee;filter:="(&#38;(osgi.ee=JavaSE)(version=${jdkLevel}))"</Require-Capability>
89+
</instructions>
17590
</configuration>
17691
</execution>
17792
</executions>
17893
</plugin>
17994

18095
<plugin>
181-
<artifactId>maven-surefire-plugin</artifactId>
96+
<groupId>org.apache.maven.plugins</groupId>
97+
<artifactId>maven-jar-plugin</artifactId>
98+
<version>${maven-jar-plugin-version}</version>
18299
<configuration>
183-
<argLine>-Xmx512m -XX:MaxPermSize=128m</argLine>
100+
<classesDirectory>${project.basedir}/../../quickfixj-core/target/classes/</classesDirectory>
184101
<includes>
185-
<include>**/*Test.java</include>
102+
<include>*.xml</include>
103+
<include>quickfix/field/*.class</include>
104+
<include>quickfix/fix*/**</include>
186105
</includes>
106+
<archive>
107+
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
108+
</archive>
187109
</configuration>
188110
</plugin>
189111

190-
<plugin>
191-
<artifactId>maven-jar-plugin</artifactId>
192-
</plugin>
193112
<plugin>
194113
<artifactId>maven-source-plugin</artifactId>
114+
<groupId>org.apache.maven.plugins</groupId>
115+
<version>${maven-source-plugin-version}</version>
116+
<configuration>
117+
<includes>
118+
<include>*.xml</include>
119+
<include>quickfix/fix*/**</include>
120+
<include>quickfix/field/**</include>
121+
</includes>
122+
</configuration>
195123
</plugin>
196124
</plugins>
197125
</build>
126+
198127
</project>

‎quickfixj-messages/quickfixj-messages-all/src/test/java/quickfixj/SupportForMultipleFixVersionsTest.java‎

Lines changed: 0 additions & 61 deletions
This file was deleted.

‎quickfixj-messages/quickfixj-messages-fix40/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<goals><goal>add-source</goal></goals>
3636
<configuration>
3737
<sources>
38-
<source>${project.basedir}/../quickfixj-messages-all/target/generated-sources/</source>
38+
<source>${project.basedir}/../../quickfixj-core/target/generated-sources/</source>
3939
</sources>
4040
</configuration>
4141
</execution>
@@ -66,10 +66,10 @@
6666
<artifactId>maven-jar-plugin</artifactId>
6767
<version>${maven-jar-plugin-version}</version>
6868
<configuration>
69-
<classesDirectory>${project.basedir}/../quickfixj-messages-all/target/classes/</classesDirectory>
69+
<classesDirectory>${project.basedir}/../../quickfixj-core/target/classes/</classesDirectory>
7070
<includes>
7171
<include>FIX40.xml</include>
72-
<include>quickfix/field/**</include>
72+
<include>quickfix/field/*.class</include>
7373
<include>quickfix/fix40/**</include>
7474
</includes>
7575
<archive>

‎quickfixj-messages/quickfixj-messages-fix41/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<goals><goal>add-source</goal></goals>
3535
<configuration>
3636
<sources>
37-
<source>${project.basedir}/../quickfixj-messages-all/target/generated-sources/</source>
37+
<source>${project.basedir}/../../quickfixj-core/target/generated-sources/</source>
3838
</sources>
3939
</configuration>
4040
</execution>
@@ -67,11 +67,11 @@
6767
<artifactId>maven-jar-plugin</artifactId>
6868
<version>${maven-jar-plugin-version}</version>
6969
<configuration>
70-
<classesDirectory>${project.basedir}/../quickfixj-messages-all/target/classes/</classesDirectory>
70+
<classesDirectory>${project.basedir}/../../quickfixj-core/target/classes/</classesDirectory>
7171
<includes>
7272
<include>FIX41.xml</include>
73+
<include>quickfix/field/*.class</include>
7374
<include>quickfix/fix41/**</include>
74-
<include>quickfix/field/**</include>
7575
</includes>
7676
<archive>
7777
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>

0 commit comments

Comments
 (0)