Skip to content

Commit f40c9d3

Browse files
author
eugenp
committed
upgrading to spring security 3.2, other maven upgrades, cleanup work
1 parent dac56fd commit f40c9d3

15 files changed

Lines changed: 756 additions & 738 deletions

File tree

‎spring-mvc-java/pom.xml‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@
140140
<properties>
141141
<!-- Spring -->
142142
<org.springframework.version>3.2.6.RELEASE</org.springframework.version>
143-
<org.springframework.security.version>3.1.4.RELEASE</org.springframework.security.version>
143+
<org.springframework.security.version>3.2.0.RELEASE</org.springframework.security.version>
144144

145145
<!-- persistence -->
146146
<hibernate.version>4.3.0.Final</hibernate.version>
@@ -166,14 +166,13 @@
166166
<httpclient.version>4.3.1</httpclient.version>
167167

168168
<rest-assured.version>2.0.1</rest-assured.version>
169-
<groovy.version>1.8.9</groovy.version>
170169

171170
<!-- maven plugins -->
172-
<cargo-maven2-plugin.version>1.4.5</cargo-maven2-plugin.version>
173171
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
174-
<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
175-
<maven-surefire-plugin.version>2.16</maven-surefire-plugin.version>
176172
<maven-war-plugin.version>2.4</maven-war-plugin.version>
173+
<maven-surefire-plugin.version>2.16</maven-surefire-plugin.version>
174+
<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
175+
<cargo-maven2-plugin.version>1.4.5</cargo-maven2-plugin.version>
177176

178177
</properties>
179178

‎spring-mvc-no-xml/pom.xml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,12 +125,14 @@
125125
<httpclient.version>4.3.1</httpclient.version>
126126

127127
<rest-assured.version>2.1.0</rest-assured.version>
128-
<groovy.version>1.8.9</groovy.version>
129128

130129
<!-- Maven plugins -->
131-
<cargo-maven2-plugin.version>1.4.5</cargo-maven2-plugin.version>
132-
<maven-surefire-plugin.version>2.16</maven-surefire-plugin.version>
130+
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
133131
<maven-war-plugin.version>2.4</maven-war-plugin.version>
132+
<maven-surefire-plugin.version>2.16</maven-surefire-plugin.version>
133+
<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
134+
<cargo-maven2-plugin.version>1.4.5</cargo-maven2-plugin.version>
135+
134136
</properties>
135137

136138
</project>

‎spring-mvc-no-xml/src/main/resources/webSecurityConfig.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<beans:beans xmlns="http://www.springframework.org/schema/security" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
33
xmlns:beans="http://www.springframework.org/schema/beans"
44
xsi:schemaLocation="
5-
http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.1.xsd
5+
http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.2.xsd
66
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd">
77

88
<http access-denied-page="/access-denied.html" use-expressions="true">

‎spring-mvc-xml/pom.xml‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,11 +116,14 @@
116116
<httpclient.version>4.3.1</httpclient.version>
117117

118118
<rest-assured.version>2.1.0</rest-assured.version>
119-
<groovy.version>1.8.9</groovy.version>
120119

121-
<!-- Maven plugins -->
122-
<cargo-maven2-plugin.version>1.4.5</cargo-maven2-plugin.version>
123-
<maven-surefire-plugin.version>2.16</maven-surefire-plugin.version>
120+
<!-- Maven plugins -->
121+
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
122+
<maven-war-plugin.version>2.4</maven-war-plugin.version>
123+
<maven-surefire-plugin.version>2.16</maven-surefire-plugin.version>
124+
<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
125+
<cargo-maven2-plugin.version>1.4.5</cargo-maven2-plugin.version>
126+
124127
</properties>
125128

126129
</project>

‎spring-mvc-xml/src/main/resources/webSecurityConfig.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<beans:beans xmlns="http://www.springframework.org/schema/security" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
33
xmlns:beans="http://www.springframework.org/schema/beans"
44
xsi:schemaLocation="
5-
http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.1.xsd
5+
http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.2.xsd
66
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd">
77

88
<http access-denied-page="/access-denied.html" use-expressions="true">

‎spring-security-basic-auth/pom.xml‎

