cleanup work

This commit is contained in:
eugenp
2015-10-26 14:59:43 +02:00
parent 1ef53e2f68
commit 1da86e7c83
4 changed files with 17 additions and 11 deletions

View File

@@ -287,7 +287,7 @@
<properties>
<!-- Spring -->
<org.springframework.version>4.2.0.RELEASE</org.springframework.version>
<org.springframework.version>4.2.2.RELEASE</org.springframework.version>
<org.springframework.security.version>4.0.2.RELEASE</org.springframework.security.version>
<!-- persistence -->
@@ -295,8 +295,8 @@
<mysql-connector-java.version>5.1.36</mysql-connector-java.version>
<!-- http -->
<httpcore.version>4.4.1</httpcore.version>
<httpclient.version>4.5</httpclient.version>
<httpcore.version>4.4.3</httpcore.version>
<httpclient.version>4.5.1</httpclient.version>
<!-- logging -->
<org.slf4j.version>1.7.12</org.slf4j.version>
@@ -314,13 +314,13 @@
<junit.version>4.11</junit.version>
<mockito.version>1.10.19</mockito.version>
<rest-assured.version>2.4.1</rest-assured.version>
<rest-assured.version>2.6.0</rest-assured.version>
<!-- Maven plugins -->
<maven-compiler-plugin.version>3.3</maven-compiler-plugin.version>
<maven-war-plugin.version>2.6</maven-war-plugin.version>
<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
<cargo-maven2-plugin.version>1.4.15</cargo-maven2-plugin.version>
<maven-surefire-plugin.version>2.19</maven-surefire-plugin.version>
<cargo-maven2-plugin.version>1.4.16</cargo-maven2-plugin.version>
</properties>

View File

@@ -2,9 +2,9 @@
<beans:beans xmlns="http://www.springframework.org/schema/security" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
xsi:schemaLocation="
http://www.springframework.org/schema/security
http://www.springframework.org/schema/security/spring-security-3.2.xsd
http://www.springframework.org/schema/security/spring-security-4.0.xsd
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-4.1.xsd"
http://www.springframework.org/schema/beans/spring-beans-4.2.xsd"
>
<http create-session="stateless" use-expressions="true">