Skip to content

Commit d4f2487

Browse files
poutsmapoutsma
committed
SWS-484: Missing version qualifiers on Export-Package entries
1 parent a231bb8 commit d4f2487

File tree

7 files changed

+48
-49
lines changed

7 files changed

+48
-49
lines changed

‎core-tiger/pom.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,28 +45,28 @@
4545
<plugin>
4646
<groupId>org.apache.felix</groupId>
4747
<artifactId>maven-bundle-plugin</artifactId>
48-
<version>1.2.0</version>
48+
<version>1.4.3</version>
4949
<extensions>true</extensions>
5050
<configuration>
5151
<excludeDependencies>true</excludeDependencies>
5252
<instructions>
5353
<Bundle-SymbolicName>org.springframework.bundle.ws.core-tiger</Bundle-SymbolicName>
54-
<Export-Package>org.springframework.ws*</Export-Package>
54+
<Export-Package>org.springframework.ws*;version="${pom.version}"</Export-Package>
5555
<Import-Package>
5656
org.apache.commons.logging*,
5757
javax.xml.namespace*,
5858
javax.xml.transform*,
5959
org.w3c.dom*,
60-
org.springframework.xml*,
61-
org.springframework.oxm*,
62-
org.springframework.ws*,
63-
org.springframework*;version="2.0",
60+
org.springframework.xml*;version="${pom.version}",
61+
org.springframework.oxm*;version="${pom.version}",
62+
org.springframework.ws*;version="${pom.version}",
63+
org.springframework*;version="[2.0,3.0)",
6464
*;resolution:=optional
6565
</Import-Package>
66-
<Fragment-Host>org.springframework.bundle.ws.core;version="[${pom.version}, ${pom.version}]"</Fragment-Host>
66+
<Fragment-Host>org.springframework.bundle.ws.core</Fragment-Host>
6767
<Implementation-Title>${pom.name}</Implementation-Title>
68-
<Implementation-Version>${pom.version}</Implementation-Version>
6968
<Spring-WS-Version>${pom.version}</Spring-WS-Version>
69+
<Bundle-Vendor>SpringSource</Bundle-Vendor>
7070
</instructions>
7171
</configuration>
7272
</plugin>

‎core/pom.xml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,12 @@
4242
<plugin>
4343
<groupId>org.apache.felix</groupId>
4444
<artifactId>maven-bundle-plugin</artifactId>
45-
<version>1.2.0</version>
45+
<version>1.4.3</version>
4646
<extensions>true</extensions>
4747
<configuration>
4848
<instructions>
4949
<Bundle-SymbolicName>org.springframework.bundle.ws.core</Bundle-SymbolicName>
50-
<Export-Package>org.springframework.ws*</Export-Package>
50+
<Export-Package>org.springframework.ws*;version="${pom.version}"</Export-Package>
5151
<Import-Package>
5252
org.apache.commons.logging*,
5353
javax.activation*,
@@ -58,15 +58,15 @@
5858
javax.xml.transform*,
5959
org.xml.sax*,
6060
org.w3c.dom*,
61-
org.springframework.xml*,
62-
org.springframework.oxm*,
63-
org.springframework.ws*,
64-
org.springframework*;version="2.0",
61+
org.springframework.xml*;version="${pom.version}",
62+
org.springframework.oxm*;version="${pom.version}",
63+
org.springframework.ws*;version="${pom.version}",
64+
org.springframework*;version="[2.0,3.0)",
6565
*;resolution:=optional
6666
</Import-Package>
6767
<Implementation-Title>${pom.name}</Implementation-Title>
68-
<Implementation-Version>${pom.version}</Implementation-Version>
6968
<Spring-WS-Version>${pom.version}</Spring-WS-Version>
69+
<Bundle-Vendor>SpringSource</Bundle-Vendor>
7070
</instructions>
7171
</configuration>
7272
</plugin>

