Skip to content

Commit d30acc7

Browse files
author
manureno
committed
Use the classes compiled by quickfixj-messages-all to build the jars of modules quickfixj-messages-fix99. Use jar & source plugins instead of bundle plugin.
1 parent 5b42345 commit d30acc7

File tree

11 files changed

+364
-193
lines changed

11 files changed

+364
-193
lines changed

‎quickfixj-messages/pom.xml‎

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -27,37 +27,4 @@
2727
<module>quickfixj-messages-all</module>
2828
</modules>
2929

30-
<dependencies>
31-
<dependency>
32-
<groupId>org.quickfixj</groupId>
33-
<artifactId>quickfixj-core</artifactId>
34-
<version>${project.version}</version>
35-
</dependency>
36-
</dependencies>
37-
38-
<build>
39-
<pluginManagement>
40-
<plugins>
41-
<plugin>
42-
<groupId>org.apache.felix</groupId>
43-
<artifactId>maven-bundle-plugin</artifactId>
44-
<configuration>
45-
<instructions>
46-
<Import-Package>quickfix,quickfix.field,*</Import-Package>
47-
</instructions>
48-
</configuration>
49-
</plugin>
50-
<plugin>
51-
<artifactId>maven-jar-plugin</artifactId>
52-
<configuration>
53-
<includes>
54-
<include>quickfix/field/**</include>
55-
<include>quickfix/${fix.name}/**</include>
56-
<include>${fix.spec}</include>
57-
</includes>
58-
</configuration>
59-
</plugin>
60-
</plugins>
61-
</pluginManagement>
62-
</build>
6330
</project>

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

Lines changed: 7 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,19 @@
88
</parent>
99

1010
<artifactId>quickfixj-messages-all</artifactId>
11-
<packaging>bundle</packaging>
11+
<packaging>jar</packaging>
1212

1313
<name>QuickFIX/J Message classes for all FIX specifications</name>
1414
<description>QuickFIX/J Message classes for all FIX specifications</description>
1515
<url>http://www.quickfixj.org</url>
1616

1717
<dependencies>
18+
<dependency>
19+
<groupId>org.quickfixj</groupId>
20+
<artifactId>quickfixj-core</artifactId>
21+
<version>${project.version}</version>
22+
</dependency>
23+
1824
<dependency>
1925
<groupId>junit</groupId>
2026
<artifactId>junit</artifactId>
@@ -181,38 +187,6 @@
181187
</configuration>
182188
</plugin>
183189

184-
<plugin>
185-
<artifactId>maven-shade-plugin</artifactId>
186-
<executions>
187-
<execution>
188-
<id>merge-all-classes</id>
189-
<phase>package</phase>
190-
<goals>
191-
<goal>shade</goal>
192-
</goals>
193-
<configuration>
194-
<createSourcesJar>true</createSourcesJar>
195-
<createDependencyReducedPom>false</createDependencyReducedPom>
196-
<artifactSet>
197-
<includes>
198-
<include>*:quickfixj-messages-fix*</include>
199-
</includes>
200-
</artifactSet>
201-
</configuration>
202-
</execution>
203-
</executions>
204-
</plugin>
205-
<plugin>
206-
<groupId>org.apache.felix</groupId>
207-
<artifactId>maven-bundle-plugin</artifactId>
208-
<configuration>
209-
<instructions>
210-
<Import-Package>quickfix,quickfix.field,*</Import-Package>
211-
<Export-Package>quickfix.field,quickfix.fix*</Export-Package>
212-
<Private-Package>quickfix.field,quickfix.fix*</Private-Package>
213-
</instructions>
214-
</configuration>
215-
</plugin>
216190
<plugin>
217191
<artifactId>maven-jar-plugin</artifactId>
218192
</plugin>

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

Lines changed: 39 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,39 +8,63 @@
88
</parent>
99

1010
<artifactId>quickfixj-messages-fix40</artifactId>
11-
<packaging>bundle</packaging>
11+
<packaging>jar</packaging>
1212

1313
<name>QuickFIX/J Message classes for FIX 4.0</name>
1414
<description>QuickFIX/J Message classes for FIX 4.0</description>
1515
<url>http://www.quickfixj.org</url>
16+
17+
<dependencies>
18+
<dependency>
19+
<groupId>org.quickfixj</groupId>
20+
<artifactId>quickfixj-messages-all</artifactId>
21+
<version>${project.version}</version>
22+
</dependency>
23+
</dependencies>
1624

17-
<build>
25+
<build>
1826
<plugins>
1927
<plugin>
20-
<groupId>org.quickfixj</groupId>
21-
<artifactId>quickfixj-codegenerator</artifactId>
22-
<version>${project.version}</version>
28+
<groupId>org.codehaus.mojo</groupId>
29+
<artifactId>build-helper-maven-plugin</artifactId>
2330
<executions>
2431
<execution>
25-
<id>fix40</id>
26-
<goals>
27-
<goal>generate</goal>
28-
</goals>
32+
<phase>prepare-package</phase>
33+
<goals><goal>add-source</goal></goals>
2934
<configuration>
30-
<dictFile>./src/main/resources/FIX40.xml</dictFile>
31-
<packaging>quickfix.fixt40</packaging>
32-
<fieldPackage>quickfix.field</fieldPackage>
33-
<decimal>${generator.decimal}</decimal>
35+
<sources>
36+
<source>${project.basedir}/../quickfixj-messages-all/target/generated-sources/</source>
37+
</sources>
3438
</configuration>
3539
</execution>
3640
</executions>
3741
</plugin>
3842
<plugin>
39-
<artifactId>maven-source-plugin</artifactId>
43+
<artifactId>maven-jar-plugin</artifactId>
44+
<groupId>org.apache.maven.plugins</groupId>
45+
<version>2.6</version>
46+
<configuration>
47+
<classesDirectory>${project.basedir}/../quickfixj-messages-all/target/classes/</classesDirectory>
48+
<includes>
49+
<include>FIX40.xml</include>
50+
<include>quickfix/field/**</include>
51+
<include>quickfix/fix40/**</include>
52+
</includes>
53+
</configuration>
4054
</plugin>
4155
<plugin>
42-
<artifactId>maven-jar-plugin</artifactId>
56+
<artifactId>maven-source-plugin</artifactId>
57+
<groupId>org.apache.maven.plugins</groupId>
58+
<version>2.4</version>
59+
<configuration>
60+
<includes>
61+
<include>FIX40.xml</include>
62+
<include>quickfix/field/**</include>
63+
<include>quickfix/fix40/**</include>
64+
</includes>
65+
</configuration>
4366
</plugin>
67+
4468
</plugins>
4569
</build>
4670
</project>

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

Lines changed: 39 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,38 +8,63 @@
88
</parent>
99

1010
<artifactId>quickfixj-messages-fix41</artifactId>
11-
<packaging>bundle</packaging>
11+
<packaging>jar</packaging>
1212

1313
<name>QuickFIX/J Message classes for FIX 4.1</name>
1414
<description>QuickFIX/J Message classes for FIX 4.1</description>
1515
<url>http://www.quickfixj.org</url>
16+
17+
<dependencies>
18+
<dependency>
19+
<groupId>org.quickfixj</groupId>
20+
<artifactId>quickfixj-messages-all</artifactId>
21+
<version>${project.version}</version>
22+
</dependency>
23+
</dependencies>
1624

1725
<build>
1826
<plugins>
1927
<plugin>
20-
<groupId>org.quickfixj</groupId>
21-
<artifactId>quickfixj-codegenerator</artifactId>
22-
<version>${project.version}</version>
28+
<groupId>org.codehaus.mojo</groupId>
29+
<artifactId>build-helper-maven-plugin</artifactId>
2330
<executions>
2431
<execution>
25-
<id>fix41</id>
26-
<goals>
27-
<goal>generate</goal>
28-
</goals>
32+
<phase>prepare-package</phase>
33+
<goals><goal>add-source</goal></goals>
2934
<configuration>
30-
<dictFile>./src/main/resources/FIX41.xml</dictFile>
31-
<packaging>quickfix.fix41</packaging>
32-
<fieldPackage>quickfix.field</fieldPackage>
33-
<decimal>${generator.decimal}</decimal>
35+
<sources>
36+
<source>${project.basedir}/../quickfixj-messages-all/target/generated-sources/</source>
37+
</sources>
3438
</configuration>
3539
</execution>
3640
</executions>
3741
</plugin>
42+
3843
<plugin>
39-
<artifactId>maven-source-plugin</artifactId>
44+
<artifactId>maven-jar-plugin</artifactId>
45+
<groupId>org.apache.maven.plugins</groupId>
46+
<version>2.6</version>
47+
<configuration>
48+
<classesDirectory>${project.basedir}/../quickfixj-messages-all/target/classes/</classesDirectory>
49+
<includes>
50+
<include>FIX41.xml</include>
51+
<include>quickfix/fix41/**</include>
52+
<include>quickfix/field/**</include>
53+
</includes>
54+
</configuration>
4055
</plugin>
56+
4157
<plugin>
42-
<artifactId>maven-jar-plugin</artifactId>
58+
<artifactId>maven-source-plugin</artifactId>
59+
<groupId>org.apache.maven.plugins</groupId>
60+
<version>2.4</version>
61+
<configuration>
62+
<includes>
63+
<include>FIX41.xml</include>
64+
<include>quickfix/fix41/**</include>
65+
<include>quickfix/field/**</include>
66+
</includes>
67+
</configuration>
4368
</plugin>
4469
</plugins>
4570
</build>

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

Lines changed: 39 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,38 +8,63 @@
88
</parent>
99

1010
<artifactId>quickfixj-messages-fix42</artifactId>
11-
<packaging>bundle</packaging>
11+
<packaging>jar</packaging>
1212

1313
<name>QuickFIX/J Message classes for FIX 4.2</name>
1414
<description>QuickFIX/J Message classes for FIX 4.2</description>
1515
<url>http://www.quickfixj.org</url>
16+
17+
<dependencies>
18+
<dependency>
19+
<groupId>org.quickfixj</groupId>
20+
<artifactId>quickfixj-messages-all</artifactId>
21+
<version>${project.version}</version>
22+
</dependency>
23+
</dependencies>
1624

1725
<build>
1826
<plugins>
1927
<plugin>
20-
<groupId>org.quickfixj</groupId>
21-
<artifactId>quickfixj-codegenerator</artifactId>
22-
<version>${project.version}</version>
28+
<groupId>org.codehaus.mojo</groupId>
29+
<artifactId>build-helper-maven-plugin</artifactId>
2330
<executions>
2431
<execution>
25-
<id>fix42</id>
26-
<goals>
27-
<goal>generate</goal>
28-
</goals>
32+
<phase>prepare-package</phase>
33+
<goals><goal>add-source</goal></goals>
2934
<configuration>
30-
<dictFile>./src/main/resources/FIX42.xml</dictFile>
31-
<packaging>quickfix.fix42</packaging>
32-
<fieldPackage>quickfix.field</fieldPackage>
33-
<decimal>${generator.decimal}</decimal>
35+
<sources>
36+
<source>${project.basedir}/../quickfixj-messages-all/target/generated-sources/</source>
37+
</sources>
3438
</configuration>
3539
</execution>
3640
</executions>
3741
</plugin>
42+
3843
<plugin>
39-
<artifactId>maven-source-plugin</artifactId>
44+
<artifactId>maven-jar-plugin</artifactId>
45+
<groupId>org.apache.maven.plugins</groupId>
46+
<version>2.6</version>
47+
<configuration>
48+
<classesDirectory>${project.basedir}/../quickfixj-messages-all/target/classes/</classesDirectory>
49+
<includes>
50+
<include>FIX42.xml</include>
51+
<include>quickfix/fix42/**</include>
52+
<include>quickfix/field/**</include>
53+
</includes>
54+
</configuration>
4055
</plugin>
56+
4157
<plugin>
42-
<artifactId>maven-jar-plugin</artifactId>
58+
<artifactId>maven-source-plugin</artifactId>
59+
<groupId>org.apache.maven.plugins</groupId>
60+
<version>2.4</version>
61+
<configuration>
62+
<includes>
63+
<include>FIX42.xml</include>
64+
<include>quickfix/fix42/**</include>
65+
<include>quickfix/field/**</include>
66+
</includes>
67+
</configuration>
4368
</plugin>
4469
</plugins>
4570
</build>

0 commit comments

Comments
 (0)