Upgrading dependencies

This commit is contained in:
Arjen Poutsma
2008-05-02 22:11:09 +00:00
parent 0c1f86fda1
commit 9b9634030c
2 changed files with 24 additions and 63 deletions

View File

@@ -29,7 +29,7 @@
<url>http://fisheye3.cenqua.com/browse/springframework/spring-ws/trunk</url>
</scm>
<properties>
<spring.version>2.5.3</spring.version>
<spring.version>2.5.4</spring.version>
</properties>
<repositories>
<repository>
@@ -368,53 +368,7 @@
<dependency>
<groupId>org.codehaus.castor</groupId>
<artifactId>castor</artifactId>
<version>1.1.2</version>
<exclusions>
<exclusion>
<groupId>adaptx</groupId>
<artifactId>adaptx</artifactId>
</exclusion>
<exclusion>
<groupId>ant</groupId>
<artifactId>ant</artifactId>
</exclusion>
<exclusion>
<groupId>cglib</groupId>
<artifactId>cglib-full</artifactId>
</exclusion>
<exclusion>
<groupId>com.cenqua.clover</groupId>
<artifactId>clover</artifactId>
</exclusion>
<exclusion>
<groupId>oro</groupId>
<artifactId>oro</artifactId>
</exclusion>
<exclusion>
<groupId>jakarta-regexp</groupId>
<artifactId>jakarta-regexp</artifactId>
</exclusion>
<exclusion>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
<exclusion>
<groupId>javax.transaction</groupId>
<artifactId>jta</artifactId>
</exclusion>
<exclusion>
<groupId>ldapsdk</groupId>
<artifactId>ldapsdk</artifactId>
</exclusion>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
<exclusion>
<groupId>xerces</groupId>
<artifactId>xerces</artifactId>
</exclusion>
</exclusions>
<version>1.2</version>
</dependency>
<!-- XMLBeans -->
<dependency>
@@ -475,7 +429,7 @@
<dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-api</artifactId>
<version>1.2.5</version>
<version>1.2.7</version>
<exclusions>
<exclusion>
<groupId>jaxen</groupId>
@@ -498,7 +452,7 @@
<dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-impl</artifactId>
<version>1.2.5</version>
<version>1.2.7</version>
<exclusions>
<exclusion>
<groupId>jaxen</groupId>
@@ -646,7 +600,12 @@
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-core</artifactId>
<version>2.0.0</version>
<version>2.0.1</version>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-core-tiger</artifactId>
<version>2.0.1</version>
</dependency>
<!-- JEE dependencies -->
<dependency>

26
pom.xml
View File

@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<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">
<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">
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.ws</groupId>
<artifactId>spring-ws</artifactId>
@@ -88,7 +89,7 @@
<url>http://fisheye3.cenqua.com/browse/springframework/spring-ws/trunk</url>
</scm>
<properties>
<spring.version>2.5.2</spring.version>
<spring.version>2.5.4</spring.version>
</properties>
<modules>
<module>parent</module>
@@ -360,13 +361,13 @@
<artifactItem>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-api</artifactId>
<version>1.2.5</version>
<version>1.2.7</version>
<outputDirectory>${project.build.directory}/dependency/ws-commons/</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-impl</artifactId>
<version>1.2.5</version>
<version>1.2.7</version>
<outputDirectory>${project.build.directory}/dependency/ws-commons/</outputDirectory>
</artifactItem>
<artifactItem>
@@ -424,7 +425,7 @@
<artifactItem>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-core</artifactId>
<version>2.0-M2</version>
<version>2.0.1</version>
<outputDirectory>${project.build.directory}/dependency/spring-security/</outputDirectory>
</artifactItem>
<!--Java EE-->
@@ -598,19 +599,20 @@
<postProcess>
<copy todir="target/site/reference">
<fileset dir="target/docbkx">
<include name="**/*.html" />
<include name="**/*.pdf" />
<include name="**/*.html"/>
<include name="**/*.pdf"/>
</fileset>
</copy>
<copy todir="target/site/reference/html">
<fileset dir="src/docbkx/resources">
<include name="**/*.css" />
<include name="**/*.png" />
<include name="**/*.gif" />
<include name="**/*.jpg" />
<include name="**/*.css"/>
<include name="**/*.png"/>
<include name="**/*.gif"/>
<include name="**/*.jpg"/>
</fileset>
</copy>
<move file="target/site/reference/pdf/index.pdf" tofile="target/site/reference/pdf/spring-ws-reference.pdf" failonerror="false" />
<move file="target/site/reference/pdf/index.pdf"
tofile="target/site/reference/pdf/spring-ws-reference.pdf" failonerror="false"/>
</postProcess>
</configuration>
</plugin>