Lines changed: 31 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@
141141
<plugin>
142142
<groupId>org.apache.maven.plugins</groupId>
143143
<artifactId>maven-surefire-plugin</artifactId>
144-
<version>${maven-surefire-plugin.version}</version>
144+
<version>${maven-surefire-plugin.version}</version>
145145
<configuration>
146146
<excludes>
147147
<!-- <exclude>**/*ProductionTest.java</exclude> -->
@@ -155,7 +155,7 @@
155155
<plugin>
156156
<groupId>org.codehaus.cargo</groupId>
157157
<artifactId>cargo-maven2-plugin</artifactId>
158-
<version>${cargo-maven2-plugin.version}</version>
158+
<version>${cargo-maven2-plugin.version}</version>
159159
<configuration>
160160
<wait>true</wait>
161161
<container>
@@ -178,39 +178,42 @@
178178
</build>
179179

180180
<properties>
181-
<!-- Spring -->
182-
<org.springframework.version>3.2.6.RELEASE</org.springframework.version>
183-
<org.springframework.security.version>3.1.4.RELEASE</org.springframework.security.version>
181+
<!-- Spring -->
182+
<org.springframework.version>3.2.6.RELEASE</org.springframework.version>
183+
<org.springframework.security.version>3.2.0.RELEASE</org.springframework.security.version>
184+
185+
<!-- persistence -->
186+
<hibernate.version>4.3.0.Final</hibernate.version>
187+
<mysql-connector-java.version>5.1.27</mysql-connector-java.version>
184188

185-
<!-- persistence -->
186-
<hibernate.version>4.3.0.Final</hibernate.version>
187-
<mysql-connector-java.version>5.1.27</mysql-connector-java.version>
189+
<!-- logging -->
190+
<org.slf4j.version>1.7.5</org.slf4j.version>
191+
<logback.version>1.0.11</logback.version>
188192

189-
<!-- logging -->
190-
<org.slf4j.version>1.7.5</org.slf4j.version>
191-
<logback.version>1.0.11</logback.version>
193+
<!-- various -->
194+
<hibernate-validator.version>5.0.1.Final</hibernate-validator.version>
192195

193-
<!-- various -->
194-
<hibernate-validator.version>5.0.1.Final</hibernate-validator.version>
196+
<!-- util -->
197+
<guava.version>15.0</guava.version>
198+
<commons-lang3.version>3.1</commons-lang3.version>
195199

196-
<!-- util -->
197-
<guava.version>15.0</guava.version>
198-
<commons-lang3.version>3.1</commons-lang3.version>
200+
<!-- testing -->
201+
<org.hamcrest.version>1.3</org.hamcrest.version>
202+
<junit.version>4.11</junit.version>
203+
<mockito.version>1.9.5</mockito.version>
199204

200-
<!-- testing -->
201-
<org.hamcrest.version>1.3</org.hamcrest.version>
202-
<junit.version>4.11</junit.version>
203-
<mockito.version>1.9.5</mockito.version>
205+
<httpcore.version>4.3</httpcore.version>
206+
<httpclient.version>4.3.1</httpclient.version>
204207

205-
<httpcore.version>4.3</httpcore.version>
206-
<httpclient.version>4.3.1</httpclient.version>
208+
<rest-assured.version>2.1.0</rest-assured.version>
207209

208-
<rest-assured.version>2.1.0</rest-assured.version>
209-
<groovy.version>1.8.9</groovy.version>
210+
<!-- Maven plugins -->
211+
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
212+
<maven-war-plugin.version>2.4</maven-war-plugin.version>
213+
<maven-surefire-plugin.version>2.16</maven-surefire-plugin.version>
214+
<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
215+
<cargo-maven2-plugin.version>1.4.5</cargo-maven2-plugin.version>
210216

211-
<!-- Maven plugins -->
212-
<cargo-maven2-plugin.version>1.4.5</cargo-maven2-plugin.version>
213-
<maven-surefire-plugin.version>2.16</maven-surefire-plugin.version>
214-
</properties>
217+
</properties>
215218

216219
</project>

‎spring-security-basic-auth/src/main/resources/webSecurityConfig.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<beans:beans xmlns="http://www.springframework.org/schema/security"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
44
xsi:schemaLocation="
5-
http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.1.xsd
5+
http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.2.xsd
66
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd">
77

88
<http pattern="/securityNone" security="none" />

0 commit comments

Comments
 (0)