Skip to content

Commit 9a36c64

Browse files
poutsmapoutsma
committed
SWS-578 - Fix manifest to disallow usage of org.springframework.oxm version 3.0.0
1 parent 2f275a5 commit 9a36c64

File tree

8 files changed

+69
-58
lines changed

8 files changed

+69
-58
lines changed

‎core-tiger/pom.xml‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@
4444
<plugin>
4545
<groupId>org.apache.felix</groupId>
4646
<artifactId>maven-bundle-plugin</artifactId>
47-
<version>1.4.3</version>
48-
<extensions>true</extensions>
4947
<configuration>
5048
<excludeDependencies>true</excludeDependencies>
5149
<instructions>
@@ -56,10 +54,10 @@
5654
javax.xml.namespace*,
5755
javax.xml.transform*,
5856
org.w3c.dom*,
59-
org.springframework.xml*;version="${pom.version}",
60-
org.springframework.oxm*;version="${pom.version}",
61-
org.springframework.ws*;version="${pom.version}",
62-
org.springframework*;version="[2.0,3.1.0)",
57+
org.springframework.xml*;version="[${pom.version},${pom.version}]",
58+
org.springframework.oxm*;version="[${pom.version},${pom.version}]",
59+
org.springframework.ws*;version="[${pom.version},${pom.version}]",
60+
org.springframework*;version="[2.0,4.0)",
6361
*;resolution:=optional
6462
</Import-Package>
6563
<Fragment-Host>org.springframework.bundle.ws.core</Fragment-Host>

‎core/pom.xml‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@
4141
<plugin>
4242
<groupId>org.apache.felix</groupId>
4343
<artifactId>maven-bundle-plugin</artifactId>
44-
<version>1.4.3</version>
45-
<extensions>true</extensions>
4644
<configuration>
4745
<instructions>
4846
<Bundle-SymbolicName>org.springframework.bundle.ws.core</Bundle-SymbolicName>
@@ -57,10 +55,10 @@
5755
javax.xml.transform*,
5856
org.xml.sax*,
5957
org.w3c.dom*,
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.1.0)",
58+
org.springframework.xml*;version="[${pom.version},${pom.version}]",
59+
org.springframework.oxm*;version="[${pom.version},${pom.version}]",
60+
org.springframework.ws*;version="[${pom.version},${pom.version}]",
61+
org.springframework*;version="[2.0,4.0)",
6462
*;resolution:=optional
6563
</Import-Package>
6664
<Implementation-Title>${pom.name}</Implementation-Title>

‎oxm-tiger/pom.xml‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,6 @@
7878
<plugin>
7979
<groupId>org.apache.felix</groupId>
8080
<artifactId>maven-bundle-plugin</artifactId>
81-
<version>1.4.3</version>
82-
<extensions>true</extensions>
8381
<configuration>
8482
<excludeDependencies>true</excludeDependencies>
8583
<instructions>
@@ -90,9 +88,9 @@
9088
javax.xml.namespace*,
9189
javax.xml.stream*,
9290
javax.xml.transform*,
93-
org.springframework.xml*;version="${pom.version}",
94-
org.springframework.oxm*;version="${pom.version}",
95-
org.springframework*;version="[2.0,3.1.0)",
91+
org.springframework.xml*;version="[${pom.version},${pom.version}]",
92+
org.springframework.oxm*;version="[${pom.version},${pom.version}]",
93+
org.springframework*;version="[2.0,4.0)",
9694
*;resolution:=optional
9795
</Import-Package>
9896
<Fragment-Host>org.springframework.bundle.ws.oxm</Fragment-Host>

‎oxm/pom.xml‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,6 @@
7474
<plugin>
7575
<groupId>org.apache.felix</groupId>
7676
<artifactId>maven-bundle-plugin</artifactId>
77-
<version>1.4.3</version>
78-
<extensions>true</extensions>
7977
<configuration>
8078
<instructions>
8179
<Bundle-SymbolicName>org.springframework.bundle.ws.oxm</Bundle-SymbolicName>
@@ -87,11 +85,11 @@
8785
javax.xml.transform*,
8886
org.xml.sax*,
8987
org.w3c.dom*,
90-
org.springframework.xml*;version="${pom.version}",
91-
org.springframework.oxm*;version="${pom.version}",
92-
org.springframework.jms*;version="[2.0,3.1.0)";resolution:=optional,
93-
org.springframework.web*;version="[2.0,3.1.0)";resolution:=optional,
94-
org.springframework*;version="[2.0,3.1.0)",
88+
org.springframework.xml*;version="[${pom.version},${pom.version}]",
89+
org.springframework.oxm*;version="[${pom.version},${pom.version}]",
90+
org.springframework.jms*;version="[2.0,4.0)";resolution:=optional,
91+
org.springframework.web*;version="[2.0,4.0)";resolution:=optional,
92+
org.springframework*;version="[2.0,4.0)",
9593
*;resolution:=optional
9694
</Import-Package>
9795
<Implementation-Title>${pom.name}</Implementation-Title>

‎parent/pom.xml‎

