upgrading to spring security 3.2, other maven upgrades, cleanup work

This commit is contained in:
eugenp
2013-12-18 13:25:45 +02:00
parent dac56fd805
commit f40c9d3a96
15 changed files with 663 additions and 645 deletions
+31 -28
View File
@@ -141,7 +141,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven-surefire-plugin.version}</version>
<version>${maven-surefire-plugin.version}</version>
<configuration>
<excludes>
<!-- <exclude>**/*ProductionTest.java</exclude> -->
@@ -155,7 +155,7 @@
<plugin>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven2-plugin</artifactId>
<version>${cargo-maven2-plugin.version}</version>
<version>${cargo-maven2-plugin.version}</version>
<configuration>
<wait>true</wait>
<container>
@@ -178,39 +178,42 @@
</build>
<properties>
<!-- Spring -->
<org.springframework.version>3.2.6.RELEASE</org.springframework.version>
<org.springframework.security.version>3.1.4.RELEASE</org.springframework.security.version>
<!-- Spring -->
<org.springframework.version>3.2.6.RELEASE</org.springframework.version>
<org.springframework.security.version>3.2.0.RELEASE</org.springframework.security.version>
<!-- persistence -->
<hibernate.version>4.3.0.Final</hibernate.version>
<mysql-connector-java.version>5.1.27</mysql-connector-java.version>
<!-- persistence -->
<hibernate.version>4.3.0.Final</hibernate.version>
<mysql-connector-java.version>5.1.27</mysql-connector-java.version>
<!-- logging -->
<org.slf4j.version>1.7.5</org.slf4j.version>
<logback.version>1.0.11</logback.version>
<!-- logging -->
<org.slf4j.version>1.7.5</org.slf4j.version>
<logback.version>1.0.11</logback.version>
<!-- various -->
<hibernate-validator.version>5.0.1.Final</hibernate-validator.version>
<!-- various -->
<hibernate-validator.version>5.0.1.Final</hibernate-validator.version>
<!-- util -->
<guava.version>15.0</guava.version>
<commons-lang3.version>3.1</commons-lang3.version>
<!-- util -->
<guava.version>15.0</guava.version>
<commons-lang3.version>3.1</commons-lang3.version>
<!-- testing -->
<org.hamcrest.version>1.3</org.hamcrest.version>
<junit.version>4.11</junit.version>
<mockito.version>1.9.5</mockito.version>
<!-- testing -->
<org.hamcrest.version>1.3</org.hamcrest.version>
<junit.version>4.11</junit.version>
<mockito.version>1.9.5</mockito.version>
<httpcore.version>4.3</httpcore.version>
<httpclient.version>4.3.1</httpclient.version>
<httpcore.version>4.3</httpcore.version>
<httpclient.version>4.3.1</httpclient.version>
<rest-assured.version>2.1.0</rest-assured.version>
<groovy.version>1.8.9</groovy.version>
<rest-assured.version>2.1.0</rest-assured.version>
<!-- Maven plugins -->
<cargo-maven2-plugin.version>1.4.5</cargo-maven2-plugin.version>
<maven-surefire-plugin.version>2.16</maven-surefire-plugin.version>
</properties>
<!-- Maven plugins -->
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
<maven-war-plugin.version>2.4</maven-war-plugin.version>
<maven-surefire-plugin.version>2.16</maven-surefire-plugin.version>
<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
<cargo-maven2-plugin.version>1.4.5</cargo-maven2-plugin.version>
</properties>
</project>