23 changed files with 1608 additions and 1477 deletions
@ -1,274 +1,280 @@ |
|||||||
<?xml version="1.0" encoding="UTF-8"?> |
<?xml version="1.0" encoding="UTF-8"?> |
||||||
<project xmlns="http://maven.apache.org/POM/4.0.0" |
<project xmlns="http://maven.apache.org/POM/4.0.0" |
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" |
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" |
||||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> |
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> |
||||||
<modelVersion>4.0.0</modelVersion> |
<modelVersion>4.0.0</modelVersion> |
||||||
<groupId>org.springframework</groupId> |
<groupId>org.springframework</groupId> |
||||||
<artifactId>spring-context</artifactId> |
<artifactId>spring-context</artifactId> |
||||||
<packaging>jar</packaging> |
<packaging>jar</packaging> |
||||||
<version>3.1.1.BUILD-SNAPSHOT</version> |
<version>3.1.1.BUILD-SNAPSHOT</version> |
||||||
<parent> |
<parent> |
||||||
<groupId>org.springframework</groupId> |
<groupId>org.springframework</groupId> |
||||||
<artifactId>spring-parent</artifactId> |
<artifactId>spring-parent</artifactId> |
||||||
<relativePath>../org.springframework.spring-parent</relativePath> |
<relativePath>../org.springframework.spring-parent</relativePath> |
||||||
<version>3.1.1.BUILD-SNAPSHOT</version> |
<version>3.1.1.BUILD-SNAPSHOT</version> |
||||||
</parent> |
</parent> |
||||||
|
<licenses> |
||||||
<dependencies> |
<license> |
||||||
<dependency> |
<name>The Apache Software License, Version 2.0</name> |
||||||
<groupId>backport-util-concurrent</groupId> |
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> |
||||||
<artifactId>backport-util-concurrent</artifactId> |
<distribution>repo</distribution> |
||||||
<version>3.0</version> |
</license> |
||||||
<optional>true</optional> |
</licenses> |
||||||
</dependency> |
<dependencies> |
||||||
<dependency> |
<dependency> |
||||||
<groupId>javax.annotation</groupId> |
<groupId>backport-util-concurrent</groupId> |
||||||
<artifactId>jsr250-api</artifactId> |
<artifactId>backport-util-concurrent</artifactId> |
||||||
<version>1.0</version> |
<version>3.0</version> |
||||||
<optional>true</optional> |
<optional>true</optional> |
||||||
</dependency> |
</dependency> |
||||||
<dependency> |
<dependency> |
||||||
<groupId>org.apache.geronimo.specs</groupId> |
<groupId>javax.annotation</groupId> |
||||||
<artifactId>geronimo-ejb_3.0_spec</artifactId> |
<artifactId>jsr250-api</artifactId> |
||||||
<version>1.0.1</version> |
<version>1.0</version> |
||||||
<optional>true</optional> |
<optional>true</optional> |
||||||
</dependency> |
</dependency> |
||||||
<dependency> |
<dependency> |
||||||
<groupId>org.apache.geronimo.specs</groupId> |
<groupId>org.apache.geronimo.specs</groupId> |
||||||
<artifactId>geronimo-interceptor_3.0_spec</artifactId> |
<artifactId>geronimo-ejb_3.0_spec</artifactId> |
||||||
<version>1.0.1</version> |
<version>1.0.1</version> |
||||||
<optional>true</optional> |
<optional>true</optional> |
||||||
</dependency> |
</dependency> |
||||||
<dependency> |
<dependency> |
||||||
<groupId>javax.inject</groupId> |
<groupId>org.apache.geronimo.specs</groupId> |
||||||
<artifactId>javax.inject</artifactId> |
<artifactId>geronimo-interceptor_3.0_spec</artifactId> |
||||||
<version>1</version> |
<version>1.0.1</version> |
||||||
<optional>true</optional> |
<optional>true</optional> |
||||||
</dependency> |
</dependency> |
||||||
<dependency> |
<dependency> |
||||||
<groupId>javax.inject</groupId> |
<groupId>javax.inject</groupId> |
||||||
<artifactId>javax.inject-tck</artifactId> |
<artifactId>javax.inject</artifactId> |
||||||
<version>1</version> |
<version>1</version> |
||||||
<scope>test</scope> |
<optional>true</optional> |
||||||
</dependency> |
</dependency> |
||||||
<dependency> |
<dependency> |
||||||
<groupId>org.apache.geronimo.specs</groupId> |
<groupId>javax.inject</groupId> |
||||||
<artifactId>geronimo-jms_1.1_spec</artifactId> |
<artifactId>javax.inject-tck</artifactId> |
||||||
<version>1.1</version> |
<version>1</version> |
||||||
<optional>true</optional> |
<scope>test</scope> |
||||||
</dependency> |
</dependency> |
||||||
<dependency> |
<dependency> |
||||||
<groupId>javax.persistence</groupId> |
<groupId>org.apache.geronimo.specs</groupId> |
||||||
<artifactId>persistence-api</artifactId> |
<artifactId>geronimo-jms_1.1_spec</artifactId> |
||||||
<version>1.0</version> |
<version>1.1</version> |
||||||
<optional>true</optional> |
<optional>true</optional> |
||||||
</dependency> |
</dependency> |
||||||
<dependency> |
<dependency> |
||||||
<groupId>javax.validation</groupId> |
<groupId>javax.persistence</groupId> |
||||||
<artifactId>validation-api</artifactId> |
<artifactId>persistence-api</artifactId> |
||||||
<version>1.0.0.GA</version> |
<version>1.0</version> |
||||||
<optional>true</optional> |
<optional>true</optional> |
||||||
</dependency> |
</dependency> |
||||||
<dependency> |
<dependency> |
||||||
<groupId>javax.xml.ws</groupId> |
<groupId>javax.validation</groupId> |
||||||
<artifactId>jaxws-api</artifactId> |
<artifactId>validation-api</artifactId> |
||||||
<version>2.1-1</version> |
<version>1.0.0.GA</version> |
||||||
<optional>true</optional> |
<optional>true</optional> |
||||||
</dependency> |
</dependency> |
||||||
<dependency> |
<dependency> |
||||||
<groupId>cglib</groupId> |
<groupId>javax.xml.ws</groupId> |
||||||
<artifactId>cglib-nodep</artifactId> |
<artifactId>jaxws-api</artifactId> |
||||||
<version>2.2</version> |
<version>2.1-1</version> |
||||||
<optional>true</optional> |
<optional>true</optional> |
||||||
</dependency> |
</dependency> |
||||||
<dependency> |
<dependency> |
||||||
<groupId>aopalliance</groupId> |
<groupId>cglib</groupId> |
||||||
<artifactId>aopalliance</artifactId> |
<artifactId>cglib-nodep</artifactId> |
||||||
<version>1.0</version> |
<version>2.2</version> |
||||||
<scope>compile</scope> |
<optional>true</optional> |
||||||
<optional>true</optional> |
</dependency> |
||||||
</dependency> |
<dependency> |
||||||
<!-- common logging dependency is in spring-core --> |
<groupId>aopalliance</groupId> |
||||||
<dependency> |
<artifactId>aopalliance</artifactId> |
||||||
<groupId>org.aspectj</groupId> |
<version>1.0</version> |
||||||
<artifactId>aspectjweaver</artifactId> |
<scope>compile</scope> |
||||||
<optional>true</optional> |
<optional>true</optional> |
||||||
</dependency> |
</dependency> |
||||||
<dependency> |
<!-- common logging dependency is in spring-core --> |
||||||
<groupId>org.beanshell</groupId> |
<dependency> |
||||||
<artifactId>bsh</artifactId> |
<groupId>org.aspectj</groupId> |
||||||
<version>2.0b4</version> |
<artifactId>aspectjweaver</artifactId> |
||||||
<optional>true</optional> |
<optional>true</optional> |
||||||
</dependency> |
</dependency> |
||||||
<dependency> |
<dependency> |
||||||
<groupId>org.codehaus.groovy</groupId> |
<groupId>org.beanshell</groupId> |
||||||
<artifactId>groovy-all</artifactId> |
<artifactId>bsh</artifactId> |
||||||
<version>1.6.3</version> |
<version>2.0b4</version> |
||||||
<optional>true</optional> |
<optional>true</optional> |
||||||
</dependency> |
</dependency> |
||||||
<dependency> |
<dependency> |
||||||
<groupId>org.jruby</groupId> |
<groupId>org.codehaus.groovy</groupId> |
||||||
<artifactId>jruby</artifactId> |
<artifactId>groovy-all</artifactId> |
||||||
<version>1.4.0</version> |
<version>1.6.3</version> |
||||||
<optional>true</optional> |
<optional>true</optional> |
||||||
</dependency> |
</dependency> |
||||||
<dependency> |
<dependency> |
||||||
<groupId>asm</groupId> |
<groupId>org.jruby</groupId> |
||||||
<artifactId>asm</artifactId> |
<artifactId>jruby</artifactId> |
||||||
<version>3.0</version> |
<version>1.4.0</version> |
||||||
<optional>true</optional> |
<optional>true</optional> |
||||||
</dependency> |
</dependency> |
||||||
<dependency> |
<dependency> |
||||||
<groupId>joda-time</groupId> |
<groupId>asm</groupId> |
||||||
<artifactId>joda-time</artifactId> |
<artifactId>asm</artifactId> |
||||||
<version>1.6</version> |
<version>3.0</version> |
||||||
<optional>true</optional> |
<optional>true</optional> |
||||||
</dependency> |
</dependency> |
||||||
<dependency> |
<dependency> |
||||||
<groupId>org.springframework</groupId> |
<groupId>joda-time</groupId> |
||||||
<artifactId>spring-aop</artifactId> |
<artifactId>joda-time</artifactId> |
||||||
<version>${project.version}</version> |
<version>1.6</version> |
||||||
<scope>compile</scope> |
<optional>true</optional> |
||||||
</dependency> |
</dependency> |
||||||
<dependency> |
<dependency> |
||||||
<groupId>org.springframework</groupId> |
<groupId>org.springframework</groupId> |
||||||
<artifactId>spring-beans</artifactId> |
<artifactId>spring-aop</artifactId> |
||||||
<version>${project.version}</version> |
<version>${project.version}</version> |
||||||
<scope>compile</scope> |
<scope>compile</scope> |
||||||
</dependency> |
</dependency> |
||||||
<dependency> |
<dependency> |
||||||
<groupId>org.springframework</groupId> |
<groupId>org.springframework</groupId> |
||||||
<artifactId>spring-core</artifactId> |
<artifactId>spring-beans</artifactId> |
||||||
<version>${project.version}</version> |
<version>${project.version}</version> |
||||||
<scope>compile</scope> |
<scope>compile</scope> |
||||||
</dependency> |
</dependency> |
||||||
<dependency> |
<dependency> |
||||||
<groupId>org.springframework</groupId> |
<groupId>org.springframework</groupId> |
||||||
<artifactId>spring-expression</artifactId> |
<artifactId>spring-core</artifactId> |
||||||
<version>${project.version}</version> |
<version>${project.version}</version> |
||||||
<scope>compile</scope> |
<scope>compile</scope> |
||||||
</dependency> |
</dependency> |
||||||
<dependency> |
<dependency> |
||||||
<groupId>org.springframework</groupId> |
<groupId>org.springframework</groupId> |
||||||
<artifactId>spring-instrument</artifactId> |
<artifactId>spring-expression</artifactId> |
||||||
<version>${project.version}</version> |
<version>${project.version}</version> |
||||||
<optional>true</optional> |
<scope>compile</scope> |
||||||
</dependency> |
</dependency> |
||||||
<dependency> |
<dependency> |
||||||
<groupId>org.springframework</groupId> |
<groupId>org.springframework</groupId> |
||||||
<artifactId>spring-asm</artifactId> |
<artifactId>spring-instrument</artifactId> |
||||||
<version>${project.version}</version> |
<version>${project.version}</version> |
||||||
<scope>compile</scope> |
<optional>true</optional> |
||||||
</dependency> |
</dependency> |
||||||
<dependency> |
<dependency> |
||||||
<groupId>org.apache.geronimo.specs</groupId> |
<groupId>org.springframework</groupId> |
||||||
<artifactId>geronimo-jta_1.1_spec</artifactId> |
<artifactId>spring-asm</artifactId> |
||||||
<version>1.1</version> |
<version>${project.version}</version> |
||||||
<optional>true</optional> |
<scope>compile</scope> |
||||||
</dependency> |
</dependency> |
||||||
<dependency> |
<dependency> |
||||||
<groupId>net.sf.ehcache</groupId> |
<groupId>org.apache.geronimo.specs</groupId> |
||||||
<artifactId>ehcache-core</artifactId> |
<artifactId>geronimo-jta_1.1_spec</artifactId> |
||||||
<version>2.0.0</version> |
<version>1.1</version> |
||||||
<optional>true</optional> |
<optional>true</optional> |
||||||
</dependency> |
</dependency> |
||||||
<dependency> |
<dependency> |
||||||
<groupId>javax.xml</groupId> |
<groupId>net.sf.ehcache</groupId> |
||||||
<artifactId>jaxrpc-api</artifactId> |
<artifactId>ehcache-core</artifactId> |
||||||
<version>1.1</version> |
<version>2.0.0</version> |
||||||
<scope>test</scope> |
<optional>true</optional> |
||||||
</dependency> |
</dependency> |
||||||
<dependency> |
<dependency> |
||||||
<groupId>commons-pool</groupId> |
<groupId>javax.xml</groupId> |
||||||
<artifactId>commons-pool</artifactId> |
<artifactId>jaxrpc-api</artifactId> |
||||||
<version>1.5.3</version> |
<version>1.1</version> |
||||||
<scope>test</scope> |
<scope>test</scope> |
||||||
</dependency> |
</dependency> |
||||||
<dependency> |
<dependency> |
||||||
<groupId>commons-dbcp</groupId> |
<groupId>commons-pool</groupId> |
||||||
<artifactId>commons-dbcp</artifactId> |
<artifactId>commons-pool</artifactId> |
||||||
<version>1.2.2</version> |
<version>1.5.3</version> |
||||||
<scope>test</scope> |
<scope>test</scope> |
||||||
</dependency> |
</dependency> |
||||||
<dependency> |
<dependency> |
||||||
<groupId>log4j</groupId> |
<groupId>commons-dbcp</groupId> |
||||||
<artifactId>log4j</artifactId> |
<artifactId>commons-dbcp</artifactId> |
||||||
<scope>test</scope> |
<version>1.2.2</version> |
||||||
</dependency> |
<scope>test</scope> |
||||||
<dependency> |
</dependency> |
||||||
<groupId>org.easymock</groupId> |
<dependency> |
||||||
<artifactId>easymock</artifactId> |
<groupId>log4j</groupId> |
||||||
<scope>test</scope> |
<artifactId>log4j</artifactId> |
||||||
</dependency> |
<scope>test</scope> |
||||||
<dependency> |
</dependency> |
||||||
<groupId>org.hamcrest</groupId> |
<dependency> |
||||||
<artifactId>hamcrest-all</artifactId> |
<groupId>org.easymock</groupId> |
||||||
<version>1.1</version> |
<artifactId>easymock</artifactId> |
||||||
</dependency> |
<scope>test</scope> |
||||||
<dependency> |
</dependency> |
||||||
<groupId>org.hibernate</groupId> |
<dependency> |
||||||
<artifactId>com.springsource.org.hibernate.validator</artifactId> |
<groupId>org.hamcrest</groupId> |
||||||
<version>4.2.0.Final</version> |
<artifactId>hamcrest-all</artifactId> |
||||||
<scope>compile</scope> |
<version>1.1</version> |
||||||
<optional>true</optional> |
</dependency> |
||||||
<exclusions> |
<dependency> |
||||||
<exclusion> |
<groupId>org.hibernate</groupId> |
||||||
<groupId>javax.validation</groupId> |
<artifactId>com.springsource.org.hibernate.validator</artifactId> |
||||||
<artifactId>com.springsource.javax.validation</artifactId> |
<version>4.2.0.Final</version> |
||||||
</exclusion> |
<scope>compile</scope> |
||||||
<exclusion> |
<optional>true</optional> |
||||||
<groupId>org.slf4j</groupId> |
<exclusions> |
||||||
<artifactId>com.springsource.slf4j.api</artifactId> |
<exclusion> |
||||||
</exclusion> |
<groupId>javax.validation</groupId> |
||||||
</exclusions> |
<artifactId>com.springsource.javax.validation</artifactId> |
||||||
</dependency> |
</exclusion> |
||||||
<dependency> |
<exclusion> |
||||||
<groupId>junit</groupId> |
<groupId>org.slf4j</groupId> |
||||||
<artifactId>junit</artifactId> |
<artifactId>com.springsource.slf4j.api</artifactId> |
||||||
<scope>test</scope> |
</exclusion> |
||||||
</dependency> |
</exclusions> |
||||||
<dependency> |
</dependency> |
||||||
<groupId>org.slf4j</groupId> |
<dependency> |
||||||
<artifactId>slf4j-log4j12</artifactId> |
<groupId>junit</groupId> |
||||||
<scope>test</scope> |
<artifactId>junit</artifactId> |
||||||
</dependency> |
<scope>test</scope> |
||||||
<dependency> |
</dependency> |
||||||
<groupId>org.codehaus.jsr166-mirror</groupId> |
<dependency> |
||||||
<artifactId>jsr166</artifactId> |
<groupId>org.slf4j</groupId> |
||||||
<version>1.7.0</version> |
<artifactId>slf4j-log4j12</artifactId> |
||||||
<scope>provided</scope> |
<scope>test</scope> |
||||||
</dependency> |
</dependency> |
||||||
</dependencies> |
<dependency> |
||||||
<build> |
<groupId>org.codehaus.jsr166-mirror</groupId> |
||||||
<pluginManagement> |
<artifactId>jsr166</artifactId> |
||||||
<plugins> |
<version>1.7.0</version> |
||||||
<plugin> |
<scope>provided</scope> |
||||||
<groupId>org.apache.maven.plugins</groupId> |
</dependency> |
||||||
<artifactId>maven-surefire-plugin</artifactId> |
</dependencies> |
||||||
<configuration> |
<build> |
||||||
<junitArtifactName>junit:junit</junitArtifactName> |
<pluginManagement> |
||||||
</configuration> |
<plugins> |
||||||
</plugin> |
<plugin> |
||||||
</plugins> |
<groupId>org.apache.maven.plugins</groupId> |
||||||
</pluginManagement> |
<artifactId>maven-surefire-plugin</artifactId> |
||||||
<testResources> |
<configuration> |
||||||
<testResource> |
<junitArtifactName>junit:junit</junitArtifactName> |
||||||
<directory>${project.basedir}/src/test/java |
</configuration> |
||||||
</directory> |
</plugin> |
||||||
<includes> |
</plugins> |
||||||
<include>**/*</include> |
</pluginManagement> |
||||||
</includes> |
<testResources> |
||||||
<excludes> |
<testResource> |
||||||
<exclude>**/*.java</exclude> |
<directory>${project.basedir}/src/test/java |
||||||
</excludes> |
</directory> |
||||||
</testResource> |
<includes> |
||||||
<testResource> |
<include>**/*</include> |
||||||
<directory>${project.basedir}/src/test/resources |
</includes> |
||||||
</directory> |
<excludes> |
||||||
<includes> |
<exclude>**/*.java</exclude> |
||||||
<include>**/*</include> |
</excludes> |
||||||
</includes> |
</testResource> |
||||||
</testResource> |
<testResource> |
||||||
</testResources> |
<directory>${project.basedir}/src/test/resources |
||||||
</build> |
</directory> |
||||||
|
<includes> |
||||||
|
<include>**/*</include> |
||||||
|
</includes> |
||||||
|
</testResource> |
||||||
|
</testResources> |
||||||
|
</build> |
||||||
</project> |
</project> |
||||||
|
|||||||
@ -1,77 +1,83 @@ |
|||||||
<?xml version="1.0" encoding="UTF-8"?> |
<?xml version="1.0" encoding="UTF-8"?> |
||||||
<project xmlns="http://maven.apache.org/POM/4.0.0" |
<project xmlns="http://maven.apache.org/POM/4.0.0" |
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" |
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" |
||||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> |
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> |
||||||
<modelVersion>4.0.0</modelVersion> |
<modelVersion>4.0.0</modelVersion> |
||||||
<groupId>org.springframework</groupId> |
<groupId>org.springframework</groupId> |
||||||
<artifactId>spring-core</artifactId> |
<artifactId>spring-core</artifactId> |
||||||
<packaging>jar</packaging> |
<packaging>jar</packaging> |
||||||
<version>3.1.1.BUILD-SNAPSHOT</version> |
<version>3.1.1.BUILD-SNAPSHOT</version> |
||||||
<parent> |
<parent> |
||||||
<groupId>org.springframework</groupId> |
<groupId>org.springframework</groupId> |
||||||
<artifactId>spring-parent</artifactId> |
<artifactId>spring-parent</artifactId> |
||||||
<relativePath>../org.springframework.spring-parent</relativePath> |
<relativePath>../org.springframework.spring-parent</relativePath> |
||||||
<version>3.1.1.BUILD-SNAPSHOT</version> |
<version>3.1.1.BUILD-SNAPSHOT</version> |
||||||
</parent> |
</parent> |
||||||
|
<licenses> |
||||||
<dependencies> |
<license> |
||||||
<dependency> |
<name>The Apache Software License, Version 2.0</name> |
||||||
<groupId>commons-collections</groupId> |
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> |
||||||
<artifactId>commons-collections</artifactId> |
<distribution>repo</distribution> |
||||||
<version>3.2</version> |
</license> |
||||||
<optional>true</optional> |
</licenses> |
||||||
</dependency> |
<dependencies> |
||||||
<dependency> |
<dependency> |
||||||
<groupId>org.springframework</groupId> |
<groupId>commons-collections</groupId> |
||||||
<artifactId>spring-asm</artifactId> |
<artifactId>commons-collections</artifactId> |
||||||
<version>${project.version}</version> |
<version>3.2</version> |
||||||
<scope>compile</scope> |
<optional>true</optional> |
||||||
</dependency> |
</dependency> |
||||||
<dependency> |
<dependency> |
||||||
<groupId>commons-logging</groupId> |
<groupId>org.springframework</groupId> |
||||||
<artifactId>commons-logging</artifactId> |
<artifactId>spring-asm</artifactId> |
||||||
<version>1.1.1</version> |
<version>${project.version}</version> |
||||||
<scope>compile</scope> |
<scope>compile</scope> |
||||||
</dependency> |
</dependency> |
||||||
<dependency> |
<dependency> |
||||||
<groupId>log4j</groupId> |
<groupId>commons-logging</groupId> |
||||||
<artifactId>log4j</artifactId> |
<artifactId>commons-logging</artifactId> |
||||||
<scope>compile</scope> |
<version>1.1.1</version> |
||||||
<optional>true</optional> |
<scope>compile</scope> |
||||||
</dependency> |
</dependency> |
||||||
<dependency> |
<dependency> |
||||||
<groupId>net.sf.jopt-simple</groupId> |
<groupId>log4j</groupId> |
||||||
<artifactId>jopt-simple</artifactId> |
<artifactId>log4j</artifactId> |
||||||
<version>3.0</version> |
<scope>compile</scope> |
||||||
<scope>compile</scope> |
<optional>true</optional> |
||||||
<optional>true</optional> |
</dependency> |
||||||
</dependency> |
<dependency> |
||||||
<dependency> |
<groupId>net.sf.jopt-simple</groupId> |
||||||
<groupId>org.aspectj</groupId> |
<artifactId>jopt-simple</artifactId> |
||||||
<artifactId>aspectjweaver</artifactId> |
<version>3.0</version> |
||||||
<optional>true</optional> |
<scope>compile</scope> |
||||||
</dependency> |
<optional>true</optional> |
||||||
<dependency> |
</dependency> |
||||||
<groupId>junit</groupId> |
<dependency> |
||||||
<artifactId>junit</artifactId> |
<groupId>org.aspectj</groupId> |
||||||
<scope>test</scope> |
<artifactId>aspectjweaver</artifactId> |
||||||
</dependency> |
<optional>true</optional> |
||||||
<dependency> |
</dependency> |
||||||
<groupId>org.easymock</groupId> |
<dependency> |
||||||
<artifactId>easymock</artifactId> |
<groupId>junit</groupId> |
||||||
<scope>test</scope> |
<artifactId>junit</artifactId> |
||||||
</dependency> |
<scope>test</scope> |
||||||
<dependency> |
</dependency> |
||||||
<groupId>xmlunit</groupId> |
<dependency> |
||||||
<artifactId>xmlunit</artifactId> |
<groupId>org.easymock</groupId> |
||||||
<version>1.2</version> |
<artifactId>easymock</artifactId> |
||||||
<scope>test</scope> |
<scope>test</scope> |
||||||
</dependency> |
</dependency> |
||||||
<dependency> |
<dependency> |
||||||
<groupId>org.codehaus.woodstox</groupId> |
<groupId>xmlunit</groupId> |
||||||
<artifactId>wstx-asl</artifactId> |
<artifactId>xmlunit</artifactId> |
||||||
<version>3.2.7</version> |
<version>1.2</version> |
||||||
<scope>test</scope> |
<scope>test</scope> |
||||||
</dependency> |
</dependency> |
||||||
</dependencies> |
<dependency> |
||||||
|
<groupId>org.codehaus.woodstox</groupId> |
||||||
|
<artifactId>wstx-asl</artifactId> |
||||||
|
<version>3.2.7</version> |
||||||
|
<scope>test</scope> |
||||||
|
</dependency> |
||||||
|
</dependencies> |
||||||
</project> |
</project> |
||||||
|
|||||||
@ -1,237 +1,244 @@ |
|||||||
<?xml version="1.0" encoding="UTF-8"?> |
<?xml version="1.0" encoding="UTF-8"?> |
||||||
<project xmlns="http://maven.apache.org/POM/4.0.0" |
<project xmlns="http://maven.apache.org/POM/4.0.0" |
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" |
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" |
||||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> |
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> |
||||||
<modelVersion>4.0.0</modelVersion> |
<modelVersion>4.0.0</modelVersion> |
||||||
<groupId>org.springframework</groupId> |
<groupId>org.springframework</groupId> |
||||||
<artifactId>spring-orm</artifactId> |
<artifactId>spring-orm</artifactId> |
||||||
<packaging>jar</packaging> |
<packaging>jar</packaging> |
||||||
<version>3.1.1.BUILD-SNAPSHOT</version> |
<version>3.1.1.BUILD-SNAPSHOT</version> |
||||||
<parent> |
<parent> |
||||||
<groupId>org.springframework</groupId> |
<groupId>org.springframework</groupId> |
||||||
<artifactId>spring-parent</artifactId> |
<artifactId>spring-parent</artifactId> |
||||||
<relativePath>../org.springframework.spring-parent</relativePath> |
<relativePath>../org.springframework.spring-parent</relativePath> |
||||||
<version>3.1.1.BUILD-SNAPSHOT</version> |
<version>3.1.1.BUILD-SNAPSHOT</version> |
||||||
</parent> |
</parent> |
||||||
<dependencies> |
<licenses> |
||||||
<dependency> |
<license> |
||||||
<groupId>toplink.essentials</groupId> |
<name>The Apache Software License, Version 2.0</name> |
||||||
<artifactId>toplink-essentials</artifactId> |
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> |
||||||
<version>2.0-41</version> |
<distribution>repo</distribution> |
||||||
<optional>true</optional> |
</license> |
||||||
</dependency> |
</licenses> |
||||||
<dependency> |
<dependencies> |
||||||
<groupId>aopalliance</groupId> |
<dependency> |
||||||
<artifactId>aopalliance</artifactId> |
<groupId>toplink.essentials</groupId> |
||||||
<version>1.0</version> |
<artifactId>toplink-essentials</artifactId> |
||||||
<optional>true</optional> |
<version>2.0-41</version> |
||||||
</dependency> |
<optional>true</optional> |
||||||
<!-- common logging dependency is in spring-core --> |
</dependency> |
||||||
<dependency> |
<dependency> |
||||||
<groupId>org.apache.ibatis</groupId> |
<groupId>aopalliance</groupId> |
||||||
<artifactId>ibatis-sqlmap</artifactId> |
<artifactId>aopalliance</artifactId> |
||||||
<version>2.3.4.726</version> |
<version>1.0</version> |
||||||
<optional>true</optional> |
<optional>true</optional> |
||||||
</dependency> |
</dependency> |
||||||
<dependency> |
<!-- common logging dependency is in spring-core --> |
||||||
<groupId>org.apache.openjpa</groupId> |
<dependency> |
||||||
<artifactId>openjpa</artifactId> |
<groupId>org.apache.ibatis</groupId> |
||||||
<version>1.1.0</version> |
<artifactId>ibatis-sqlmap</artifactId> |
||||||
<optional>true</optional> |
<version>2.3.4.726</version> |
||||||
</dependency> |
<optional>true</optional> |
||||||
<dependency> |
</dependency> |
||||||
<groupId>org.eclipse.persistence</groupId> |
<dependency> |
||||||
<artifactId>org.eclipse.persistence.core</artifactId> |
<groupId>org.apache.openjpa</groupId> |
||||||
<version>1.0.1</version> |
<artifactId>openjpa</artifactId> |
||||||
<optional>true</optional> |
<version>1.1.0</version> |
||||||
</dependency> |
<optional>true</optional> |
||||||
<dependency> |
</dependency> |
||||||
<groupId>org.eclipse.persistence</groupId> |
<dependency> |
||||||
<artifactId>org.eclipse.persistence.jpa</artifactId> |
<groupId>org.eclipse.persistence</groupId> |
||||||
<version>1.0.1</version> |
<artifactId>org.eclipse.persistence.core</artifactId> |
||||||
<optional>true</optional> |
<version>1.0.1</version> |
||||||
</dependency> |
<optional>true</optional> |
||||||
<dependency> |
</dependency> |
||||||
<groupId>org.eclipse.persistence</groupId> |
<dependency> |
||||||
<artifactId>org.eclipse.persistence.asm</artifactId> |
<groupId>org.eclipse.persistence</groupId> |
||||||
<version>1.0.1</version> |
<artifactId>org.eclipse.persistence.jpa</artifactId> |
||||||
<scope>test</scope> |
<version>1.0.1</version> |
||||||
</dependency> |
<optional>true</optional> |
||||||
<dependency> |
</dependency> |
||||||
<groupId>org.eclipse.persistence</groupId> |
<dependency> |
||||||
<artifactId>org.eclipse.persistence.antlr</artifactId> |
<groupId>org.eclipse.persistence</groupId> |
||||||
<version>1.0.1</version> |
<artifactId>org.eclipse.persistence.asm</artifactId> |
||||||
<scope>test</scope> |
<version>1.0.1</version> |
||||||
</dependency> |
<scope>test</scope> |
||||||
<dependency> |
</dependency> |
||||||
<groupId>org.hibernate</groupId> |
<dependency> |
||||||
<artifactId>hibernate-core</artifactId> |
<groupId>org.eclipse.persistence</groupId> |
||||||
<version>3.6.0.Final</version> |
<artifactId>org.eclipse.persistence.antlr</artifactId> |
||||||
<optional>true</optional> |
<version>1.0.1</version> |
||||||
</dependency> |
<scope>test</scope> |
||||||
<dependency> |
</dependency> |
||||||
<groupId>org.hibernate</groupId> |
<dependency> |
||||||
<artifactId>hibernate-cglib-repack</artifactId> |
<groupId>org.hibernate</groupId> |
||||||
<version>2.1_3</version> |
<artifactId>hibernate-core</artifactId> |
||||||
<scope>test</scope> |
<version>3.6.0.Final</version> |
||||||
</dependency> |
<optional>true</optional> |
||||||
<dependency> |
</dependency> |
||||||
<groupId>cglib</groupId> |
<dependency> |
||||||
<artifactId>cglib-nodep</artifactId> |
<groupId>org.hibernate</groupId> |
||||||
<version>2.2</version> |
<artifactId>hibernate-cglib-repack</artifactId> |
||||||
<scope>test</scope> |
<version>2.1_3</version> |
||||||
</dependency> |
<scope>test</scope> |
||||||
<dependency> |
</dependency> |
||||||
<groupId>org.slf4j</groupId> |
<dependency> |
||||||
<artifactId>slf4j-log4j12</artifactId> |
<groupId>cglib</groupId> |
||||||
<scope>test</scope> |
<artifactId>cglib-nodep</artifactId> |
||||||
<optional>true</optional> |
<version>2.2</version> |
||||||
</dependency> |
<scope>test</scope> |
||||||
<dependency> |
</dependency> |
||||||
<groupId>log4j</groupId> |
<dependency> |
||||||
<artifactId>log4j</artifactId> |
<groupId>org.slf4j</groupId> |
||||||
<scope>test</scope> |
<artifactId>slf4j-log4j12</artifactId> |
||||||
<optional>true</optional> |
<scope>test</scope> |
||||||
</dependency> |
<optional>true</optional> |
||||||
<dependency> |
</dependency> |
||||||
<groupId>org.hibernate</groupId> |
<dependency> |
||||||
<artifactId>hibernate-annotations</artifactId> |
<groupId>log4j</groupId> |
||||||
<version>3.4.0.GA</version> |
<artifactId>log4j</artifactId> |
||||||
<optional>true</optional> |
<scope>test</scope> |
||||||
</dependency> |
<optional>true</optional> |
||||||
<dependency> |
</dependency> |
||||||
<groupId>org.hibernate</groupId> |
<dependency> |
||||||
<artifactId>hibernate-entitymanager</artifactId> |
<groupId>org.hibernate</groupId> |
||||||
<version>3.4.0.GA</version> |
<artifactId>hibernate-annotations</artifactId> |
||||||
<optional>true</optional> |
<version>3.4.0.GA</version> |
||||||
</dependency> |
<optional>true</optional> |
||||||
<dependency> |
</dependency> |
||||||
<groupId>javax.jdo</groupId> |
<dependency> |
||||||
<artifactId>jdo2-api</artifactId> |
<groupId>org.hibernate</groupId> |
||||||
<version>2.1</version> |
<artifactId>hibernate-entitymanager</artifactId> |
||||||
<optional>true</optional> |
<version>3.4.0.GA</version> |
||||||
</dependency> |
<optional>true</optional> |
||||||
<dependency> |
</dependency> |
||||||
<groupId>javax.persistence</groupId> |
<dependency> |
||||||
<artifactId>persistence-api</artifactId> |
<groupId>javax.jdo</groupId> |
||||||
<version>1.0</version> |
<artifactId>jdo2-api</artifactId> |
||||||
<optional>true</optional> |
<version>2.1</version> |
||||||
</dependency> |
<optional>true</optional> |
||||||
<dependency> |
</dependency> |
||||||
<groupId>javax.servlet</groupId> |
<dependency> |
||||||
<artifactId>servlet-api</artifactId> |
<groupId>javax.persistence</groupId> |
||||||
<version>2.5</version> |
<artifactId>persistence-api</artifactId> |
||||||
<optional>true</optional> |
<version>1.0</version> |
||||||
</dependency> |
<optional>true</optional> |
||||||
<dependency> |
</dependency> |
||||||
<groupId>org.apache.geronimo.specs</groupId> |
<dependency> |
||||||
<artifactId>geronimo-jta_1.1_spec</artifactId> |
<groupId>javax.servlet</groupId> |
||||||
<version>1.1</version> |
<artifactId>servlet-api</artifactId> |
||||||
<scope>provided</scope> |
<version>2.5</version> |
||||||
</dependency> |
<optional>true</optional> |
||||||
<dependency> |
</dependency> |
||||||
<groupId>org.springframework</groupId> |
<dependency> |
||||||
<artifactId>spring-aop</artifactId> |
<groupId>org.apache.geronimo.specs</groupId> |
||||||
<version>${project.version}</version> |
<artifactId>geronimo-jta_1.1_spec</artifactId> |
||||||
<optional>true</optional> |
<version>1.1</version> |
||||||
</dependency> |
<scope>provided</scope> |
||||||
<dependency> |
</dependency> |
||||||
<groupId>org.springframework</groupId> |
<dependency> |
||||||
<artifactId>spring-beans</artifactId> |
<groupId>org.springframework</groupId> |
||||||
<version>${project.version}</version> |
<artifactId>spring-aop</artifactId> |
||||||
<scope>compile</scope> |
<version>${project.version}</version> |
||||||
</dependency> |
<optional>true</optional> |
||||||
<dependency> |
</dependency> |
||||||
<groupId>org.springframework</groupId> |
<dependency> |
||||||
<artifactId>spring-context</artifactId> |
<groupId>org.springframework</groupId> |
||||||
<version>${project.version}</version> |
<artifactId>spring-beans</artifactId> |
||||||
<optional>true</optional> |
<version>${project.version}</version> |
||||||
</dependency> |
<scope>compile</scope> |
||||||
<dependency> |
</dependency> |
||||||
<groupId>org.springframework</groupId> |
<dependency> |
||||||
<artifactId>spring-core</artifactId> |
<groupId>org.springframework</groupId> |
||||||
<version>${project.version}</version> |
<artifactId>spring-context</artifactId> |
||||||
<scope>compile</scope> |
<version>${project.version}</version> |
||||||
</dependency> |
<optional>true</optional> |
||||||
<dependency> |
</dependency> |
||||||
<groupId>org.springframework</groupId> |
<dependency> |
||||||
<artifactId>spring-jdbc</artifactId> |
<groupId>org.springframework</groupId> |
||||||
<version>${project.version}</version> |
<artifactId>spring-core</artifactId> |
||||||
<scope>compile</scope> |
<version>${project.version}</version> |
||||||
</dependency> |
<scope>compile</scope> |
||||||
<dependency> |
</dependency> |
||||||
<groupId>org.springframework</groupId> |
<dependency> |
||||||
<artifactId>spring-tx</artifactId> |
<groupId>org.springframework</groupId> |
||||||
<version>${project.version}</version> |
<artifactId>spring-jdbc</artifactId> |
||||||
<scope>compile</scope> |
<version>${project.version}</version> |
||||||
</dependency> |
<scope>compile</scope> |
||||||
<dependency> |
</dependency> |
||||||
<groupId>org.springframework</groupId> |
<dependency> |
||||||
<artifactId>spring-web</artifactId> |
<groupId>org.springframework</groupId> |
||||||
<version>${project.version}</version> |
<artifactId>spring-tx</artifactId> |
||||||
<optional>true</optional> |
<version>${project.version}</version> |
||||||
</dependency> |
<scope>compile</scope> |
||||||
<dependency> |
</dependency> |
||||||
<groupId>org.aspectj</groupId> |
<dependency> |
||||||
<artifactId>aspectjweaver</artifactId> |
<groupId>org.springframework</groupId> |
||||||
<scope>test</scope> |
<artifactId>spring-web</artifactId> |
||||||
</dependency> |
<version>${project.version}</version> |
||||||
<dependency> |
<optional>true</optional> |
||||||
<groupId>commons-dbcp</groupId> |
</dependency> |
||||||
<artifactId>commons-dbcp</artifactId> |
<dependency> |
||||||
<version>1.2.2</version> |
<groupId>org.aspectj</groupId> |
||||||
<scope>test</scope> |
<artifactId>aspectjweaver</artifactId> |
||||||
</dependency> |
<scope>test</scope> |
||||||
<dependency> |
</dependency> |
||||||
<groupId>commons-pool</groupId> |
<dependency> |
||||||
<artifactId>commons-pool</artifactId> |
<groupId>commons-dbcp</groupId> |
||||||
<version>1.5.3</version> |
<artifactId>commons-dbcp</artifactId> |
||||||
<scope>test</scope> |
<version>1.2.2</version> |
||||||
</dependency> |
<scope>test</scope> |
||||||
<dependency> |
</dependency> |
||||||
<groupId>org.easymock</groupId> |
<dependency> |
||||||
<artifactId>easymock</artifactId> |
<groupId>commons-pool</groupId> |
||||||
<scope>test</scope> |
<artifactId>commons-pool</artifactId> |
||||||
</dependency> |
<version>1.5.3</version> |
||||||
<dependency> |
<scope>test</scope> |
||||||
<groupId>hsqldb</groupId> |
</dependency> |
||||||
<artifactId>hsqldb</artifactId> |
<dependency> |
||||||
<version>1.8.0.7</version> |
<groupId>org.easymock</groupId> |
||||||
<scope>test</scope> |
<artifactId>easymock</artifactId> |
||||||
</dependency> |
<scope>test</scope> |
||||||
<dependency> |
</dependency> |
||||||
<groupId>junit</groupId> |
<dependency> |
||||||
<artifactId>junit</artifactId> |
<groupId>hsqldb</groupId> |
||||||
<scope>test</scope> |
<artifactId>hsqldb</artifactId> |
||||||
</dependency> |
<version>1.8.0.7</version> |
||||||
</dependencies> |
<scope>test</scope> |
||||||
<build> |
</dependency> |
||||||
<resources> |
<dependency> |
||||||
<resource> |
<groupId>junit</groupId> |
||||||
<directory>src/main/java</directory> |
<artifactId>junit</artifactId> |
||||||
<includes> |
<scope>test</scope> |
||||||
<include>**/*.xsd</include> |
</dependency> |
||||||
<include>**/*.xml</include> |
</dependencies> |
||||||
</includes> |
<build> |
||||||
</resource> |
<resources> |
||||||
</resources> |
<resource> |
||||||
<testResources> |
<directory>src/main/java</directory> |
||||||
<testResource> |
<includes> |
||||||
<directory>src/test/java</directory> |
<include>**/*.xsd</include> |
||||||
<includes> |
<include>**/*.xml</include> |
||||||
<include>**/*.xml</include> |
</includes> |
||||||
<include>**/*.sql</include> |
</resource> |
||||||
<include>**/*.jar</include> |
</resources> |
||||||
<include>**/*.properties</include> |
<testResources> |
||||||
</includes> |
<testResource> |
||||||
</testResource> |
<directory>src/test/java</directory> |
||||||
<testResource> |
<includes> |
||||||
<directory>src/test/resources</directory> |
<include>**/*.xml</include> |
||||||
<includes> |
<include>**/*.sql</include> |
||||||
<include>**/*.xml</include> |
<include>**/*.jar</include> |
||||||
<include>*.jar</include> |
<include>**/*.properties</include> |
||||||
</includes> |
</includes> |
||||||
</testResource> |
</testResource> |
||||||
</testResources> |
<testResource> |
||||||
</build> |
<directory>src/test/resources</directory> |
||||||
|
<includes> |
||||||
|
<include>**/*.xml</include> |
||||||
|
<include>*.jar</include> |
||||||
|
</includes> |
||||||
|
</testResource> |
||||||
|
</testResources> |
||||||
|
</build> |
||||||
</project> |
</project> |
||||||
|
|||||||
@ -1,102 +1,108 @@ |
|||||||
<?xml version="1.0" encoding="UTF-8"?> |
<?xml version="1.0" encoding="UTF-8"?> |
||||||
<project xmlns="http://maven.apache.org/POM/4.0.0" |
<project xmlns="http://maven.apache.org/POM/4.0.0" |
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" |
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" |
||||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> |
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> |
||||||
<modelVersion>4.0.0</modelVersion> |
<modelVersion>4.0.0</modelVersion> |
||||||
<groupId>org.springframework</groupId> |
<groupId>org.springframework</groupId> |
||||||
<artifactId>spring-oxm</artifactId> |
<artifactId>spring-oxm</artifactId> |
||||||
<packaging>jar</packaging> |
<packaging>jar</packaging> |
||||||
<version>3.1.1.BUILD-SNAPSHOT</version> |
<version>3.1.1.BUILD-SNAPSHOT</version> |
||||||
<parent> |
<parent> |
||||||
<groupId>org.springframework</groupId> |
<groupId>org.springframework</groupId> |
||||||
<artifactId>spring-parent</artifactId> |
<artifactId>spring-parent</artifactId> |
||||||
<relativePath>../org.springframework.spring-parent</relativePath> |
<relativePath>../org.springframework.spring-parent</relativePath> |
||||||
<version>3.1.1.BUILD-SNAPSHOT</version> |
<version>3.1.1.BUILD-SNAPSHOT</version> |
||||||
</parent> |
</parent> |
||||||
|
<licenses> |
||||||
<dependencies> |
<license> |
||||||
<dependency> |
<name>The Apache Software License, Version 2.0</name> |
||||||
<groupId>com.thoughtworks.xstream</groupId> |
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> |
||||||
<artifactId>xstream</artifactId> |
<distribution>repo</distribution> |
||||||
<version>1.3.1</version> |
</license> |
||||||
<optional>true</optional> |
</licenses> |
||||||
</dependency> |
<dependencies> |
||||||
<dependency> |
<dependency> |
||||||
<groupId>com.sun.xml.bind</groupId> |
<groupId>com.thoughtworks.xstream</groupId> |
||||||
<artifactId>jaxb-impl</artifactId> |
<artifactId>xstream</artifactId> |
||||||
<version>2.1.7</version> |
<version>1.3.1</version> |
||||||
<optional>true</optional> |
<optional>true</optional> |
||||||
</dependency> |
</dependency> |
||||||
<dependency> |
<dependency> |
||||||
<groupId>org.jibx</groupId> |
<groupId>com.sun.xml.bind</groupId> |
||||||
<artifactId>jibx-run</artifactId> |
<artifactId>jaxb-impl</artifactId> |
||||||
<version>1.1.5</version> |
<version>2.1.7</version> |
||||||
<optional>true</optional> |
<optional>true</optional> |
||||||
</dependency> |
</dependency> |
||||||
<!-- common logging dependency is in spring-core --> |
<dependency> |
||||||
<dependency> |
<groupId>org.jibx</groupId> |
||||||
<groupId>commons-lang</groupId> |
<artifactId>jibx-run</artifactId> |
||||||
<artifactId>commons-lang</artifactId> |
<version>1.1.5</version> |
||||||
<version>2.5</version> |
<optional>true</optional> |
||||||
<scope>compile</scope> |
</dependency> |
||||||
</dependency> |
<!-- common logging dependency is in spring-core --> |
||||||
<dependency> |
<dependency> |
||||||
<groupId>org.apache.xmlbeans</groupId> |
<groupId>commons-lang</groupId> |
||||||
<artifactId>xmlbeans</artifactId> |
<artifactId>commons-lang</artifactId> |
||||||
<version>2.4.0</version> |
<version>2.5</version> |
||||||
<optional>true</optional> |
<scope>compile</scope> |
||||||
</dependency> |
</dependency> |
||||||
<dependency> |
<dependency> |
||||||
<groupId>org.codehaus.castor</groupId> |
<groupId>org.apache.xmlbeans</groupId> |
||||||
<artifactId>castor-xml</artifactId> |
<artifactId>xmlbeans</artifactId> |
||||||
<version>1.3.2</version> |
<version>2.4.0</version> |
||||||
<optional>true</optional> |
<optional>true</optional> |
||||||
</dependency> |
</dependency> |
||||||
<dependency> |
<dependency> |
||||||
<groupId>org.springframework</groupId> |
<groupId>org.codehaus.castor</groupId> |
||||||
<artifactId>spring-beans</artifactId> |
<artifactId>castor-xml</artifactId> |
||||||
<version>${project.version}</version> |
<version>1.3.2</version> |
||||||
<scope>compile</scope> |
<optional>true</optional> |
||||||
</dependency> |
</dependency> |
||||||
<dependency> |
<dependency> |
||||||
<groupId>org.springframework</groupId> |
<groupId>org.springframework</groupId> |
||||||
<artifactId>spring-context</artifactId> |
<artifactId>spring-beans</artifactId> |
||||||
<version>${project.version}</version> |
<version>${project.version}</version> |
||||||
<scope>compile</scope> |
<scope>compile</scope> |
||||||
</dependency> |
</dependency> |
||||||
<dependency> |
<dependency> |
||||||
<groupId>org.springframework</groupId> |
<groupId>org.springframework</groupId> |
||||||
<artifactId>spring-core</artifactId> |
<artifactId>spring-context</artifactId> |
||||||
<version>${project.version}</version> |
<version>${project.version}</version> |
||||||
<scope>compile</scope> |
<scope>compile</scope> |
||||||
</dependency> |
</dependency> |
||||||
<dependency> |
<dependency> |
||||||
<groupId>junit</groupId> |
<groupId>org.springframework</groupId> |
||||||
<artifactId>junit</artifactId> |
<artifactId>spring-core</artifactId> |
||||||
<scope>test</scope> |
<version>${project.version}</version> |
||||||
</dependency> |
<scope>compile</scope> |
||||||
<dependency> |
</dependency> |
||||||
<groupId>org.easymock</groupId> |
<dependency> |
||||||
<artifactId>easymock</artifactId> |
<groupId>junit</groupId> |
||||||
<scope>test</scope> |
<artifactId>junit</artifactId> |
||||||
</dependency> |
<scope>test</scope> |
||||||
<dependency> |
</dependency> |
||||||
<groupId>org.codehaus.jettison</groupId> |
<dependency> |
||||||
<artifactId>jettison</artifactId> |
<groupId>org.easymock</groupId> |
||||||
<version>1.0.1</version> |
<artifactId>easymock</artifactId> |
||||||
<scope>test</scope> |
<scope>test</scope> |
||||||
</dependency> |
</dependency> |
||||||
<dependency> |
<dependency> |
||||||
<groupId>xmlunit</groupId> |
<groupId>org.codehaus.jettison</groupId> |
||||||
<artifactId>xmlunit</artifactId> |
<artifactId>jettison</artifactId> |
||||||
<version>1.2</version> |
<version>1.0.1</version> |
||||||
<scope>test</scope> |
<scope>test</scope> |
||||||
</dependency> |
</dependency> |
||||||
<dependency> |
<dependency> |
||||||
<groupId>xmlpull</groupId> |
<groupId>xmlunit</groupId> |
||||||
<artifactId>xmlpull</artifactId> |
<artifactId>xmlunit</artifactId> |
||||||
<version>1.1.3.4a</version> |
<version>1.2</version> |
||||||
<scope>test</scope> |
<scope>test</scope> |
||||||
</dependency> |
</dependency> |
||||||
</dependencies> |
<dependency> |
||||||
|
<groupId>xmlpull</groupId> |
||||||
|
<artifactId>xmlpull</artifactId> |
||||||
|
<version>1.1.3.4a</version> |
||||||
|
<scope>test</scope> |
||||||
|
</dependency> |
||||||
|
</dependencies> |
||||||
</project> |
</project> |
||||||
|
|||||||
@ -1,313 +1,318 @@ |
|||||||
<?xml version="1.0" encoding="UTF-8"?> |
<?xml version="1.0" encoding="UTF-8"?> |
||||||
<project xmlns="http://maven.apache.org/POM/4.0.0" |
<project xmlns="http://maven.apache.org/POM/4.0.0" |
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" |
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" |
||||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> |
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> |
||||||
<modelVersion>4.0.0</modelVersion> |
<modelVersion>4.0.0</modelVersion> |
||||||
<groupId>org.springframework</groupId> |
<groupId>org.springframework</groupId> |
||||||
<artifactId>spring-webmvc</artifactId> |
<artifactId>spring-webmvc</artifactId> |
||||||
<packaging>jar</packaging> |
<packaging>jar</packaging> |
||||||
<version>3.1.1.BUILD-SNAPSHOT</version> |
<version>3.1.1.BUILD-SNAPSHOT</version> |
||||||
<parent> |
<parent> |
||||||
<groupId>org.springframework</groupId> |
<groupId>org.springframework</groupId> |
||||||
<artifactId>spring-parent</artifactId> |
<artifactId>spring-parent</artifactId> |
||||||
<relativePath>../org.springframework.spring-parent</relativePath> |
<relativePath>../org.springframework.spring-parent</relativePath> |
||||||
<version>3.1.1.BUILD-SNAPSHOT</version> |
<version>3.1.1.BUILD-SNAPSHOT</version> |
||||||
</parent> |
</parent> |
||||||
|
<licenses> |
||||||
<profiles> |
<license> |
||||||
<profile> |
<name>The Apache Software License, Version 2.0</name> |
||||||
<id>tiger</id> |
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> |
||||||
<activation> |
<distribution>repo</distribution> |
||||||
<jdk>1.5</jdk> |
</license> |
||||||
</activation> |
</licenses> |
||||||
<dependencies> |
<profiles> |
||||||
<dependency> |
<profile> |
||||||
<groupId>stax</groupId> |
<id>tiger</id> |
||||||
<artifactId>stax</artifactId> |
<activation> |
||||||
<version>1.2.0</version> |
<jdk>1.5</jdk> |
||||||
</dependency> |
</activation> |
||||||
</dependencies> |
<dependencies> |
||||||
</profile> |
<dependency> |
||||||
</profiles> |
<groupId>stax</groupId> |
||||||
|
<artifactId>stax</artifactId> |
||||||
<dependencies> |
<version>1.2.0</version> |
||||||
<dependency> |
</dependency> |
||||||
<groupId>rome</groupId> |
</dependencies> |
||||||
<artifactId>rome</artifactId> |
</profile> |
||||||
<version>1.0</version> |
</profiles> |
||||||
<optional>true</optional> |
<dependencies> |
||||||
</dependency> |
<dependency> |
||||||
<dependency> |
<groupId>rome</groupId> |
||||||
<groupId>com.lowagie</groupId> |
<artifactId>rome</artifactId> |
||||||
<artifactId>itext</artifactId> |
<version>1.0</version> |
||||||
<version>2.0.8</version> |
<optional>true</optional> |
||||||
<optional>true</optional> |
</dependency> |
||||||
</dependency> |
<dependency> |
||||||
<dependency> |
<groupId>com.lowagie</groupId> |
||||||
<groupId>org.freemarker</groupId> |
<artifactId>itext</artifactId> |
||||||
<artifactId>freemarker</artifactId> |
<version>2.0.8</version> |
||||||
<version>2.3.15</version> |
<optional>true</optional> |
||||||
<optional>true</optional> |
</dependency> |
||||||
</dependency> |
<dependency> |
||||||
<dependency> |
<groupId>org.freemarker</groupId> |
||||||
<groupId>javax.el</groupId> |
<artifactId>freemarker</artifactId> |
||||||
<artifactId>el-api</artifactId> |
<version>2.3.15</version> |
||||||
<version>1.0</version> |
<optional>true</optional> |
||||||
<scope>provided</scope> |
</dependency> |
||||||
</dependency> |
<dependency> |
||||||
<dependency> |
<groupId>javax.el</groupId> |
||||||
<groupId>org.apache.tomcat</groupId> |
<artifactId>el-api</artifactId> |
||||||
<artifactId>tomcat-servlet-api</artifactId> |
<version>1.0</version> |
||||||
<version>7.0.8</version> |
<scope>provided</scope> |
||||||
<scope>provided</scope> |
</dependency> |
||||||
</dependency> |
<dependency> |
||||||
<dependency> |
<groupId>org.apache.tomcat</groupId> |
||||||
<groupId>javax.servlet.jsp</groupId> |
<artifactId>tomcat-servlet-api</artifactId> |
||||||
<artifactId>jsp-api</artifactId> |
<version>7.0.8</version> |
||||||
<version>2.1</version> |
<scope>provided</scope> |
||||||
<scope>provided</scope> |
</dependency> |
||||||
</dependency> |
<dependency> |
||||||
<dependency> |
<groupId>javax.servlet.jsp</groupId> |
||||||
<groupId>javax.servlet</groupId> |
<artifactId>jsp-api</artifactId> |
||||||
<artifactId>jstl</artifactId> |
<version>2.1</version> |
||||||
<version>1.1.2</version> |
<scope>provided</scope> |
||||||
<scope>provided</scope> |
</dependency> |
||||||
</dependency> |
<dependency> |
||||||
<dependency> |
<groupId>javax.servlet</groupId> |
||||||
<groupId>net.sourceforge.jexcelapi</groupId> |
<artifactId>jstl</artifactId> |
||||||
<artifactId>jxl</artifactId> |
<version>1.1.2</version> |
||||||
<version>2.6.3</version> |
<scope>provided</scope> |
||||||
<optional>true</optional> |
</dependency> |
||||||
</dependency> |
<dependency> |
||||||
<dependency> |
<groupId>net.sourceforge.jexcelapi</groupId> |
||||||
<groupId>jasperreports</groupId> |
<artifactId>jxl</artifactId> |
||||||
<artifactId>jasperreports</artifactId> |
<version>2.6.3</version> |
||||||
<version>2.0.5</version> |
<optional>true</optional> |
||||||
<optional>true</optional> |
</dependency> |
||||||
<exclusions> |
<dependency> |
||||||
<exclusion> |
<groupId>jasperreports</groupId> |
||||||
<groupId>xml-apis</groupId> |
<artifactId>jasperreports</artifactId> |
||||||
<artifactId>xml-apis</artifactId> |
<version>2.0.5</version> |
||||||
</exclusion> |
<optional>true</optional> |
||||||
</exclusions> |
<exclusions> |
||||||
</dependency> |
<exclusion> |
||||||
<!-- common logging dependency is in spring-core --> |
<groupId>xml-apis</groupId> |
||||||
<dependency> |
<artifactId>xml-apis</artifactId> |
||||||
<groupId>org.apache.poi</groupId> |
</exclusion> |
||||||
<artifactId>poi</artifactId> |
</exclusions> |
||||||
<version>3.0.2-FINAL</version> |
</dependency> |
||||||
<optional>true</optional> |
<!-- common logging dependency is in spring-core --> |
||||||
</dependency> |
<dependency> |
||||||
<dependency> |
<groupId>org.apache.poi</groupId> |
||||||
<groupId>org.apache.tiles</groupId> |
<artifactId>poi</artifactId> |
||||||
<artifactId>tiles-api</artifactId> |
<version>3.0.2-FINAL</version> |
||||||
<version>2.1.2</version> |
<optional>true</optional> |
||||||
<optional>true</optional> |
</dependency> |
||||||
</dependency> |
<dependency> |
||||||
<dependency> |
<groupId>org.apache.tiles</groupId> |
||||||
<groupId>org.apache.tiles</groupId> |
<artifactId>tiles-api</artifactId> |
||||||
<artifactId>tiles-core</artifactId> |
<version>2.1.2</version> |
||||||
<version>2.1.2</version> |
<optional>true</optional> |
||||||
<optional>true</optional> |
</dependency> |
||||||
</dependency> |
<dependency> |
||||||
<dependency> |
<groupId>org.apache.tiles</groupId> |
||||||
<groupId>org.apache.tiles</groupId> |
<artifactId>tiles-core</artifactId> |
||||||
<artifactId>tiles-jsp</artifactId> |
<version>2.1.2</version> |
||||||
<version>2.1.2</version> |
<optional>true</optional> |
||||||
<optional>true</optional> |
</dependency> |
||||||
</dependency> |
<dependency> |
||||||
<dependency> |
<groupId>org.apache.tiles</groupId> |
||||||
<groupId>org.apache.tiles</groupId> |
<artifactId>tiles-jsp</artifactId> |
||||||
<artifactId>tiles-servlet</artifactId> |
<version>2.1.2</version> |
||||||
<version>2.1.2</version> |
<optional>true</optional> |
||||||
<optional>true</optional> |
</dependency> |
||||||
</dependency> |
<dependency> |
||||||
<dependency> |
<groupId>org.apache.tiles</groupId> |
||||||
<groupId>velocity</groupId> |
<artifactId>tiles-servlet</artifactId> |
||||||
<artifactId>velocity</artifactId> |
<version>2.1.2</version> |
||||||
<version>1.5</version> |
<optional>true</optional> |
||||||
<optional>true</optional> |
</dependency> |
||||||
</dependency> |
<dependency> |
||||||
<dependency> |
<groupId>velocity</groupId> |
||||||
<groupId>velocity-tools</groupId> |
<artifactId>velocity</artifactId> |
||||||
<artifactId>velocity-tools-view</artifactId> |
<version>1.5</version> |
||||||
<version>1.4</version> |
<optional>true</optional> |
||||||
<optional>true</optional> |
</dependency> |
||||||
</dependency> |
<dependency> |
||||||
<dependency> |
<groupId>velocity-tools</groupId> |
||||||
<groupId>org.codehaus.jackson</groupId> |
<artifactId>velocity-tools-view</artifactId> |
||||||
<artifactId>jackson-mapper-asl</artifactId> |
<version>1.4</version> |
||||||
<version>1.4.2</version> |
<optional>true</optional> |
||||||
<optional>true</optional> |
</dependency> |
||||||
</dependency> |
<dependency> |
||||||
<dependency> |
<groupId>org.codehaus.jackson</groupId> |
||||||
<groupId>org.springframework</groupId> |
<artifactId>jackson-mapper-asl</artifactId> |
||||||
<artifactId>spring-asm</artifactId> |
<version>1.4.2</version> |
||||||
<version>${project.version}</version> |
<optional>true</optional> |
||||||
<scope>compile</scope> |
</dependency> |
||||||
</dependency> |
<dependency> |
||||||
<dependency> |
<groupId>org.springframework</groupId> |
||||||
<groupId>org.springframework</groupId> |
<artifactId>spring-asm</artifactId> |
||||||
<artifactId>spring-beans</artifactId> |
<version>${project.version}</version> |
||||||
<version>${project.version}</version> |
<scope>compile</scope> |
||||||
<scope>compile</scope> |
</dependency> |
||||||
</dependency> |
<dependency> |
||||||
<dependency> |
<groupId>org.springframework</groupId> |
||||||
<groupId>org.springframework</groupId> |
<artifactId>spring-beans</artifactId> |
||||||
<artifactId>spring-context</artifactId> |
<version>${project.version}</version> |
||||||
<version>${project.version}</version> |
<scope>compile</scope> |
||||||
<scope>compile</scope> |
</dependency> |
||||||
</dependency> |
<dependency> |
||||||
<dependency> |
<groupId>org.springframework</groupId> |
||||||
<groupId>org.springframework</groupId> |
<artifactId>spring-context</artifactId> |
||||||
<artifactId>spring-context-support</artifactId> |
<version>${project.version}</version> |
||||||
<version>${project.version}</version> |
<scope>compile</scope> |
||||||
<scope>compile</scope> |
</dependency> |
||||||
</dependency> |
<dependency> |
||||||
<dependency> |
<groupId>org.springframework</groupId> |
||||||
<groupId>org.springframework</groupId> |
<artifactId>spring-context-support</artifactId> |
||||||
<artifactId>spring-core</artifactId> |
<version>${project.version}</version> |
||||||
<version>${project.version}</version> |
<scope>compile</scope> |
||||||
<scope>compile</scope> |
</dependency> |
||||||
</dependency> |
<dependency> |
||||||
<dependency> |
<groupId>org.springframework</groupId> |
||||||
<groupId>org.springframework</groupId> |
<artifactId>spring-core</artifactId> |
||||||
<artifactId>spring-expression</artifactId> |
<version>${project.version}</version> |
||||||
<version>${project.version}</version> |
<scope>compile</scope> |
||||||
<scope>compile</scope> |
</dependency> |
||||||
</dependency> |
<dependency> |
||||||
<dependency> |
<groupId>org.springframework</groupId> |
||||||
<groupId>org.springframework</groupId> |
<artifactId>spring-expression</artifactId> |
||||||
<artifactId>spring-oxm</artifactId> |
<version>${project.version}</version> |
||||||
<version>${project.version}</version> |
<scope>compile</scope> |
||||||
<optional>true</optional> |
</dependency> |
||||||
</dependency> |
<dependency> |
||||||
<dependency> |
<groupId>org.springframework</groupId> |
||||||
<groupId>org.springframework</groupId> |
<artifactId>spring-oxm</artifactId> |
||||||
<artifactId>spring-orm</artifactId> |
<version>${project.version}</version> |
||||||
<version>${project.version}</version> |
<optional>true</optional> |
||||||
<scope>test</scope> |
</dependency> |
||||||
</dependency> |
<dependency> |
||||||
<dependency> |
<groupId>org.springframework</groupId> |
||||||
<groupId>org.springframework</groupId> |
<artifactId>spring-orm</artifactId> |
||||||
<artifactId>spring-web</artifactId> |
<version>${project.version}</version> |
||||||
<version>${project.version}</version> |
<scope>test</scope> |
||||||
<scope>compile</scope> |
</dependency> |
||||||
</dependency> |
<dependency> |
||||||
<dependency> |
<groupId>org.springframework</groupId> |
||||||
<groupId>junit</groupId> |
<artifactId>spring-web</artifactId> |
||||||
<artifactId>junit</artifactId> |
<version>${project.version}</version> |
||||||
<scope>test</scope> |
<scope>compile</scope> |
||||||
</dependency> |
</dependency> |
||||||
<dependency> |
<dependency> |
||||||
<groupId>org.easymock</groupId> |
<groupId>junit</groupId> |
||||||
<artifactId>easymock</artifactId> |
<artifactId>junit</artifactId> |
||||||
<scope>test</scope> |
<scope>test</scope> |
||||||
</dependency> |
</dependency> |
||||||
<dependency> |
<dependency> |
||||||
<groupId>xmlunit</groupId> |
<groupId>org.easymock</groupId> |
||||||
<artifactId>xmlunit</artifactId> |
<artifactId>easymock</artifactId> |
||||||
<version>1.2</version> |
<scope>test</scope> |
||||||
<scope>test</scope> |
</dependency> |
||||||
</dependency> |
<dependency> |
||||||
<dependency> |
<groupId>xmlunit</groupId> |
||||||
<groupId>commons-fileupload</groupId> |
<artifactId>xmlunit</artifactId> |
||||||
<artifactId>commons-fileupload</artifactId> |
<version>1.2</version> |
||||||
<version>1.2</version> |
<scope>test</scope> |
||||||
<scope>test</scope> |
</dependency> |
||||||
</dependency> |
<dependency> |
||||||
<dependency> |
<groupId>commons-fileupload</groupId> |
||||||
<groupId>dom4j</groupId> |
<artifactId>commons-fileupload</artifactId> |
||||||
<artifactId>dom4j</artifactId> |
<version>1.2</version> |
||||||
<version>1.6.1</version> |
<scope>test</scope> |
||||||
<scope>test</scope> |
</dependency> |
||||||
<exclusions> |
<dependency> |
||||||
<exclusion> |
<groupId>dom4j</groupId> |
||||||
<groupId>xml-apis</groupId> |
<artifactId>dom4j</artifactId> |
||||||
<artifactId>xml-apis</artifactId> |
<version>1.6.1</version> |
||||||
</exclusion> |
<scope>test</scope> |
||||||
</exclusions> |
<exclusions> |
||||||
</dependency> |
<exclusion> |
||||||
<dependency> |
<groupId>xml-apis</groupId> |
||||||
<groupId>jaxen</groupId> |
<artifactId>xml-apis</artifactId> |
||||||
<artifactId>jaxen</artifactId> |
</exclusion> |
||||||
<version>1.1.1</version> |
</exclusions> |
||||||
<scope>test</scope> |
</dependency> |
||||||
<exclusions> |
<dependency> |
||||||
<exclusion> |
<groupId>jaxen</groupId> |
||||||
<groupId>xml-apis</groupId> |
<artifactId>jaxen</artifactId> |
||||||
<artifactId>xml-apis</artifactId> |
<version>1.1.1</version> |
||||||
</exclusion> |
<scope>test</scope> |
||||||
<exclusion> |
<exclusions> |
||||||
<groupId>xom</groupId> |
<exclusion> |
||||||
<artifactId>xom</artifactId> |
<groupId>xml-apis</groupId> |
||||||
</exclusion> |
<artifactId>xml-apis</artifactId> |
||||||
<exclusion> |
</exclusion> |
||||||
<groupId>xerces</groupId> |
<exclusion> |
||||||
<artifactId>xercesImpl</artifactId> |
<groupId>xom</groupId> |
||||||
</exclusion> |
<artifactId>xom</artifactId> |
||||||
</exclusions> |
</exclusion> |
||||||
</dependency> |
<exclusion> |
||||||
<dependency> |
<groupId>xerces</groupId> |
||||||
<groupId>cglib</groupId> |
<artifactId>xercesImpl</artifactId> |
||||||
<artifactId>cglib-nodep</artifactId> |
</exclusion> |
||||||
<version>2.2</version> |
</exclusions> |
||||||
<scope>test</scope> |
</dependency> |
||||||
</dependency> |
<dependency> |
||||||
<dependency> |
<groupId>cglib</groupId> |
||||||
<groupId>rhino</groupId> |
<artifactId>cglib-nodep</artifactId> |
||||||
<artifactId>js</artifactId> |
<version>2.2</version> |
||||||
<version>1.7R1</version> |
<scope>test</scope> |
||||||
<scope>test</scope> |
</dependency> |
||||||
</dependency> |
<dependency> |
||||||
<dependency> |
<groupId>rhino</groupId> |
||||||
<groupId>org.apache.geronimo.specs</groupId> |
<artifactId>js</artifactId> |
||||||
<artifactId>geronimo-jta_1.1_spec</artifactId> |
<version>1.7R1</version> |
||||||
<version>1.1</version> |
<scope>test</scope> |
||||||
<scope>provided</scope> |
</dependency> |
||||||
<optional>true</optional> |
<dependency> |
||||||
</dependency> |
<groupId>org.apache.geronimo.specs</groupId> |
||||||
<dependency> |
<artifactId>geronimo-jta_1.1_spec</artifactId> |
||||||
<groupId>javax.validation</groupId> |
<version>1.1</version> |
||||||
<artifactId>validation-api</artifactId> |
<scope>provided</scope> |
||||||
<version>1.0.0.GA</version> |
<optional>true</optional> |
||||||
<scope>provided</scope> |
</dependency> |
||||||
</dependency> |
<dependency> |
||||||
<dependency> |
<groupId>javax.validation</groupId> |
||||||
<groupId>org.hibernate</groupId> |
<artifactId>validation-api</artifactId> |
||||||
<artifactId>hibernate-validator</artifactId> |
<version>1.0.0.GA</version> |
||||||
<version>4.0.0.GA</version> |
<scope>provided</scope> |
||||||
<scope>test</scope> |
</dependency> |
||||||
</dependency> |
<dependency> |
||||||
<dependency> |
<groupId>org.hibernate</groupId> |
||||||
<groupId>org.slf4j</groupId> |
<artifactId>hibernate-validator</artifactId> |
||||||
<artifactId>slf4j-log4j12</artifactId> |
<version>4.0.0.GA</version> |
||||||
<scope>test</scope> |
<scope>test</scope> |
||||||
<optional>true</optional> |
</dependency> |
||||||
</dependency> |
<dependency> |
||||||
<dependency> |
<groupId>org.slf4j</groupId> |
||||||
<groupId>log4j</groupId> |
<artifactId>slf4j-log4j12</artifactId> |
||||||
<artifactId>log4j</artifactId> |
<scope>test</scope> |
||||||
<scope>test</scope> |
<optional>true</optional> |
||||||
<optional>true</optional> |
</dependency> |
||||||
</dependency> |
<dependency> |
||||||
<dependency> |
<groupId>log4j</groupId> |
||||||
<groupId>joda-time</groupId> |
<artifactId>log4j</artifactId> |
||||||
<artifactId>joda-time</artifactId> |
<scope>test</scope> |
||||||
<version>1.6</version> |
<optional>true</optional> |
||||||
<scope>test</scope> |
</dependency> |
||||||
</dependency> |
<dependency> |
||||||
<dependency> |
<groupId>joda-time</groupId> |
||||||
<groupId>org.mortbay.jetty</groupId> |
<artifactId>joda-time</artifactId> |
||||||
<artifactId>jetty</artifactId> |
<version>1.6</version> |
||||||
<version>6.1.9</version> |
<scope>test</scope> |
||||||
<scope>test</scope> |
</dependency> |
||||||
<exclusions> |
<dependency> |
||||||
<exclusion> |
<groupId>org.mortbay.jetty</groupId> |
||||||
<artifactId>servlet-api-2.5</artifactId> |
<artifactId>jetty</artifactId> |
||||||
<groupId>org.mortbay.jetty</groupId> |
<version>6.1.9</version> |
||||||
</exclusion> |
<scope>test</scope> |
||||||
</exclusions> |
<exclusions> |
||||||
</dependency> |
<exclusion> |
||||||
</dependencies> |
<artifactId>servlet-api-2.5</artifactId> |
||||||
|
<groupId>org.mortbay.jetty</groupId> |
||||||
|
</exclusion> |
||||||
|
</exclusions> |
||||||
|
</dependency> |
||||||
|
</dependencies> |
||||||
</project> |
</project> |
||||||
|
|||||||
@ -1,192 +1,198 @@ |
|||||||
<?xml version="1.0" encoding="UTF-8"?> |
<?xml version="1.0" encoding="UTF-8"?> |
||||||
<project xmlns="http://maven.apache.org/POM/4.0.0" 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> |
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> |
||||||
<groupId>org.springframework</groupId> |
<modelVersion>4.0.0</modelVersion> |
||||||
<artifactId>spring-web</artifactId> |
<groupId>org.springframework</groupId> |
||||||
<packaging>jar</packaging> |
<artifactId>spring-web</artifactId> |
||||||
<version>3.1.1.BUILD-SNAPSHOT</version> |
<packaging>jar</packaging> |
||||||
<parent> |
<version>3.1.1.BUILD-SNAPSHOT</version> |
||||||
<groupId>org.springframework</groupId> |
<parent> |
||||||
<artifactId>spring-parent</artifactId> |
<groupId>org.springframework</groupId> |
||||||
<relativePath>../org.springframework.spring-parent</relativePath> |
<artifactId>spring-parent</artifactId> |
||||||
<version>3.1.1.BUILD-SNAPSHOT</version> |
<relativePath>../org.springframework.spring-parent</relativePath> |
||||||
</parent> |
<version>3.1.1.BUILD-SNAPSHOT</version> |
||||||
|
</parent> |
||||||
<dependencies> |
<licenses> |
||||||
<dependency> |
<license> |
||||||
<groupId>com.caucho</groupId> |
<name>The Apache Software License, Version 2.0</name> |
||||||
<artifactId>com.springsource.com.caucho</artifactId> |
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> |
||||||
<version>3.2.1</version> |
<distribution>repo</distribution> |
||||||
<optional>true</optional> |
</license> |
||||||
</dependency> |
</licenses> |
||||||
<dependency> |
<dependencies> |
||||||
<groupId>rome</groupId> |
<dependency> |
||||||
<artifactId>rome</artifactId> |
<groupId>com.caucho</groupId> |
||||||
<version>1.0</version> |
<artifactId>com.springsource.com.caucho</artifactId> |
||||||
<optional>true</optional> |
<version>3.2.1</version> |
||||||
</dependency> |
<optional>true</optional> |
||||||
<dependency> |
</dependency> |
||||||
<groupId>javax.el</groupId> |
<dependency> |
||||||
<artifactId>el-api</artifactId> |
<groupId>rome</groupId> |
||||||
<version>1.0</version> |
<artifactId>rome</artifactId> |
||||||
<optional>true</optional> |
<version>1.0</version> |
||||||
</dependency> |
<optional>true</optional> |
||||||
<dependency> |
</dependency> |
||||||
<groupId>javax.faces</groupId> |
<dependency> |
||||||
<artifactId>jsf-api</artifactId> |
<groupId>javax.el</groupId> |
||||||
<version>1.2_08</version> |
<artifactId>el-api</artifactId> |
||||||
<optional>true</optional> |
<version>1.0</version> |
||||||
</dependency> |
<optional>true</optional> |
||||||
<dependency> |
</dependency> |
||||||
<groupId>javax.portlet</groupId> |
<dependency> |
||||||
<artifactId>portlet-api</artifactId> |
<groupId>javax.faces</groupId> |
||||||
<version>2.0</version> |
<artifactId>jsf-api</artifactId> |
||||||
<scope>provided</scope> |
<version>1.2_08</version> |
||||||
</dependency> |
<optional>true</optional> |
||||||
<dependency> |
</dependency> |
||||||
<groupId>org.apache.tomcat</groupId> |
<dependency> |
||||||
<artifactId>tomcat-servlet-api</artifactId> |
<groupId>javax.portlet</groupId> |
||||||
<version>7.0.8</version> |
<artifactId>portlet-api</artifactId> |
||||||
<scope>provided</scope> |
<version>2.0</version> |
||||||
</dependency> |
<scope>provided</scope> |
||||||
<dependency> |
</dependency> |
||||||
<groupId>javax.servlet.jsp</groupId> |
<dependency> |
||||||
<artifactId>jsp-api</artifactId> |
<groupId>org.apache.tomcat</groupId> |
||||||
<version>2.1</version> |
<artifactId>tomcat-servlet-api</artifactId> |
||||||
<scope>provided</scope> |
<version>7.0.8</version> |
||||||
</dependency> |
<scope>provided</scope> |
||||||
<dependency> |
</dependency> |
||||||
<groupId>javax.xml</groupId> |
<dependency> |
||||||
<artifactId>jaxrpc-api</artifactId> |
<groupId>javax.servlet.jsp</groupId> |
||||||
<version>1.1</version> |
<artifactId>jsp-api</artifactId> |
||||||
<optional>true</optional> |
<version>2.1</version> |
||||||
</dependency> |
<scope>provided</scope> |
||||||
<dependency> |
</dependency> |
||||||
<groupId>javax.xml.soap</groupId> |
<dependency> |
||||||
<artifactId>saaj-api</artifactId> |
<groupId>javax.xml</groupId> |
||||||
<version>1.3</version> |
<artifactId>jaxrpc-api</artifactId> |
||||||
<scope>provided</scope> |
<version>1.1</version> |
||||||
</dependency> |
<optional>true</optional> |
||||||
<dependency> |
</dependency> |
||||||
<groupId>javax.xml.ws</groupId> |
<dependency> |
||||||
<artifactId>jaxws-api</artifactId> |
<groupId>javax.xml.soap</groupId> |
||||||
<version>2.1-1</version> |
<artifactId>saaj-api</artifactId> |
||||||
<optional>true</optional> |
<version>1.3</version> |
||||||
</dependency> |
<scope>provided</scope> |
||||||
<dependency> |
</dependency> |
||||||
<groupId>aopalliance</groupId> |
<dependency> |
||||||
<artifactId>aopalliance</artifactId> |
<groupId>javax.xml.ws</groupId> |
||||||
<version>1.0</version> |
<artifactId>jaxws-api</artifactId> |
||||||
<scope>compile</scope> |
<version>2.1-1</version> |
||||||
</dependency> |
<optional>true</optional> |
||||||
<dependency> |
</dependency> |
||||||
<groupId>axis</groupId> |
<dependency> |
||||||
<artifactId>axis</artifactId> |
<groupId>aopalliance</groupId> |
||||||
<version>1.4</version> |
<artifactId>aopalliance</artifactId> |
||||||
<optional>true</optional> |
<version>1.0</version> |
||||||
</dependency> |
<scope>compile</scope> |
||||||
<dependency> |
</dependency> |
||||||
<groupId>commons-fileupload</groupId> |
<dependency> |
||||||
<artifactId>commons-fileupload</artifactId> |
<groupId>axis</groupId> |
||||||
<version>1.2</version> |
<artifactId>axis</artifactId> |
||||||
<optional>true</optional> |
<version>1.4</version> |
||||||
</dependency> |
<optional>true</optional> |
||||||
<dependency> |
</dependency> |
||||||
<groupId>commons-httpclient</groupId> |
<dependency> |
||||||
<artifactId>commons-httpclient</artifactId> |
<groupId>commons-fileupload</groupId> |
||||||
<version>3.1</version> |
<artifactId>commons-fileupload</artifactId> |
||||||
<optional>true</optional> |
<version>1.2</version> |
||||||
</dependency> |
<optional>true</optional> |
||||||
<dependency> |
</dependency> |
||||||
<groupId>org.apache.httpcomponents</groupId> |
<dependency> |
||||||
<artifactId>httpclient</artifactId> |
<groupId>commons-httpclient</groupId> |
||||||
<version>4.1.1</version> |
<artifactId>commons-httpclient</artifactId> |
||||||
<optional>true</optional> |
<version>3.1</version> |
||||||
</dependency> |
<optional>true</optional> |
||||||
<!-- common logging dependency is in spring-core --> |
</dependency> |
||||||
<dependency> |
<dependency> |
||||||
<groupId>log4j</groupId> |
<groupId>org.apache.httpcomponents</groupId> |
||||||
<artifactId>log4j</artifactId> |
<artifactId>httpclient</artifactId> |
||||||
<scope>compile</scope> |
<version>4.1.1</version> |
||||||
<optional>true</optional> |
<optional>true</optional> |
||||||
</dependency> |
</dependency> |
||||||
<dependency> |
<!-- common logging dependency is in spring-core --> |
||||||
<groupId>org.codehaus.jackson</groupId> |
<dependency> |
||||||
<artifactId>jackson-mapper-asl</artifactId> |
<groupId>log4j</groupId> |
||||||
<version>1.4.2</version> |
<artifactId>log4j</artifactId> |
||||||
<optional>true</optional> |
<scope>compile</scope> |
||||||
</dependency> |
<optional>true</optional> |
||||||
<dependency> |
</dependency> |
||||||
<groupId>org.springframework</groupId> |
<dependency> |
||||||
<artifactId>spring-aop</artifactId> |
<groupId>org.codehaus.jackson</groupId> |
||||||
<version>${project.version}</version> |
<artifactId>jackson-mapper-asl</artifactId> |
||||||
<optional>true</optional> |
<version>1.4.2</version> |
||||||
</dependency> |
<optional>true</optional> |
||||||
<dependency> |
</dependency> |
||||||
<groupId>org.springframework</groupId> |
<dependency> |
||||||
<artifactId>spring-beans</artifactId> |
<groupId>org.springframework</groupId> |
||||||
<version>${project.version}</version> |
<artifactId>spring-aop</artifactId> |
||||||
<scope>compile</scope> |
<version>${project.version}</version> |
||||||
</dependency> |
<optional>true</optional> |
||||||
<dependency> |
</dependency> |
||||||
<groupId>org.springframework</groupId> |
<dependency> |
||||||
<artifactId>spring-context</artifactId> |
<groupId>org.springframework</groupId> |
||||||
<version>${project.version}</version> |
<artifactId>spring-beans</artifactId> |
||||||
<scope>compile</scope> |
<version>${project.version}</version> |
||||||
</dependency> |
<scope>compile</scope> |
||||||
<dependency> |
</dependency> |
||||||
<groupId>org.springframework</groupId> |
<dependency> |
||||||
<artifactId>spring-core</artifactId> |
<groupId>org.springframework</groupId> |
||||||
<version>${project.version}</version> |
<artifactId>spring-context</artifactId> |
||||||
<scope>compile</scope> |
<version>${project.version}</version> |
||||||
</dependency> |
<scope>compile</scope> |
||||||
<dependency> |
</dependency> |
||||||
<groupId>org.springframework</groupId> |
<dependency> |
||||||
<artifactId>spring-oxm</artifactId> |
<groupId>org.springframework</groupId> |
||||||
<version>${project.version}</version> |
<artifactId>spring-core</artifactId> |
||||||
<optional>true</optional> |
<version>${project.version}</version> |
||||||
</dependency> |
<scope>compile</scope> |
||||||
<dependency> |
</dependency> |
||||||
<groupId>taglibs</groupId> |
<dependency> |
||||||
<artifactId>standard</artifactId> |
<groupId>org.springframework</groupId> |
||||||
<version>1.1.2</version> |
<artifactId>spring-oxm</artifactId> |
||||||
<scope>test</scope> |
<version>${project.version}</version> |
||||||
</dependency> |
<optional>true</optional> |
||||||
<dependency> |
</dependency> |
||||||
<groupId>junit</groupId> |
<dependency> |
||||||
<artifactId>junit</artifactId> |
<groupId>taglibs</groupId> |
||||||
<scope>test</scope> |
<artifactId>standard</artifactId> |
||||||
</dependency> |
<version>1.1.2</version> |
||||||
<dependency> |
<scope>test</scope> |
||||||
<groupId>cglib</groupId> |
</dependency> |
||||||
<artifactId>cglib-nodep</artifactId> |
<dependency> |
||||||
<version>2.2</version> |
<groupId>junit</groupId> |
||||||
<scope>test</scope> |
<artifactId>junit</artifactId> |
||||||
</dependency> |
<scope>test</scope> |
||||||
<dependency> |
</dependency> |
||||||
<groupId>org.easymock</groupId> |
<dependency> |
||||||
<artifactId>easymock</artifactId> |
<groupId>cglib</groupId> |
||||||
<scope>test</scope> |
<artifactId>cglib-nodep</artifactId> |
||||||
</dependency> |
<version>2.2</version> |
||||||
<dependency> |
<scope>test</scope> |
||||||
<groupId>org.mortbay.jetty</groupId> |
</dependency> |
||||||
<artifactId>jetty</artifactId> |
<dependency> |
||||||
<version>6.1.9</version> |
<groupId>org.easymock</groupId> |
||||||
<scope>test</scope> |
<artifactId>easymock</artifactId> |
||||||
<exclusions> |
<scope>test</scope> |
||||||
<exclusion> |
</dependency> |
||||||
<artifactId>servlet-api-2.5</artifactId> |
<dependency> |
||||||
<groupId>org.mortbay.jetty</groupId> |
<groupId>org.mortbay.jetty</groupId> |
||||||
</exclusion> |
<artifactId>jetty</artifactId> |
||||||
</exclusions> |
<version>6.1.9</version> |
||||||
</dependency> |
<scope>test</scope> |
||||||
<dependency> |
<exclusions> |
||||||
<groupId>xmlunit</groupId> |
<exclusion> |
||||||
<artifactId>xmlunit</artifactId> |
<artifactId>servlet-api-2.5</artifactId> |
||||||
<version>1.2</version> |
<groupId>org.mortbay.jetty</groupId> |
||||||
<scope>test</scope> |
</exclusion> |
||||||
</dependency> |
</exclusions> |
||||||
</dependencies> |
</dependency> |
||||||
|
<dependency> |
||||||
|
<groupId>xmlunit</groupId> |
||||||
|
<artifactId>xmlunit</artifactId> |
||||||
|
<version>1.2</version> |
||||||
|
<scope>test</scope> |
||||||
|
</dependency> |
||||||
|
</dependencies> |
||||||
</project> |
</project> |
||||||
|
|||||||
Loading…
Reference in new issue