Skip to content

Commit bc4118b

Browse files
chrjohnchrjohn
committed
Merge branch 'manureno-QFJ-855'
2 parents 8e13e44 + e024476 commit bc4118b

File tree

11 files changed

+593
-193
lines changed

11 files changed

+593
-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 specs</name>
1414
<description>QuickFIX/J Message classes for all FIX specs</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: 65 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,39 +8,89 @@
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>
30+
<version>1.9.1</version>
2331
<executions>
2432
<execution>
25-
<id>fix40</id>
26-
<goals>
27-
<goal>generate</goal>
28-
</goals>
33+
<phase>prepare-package</phase>
34+
<id>add-source</id>
35+
<goals><goal>add-source</goal></goals>
2936
<configuration>
30-
<dictFile>./src/main/resources/FIX40.xml</dictFile>
31-
<packaging>quickfix.fixt40</packaging>
32-
<fieldPackage>quickfix.field</fieldPackage>
33-
<decimal>${generator.decimal}</decimal>
37+
<sources>
38+
<source>${project.basedir}/../quickfixj-messages-all/target/generated-sources/</source>
39+
</sources>
3440
</configuration>
3541
</execution>
3642
</executions>
3743
</plugin>
38-
<plugin>
39-
<artifactId>maven-source-plugin</artifactId>
44+
<plugin>
45+
<groupId>org.apache.felix</groupId>
46+
<artifactId>maven-bundle-plugin</artifactId>
47+
<executions>
48+
<execution>
49+
<id>bundle-manifest</id>
50+
<phase>process-classes</phase>
51+
<goals>
52+
<goal>manifest</goal>
53+
</goals>
54+
<configuration>
55+
<instructions>
56+
<Export-Package>quickfix.field;version="${project.version}";uses:=quickfix,quickfix.fix40;version="${project.version}";uses:=quickfix,quickfix.field;version="${project.version}"</Export-Package>
57+
<Import-Package>quickfix,quickfix.field;version="${project.version}"</Import-Package>
58+
<Require-Capability>osgi.ee;filter:="(&#38;(osgi.ee=JavaSE)(version=${jdkLevel}))"</Require-Capability>
59+
</instructions>
60+
</configuration>
61+
</execution>
62+
</executions>
4063
</plugin>
4164
<plugin>
4265
<artifactId>maven-jar-plugin</artifactId>
66+
<groupId>org.apache.maven.plugins</groupId>
67+
<version>2.6</version>
68+
<configuration>
69+
<classesDirectory>${project.basedir}/../quickfixj-messages-all/target/classes/</classesDirectory>
70+
<includes>
71+
<include>FIX40.xml</include>
72+
<include>quickfix/field/**</include>
73+
<include>quickfix/fix40/**</include>
74+
</includes>
75+
<archive>
76+
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
77+
</archive>
78+
</configuration>
79+
</plugin>
80+
81+
<plugin>
82+
<artifactId>maven-source-plugin</artifactId>
83+
<groupId>org.apache.maven.plugins</groupId>
84+
<version>2.4</version>
85+
<configuration>
86+
<includes>
87+
<include>FIX40.xml</include>
88+
<include>quickfix/field/**</include>
89+
<include>quickfix/fix40/**</include>
90+
</includes>
91+
</configuration>
4392
</plugin>
93+
4494
</plugins>
4595
</build>
4696
</project>

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

Lines changed: 64 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,38 +8,88 @@
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>
30+
<version>1.9.1</version>
2331
<executions>
2432
<execution>
25-
<id>fix41</id>
26-
<goals>
27-
<goal>generate</goal>
28-
</goals>
33+
<phase>prepare-package</phase>
34+
<goals><goal>add-source</goal></goals>
2935
<configuration>
30-
<dictFile>./src/main/resources/FIX41.xml</dictFile>
31-
<packaging>quickfix.fix41</packaging>
32-
<fieldPackage>quickfix.field</fieldPackage>
33-
<decimal>${generator.decimal}</decimal>
36+
<sources>
37+
<source>${project.basedir}/../quickfixj-messages-all/target/generated-sources/</source>
38+
</sources>
3439
</configuration>
3540
</execution>
3641
</executions>
3742
</plugin>
38-
<plugin>
39-
<artifactId>maven-source-plugin</artifactId>
43+
44+
<plugin>
45+
<groupId>org.apache.felix</groupId>
46+
<artifactId>maven-bundle-plugin</artifactId>
47+
<executions>
48+
<execution>
49+
<id>bundle-manifest</id>
50+
<phase>process-classes</phase>
51+
<goals>
52+
<goal>manifest</goal>
53+
</goals>
54+
<configuration>
55+
<instructions>
56+
<Export-Package>quickfix.field;version="${project.version}";uses:=quickfix,quickfix.fix41;version="${project.version}";uses:=quickfix,quickfix.field;version="${project.version}"</Export-Package>
57+
<Import-Package>quickfix,quickfix.field;version="${project.version}"</Import-Package>
58+
<Require-Capability>osgi.ee;filter:="(&#38;(osgi.ee=JavaSE)(version=${jdkLevel}))"</Require-Capability>
59+
</instructions>
60+
</configuration>
61+
</execution>
62+
</executions>
4063
</plugin>
64+
4165
<plugin>
4266
<artifactId>maven-jar-plugin</artifactId>
67+
<groupId>org.apache.maven.plugins</groupId>
68+
<version>2.6</version>
69+
<configuration>
70+
<classesDirectory>${project.basedir}/../quickfixj-messages-all/target/classes/</classesDirectory>
71+
<includes>
72+
<include>FIX41.xml</include>
73+
<include>quickfix/fix41/**</include>
74+
<include>quickfix/field/**</include>
75+
</includes>
76+
<archive>
77+
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
78+
</archive>
79+
</configuration>
80+
</plugin>
81+
82+
<plugin>
83+
<artifactId>maven-source-plugin</artifactId>
84+
<groupId>org.apache.maven.plugins</groupId>
85+
<version>2.4</version>
86+
<configuration>
87+
<includes>
88+
<include>FIX41.xml</include>
89+
<include>quickfix/fix41/**</include>
90+
<include>quickfix/field/**</include>
91+
</includes>
92+
</configuration>
4393
</plugin>
4494
</plugins>
4595
</build>

0 commit comments

Comments
 (0)