Skip to content

Commit cdfbabd

Browse files
author
ManuReno
committed
Restore osgi meta data in manifest files
1 parent 2ea46ee commit cdfbabd

File tree

11 files changed

+224
-4
lines changed

11 files changed

+224
-4
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@
145145
</goals>
146146
<configuration>
147147
<dictFile>../quickfixj-messages-fix40/src/main/resources/FIX40.xml</dictFile>
148-
<packaging>quickfix.fix40</packaging>
148+
<packaging>quickfix.fixt40</packaging>
149149
<fieldPackage>quickfix.field</fieldPackage>
150150
<decimal>${generator.decimal}</decimal>
151151
</configuration>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
public class SupportForMultipleFixVersionsTest extends TestCase {
1212

1313
public void testFIX40() {
14-
quickfix.fix40.MessageFactory fact = new quickfix.fix40.MessageFactory();
14+
quickfix.fixt40.MessageFactory fact = new quickfix.fixt40.MessageFactory();
1515
Object newMessage = fact.create("FIX.4.0", "D");
1616
assertNotNull(newMessage);
1717
}

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

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
<executions>
3232
<execution>
3333
<phase>prepare-package</phase>
34+
<id>add-source</id>
3435
<goals><goal>add-source</goal></goals>
3536
<configuration>
3637
<sources>
@@ -40,6 +41,26 @@
4041
</execution>
4142
</executions>
4243
</plugin>
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.fixt40;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=1.6))"</Require-Capability>
59+
</instructions>
60+
</configuration>
61+
</execution>
62+
</executions>
63+
</plugin>
4364
<plugin>
4465
<artifactId>maven-jar-plugin</artifactId>
4566
<groupId>org.apache.maven.plugins</groupId>
@@ -49,10 +70,14 @@
4970
<includes>
5071
<include>FIX40.xml</include>
5172
<include>quickfix/field/**</include>
52-
<include>quickfix/fix40/**</include>
73+
<include>quickfix/fixt40/**</include>
5374
</includes>
75+
<archive>
76+
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
77+
</archive>
5478
</configuration>
5579
</plugin>
80+
5681
<plugin>
5782
<artifactId>maven-source-plugin</artifactId>
5883
<groupId>org.apache.maven.plugins</groupId>
@@ -61,7 +86,7 @@
6186
<includes>
6287
<include>FIX40.xml</include>
6388
<include>quickfix/field/**</include>
64-
<include>quickfix/fix40/**</include>
89+
<include>quickfix/fixt40/**</include>
6590
</includes>
6691
</configuration>
6792
</plugin>

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,27 @@
4141
</executions>
4242
</plugin>
4343

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=1.6))"</Require-Capability>
59+
</instructions>
60+
</configuration>
61+
</execution>
62+
</executions>
63+
</plugin>
64+
4465
<plugin>
4566
<artifactId>maven-jar-plugin</artifactId>
4667
<groupId>org.apache.maven.plugins</groupId>
@@ -52,6 +73,9 @@
5273
<include>quickfix/fix41/**</include>
5374
<include>quickfix/field/**</include>
5475
</includes>
76+
<archive>
77+
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
78+
</archive>
5579
</configuration>
5680
</plugin>
5781

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,27 @@
4141
</executions>
4242
</plugin>
4343

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.fix42;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=1.6))"</Require-Capability>
59+
</instructions>
60+
</configuration>
61+
</execution>
62+
</executions>
63+
</plugin>
64+
4465
<plugin>
4566
<artifactId>maven-jar-plugin</artifactId>
4667
<groupId>org.apache.maven.plugins</groupId>
@@ -52,6 +73,9 @@
5273
<include>quickfix/fix42/**</include>
5374
<include>quickfix/field/**</include>
5475
</includes>
76+
<archive>
77+
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
78+
</archive>
5579
</configuration>
5680
</plugin>
5781

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,27 @@
4141
</executions>
4242
</plugin>
4343

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.fix43;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=1.6))"</Require-Capability>
59+
</instructions>
60+
</configuration>
61+
</execution>
62+
</executions>
63+
</plugin>
64+
4465
<plugin>
4566
<artifactId>maven-jar-plugin</artifactId>
4667
<groupId>org.apache.maven.plugins</groupId>
@@ -52,6 +73,9 @@
5273
<include>quickfix/fix43/**</include>
5374
<include>quickfix/field/**</include>
5475
</includes>
76+
<archive>
77+
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
78+
</archive>
5579
</configuration>
5680
</plugin>
5781

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,27 @@
4141
</executions>
4242
</plugin>
4343

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.fix44;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=1.6))"</Require-Capability>
59+
</instructions>
60+
</configuration>
61+
</execution>
62+
</executions>
63+
</plugin>
64+
4465
<plugin>
4566
<artifactId>maven-jar-plugin</artifactId>
4667
<groupId>org.apache.maven.plugins</groupId>
@@ -53,6 +74,9 @@
5374
<include>quickfix/fix44/**</include>
5475
<include>quickfix/field/**</include>
5576
</includes>
77+
<archive>
78+
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
79+
</archive>
5680
</configuration>
5781
</plugin>
5882

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,27 @@
4141
</executions>
4242
</plugin>
4343

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.fix50;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=1.6))"</Require-Capability>
59+
</instructions>
60+
</configuration>
61+
</execution>
62+
</executions>
63+
</plugin>
64+
4465
<plugin>
4566
<artifactId>maven-jar-plugin</artifactId>
4667
<groupId>org.apache.maven.plugins</groupId>
@@ -52,6 +73,9 @@
5273
<include>quickfix/fix50/**</include>
5374
<include>quickfix/field/**</include>
5475
</includes>
76+
<archive>
77+
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
78+
</archive>
5579
</configuration>
5680
</plugin>
5781

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,27 @@
4141
</executions>
4242
</plugin>
4343

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.fix50sp1;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=1.6))"</Require-Capability>
59+
</instructions>
60+
</configuration>
61+
</execution>
62+
</executions>
63+
</plugin>
64+
4465
<plugin>
4566
<artifactId>maven-jar-plugin</artifactId>
4667
<groupId>org.apache.maven.plugins</groupId>
@@ -53,6 +74,9 @@
5374
<include>quickfix/fix50sp1/**</include>
5475
<include>quickfix/field/**</include>
5576
</includes>
77+
<archive>
78+
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
79+
</archive>
5680
</configuration>
5781
</plugin>
5882

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

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,27 @@
4141
</executions>
4242
</plugin>
4343

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.fix50sp2;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=1.6))"</Require-Capability>
59+
</instructions>
60+
</configuration>
61+
</execution>
62+
</executions>
63+
</plugin>
64+
4465
<plugin>
4566
<artifactId>maven-jar-plugin</artifactId>
4667
<groupId>org.apache.maven.plugins</groupId>
@@ -53,6 +74,9 @@
5374
<include>quickfix/fix50sp2/**</include>
5475
<include>quickfix/field/**</include>
5576
</includes>
77+
<archive>
78+
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
79+
</archive>
5680
</configuration>
5781
</plugin>
5882

@@ -67,6 +91,9 @@
6791
<include>quickfix/fix50sp2/**</include>
6892
<include>quickfix/field/**</include>
6993
</includes>
94+
<archive>
95+
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
96+
</archive>
7097
</configuration>
7198
</plugin>
7299
</plugins>

0 commit comments

Comments
 (0)