‎oxm-tiger/pom.xml‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -80,29 +80,27 @@
8080
<plugin>
8181
<groupId>org.apache.felix</groupId>
8282
<artifactId>maven-bundle-plugin</artifactId>
83-
<version>1.2.0</version>
83+
<version>1.4.3</version>
8484
<extensions>true</extensions>
8585
<configuration>
8686
<excludeDependencies>true</excludeDependencies>
8787
<instructions>
8888
<Bundle-SymbolicName>org.springframework.bundle.ws.oxm-tiger</Bundle-SymbolicName>
89-
<Export-Package>
90-
org.springframework.oxm*
91-
</Export-Package>
89+
<Export-Package>org.springframework.oxm*;version="${pom.version}"</Export-Package>
9290
<Import-Package>
9391
org.apache.commons.logging*,
9492
javax.xml.namespace*,
9593
javax.xml.stream*,
9694
javax.xml.transform*,
97-
org.springframework.xml*,
98-
org.springframework.oxm*,
99-
org.springframework*;version="2.0",
95+
org.springframework.xml*;version="${pom.version}",
96+
org.springframework.oxm*;version="${pom.version}",
97+
org.springframework*;version="[2.0,3.0)",
10098
*;resolution:=optional
10199
</Import-Package>
102-
<Fragment-Host>org.springframework.bundle.ws.oxm;version="[${pom.version}, ${pom.version}]"</Fragment-Host>
100+
<Fragment-Host>org.springframework.bundle.ws.oxm</Fragment-Host>
103101
<Implementation-Title>${pom.name}</Implementation-Title>
104-
<Implementation-Version>${pom.version}</Implementation-Version>
105102
<Spring-WS-Version>${pom.version}</Spring-WS-Version>
103+
<Bundle-Vendor>SpringSource</Bundle-Vendor>
106104
</instructions>
107105
</configuration>
108106
</plugin>

‎oxm/pom.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -76,29 +76,29 @@
7676
<plugin>
7777
<groupId>org.apache.felix</groupId>
7878
<artifactId>maven-bundle-plugin</artifactId>
79-
<version>1.2.0</version>
79+
<version>1.4.3</version>
8080
<extensions>true</extensions>
8181
<configuration>
8282
<instructions>
8383
<Bundle-SymbolicName>org.springframework.bundle.ws.oxm</Bundle-SymbolicName>
84-
<Export-Package>org.springframework.oxm*</Export-Package>
84+
<Export-Package>org.springframework.oxm*;version="${pom.version}"</Export-Package>
8585
<Import-Package>
8686
org.apache.commons.logging*,
8787
javax.xml.parsers*,
8888
javax.xml.stream*,
8989
javax.xml.transform*,
9090
org.xml.sax*,
9191
org.w3c.dom*,
92-
org.springframework.xml*,
93-
org.springframework.oxm*,
94-
org.springframework.jms*;version="2.0";resolution:=optional,
95-
org.springframework.web*;version="2.0";resolution:=optional,
96-
org.springframework*;version="2.0",
92+
org.springframework.xml*;version="${pom.version}",
93+
org.springframework.oxm*;version="${pom.version}",
94+
org.springframework.jms*;version="[2.0,3.0)";resolution:=optional,
95+
org.springframework.web*;version="[2.0,3.0)";resolution:=optional,
96+
org.springframework*;version="[2.0,3.0)",
9797
*;resolution:=optional
9898
</Import-Package>
9999
<Implementation-Title>${pom.name}</Implementation-Title>
100-
<Implementation-Version>${pom.version}</Implementation-Version>
101100
<Spring-WS-Version>${pom.version}</Spring-WS-Version>
101+
<Bundle-Vendor>SpringSource</Bundle-Vendor>
102102
</instructions>
103103
</configuration>
104104
</plugin>