Lines changed: 43 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -57,57 +57,78 @@
5757
<version>1.2.2</version>
5858
</extension>
5959
</extensions>
60+
<pluginManagement>
61+
<plugins>
62+
<plugin>
63+
<artifactId>maven-compiler-plugin</artifactId>
64+
<version>2.1</version>
65+
<configuration>
66+
<source>1.3</source>
67+
<target>1.4</target>
68+
</configuration>
69+
</plugin>
70+
<plugin>
71+
<artifactId>maven-surefire-plugin</artifactId>
72+
<version>2.3</version>
73+
<configuration>
74+
<forkMode>once</forkMode>
75+
<childDelegation>false</childDelegation>
76+
</configuration>
77+
</plugin>
78+
<plugin>
79+
<artifactId>maven-jar-plugin</artifactId>
80+
<version>2.3</version>
81+
<configuration>
82+
<archive>
83+
<manifest>
84+
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
85+
</manifest>
86+
<manifestEntries>
87+
<Spring-WS-Version>${pom.version}</Spring-WS-Version>
88+
</manifestEntries>
89+
</archive>
90+
</configuration>
91+
</plugin>
92+
<plugin>
93+
<groupId>org.apache.felix</groupId>
94+
<artifactId>maven-bundle-plugin</artifactId>
95+
<version>2.0.1</version>
96+
<extensions>true</extensions>
97+
</plugin>
98+
</plugins>
99+
</pluginManagement>
60100
<plugins>
61101
<!-- Building -->
62102
<plugin>
63103
<artifactId>maven-compiler-plugin</artifactId>
64-
<configuration>
65-
<source>1.3</source>
66-
<target>1.4</target>
67-
</configuration>
68104
</plugin>
69105
<plugin>
70106
<artifactId>maven-surefire-plugin</artifactId>
71-
<version>2.3</version>
72-
<configuration>
73-
<forkMode>once</forkMode>
74-
<childDelegation>false</childDelegation>
75-
</configuration>
76107
</plugin>
77108
<plugin>
78109
<artifactId>maven-jar-plugin</artifactId>
79-
<configuration>
80-
<archive>
81-
<manifest>
82-
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
83-
</manifest>
84-
<manifestEntries>
85-
<Spring-WS-Version>${pom.version}</Spring-WS-Version>
86-
</manifestEntries>
87-
</archive>
88-
</configuration>
89110
</plugin>
90111
</plugins>
91112
</build>
92113
<reporting>
93114
<plugins>
94115
<plugin>
95116
<artifactId>maven-jxr-plugin</artifactId>
117+
<version>2.1</version>
96118
<configuration>
97119
<aggregate>true</aggregate>
98120
</configuration>
99121
</plugin>
100122
<plugin>
101123
<artifactId>maven-surefire-report-plugin</artifactId>
124+
<version>2.4.2</version>
102125
<configuration>
103126
<aggregate>true</aggregate>
104127
</configuration>
105128
</plugin>
106-
<plugin>
107-
<artifactId>maven-project-info-reports-plugin</artifactId>
108-
</plugin>
109129
<plugin>
110130
<artifactId>maven-javadoc-plugin</artifactId>
131+
<version>2.6.1</version>
111132
<configuration>
112133
<quiet>true</quiet>
113134
</configuration>

‎security/pom.xml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,6 @@
4949
<plugin>
5050
<groupId>org.apache.felix</groupId>
5151
<artifactId>maven-bundle-plugin</artifactId>
52-
<version>1.4.3</version>
53-
<extensions>true</extensions>
5452
<configuration>
5553
<instructions>
5654
<Bundle-SymbolicName>org.springframework.bundle.ws.security</Bundle-SymbolicName>
@@ -62,7 +60,7 @@
6260
javax.xml.namespace*,
6361
javax.xml.soap*,
6462
com.sun.xml.wss*,
65-
org.springframework.ws*;version="${pom.version}",
63+
org.springframework.ws*;version="[${pom.version},${pom.version}]",
6664
org.springframework*;version="2.0",
6765
*;resolution:=optional
6866
</Import-Package>

‎support/pom.xml‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,6 @@
5050
<plugin>
5151
<groupId>org.apache.felix</groupId>
5252
<artifactId>maven-bundle-plugin</artifactId>
53-
<version>1.4.3</version>
54-
<extensions>true</extensions>
5553
<configuration>
5654
<excludeDependencies>true</excludeDependencies>
5755
<instructions>
@@ -62,9 +60,9 @@
6260
javax.activation*,
6361
javax.jms*,
6462
javax.mail*,
65-
org.springframework.xml*;version="${pom.version}",
66-
org.springframework.ws*;version="${pom.version}",
67-
org.springframework*;version="[2.0,3.1.0)",
63+
org.springframework.xml*;version="[${pom.version},${pom.version}]",
64+
org.springframework.ws*;version="[${pom.version},${pom.version}]",
65+
org.springframework*;version="[2.0,4.0)",
6866
*;resolution:=optional
6967
</Import-Package>
7068
<Fragment-Host>org.springframework.bundle.ws.core</Fragment-Host>
@@ -91,6 +89,10 @@
9189
<groupId>org.springframework</groupId>
9290
<artifactId>spring-jms</artifactId>
9391
</dependency>
92+
<dependency>
93+
<groupId>org.springframework</groupId>
94+
<artifactId>spring-tx</artifactId>
95+
</dependency>
9496
<dependency>
9597
<groupId>org.springframework</groupId>
9698
<artifactId>spring-test</artifactId>

‎xml/pom.xml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@
2828
<plugin>
2929
<groupId>org.apache.felix</groupId>
3030
<artifactId>maven-bundle-plugin</artifactId>
31-
<version>1.4.3</version>
32-
<extensions>true</extensions>
3331
<configuration>
3432
<instructions>
3533
<Bundle-SymbolicName>org.springframework.bundle.ws.xml</Bundle-SymbolicName>
@@ -42,8 +40,8 @@
4240
javax.xml.transform*,
4341
org.xml.sax*,
4442
org.w3c.dom*,
45-
org.springframework.xml*;version="${pom.version}",
46-
org.springframework*;version="[2.0,3.1.0)",
43+
org.springframework.xml*;version="[${pom.version},${pom.version}]",
44+
org.springframework*;version="[2.0,4.0)",
4745
*;resolution:=optional
4846
</Import-Package>
4947
<Implementation-Title>${pom.name}</Implementation-Title>

0 commit comments

Comments
 (0)