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

SWS:697: Support maven 3

Browse Source
This commit is contained in:
Arjen Poutsma
2011-08-19 11:38:25 +00:00
parent 07baebcea7
commit 740f7af5d9
11 changed files with 59 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
parent/pom.xml
View File

@@ -483,40 +483,15 @@
</dependency>
<!-- WS-Security dependencies -->
<dependency>
<groupId>com.sun.xml.wss</groupId>
<groupId>com.sun.xml.wsit</groupId>
<artifactId>xws-security</artifactId>
<version>3.0</version>
<exclusions>
<exclusion>
<groupId>javax.xml.parsers</groupId>
<artifactId>jaxp-api</artifactId>
</exclusion>
<exclusion>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</exclusion>
<exclusion>
<groupId>javax.xml.ws</groupId>
<artifactId>jaxws-api</artifactId>
</exclusion>
<exclusion>
<groupId>javax.xml</groupId>
<artifactId>jaxrpc-api</artifactId>
</exclusion>
<exclusion>
<groupId>javax.xml.soap</groupId>
<artifactId>saaj-api</artifactId>
</exclusion>
<exclusion>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
</exclusion>
</exclusions>
<!-- Version 1.3.1 is actually XWSS 3.0 -->
<version>1.3.1</version>
</dependency>
<dependency>
<groupId>com.sun.org.apache.xml.security</groupId>
<artifactId>xmlsec</artifactId>
<version>2.0</version>
<groupId>com.sun.xml.wsit</groupId>
<artifactId>wsit-rt</artifactId>
<version>1.1</version>
</dependency>
<dependency>
<groupId>org.apache.ws.security</groupId>
@@ -549,7 +524,7 @@
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-core</artifactId>
<version>3.0.2.RELEASE</version>
<version>3.0.4.RELEASE</version>
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
@@ -560,7 +535,7 @@
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-core</artifactId>
<version>3.0.2.RELEASE</version>
<version>3.0.4.RELEASE</version>
<classifier>tests</classifier>
<exclusions>
<exclusion>
@@ -572,7 +547,7 @@
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-config</artifactId>
<version>3.0.2.RELEASE</version>
<version>3.0.4.RELEASE</version>
</dependency>
<!-- X.509 dependencies -->
<dependency>

4
pom.xml
View File

@@ -163,7 +163,7 @@
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
</manifest>
<manifestEntries>
<Spring-WS-Version>${pom.version}</Spring-WS-Version>
<Spring-WS-Version>${project.version}</Spring-WS-Version>
</manifestEntries>
</archive>
<descriptors>
@@ -183,7 +183,7 @@
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
</manifest>
<manifestEntries>
<Spring-WS-Version>${pom.version}</Spring-WS-Version>
<Spring-WS-Version>${project.version}</Spring-WS-Version>
</manifestEntries>
</archive>
<descriptors>

13
samples/airline/client/saaj/pom.xml
View File

@@ -39,10 +39,9 @@
</profiles>
<repositories>
<repository>
<id>java.net</id>
<name>Java.net Repository for Maven2</name>
<url>http://download.java.net/maven/1/</url>
<layout>legacy</layout>
<id>jboss.repository.releases.public</id>
<name>JBoss Repo Public</name>
<url>http://repository.jboss.org/nexus/content/groups/public-jboss</url>
</repository>
</repositories>
<build>
@@ -65,8 +64,12 @@
</build>
<dependencies>
<dependency>
<groupId>com.sun.xml.wss</groupId>
<groupId>com.sun.xml.wsit</groupId>
<artifactId>xws-security</artifactId>
</dependency>
<dependency>
<groupId>com.sun.xml.wsit</groupId>
<artifactId>wsit-rt</artifactId>
</dependency>
</dependencies>
</project>

1
samples/airline/server/pom.xml
View File

@@ -117,7 +117,6 @@
<dependency>
<groupId>org.springframework.ws</groupId>
<artifactId>spring-ws-security</artifactId>
<scope>runtime</scope>
<exclusions>
<exclusion>
<groupId>org.apache.ws.security</groupId>

1
samples/echo/client/saaj/pom.xml
View File

@@ -30,6 +30,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.2</version>
<executions>
<execution>
<goals>

1
samples/echo/client/spring-ws/pom.xml
View File

@@ -30,6 +30,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.2</version>
<executions>
<execution>
<goals>

8
samples/mtom/server/pom.xml
View File

@@ -11,14 +11,6 @@
<packaging>war</packaging>
<name>Spring WS MTOM Sample - Server</name>
<description>This sample shows how to use MTOM and JAXB2.</description>
<pluginRepositories>
<pluginRepository>
<id>java.net</id>
<name>Java.net Repository for Maven2</name>
<url>http://download.java.net/maven/1/</url>
<layout>legacy</layout>
</pluginRepository>
</pluginRepositories>
<profiles>
<profile>
<id>jdk15</id>

25
samples/pom.xml
View File

@@ -19,17 +19,34 @@
<module>airline</module>
</modules>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.2</version>
</plugin>
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
<version>6.1.26</version>
</plugin>
<plugin>
<artifactId>maven-war-plugin</artifactId>
<version>2.1.1</version>
<configuration>
<warName>${project.artifactId}</warName>
</configuration>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<configuration>
<warName>${pom.artifactId}</warName>
</configuration>
</plugin>
</plugins>
</build>

4
samples/stockquote/server/pom.xml
View File

@@ -61,5 +61,9 @@
<groupId>org.springframework.ws</groupId>
<artifactId>spring-ws-support</artifactId>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
</dependencies>
</project>

29
security/pom.xml
View File

@@ -12,21 +12,9 @@
<description>Spring-WS WS-Security implementation</description>
<repositories>
<repository>
<id>java.net</id>
<name>Java.net Repository for Maven2</name>
<url>http://download.java.net/maven/1/</url>
<layout>legacy</layout>
<snapshots>
<enabled>false</enabled>
</snapshots>
<releases>
<enabled>true</enabled>
</releases>
</repository>
<repository>
<id>spring-ext</id>
<name>Spring External Dependencies Repository</name>
<url>https://springframework.svn.sourceforge.net/svnroot/springframework/repos/repo-ext/</url>
<id>jboss.repository.releases.public</id>
<name>JBoss Repo Public</name>
<url>http://repository.jboss.org/nexus/content/groups/public-jboss</url>
</repository>
</repositories>
<profiles>
@@ -101,9 +89,13 @@
</dependency>
<!-- XWSS dependencies -->
<dependency>
<groupId>com.sun.xml.wss</groupId>
<groupId>com.sun.xml.wsit</groupId>
<artifactId>xws-security</artifactId>
</dependency>
<dependency>
<groupId>com.sun.xml.wsit</groupId>
<artifactId>wsit-rt</artifactId>
</dependency>
<!-- WSS4J dependencies -->
<dependency>
<groupId>org.apache.ws.security</groupId>
@@ -133,5 +125,10 @@
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>woodstox-core-asl</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</project>

4
support/pom.xml
View File

@@ -60,10 +60,6 @@
<groupId>org.springframework.ws</groupId>
<artifactId>spring-ws-core</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.ws</groupId>
<artifactId>spring-ws-core</artifactId>
</dependency>
<!-- Spring dependencies -->
<dependency>
<groupId>org.springframework</groupId>