‎security/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,26 +50,26 @@
5050
<plugin>
5151
<groupId>org.apache.felix</groupId>
5252
<artifactId>maven-bundle-plugin</artifactId>
53-
<version>1.2.0</version>
53+
<version>1.4.3</version>
5454
<extensions>true</extensions>
5555
<configuration>
5656
<instructions>
5757
<Bundle-SymbolicName>org.springframework.bundle.ws.security</Bundle-SymbolicName>
58-
<Export-Package>org.springframework.ws.soap.security*</Export-Package>
58+
<Export-Package>org.springframework.ws.soap.security*;version="${pom.version}"</Export-Package>
5959
<Import-Package>
6060
org.apache.commons.logging*,
6161
javax.crypto*,
6262
javax.security*,
6363
javax.xml.namespace*,
6464
javax.xml.soap*,
6565
com.sun.xml.wss*,
66-
org.springframework.ws*,
66+
org.springframework.ws*;version="${pom.version}",
6767
org.springframework*;version="2.0",
6868
*;resolution:=optional
6969
</Import-Package>
7070
<Implementation-Title>${pom.name}</Implementation-Title>
71-
<Implementation-Version>${pom.version}</Implementation-Version>
7271
<Spring-WS-Version>${pom.version}</Spring-WS-Version>
72+
<Bundle-Vendor>SpringSource</Bundle-Vendor>
7373
</instructions>
7474
</configuration>
7575
</plugin>

‎support/pom.xml‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
23
<parent>
34
<artifactId>spring-ws-parent</artifactId>
45
<groupId>org.springframework.ws</groupId>
@@ -50,27 +51,27 @@
5051
<plugin>
5152
<groupId>org.apache.felix</groupId>
5253
<artifactId>maven-bundle-plugin</artifactId>
53-
<version>1.2.0</version>
54+
<version>1.4.3</version>
5455
<extensions>true</extensions>
5556
<configuration>
5657
<excludeDependencies>true</excludeDependencies>
5758
<instructions>
5859
<Bundle-SymbolicName>org.springframework.bundle.ws.support</Bundle-SymbolicName>
59-
<Export-Package>org.springframework.ws*</Export-Package>
60+
<Export-Package>org.springframework.ws*;version="${pom.version}"</Export-Package>
6061
<Import-Package>
6162
org.apache.commons.logging*,
6263
javax.activation*,
6364
javax.jms*,
6465
javax.mail*,
65-
org.springframework.xml*,
66-
org.springframework.ws*,
67-
org.springframework*;version="2.0",
66+
org.springframework.xml*;version="${pom.version}",
67+
org.springframework.ws*;version="${pom.version}",
68+
org.springframework*;version="[2.0,3.0)",
6869
*;resolution:=optional
6970
</Import-Package>
70-
<Fragment-Host>org.springframework.bundle.ws.core;version="[${pom.version}, ${pom.version}]"</Fragment-Host>
71+
<Fragment-Host>org.springframework.bundle.ws.core</Fragment-Host>
7172
<Implementation-Title>${pom.name}</Implementation-Title>
72-
<Implementation-Version>${pom.version}</Implementation-Version>
7373
<Spring-WS-Version>${pom.version}</Spring-WS-Version>
74+
<Bundle-Vendor>SpringSource</Bundle-Vendor>
7475
</instructions>
7576
</configuration>
7677
</plugin>

‎xml/pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@
2929
<plugin>
3030
<groupId>org.apache.felix</groupId>
3131
<artifactId>maven-bundle-plugin</artifactId>
32-
<version>1.2.0</version>
32+
<version>1.4.3</version>
3333
<extensions>true</extensions>
3434
<configuration>
3535
<instructions>
3636
<Bundle-SymbolicName>org.springframework.bundle.ws.xml</Bundle-SymbolicName>
37-
<Export-Package>org.springframework.xml*</Export-Package>
37+
<Export-Package>org.springframework.xml*;version="${pom.version}"</Export-Package>
3838
<Import-Package>
3939
org.apache.commons.logging*,
4040
javax.xml.namespace*,
@@ -43,13 +43,13 @@
4343
javax.xml.transform*,
4444
org.xml.sax*,
4545
org.w3c.dom*,
46-
org.springframework.xml*,
47-
org.springframework*;version="2.0",
46+
org.springframework.xml*;version="${pom.version}",
47+
org.springframework*;version="[2.0,3.0)",
4848
*;resolution:=optional
4949
</Import-Package>
5050
<Implementation-Title>${pom.name}</Implementation-Title>
51-
<Implementation-Version>${pom.version}</Implementation-Version>
5251
<Spring-WS-Version>${pom.version}</Spring-WS-Version>
52+
<Bundle-Vendor>SpringSource</Bundle-Vendor>
5353
</instructions>
5454
</configuration>
5555
</plugin>

0 commit comments

Comments
 (0)