Spring/spring-ws
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SWS-578 - Fix manifest to disallow usage of org.springframework.oxm version 3.0.0

Browse Source
This commit is contained in:
Arjen Poutsma
2010-01-06 12:08:20 +00:00
parent 2f275a5cbb
commit 9a36c64d6f
8 changed files with 69 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core-tiger/pom.xml
View File

@@ -44,8 +44,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>1.4.3</version>
<extensions>true</extensions>
<configuration>
<excludeDependencies>true</excludeDependencies>
<instructions>
@@ -56,10 +54,10 @@
javax.xml.namespace*,
javax.xml.transform*,
org.w3c.dom*,
org.springframework.xml*;version="${pom.version}",
org.springframework.oxm*;version="${pom.version}",
org.springframework.ws*;version="${pom.version}",
org.springframework*;version="[2.0,3.1.0)",
org.springframework.xml*;version="[${pom.version},${pom.version}]",
org.springframework.oxm*;version="[${pom.version},${pom.version}]",
org.springframework.ws*;version="[${pom.version},${pom.version}]",
org.springframework*;version="[2.0,4.0)",
*;resolution:=optional
</Import-Package>
<Fragment-Host>org.springframework.bundle.ws.core</Fragment-Host>

10
core/pom.xml
View File

@@ -41,8 +41,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>1.4.3</version>
<extensions>true</extensions>
<configuration>
<instructions>
<Bundle-SymbolicName>org.springframework.bundle.ws.core</Bundle-SymbolicName>
@@ -57,10 +55,10 @@
javax.xml.transform*,
org.xml.sax*,
org.w3c.dom*,
org.springframework.xml*;version="${pom.version}",
org.springframework.oxm*;version="${pom.version}",
org.springframework.ws*;version="${pom.version}",
org.springframework*;version="[2.0,3.1.0)",
org.springframework.xml*;version="[${pom.version},${pom.version}]",
org.springframework.oxm*;version="[${pom.version},${pom.version}]",
org.springframework.ws*;version="[${pom.version},${pom.version}]",
org.springframework*;version="[2.0,4.0)",
*;resolution:=optional
</Import-Package>
<Implementation-Title>${pom.name}</Implementation-Title>

8
oxm-tiger/pom.xml
View File

@@ -78,8 +78,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>1.4.3</version>
<extensions>true</extensions>
<configuration>
<excludeDependencies>true</excludeDependencies>
<instructions>
@@ -90,9 +88,9 @@
javax.xml.namespace*,
javax.xml.stream*,
javax.xml.transform*,
org.springframework.xml*;version="${pom.version}",
org.springframework.oxm*;version="${pom.version}",
org.springframework*;version="[2.0,3.1.0)",
org.springframework.xml*;version="[${pom.version},${pom.version}]",
org.springframework.oxm*;version="[${pom.version},${pom.version}]",
org.springframework*;version="[2.0,4.0)",
*;resolution:=optional
</Import-Package>
<Fragment-Host>org.springframework.bundle.ws.oxm</Fragment-Host>

12
oxm/pom.xml
View File

@@ -74,8 +74,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>1.4.3</version>
<extensions>true</extensions>
<configuration>
<instructions>
<Bundle-SymbolicName>org.springframework.bundle.ws.oxm</Bundle-SymbolicName>
@@ -87,11 +85,11 @@
javax.xml.transform*,
org.xml.sax*,
org.w3c.dom*,
org.springframework.xml*;version="${pom.version}",
org.springframework.oxm*;version="${pom.version}",
org.springframework.jms*;version="[2.0,3.1.0)";resolution:=optional,
org.springframework.web*;version="[2.0,3.1.0)";resolution:=optional,
org.springframework*;version="[2.0,3.1.0)",
org.springframework.xml*;version="[${pom.version},${pom.version}]",
org.springframework.oxm*;version="[${pom.version},${pom.version}]",
org.springframework.jms*;version="[2.0,4.0)";resolution:=optional,
org.springframework.web*;version="[2.0,4.0)";resolution:=optional,
org.springframework*;version="[2.0,4.0)",
*;resolution:=optional
</Import-Package>
<Implementation-Title>${pom.name}</Implementation-Title>

