diff --git a/spring-mvc-java/pom.xml b/spring-mvc-java/pom.xml index 230e0b9342..a6311565bc 100644 --- a/spring-mvc-java/pom.xml +++ b/spring-mvc-java/pom.xml @@ -140,7 +140,7 @@ 3.2.6.RELEASE - 3.1.4.RELEASE + 3.2.0.RELEASE 4.3.0.Final @@ -166,14 +166,13 @@ 4.3.1 2.0.1 - 1.8.9 - 1.4.5 3.1 - 2.6 - 2.16 2.4 + 2.16 + 2.6 + 1.4.5 diff --git a/spring-mvc-no-xml/pom.xml b/spring-mvc-no-xml/pom.xml index ccff21aa64..b9ac911e8e 100644 --- a/spring-mvc-no-xml/pom.xml +++ b/spring-mvc-no-xml/pom.xml @@ -125,12 +125,14 @@ 4.3.1 2.1.0 - 1.8.9 - 1.4.5 - 2.16 + 3.1 2.4 + 2.16 + 2.6 + 1.4.5 + \ No newline at end of file diff --git a/spring-mvc-no-xml/src/main/resources/webSecurityConfig.xml b/spring-mvc-no-xml/src/main/resources/webSecurityConfig.xml index 5569cc6950..3012a337af 100644 --- a/spring-mvc-no-xml/src/main/resources/webSecurityConfig.xml +++ b/spring-mvc-no-xml/src/main/resources/webSecurityConfig.xml @@ -2,7 +2,7 @@ diff --git a/spring-mvc-xml/pom.xml b/spring-mvc-xml/pom.xml index 764a85260d..802968b976 100644 --- a/spring-mvc-xml/pom.xml +++ b/spring-mvc-xml/pom.xml @@ -116,11 +116,14 @@ 4.3.1 2.1.0 - 1.8.9 - - 1.4.5 - 2.16 + + 3.1 + 2.4 + 2.16 + 2.6 + 1.4.5 + \ No newline at end of file diff --git a/spring-mvc-xml/src/main/resources/webSecurityConfig.xml b/spring-mvc-xml/src/main/resources/webSecurityConfig.xml index 5569cc6950..3012a337af 100644 --- a/spring-mvc-xml/src/main/resources/webSecurityConfig.xml +++ b/spring-mvc-xml/src/main/resources/webSecurityConfig.xml @@ -2,7 +2,7 @@ diff --git a/spring-security-basic-auth/pom.xml b/spring-security-basic-auth/pom.xml index a7b77f3b4b..4be7c4e9cb 100644 --- a/spring-security-basic-auth/pom.xml +++ b/spring-security-basic-auth/pom.xml @@ -141,7 +141,7 @@ org.apache.maven.plugins maven-surefire-plugin - ${maven-surefire-plugin.version} + ${maven-surefire-plugin.version} @@ -155,7 +155,7 @@ org.codehaus.cargo cargo-maven2-plugin - ${cargo-maven2-plugin.version} + ${cargo-maven2-plugin.version} true @@ -178,39 +178,42 @@ - - 3.2.6.RELEASE - 3.1.4.RELEASE + + 3.2.6.RELEASE + 3.2.0.RELEASE - - 4.3.0.Final - 5.1.27 + + 4.3.0.Final + 5.1.27 - - 1.7.5 - 1.0.11 + + 1.7.5 + 1.0.11 - - 5.0.1.Final + + 5.0.1.Final - - 15.0 - 3.1 + + 15.0 + 3.1 - - 1.3 - 4.11 - 1.9.5 + + 1.3 + 4.11 + 1.9.5 - 4.3 - 4.3.1 + 4.3 + 4.3.1 - 2.1.0 - 1.8.9 + 2.1.0 - - 1.4.5 - 2.16 - + + 3.1 + 2.4 + 2.16 + 2.6 + 1.4.5 + + \ No newline at end of file diff --git a/spring-security-basic-auth/src/main/resources/webSecurityConfig.xml b/spring-security-basic-auth/src/main/resources/webSecurityConfig.xml index 2b55ca1c73..5c56b26ddd 100644 --- a/spring-security-basic-auth/src/main/resources/webSecurityConfig.xml +++ b/spring-security-basic-auth/src/main/resources/webSecurityConfig.xml @@ -2,7 +2,7 @@ diff --git a/spring-security-mvc-custom/pom.xml b/spring-security-mvc-custom/pom.xml index b4842ec74c..8e9834887f 100644 --- a/spring-security-mvc-custom/pom.xml +++ b/spring-security-mvc-custom/pom.xml @@ -1,220 +1,224 @@ - - 4.0.0 - org.baeldung - spring-security-mvc-custom - 0.1-SNAPSHOT + + 4.0.0 + org.baeldung + spring-security-mvc-custom + 0.1-SNAPSHOT - spring-security-mvc-custom - war + spring-security-mvc-custom + war - + - + - - org.springframework.security - spring-security-web - ${org.springframework.security.version} - - - org.springframework.security - spring-security-config - ${org.springframework.security.version} - - - org.springframework.security - spring-security-taglibs - ${org.springframework.security.version} - + + org.springframework.security + spring-security-web + ${org.springframework.security.version} + + + org.springframework.security + spring-security-config + ${org.springframework.security.version} + + + org.springframework.security + spring-security-taglibs + ${org.springframework.security.version} + - + - - org.springframework - spring-core - ${org.springframework.version} - - - org.springframework - spring-context - ${org.springframework.version} - - - org.springframework - spring-jdbc - ${org.springframework.version} - - - org.springframework - spring-beans - ${org.springframework.version} - - - org.springframework - spring-aop - ${org.springframework.version} - - - org.springframework - spring-tx - ${org.springframework.version} - - - org.springframework - spring-expression - ${org.springframework.version} - + + org.springframework + spring-core + ${org.springframework.version} + + + org.springframework + spring-context + ${org.springframework.version} + + + org.springframework + spring-jdbc + ${org.springframework.version} + + + org.springframework + spring-beans + ${org.springframework.version} + + + org.springframework + spring-aop + ${org.springframework.version} + + + org.springframework + spring-tx + ${org.springframework.version} + + + org.springframework + spring-expression + ${org.springframework.version} + - - org.springframework - spring-web - ${org.springframework.version} - - - org.springframework - spring-webmvc - ${org.springframework.version} - + + org.springframework + spring-web + ${org.springframework.version} + + + org.springframework + spring-webmvc + ${org.springframework.version} + - + - - javax.servlet - javax.servlet-api - 3.0.1 - provided - + + javax.servlet + javax.servlet-api + 3.0.1 + provided + - - javax.servlet - jstl - 1.2 - runtime - + + javax.servlet + jstl + 1.2 + runtime + - + - - - - - + + + + + - + - - junit - junit-dep - ${junit.version} - test - + + junit + junit-dep + ${junit.version} + test + - - org.hamcrest - hamcrest-core - ${org.hamcrest.version} - test - - - org.hamcrest - hamcrest-library - ${org.hamcrest.version} - test - + + org.hamcrest + hamcrest-core + ${org.hamcrest.version} + test + + + org.hamcrest + hamcrest-library + ${org.hamcrest.version} + test + - - org.mockito - mockito-core - ${mockito.version} - test - + + org.mockito + mockito-core + ${mockito.version} + test + - + - - spring-security-mvc-custom - - - src/main/resources - true - - + + spring-security-mvc-custom + + + src/main/resources + true + + - + - - org.apache.maven.plugins - maven-surefire-plugin - ${maven-surefire-plugin.version} - - - - - - - - - + + org.apache.maven.plugins + maven-surefire-plugin + ${maven-surefire-plugin.version} + + + + + + + + + - - org.codehaus.cargo - cargo-maven2-plugin - ${cargo-maven2-plugin.version} - - true - - jetty8x - embedded - - - - - - - 8082 - - - - + + org.codehaus.cargo + cargo-maven2-plugin + ${cargo-maven2-plugin.version} + + true + + jetty8x + embedded + + + + + + + 8082 + + + + - + - + - - - 3.2.6.RELEASE - 3.1.4.RELEASE + + + 3.2.6.RELEASE + 3.2.0.RELEASE - - 4.3.0.Final - 5.1.27 + + 4.3.0.Final + 5.1.27 - - 1.7.5 - 1.0.11 + + 1.7.5 + 1.0.11 - - 5.0.1.Final + + 5.0.1.Final - - 15.0 - 3.1 + + 15.0 + 3.1 - - 1.3 - 4.11 - 1.9.5 + + 1.3 + 4.11 + 1.9.5 - 4.3.1 - 4.3 + 4.3.1 + 4.3 - 2.1.0 - 1.8.9 + 2.1.0 - - 1.4.5 - 2.16 - + + 3.1 + 2.4 + 2.16 + 2.6 + 1.4.5 + + \ No newline at end of file diff --git a/spring-security-mvc-custom/src/main/resources/webSecurityConfig.xml b/spring-security-mvc-custom/src/main/resources/webSecurityConfig.xml index 186a435cdb..9bce45af78 100644 --- a/spring-security-mvc-custom/src/main/resources/webSecurityConfig.xml +++ b/spring-security-mvc-custom/src/main/resources/webSecurityConfig.xml @@ -2,7 +2,7 @@ diff --git a/spring-security-mvc-digest-auth/pom.xml b/spring-security-mvc-digest-auth/pom.xml index 2aa998f706..405f8f9a0c 100644 --- a/spring-security-mvc-digest-auth/pom.xml +++ b/spring-security-mvc-digest-auth/pom.xml @@ -141,7 +141,7 @@ org.apache.maven.plugins maven-surefire-plugin - ${maven-surefire-plugin.version} + ${maven-surefire-plugin.version} @@ -155,7 +155,7 @@ org.codehaus.cargo cargo-maven2-plugin - ${cargo-maven2-plugin.version} + ${cargo-maven2-plugin.version} true @@ -178,39 +178,42 @@ - - 3.2.6.RELEASE - 3.1.4.RELEASE + + 3.2.6.RELEASE + 3.2.0.RELEASE - - 4.3.0.Final - 5.1.27 + + 4.3.0.Final + 5.1.27 - - 1.7.5 - 1.0.11 + + 1.7.5 + 1.0.11 - - 5.0.1.Final + + 5.0.1.Final - - 15.0 - 3.1 + + 15.0 + 3.1 - - 1.3 - 4.11 - 1.9.5 + + 1.3 + 4.11 + 1.9.5 - 4.3 - 4.3.1 + 4.3 + 4.3.1 - 2.1.0 - 1.8.9 + 2.1.0 - - 1.4.5 - 2.16 - + + 3.1 + 2.4 + 2.16 + 2.6 + 1.4.5 + + \ No newline at end of file diff --git a/spring-security-mvc-digest-auth/src/main/resources/webSecurityConfig.xml b/spring-security-mvc-digest-auth/src/main/resources/webSecurityConfig.xml index dfd0b85371..bb13271adb 100644 --- a/spring-security-mvc-digest-auth/src/main/resources/webSecurityConfig.xml +++ b/spring-security-mvc-digest-auth/src/main/resources/webSecurityConfig.xml @@ -1,7 +1,7 @@ diff --git a/spring-security-mvc-login/pom.xml b/spring-security-mvc-login/pom.xml index a075e64a13..52cc7d5a80 100644 --- a/spring-security-mvc-login/pom.xml +++ b/spring-security-mvc-login/pom.xml @@ -1,212 +1,216 @@ - - 4.0.0 - org.baeldung - spring-security-mvc-login - 0.1-SNAPSHOT + + 4.0.0 + org.baeldung + spring-security-mvc-login + 0.1-SNAPSHOT - spring-security-mvc-login - war + spring-security-mvc-login + war - + - + - - org.springframework.security - spring-security-web - ${org.springframework.security.version} - - - org.springframework.security - spring-security-config - ${org.springframework.security.version} - - - org.springframework.security - spring-security-taglibs - ${org.springframework.security.version} - + + org.springframework.security + spring-security-web + ${org.springframework.security.version} + + + org.springframework.security + spring-security-config + ${org.springframework.security.version} + + + org.springframework.security + spring-security-taglibs + ${org.springframework.security.version} + - + - - org.springframework - spring-core - ${org.springframework.version} - - - org.springframework - spring-context - ${org.springframework.version} - - - org.springframework - spring-jdbc - ${org.springframework.version} - - - org.springframework - spring-beans - ${org.springframework.version} - - - org.springframework - spring-aop - ${org.springframework.version} - - - org.springframework - spring-tx - ${org.springframework.version} - - - org.springframework - spring-expression - ${org.springframework.version} - + + org.springframework + spring-core + ${org.springframework.version} + + + org.springframework + spring-context + ${org.springframework.version} + + + org.springframework + spring-jdbc + ${org.springframework.version} + + + org.springframework + spring-beans + ${org.springframework.version} + + + org.springframework + spring-aop + ${org.springframework.version} + + + org.springframework + spring-tx + ${org.springframework.version} + + + org.springframework + spring-expression + ${org.springframework.version} + - - org.springframework - spring-web - ${org.springframework.version} - - - org.springframework - spring-webmvc - ${org.springframework.version} - + + org.springframework + spring-web + ${org.springframework.version} + + + org.springframework + spring-webmvc + ${org.springframework.version} + - + - - javax.servlet - javax.servlet-api - 3.0.1 - provided - + + javax.servlet + javax.servlet-api + 3.0.1 + provided + - - javax.servlet - jstl - 1.2 - runtime - + + javax.servlet + jstl + 1.2 + runtime + - + - - junit - junit-dep - ${junit.version} - test - + + junit + junit-dep + ${junit.version} + test + - - org.hamcrest - hamcrest-core - ${org.hamcrest.version} - test - - - org.hamcrest - hamcrest-library - ${org.hamcrest.version} - test - + + org.hamcrest + hamcrest-core + ${org.hamcrest.version} + test + + + org.hamcrest + hamcrest-library + ${org.hamcrest.version} + test + - - org.mockito - mockito-core - ${mockito.version} - test - + + org.mockito + mockito-core + ${mockito.version} + test + - + - - spring-security-mvc-login - - - src/main/resources - true - - + + spring-security-mvc-login + + + src/main/resources + true + + - + - - org.apache.maven.plugins - maven-surefire-plugin - ${maven-surefire-plugin.version} - - - - - - - - - + + org.apache.maven.plugins + maven-surefire-plugin + ${maven-surefire-plugin.version} + + + + + + + + + - - org.codehaus.cargo - cargo-maven2-plugin - ${cargo-maven2-plugin.version} - - true - - jetty8x - embedded - - - - - - - 8082 - - - - + + org.codehaus.cargo + cargo-maven2-plugin + ${cargo-maven2-plugin.version} + + true + + jetty8x + embedded + + + + + + + 8082 + + + + - + - + - - - 3.2.6.RELEASE - 3.1.4.RELEASE + + + 3.2.6.RELEASE + 3.2.0.RELEASE - - 4.3.0.Final - 5.1.27 + + 4.3.0.Final + 5.1.27 - - 1.7.5 - 1.0.11 + + 1.7.5 + 1.0.11 - - 5.0.1.Final + + 5.0.1.Final - - 15.0 - 3.1 + + 15.0 + 3.1 - - 1.3 - 4.11 - 1.9.5 + + 1.3 + 4.11 + 1.9.5 - 4.3 - 4.3.1 + 4.3 + 4.3.1 - 2.1.0 - 1.8.9 + 2.1.0 - - 1.4.5 - 2.16 - + + 3.1 + 2.4 + 2.16 + 2.6 + 1.4.5 + + \ No newline at end of file diff --git a/spring-security-mvc-login/src/main/resources/webSecurityConfig.xml b/spring-security-mvc-login/src/main/resources/webSecurityConfig.xml index 742d9fdf03..89d7bd3f56 100644 --- a/spring-security-mvc-login/src/main/resources/webSecurityConfig.xml +++ b/spring-security-mvc-login/src/main/resources/webSecurityConfig.xml @@ -3,30 +3,26 @@ 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.1.xsd + http://www.springframework.org/schema/security/spring-security-3.2.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd"> - + - - + + + + + + - - - - - - + + diff --git a/spring-security-mvc-session/pom.xml b/spring-security-mvc-session/pom.xml index ca4eedefe5..b5c1738590 100644 --- a/spring-security-mvc-session/pom.xml +++ b/spring-security-mvc-session/pom.xml @@ -1,220 +1,224 @@ - - 4.0.0 - org.baeldung - spring-security-mvc-session - 0.1-SNAPSHOT + + 4.0.0 + org.baeldung + spring-security-mvc-session + 0.1-SNAPSHOT - spring-security-mvc-session - war + spring-security-mvc-session + war - + - + - - org.springframework.security - spring-security-web - ${org.springframework.security.version} - - - org.springframework.security - spring-security-config - ${org.springframework.security.version} - - - org.springframework.security - spring-security-taglibs - ${org.springframework.security.version} - + + org.springframework.security + spring-security-web + ${org.springframework.security.version} + + + org.springframework.security + spring-security-config + ${org.springframework.security.version} + + + org.springframework.security + spring-security-taglibs + ${org.springframework.security.version} + - + - - org.springframework - spring-core - ${org.springframework.version} - - - org.springframework - spring-context - ${org.springframework.version} - - - org.springframework - spring-jdbc - ${org.springframework.version} - - - org.springframework - spring-beans - ${org.springframework.version} - - - org.springframework - spring-aop - ${org.springframework.version} - - - org.springframework - spring-tx - ${org.springframework.version} - - - org.springframework - spring-expression - ${org.springframework.version} - + + org.springframework + spring-core + ${org.springframework.version} + + + org.springframework + spring-context + ${org.springframework.version} + + + org.springframework + spring-jdbc + ${org.springframework.version} + + + org.springframework + spring-beans + ${org.springframework.version} + + + org.springframework + spring-aop + ${org.springframework.version} + + + org.springframework + spring-tx + ${org.springframework.version} + + + org.springframework + spring-expression + ${org.springframework.version} + - - org.springframework - spring-web - ${org.springframework.version} - - - org.springframework - spring-webmvc - ${org.springframework.version} - + + org.springframework + spring-web + ${org.springframework.version} + + + org.springframework + spring-webmvc + ${org.springframework.version} + - + - - javax.servlet - javax.servlet-api - 3.0.1 - provided - + + javax.servlet + javax.servlet-api + 3.0.1 + provided + - - javax.servlet - jstl - 1.2 - runtime - + + javax.servlet + jstl + 1.2 + runtime + - - - - com.codahale.metrics - metrics-core - 3.0.1 - + - + + com.codahale.metrics + metrics-core + 3.0.1 + - - junit - junit-dep - ${junit.version} - test - + - - org.hamcrest - hamcrest-core - ${org.hamcrest.version} - test - - - org.hamcrest - hamcrest-library - ${org.hamcrest.version} - test - + + junit + junit-dep + ${junit.version} + test + - - org.mockito - mockito-core - ${mockito.version} - test - + + org.hamcrest + hamcrest-core + ${org.hamcrest.version} + test + + + org.hamcrest + hamcrest-library + ${org.hamcrest.version} + test + - + + org.mockito + mockito-core + ${mockito.version} + test + - - spring-security-mvc-session - - - src/main/resources - true - - + - + + spring-security-mvc-session + + + src/main/resources + true + + - - org.apache.maven.plugins - maven-surefire-plugin - ${maven-surefire-plugin.version} - - - - - - - - - + - - org.codehaus.cargo - cargo-maven2-plugin - ${cargo-maven2-plugin.version} - - true - - jetty8x - embedded - - - - - - - 8082 - - - - + + org.apache.maven.plugins + maven-surefire-plugin + ${maven-surefire-plugin.version} + + + + + + + + + - + + org.codehaus.cargo + cargo-maven2-plugin + ${cargo-maven2-plugin.version} + + true + + jetty8x + embedded + + + + + + + 8082 + + + + - + - - - 3.2.6.RELEASE - 3.1.4.RELEASE + - - 4.3.0.Final - 5.1.27 + + + 3.2.6.RELEASE + 3.2.0.RELEASE - - 1.7.5 - 1.0.11 + + 4.3.0.Final + 5.1.27 - - 5.0.1.Final + + 1.7.5 + 1.0.11 - - 15.0 - 3.1 + + 5.0.1.Final - - 1.3 - 4.11 - 1.9.5 + + 15.0 + 3.1 - 4.3.1 - 4.3 + + 1.3 + 4.11 + 1.9.5 - 2.1.0 - 1.8.9 + 4.3.1 + 4.3 - - 1.4.5 - 2.16 - + 2.1.0 + + + 3.1 + 2.4 + 2.16 + 2.6 + 1.4.5 + + \ No newline at end of file diff --git a/spring-security-mvc-session/src/main/resources/webSecurityConfig.xml b/spring-security-mvc-session/src/main/resources/webSecurityConfig.xml index cb7e3f0645..b2dc8572e6 100644 --- a/spring-security-mvc-session/src/main/resources/webSecurityConfig.xml +++ b/spring-security-mvc-session/src/main/resources/webSecurityConfig.xml @@ -2,7 +2,7 @@