65
parent/pom.xml
View File

@@ -57,35 +57,56 @@
<version>1.2.2</version>
</extension>
</extensions>
<pluginManagement>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.1</version>
<configuration>
<source>1.3</source>
<target>1.4</target>
</configuration>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.3</version>
<configuration>
<forkMode>once</forkMode>
<childDelegation>false</childDelegation>
</configuration>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<version>2.3</version>
<configuration>
<archive>
<manifest>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
</manifest>
<manifestEntries>
<Spring-WS-Version>${pom.version}</Spring-WS-Version>
</manifestEntries>
</archive>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>2.0.1</version>
<extensions>true</extensions>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<!-- Building -->
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.3</source>
<target>1.4</target>
</configuration>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.3</version>
<configuration>
<forkMode>once</forkMode>
<childDelegation>false</childDelegation>
</configuration>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
<manifest>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
</manifest>
<manifestEntries>
<Spring-WS-Version>${pom.version}</Spring-WS-Version>
</manifestEntries>
</archive>
</configuration>
</plugin>
</plugins>
</build>
@@ -93,21 +114,21 @@
<plugins>
<plugin>
<artifactId>maven-jxr-plugin</artifactId>
<version>2.1</version>
<configuration>
<aggregate>true</aggregate>
</configuration>
</plugin>
<plugin>
<artifactId>maven-surefire-report-plugin</artifactId>
<version>2.4.2</version>
<configuration>
<aggregate>true</aggregate>
</configuration>
</plugin>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.6.1</version>
<configuration>
<quiet>true</quiet>
</configuration>

4
security/pom.xml
View File

@@ -49,8 +49,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>1.4.3</version>
<extensions>true</extensions>
<configuration>
<instructions>
<Bundle-SymbolicName>org.springframework.bundle.ws.security</Bundle-SymbolicName>
@@ -62,7 +60,7 @@
javax.xml.namespace*,
javax.xml.soap*,
com.sun.xml.wss*,
org.springframework.ws*;version="${pom.version}",
org.springframework.ws*;version="[${pom.version},${pom.version}]",
org.springframework*;version="2.0",
*;resolution:=optional
</Import-Package>

12
support/pom.xml
View File

@@ -50,8 +50,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>1.4.3</version>
<extensions>true</extensions>
<configuration>
<excludeDependencies>true</excludeDependencies>
<instructions>
@@ -62,9 +60,9 @@
javax.activation*,
javax.jms*,
javax.mail*,
org.springframework.xml*;version="${pom.version}",
org.springframework.ws*;version="${pom.version}",
org.springframework*;version="[2.0,3.1.0)",
org.springframework.xml*;version="[${pom.version},${pom.version}]",
org.springframework.ws*;version="[${pom.version},${pom.version}]",
org.springframework*;version="[2.0,4.0)",
*;resolution:=optional
</Import-Package>
<Fragment-Host>org.springframework.bundle.ws.core</Fragment-Host>
@@ -91,6 +89,10 @@
<groupId>org.springframework</groupId>
<artifactId>spring-jms</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>

6
xml/pom.xml
View File

@@ -28,8 +28,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>1.4.3</version>
<extensions>true</extensions>
<configuration>
<instructions>
<Bundle-SymbolicName>org.springframework.bundle.ws.xml</Bundle-SymbolicName>
@@ -42,8 +40,8 @@
javax.xml.transform*,
org.xml.sax*,
org.w3c.dom*,
org.springframework.xml*;version="${pom.version}",
org.springframework*;version="[2.0,3.1.0)",
org.springframework.xml*;version="[${pom.version},${pom.version}]",
org.springframework*;version="[2.0,4.0)",
*;resolution:=optional
</Import-Package>
<Implementation-Title>${pom.name}</Implementation-Title>