From b56e5edbbdb491245c795bb0c1f5d404de95f806 Mon Sep 17 00:00:00 2001 From: Rob Winch Date: Mon, 8 Dec 2014 14:24:34 -0600 Subject: [PATCH] SEC-2784: Fix build plugins --- acl/pom.xml | 43 ++++++++++---------- aspects/pom.xml | 35 ++++++++--------- cas/pom.xml | 37 +++++++++--------- config/pom.xml | 49 ++++++++++++----------- core/pom.xml | 43 ++++++++++---------- crypto/pom.xml | 25 ++++++------ data/pom.xml | 29 +++++++------- gradle/maven-deployment.gradle | 4 +- itest/context/pom.xml | 49 +++++++++-------------- itest/web/pom.xml | 47 ++++++++-------------- ldap/pom.xml | 51 ++++++++++++------------ messaging/pom.xml | 37 +++++++++--------- openid/pom.xml | 37 +++++++++--------- remoting/pom.xml | 35 ++++++++--------- samples/aspectj-jc/pom.xml | 39 +++++++------------ samples/aspectj-xml/pom.xml | 39 +++++++------------ samples/cas/sample-xml/pom.xml | 57 +++++++++++---------------- samples/cas/server/pom.xml | 53 ++++++++++--------------- samples/concurrency-jc/pom.xml | 57 +++++++++++---------------- samples/contacts-xml/pom.xml | 71 ++++++++++++++-------------------- samples/data-jc/pom.xml | 39 +++++++------------ samples/dms-xml/pom.xml | 51 +++++++++--------------- samples/form-jc/pom.xml | 57 +++++++++++---------------- samples/gae-xml/pom.xml | 63 ++++++++++++------------------ samples/hellojs-jc/pom.xml | 57 +++++++++++---------------- samples/hellomvc-jc/pom.xml | 57 +++++++++++---------------- samples/helloworld-jc/pom.xml | 53 ++++++++++--------------- samples/inmemory-jc/pom.xml | 57 +++++++++++---------------- samples/insecure/pom.xml | 53 ++++++++++--------------- samples/insecuremvc/pom.xml | 57 +++++++++++---------------- samples/jaas-xml/pom.xml | 61 ++++++++++++----------------- samples/jdbc-jc/pom.xml | 57 +++++++++++---------------- samples/ldap-jc/pom.xml | 57 +++++++++++---------------- samples/ldap-xml/pom.xml | 53 ++++++++++--------------- samples/messages-jc/pom.xml | 57 +++++++++++---------------- samples/openid-jc/pom.xml | 57 +++++++++++---------------- samples/openid-xml/pom.xml | 53 ++++++++++--------------- samples/preauth-jc/pom.xml | 57 +++++++++++---------------- samples/preauth-xml/pom.xml | 53 ++++++++++--------------- samples/rememberme-jc/pom.xml | 57 +++++++++++---------------- samples/servletapi-xml/pom.xml | 63 ++++++++++++------------------ samples/tutorial-xml/pom.xml | 59 +++++++++++----------------- samples/x509-jc/pom.xml | 57 +++++++++++---------------- taglibs/pom.xml | 39 +++++++++---------- test/pom.xml | 31 +++++++-------- web/pom.xml | 43 ++++++++++---------- 46 files changed, 909 insertions(+), 1326 deletions(-) diff --git a/acl/pom.xml b/acl/pom.xml index b86959d64a..a4d7a75a2c 100644 --- a/acl/pom.xml +++ b/acl/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.security spring-security-acl @@ -31,17 +30,6 @@ scm:git:git://github.com/spring-projects/spring-security https://github.com/spring-projects/spring-security - - - - maven-compiler-plugin - - 1.7 - 1.7 - - - - spring-snasphot @@ -64,19 +52,19 @@ org.springframework spring-aop - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile org.springframework spring-context - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile org.springframework spring-core - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile @@ -88,13 +76,13 @@ org.springframework spring-jdbc - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile org.springframework spring-tx - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile @@ -106,7 +94,7 @@ net.sf.ehcache - ehcache-core + ehcache 2.6.5 compile true @@ -150,20 +138,31 @@ org.springframework spring-beans - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT test org.springframework spring-context-support - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT test org.springframework spring-test - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT test + + + + maven-compiler-plugin + + 1.7 + 1.7 + + + + diff --git a/aspects/pom.xml b/aspects/pom.xml index 88b1db0c66..2479e5a05b 100644 --- a/aspects/pom.xml +++ b/aspects/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.security spring-security-aspects @@ -31,17 +30,6 @@ scm:git:git://github.com/spring-projects/spring-security https://github.com/spring-projects/spring-security - - - - maven-compiler-plugin - - 1.7 - 1.7 - - - - spring-snasphot @@ -58,19 +46,19 @@ org.springframework spring-beans - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile org.springframework spring-context - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile org.springframework spring-core - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile @@ -132,14 +120,25 @@ org.springframework spring-aop - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT test org.springframework spring-test - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT test + + + + maven-compiler-plugin + + 1.7 + 1.7 + + + + diff --git a/cas/pom.xml b/cas/pom.xml index 53c07921d1..8ddca612db 100644 --- a/cas/pom.xml +++ b/cas/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.security spring-security-cas @@ -31,17 +30,6 @@ scm:git:git://github.com/spring-projects/spring-security https://github.com/spring-projects/spring-security - - - - maven-compiler-plugin - - 1.7 - 1.7 - - - - spring-snasphot @@ -70,19 +58,19 @@ org.springframework spring-beans - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile org.springframework spring-context - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile org.springframework spring-core - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile @@ -94,7 +82,7 @@ org.springframework spring-web - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile @@ -106,7 +94,7 @@ net.sf.ehcache - ehcache-core + ehcache 2.6.5 compile true @@ -150,8 +138,19 @@ org.springframework spring-test - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT test + + + + maven-compiler-plugin + + 1.7 + 1.7 + + + + diff --git a/config/pom.xml b/config/pom.xml index 4ab73b5aa3..dee0eeb5c1 100644 --- a/config/pom.xml +++ b/config/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.security spring-security-config @@ -31,17 +30,6 @@ scm:git:git://github.com/spring-projects/spring-security https://github.com/spring-projects/spring-security - - - - maven-compiler-plugin - - 1.7 - 1.7 - - - - spring-snasphot @@ -64,25 +52,25 @@ org.springframework spring-aop - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile org.springframework spring-beans - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile org.springframework spring-context - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile org.springframework spring-core - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile @@ -136,35 +124,35 @@ org.springframework spring-jdbc - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile true org.springframework spring-tx - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile true org.springframework spring-web - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile true org.springframework spring-webmvc - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile true org.springframework spring-websocket - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile true @@ -405,20 +393,31 @@ org.springframework spring-expression - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT test org.springframework spring-orm - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT test org.springframework spring-test - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT test + + + + maven-compiler-plugin + + 1.7 + 1.7 + + + + diff --git a/core/pom.xml b/core/pom.xml index acfe5f0389..7b46b40a12 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.security spring-security-core @@ -31,17 +30,6 @@ scm:git:git://github.com/spring-projects/spring-security https://github.com/spring-projects/spring-security - - - - maven-compiler-plugin - - 1.7 - 1.7 - - - - spring-snasphot @@ -58,25 +46,25 @@ org.springframework spring-aop - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile org.springframework spring-beans - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile org.springframework spring-context - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile org.springframework spring-core - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile @@ -88,7 +76,7 @@ org.springframework spring-expression - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile @@ -107,7 +95,7 @@ net.sf.ehcache - ehcache-core + ehcache 2.6.5 compile true @@ -122,14 +110,14 @@ org.springframework spring-jdbc - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile true org.springframework spring-tx - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile true @@ -280,7 +268,7 @@ org.springframework spring-test - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT test @@ -290,4 +278,15 @@ + + + + maven-compiler-plugin + + 1.7 + 1.7 + + + + diff --git a/crypto/pom.xml b/crypto/pom.xml index 56df77e4c3..fdc8b76836 100644 --- a/crypto/pom.xml +++ b/crypto/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.security spring-security-crypto @@ -31,17 +30,6 @@ scm:git:git://github.com/spring-projects/spring-security https://github.com/spring-projects/spring-security - - - - maven-compiler-plugin - - 1.7 - 1.7 - - - - spring-snasphot @@ -93,4 +81,15 @@ test + + + + maven-compiler-plugin + + 1.7 + 1.7 + + + + diff --git a/data/pom.xml b/data/pom.xml index da2e5a2876..ef8a89eda9 100644 --- a/data/pom.xml +++ b/data/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.security spring-security-data @@ -31,17 +30,6 @@ scm:git:git://github.com/spring-projects/spring-security https://github.com/spring-projects/spring-security - - - - maven-compiler-plugin - - 1.7 - 1.7 - - - - spring-snasphot @@ -64,7 +52,7 @@ org.springframework spring-core - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile @@ -113,8 +101,19 @@ org.springframework spring-test - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT test + + + + maven-compiler-plugin + + 1.7 + 1.7 + + + + diff --git a/gradle/maven-deployment.gradle b/gradle/maven-deployment.gradle index cf2149f6c9..e66962a4f0 100644 --- a/gradle/maven-deployment.gradle +++ b/gradle/maven-deployment.gradle @@ -94,14 +94,14 @@ def customizePom(pom, gradleProject) { def plugins = asNode().appendNode('build').appendNode('plugins') plugins .appendNode('plugin') - .appendNode('maven-compiler-plugin').parent() + .appendNode('artifactId','maven-compiler-plugin').parent() .appendNode('configuration') .appendNode('source','1.7').parent() .appendNode('target','1.7') if(isWar) { plugins .appendNode('plugin') - .appendNode('maven-war-plugin').parent() + .appendNode('artifactId','maven-war-plugin').parent() .appendNode('version','2.3').parent() .appendNode('configuration') .appendNode('failOnMissingWebXml','false') diff --git a/itest/context/pom.xml b/itest/context/pom.xml index 4904e60528..b7cc80bda2 100644 --- a/itest/context/pom.xml +++ b/itest/context/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.security itest-context @@ -31,17 +30,6 @@ scm:git:git://github.com/spring-projects/spring-security https://github.com/spring-projects/spring-security - - - - maven-compiler-plugin - - 1.7 - 1.7 - - - - spring-snasphot @@ -70,37 +58,25 @@ org.springframework spring-aop - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile org.springframework spring-beans - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile org.springframework spring-context - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile - - org.springframework - spring-core - 4.1.0.RC2 - compile - - - commons-logging - commons-logging - - - org.springframework spring-tx - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile @@ -167,14 +143,25 @@ org.springframework spring-test - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT test org.springframework spring-web - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT test + + + + maven-compiler-plugin + + 1.7 + 1.7 + + + + diff --git a/itest/web/pom.xml b/itest/web/pom.xml index a1cea3ff30..39691d8b67 100644 --- a/itest/web/pom.xml +++ b/itest/web/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.security itest-web @@ -31,17 +30,6 @@ scm:git:git://github.com/spring-projects/spring-security https://github.com/spring-projects/spring-security - - - - maven-compiler-plugin - - 1.7 - 1.7 - - - - spring-snasphot @@ -52,25 +40,13 @@ org.springframework spring-context - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile - - org.springframework - spring-core - 4.1.0.RC2 - compile - - - commons-logging - commons-logging - - - org.springframework spring-web - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile @@ -201,19 +177,19 @@ org.springframework spring-beans - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT test org.springframework spring-test - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT test org.springframework spring-webmvc - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT test @@ -224,4 +200,15 @@ test + + + + maven-compiler-plugin + + 1.7 + 1.7 + + + + diff --git a/ldap/pom.xml b/ldap/pom.xml index 776261d33e..579e954372 100644 --- a/ldap/pom.xml +++ b/ldap/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.security spring-security-ldap @@ -31,17 +30,6 @@ scm:git:git://github.com/spring-projects/spring-security https://github.com/spring-projects/spring-security - - - - maven-compiler-plugin - - 1.7 - 1.7 - - - - spring-snasphot @@ -56,25 +44,25 @@ compile - spring-beans - org.springframework + spring-data-commons + org.springframework.data spring-core org.springframework - spring-data-commons - org.springframework.data + spring-tx + org.springframework + + + spring-beans + org.springframework commons-logging commons-logging - - spring-tx - org.springframework - @@ -86,19 +74,19 @@ org.springframework spring-beans - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile org.springframework spring-context - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile org.springframework spring-core - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile @@ -110,7 +98,7 @@ org.springframework spring-tx - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile @@ -208,8 +196,19 @@ org.springframework spring-test - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT test + + + + maven-compiler-plugin + + 1.7 + 1.7 + + + + diff --git a/messaging/pom.xml b/messaging/pom.xml index 25c1448582..8b841ebc22 100644 --- a/messaging/pom.xml +++ b/messaging/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.security spring-security-messaging @@ -31,17 +30,6 @@ scm:git:git://github.com/spring-projects/spring-security https://github.com/spring-projects/spring-security - - - - maven-compiler-plugin - - 1.7 - 1.7 - - - - spring-snasphot @@ -64,19 +52,19 @@ org.springframework spring-beans - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile org.springframework spring-context - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile org.springframework spring-core - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile @@ -88,13 +76,13 @@ org.springframework spring-expression - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile org.springframework spring-messaging - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile @@ -221,8 +209,19 @@ org.springframework spring-test - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT test + + + + maven-compiler-plugin + + 1.7 + 1.7 + + + + diff --git a/openid/pom.xml b/openid/pom.xml index af912fad58..7b06cc3ca3 100644 --- a/openid/pom.xml +++ b/openid/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.security spring-security-openid @@ -31,17 +30,6 @@ scm:git:git://github.com/spring-projects/spring-security https://github.com/spring-projects/spring-security - - - - maven-compiler-plugin - - 1.7 - 1.7 - - - - spring-snasphot @@ -82,25 +70,25 @@ org.springframework spring-aop - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile org.springframework spring-beans - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile org.springframework spring-context - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile org.springframework spring-core - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile @@ -112,7 +100,7 @@ org.springframework spring-web - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile @@ -173,8 +161,19 @@ org.springframework spring-test - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT test + + + + maven-compiler-plugin + + 1.7 + 1.7 + + + + diff --git a/remoting/pom.xml b/remoting/pom.xml index d8588e4695..8fb01485b7 100644 --- a/remoting/pom.xml +++ b/remoting/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.security spring-security-remoting @@ -31,17 +30,6 @@ scm:git:git://github.com/spring-projects/spring-security https://github.com/spring-projects/spring-security - - - - maven-compiler-plugin - - 1.7 - 1.7 - - - - spring-snasphot @@ -64,19 +52,19 @@ org.springframework spring-beans - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile org.springframework spring-context - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile org.springframework spring-core - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile @@ -88,7 +76,7 @@ org.springframework spring-web - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile @@ -131,8 +119,19 @@ org.springframework spring-test - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT test + + + + maven-compiler-plugin + + 1.7 + 1.7 + + + + diff --git a/samples/aspectj-jc/pom.xml b/samples/aspectj-jc/pom.xml index 885f2634c7..6616008a4d 100644 --- a/samples/aspectj-jc/pom.xml +++ b/samples/aspectj-jc/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.security spring-security-samples-aspectj-jc @@ -31,17 +30,6 @@ scm:git:git://github.com/spring-projects/spring-security https://github.com/spring-projects/spring-security - - - - maven-compiler-plugin - - 1.7 - 1.7 - - - - spring-snasphot @@ -61,18 +49,6 @@ 4.0.0.CI-SNAPSHOT compile - - org.springframework - spring-core - 4.1.0.RC2 - compile - - - commons-logging - commons-logging - - - commons-logging commons-logging @@ -126,8 +102,19 @@ org.springframework spring-test - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT test + + + + maven-compiler-plugin + + 1.7 + 1.7 + + + + diff --git a/samples/aspectj-xml/pom.xml b/samples/aspectj-xml/pom.xml index 43e677358f..1630b138e9 100644 --- a/samples/aspectj-xml/pom.xml +++ b/samples/aspectj-xml/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.security spring-security-samples-aspectj-xml @@ -31,17 +30,6 @@ scm:git:git://github.com/spring-projects/spring-security https://github.com/spring-projects/spring-security - - - - maven-compiler-plugin - - 1.7 - 1.7 - - - - spring-snasphot @@ -55,18 +43,6 @@ 4.0.0.CI-SNAPSHOT compile - - org.springframework - spring-core - 4.1.0.RC2 - compile - - - commons-logging - commons-logging - - - commons-logging commons-logging @@ -126,8 +102,19 @@ org.springframework spring-test - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT test + + + + maven-compiler-plugin + + 1.7 + 1.7 + + + + diff --git a/samples/cas/sample-xml/pom.xml b/samples/cas/sample-xml/pom.xml index 9f8e20e25e..57e108d044 100644 --- a/samples/cas/sample-xml/pom.xml +++ b/samples/cas/sample-xml/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.security spring-security-samples-cassample-xml @@ -32,24 +31,6 @@ scm:git:git://github.com/spring-projects/spring-security https://github.com/spring-projects/spring-security - - - - maven-compiler-plugin - - 1.7 - 1.7 - - - - maven-war-plugin - 2.3 - - false - - - - spring-snasphot @@ -75,18 +56,6 @@ 4.0.0.CI-SNAPSHOT compile - - org.springframework - spring-core - 4.1.0.RC2 - compile - - - commons-logging - commons-logging - - - commons-logging commons-logging @@ -108,7 +77,7 @@ net.sf.ehcache - ehcache-core + ehcache 2.6.5 runtime @@ -133,7 +102,7 @@ org.springframework spring-context-support - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT runtime @@ -217,11 +186,29 @@ org.springframework spring-test - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT test /spring-security-samples-cassample-xml + + + + maven-compiler-plugin + + 1.7 + 1.7 + + + + maven-war-plugin + 2.3 + + false + + + + diff --git a/samples/cas/server/pom.xml b/samples/cas/server/pom.xml index e54f7c5be0..c96b89036a 100644 --- a/samples/cas/server/pom.xml +++ b/samples/cas/server/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.security spring-security-samples-casserver @@ -32,24 +31,6 @@ scm:git:git://github.com/spring-projects/spring-security https://github.com/spring-projects/spring-security - - - - maven-compiler-plugin - - 1.7 - 1.7 - - - - maven-war-plugin - 2.3 - - false - - - - spring-snasphot @@ -57,18 +38,6 @@ - - org.springframework - spring-core - 4.1.0.RC2 - compile - - - commons-logging - commons-logging - - - commons-logging commons-logging @@ -109,11 +78,29 @@ org.springframework spring-test - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT test /spring-security-samples-casserver + + + + maven-compiler-plugin + + 1.7 + 1.7 + + + + maven-war-plugin + 2.3 + + false + + + + diff --git a/samples/concurrency-jc/pom.xml b/samples/concurrency-jc/pom.xml index 4494982331..e76ee547ba 100644 --- a/samples/concurrency-jc/pom.xml +++ b/samples/concurrency-jc/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.security spring-security-samples-concurrency-jc @@ -32,24 +31,6 @@ scm:git:git://github.com/spring-projects/spring-security https://github.com/spring-projects/spring-security - - - - maven-compiler-plugin - - 1.7 - 1.7 - - - - maven-war-plugin - 2.3 - - false - - - - spring-snasphot @@ -123,28 +104,16 @@ 4.0.0.CI-SNAPSHOT compile - - org.springframework - spring-core - 4.1.0.RC2 - compile - - - commons-logging - commons-logging - - - org.springframework spring-jdbc - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile org.springframework spring-webmvc - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile @@ -211,11 +180,29 @@ org.springframework spring-test - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT test /sample + + + + maven-compiler-plugin + + 1.7 + 1.7 + + + + maven-war-plugin + 2.3 + + false + + + + diff --git a/samples/contacts-xml/pom.xml b/samples/contacts-xml/pom.xml index 6a9a48eff4..4ba7463462 100644 --- a/samples/contacts-xml/pom.xml +++ b/samples/contacts-xml/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.security spring-security-samples-contacts-xml @@ -32,24 +31,6 @@ scm:git:git://github.com/spring-projects/spring-security https://github.com/spring-projects/spring-security - - - - maven-compiler-plugin - - 1.7 - 1.7 - - - - maven-war-plugin - 2.3 - - false - - - - spring-snasphot @@ -72,55 +53,43 @@ org.springframework spring-aop - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile org.springframework spring-beans - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile org.springframework spring-context - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile - - org.springframework - spring-core - 4.1.0.RC2 - compile - - - commons-logging - commons-logging - - - org.springframework spring-jdbc - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile org.springframework spring-tx - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile org.springframework spring-web - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile org.springframework spring-webmvc - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile @@ -150,7 +119,7 @@ net.sf.ehcache - ehcache-core + ehcache 2.6.5 runtime @@ -193,7 +162,7 @@ org.springframework spring-context-support - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT runtime @@ -265,11 +234,29 @@ org.springframework spring-test - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT test /sample + + + + maven-compiler-plugin + + 1.7 + 1.7 + + + + maven-war-plugin + 2.3 + + false + + + + diff --git a/samples/data-jc/pom.xml b/samples/data-jc/pom.xml index 7d79a97b24..c5760ecac7 100644 --- a/samples/data-jc/pom.xml +++ b/samples/data-jc/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.security spring-security-samples-data-jc @@ -31,17 +30,6 @@ scm:git:git://github.com/spring-projects/spring-security https://github.com/spring-projects/spring-security - - - - maven-compiler-plugin - - 1.7 - 1.7 - - - - spring-snasphot @@ -97,18 +85,6 @@ 4.0.0.CI-SNAPSHOT compile - - org.springframework - spring-core - 4.1.0.RC2 - compile - - - commons-logging - commons-logging - - - commons-logging commons-logging @@ -149,8 +125,19 @@ org.springframework spring-test - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT test + + + + maven-compiler-plugin + + 1.7 + 1.7 + + + + diff --git a/samples/dms-xml/pom.xml b/samples/dms-xml/pom.xml index afe5670ba6..5d26b09001 100644 --- a/samples/dms-xml/pom.xml +++ b/samples/dms-xml/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.security spring-security-samples-dms-xml @@ -31,17 +30,6 @@ scm:git:git://github.com/spring-projects/spring-security https://github.com/spring-projects/spring-security - - - - maven-compiler-plugin - - 1.7 - 1.7 - - - - spring-snasphot @@ -64,31 +52,19 @@ org.springframework spring-beans - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile - - org.springframework - spring-core - 4.1.0.RC2 - compile - - - commons-logging - commons-logging - - - org.springframework spring-jdbc - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile org.springframework spring-tx - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile @@ -100,7 +76,7 @@ net.sf.ehcache - ehcache-core + ehcache 2.6.5 compile true @@ -120,7 +96,7 @@ org.springframework spring-context-support - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT runtime @@ -156,14 +132,25 @@ org.springframework spring-context - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT test org.springframework spring-test - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT test + + + + maven-compiler-plugin + + 1.7 + 1.7 + + + + diff --git a/samples/form-jc/pom.xml b/samples/form-jc/pom.xml index 1ab7acc67e..23229ecf41 100644 --- a/samples/form-jc/pom.xml +++ b/samples/form-jc/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.security spring-security-samples-form-jc @@ -32,24 +31,6 @@ scm:git:git://github.com/spring-projects/spring-security https://github.com/spring-projects/spring-security - - - - maven-compiler-plugin - - 1.7 - 1.7 - - - - maven-war-plugin - 2.3 - - false - - - - spring-snasphot @@ -123,28 +104,16 @@ 4.0.0.CI-SNAPSHOT compile - - org.springframework - spring-core - 4.1.0.RC2 - compile - - - commons-logging - commons-logging - - - org.springframework spring-jdbc - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile org.springframework spring-webmvc - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile @@ -259,11 +228,29 @@ org.springframework spring-test - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT test /sample + + + + maven-compiler-plugin + + 1.7 + 1.7 + + + + maven-war-plugin + 2.3 + + false + + + + diff --git a/samples/gae-xml/pom.xml b/samples/gae-xml/pom.xml index 4c089783f0..e5b09f8b14 100644 --- a/samples/gae-xml/pom.xml +++ b/samples/gae-xml/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.security spring-security-samples-gae-xml @@ -32,24 +31,6 @@ scm:git:git://github.com/spring-projects/spring-security https://github.com/spring-projects/spring-security - - - - maven-compiler-plugin - - 1.7 - 1.7 - - - - maven-war-plugin - 2.3 - - false - - - - spring-snasphot @@ -96,43 +77,31 @@ org.springframework spring-beans - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile org.springframework spring-context - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile org.springframework spring-context-support - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile - - org.springframework - spring-core - 4.1.0.RC2 - compile - - - commons-logging - commons-logging - - - org.springframework spring-web - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile org.springframework spring-webmvc - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile @@ -217,11 +186,29 @@ org.springframework spring-test - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT test /spring-security-samples-gae-xml + + + + maven-compiler-plugin + + 1.7 + 1.7 + + + + maven-war-plugin + 2.3 + + false + + + + diff --git a/samples/hellojs-jc/pom.xml b/samples/hellojs-jc/pom.xml index f774741235..26ded27259 100644 --- a/samples/hellojs-jc/pom.xml +++ b/samples/hellojs-jc/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.security spring-security-samples-hellojs-jc @@ -32,24 +31,6 @@ scm:git:git://github.com/spring-projects/spring-security https://github.com/spring-projects/spring-security - - - - maven-compiler-plugin - - 1.7 - 1.7 - - - - maven-war-plugin - 2.3 - - false - - - - spring-snasphot @@ -129,28 +110,16 @@ 4.0.0.CI-SNAPSHOT compile - - org.springframework - spring-core - 4.1.0.RC2 - compile - - - commons-logging - commons-logging - - - org.springframework spring-jdbc - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile org.springframework spring-webmvc - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile @@ -217,11 +186,29 @@ org.springframework spring-test - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT test /sample + + + + maven-compiler-plugin + + 1.7 + 1.7 + + + + maven-war-plugin + 2.3 + + false + + + + diff --git a/samples/hellomvc-jc/pom.xml b/samples/hellomvc-jc/pom.xml index 9c56495b52..cefb6b624a 100644 --- a/samples/hellomvc-jc/pom.xml +++ b/samples/hellomvc-jc/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.security spring-security-samples-hellomvc-jc @@ -32,24 +31,6 @@ scm:git:git://github.com/spring-projects/spring-security https://github.com/spring-projects/spring-security - - - - maven-compiler-plugin - - 1.7 - 1.7 - - - - maven-war-plugin - 2.3 - - false - - - - spring-snasphot @@ -123,28 +104,16 @@ 4.0.0.CI-SNAPSHOT compile - - org.springframework - spring-core - 4.1.0.RC2 - compile - - - commons-logging - commons-logging - - - org.springframework spring-jdbc - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile org.springframework spring-webmvc - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile @@ -217,11 +186,29 @@ org.springframework spring-test - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT test /sample + + + + maven-compiler-plugin + + 1.7 + 1.7 + + + + maven-war-plugin + 2.3 + + false + + + + diff --git a/samples/helloworld-jc/pom.xml b/samples/helloworld-jc/pom.xml index 66e8ae7b77..9e266fd46e 100644 --- a/samples/helloworld-jc/pom.xml +++ b/samples/helloworld-jc/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.security spring-security-samples-helloworld-jc @@ -32,24 +31,6 @@ scm:git:git://github.com/spring-projects/spring-security https://github.com/spring-projects/spring-security - - - - maven-compiler-plugin - - 1.7 - 1.7 - - - - maven-war-plugin - 2.3 - - false - - - - spring-snasphot @@ -87,18 +68,6 @@ 4.0.0.CI-SNAPSHOT compile - - org.springframework - spring-core - 4.1.0.RC2 - compile - - - commons-logging - commons-logging - - - commons-logging commons-logging @@ -193,11 +162,29 @@ org.springframework spring-test - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT test /sample + + + + maven-compiler-plugin + + 1.7 + 1.7 + + + + maven-war-plugin + 2.3 + + false + + + + diff --git a/samples/inmemory-jc/pom.xml b/samples/inmemory-jc/pom.xml index b01ac9b466..19dfe23010 100644 --- a/samples/inmemory-jc/pom.xml +++ b/samples/inmemory-jc/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.security spring-security-samples-inmemory-jc @@ -32,24 +31,6 @@ scm:git:git://github.com/spring-projects/spring-security https://github.com/spring-projects/spring-security - - - - maven-compiler-plugin - - 1.7 - 1.7 - - - - maven-war-plugin - 2.3 - - false - - - - spring-snasphot @@ -123,28 +104,16 @@ 4.0.0.CI-SNAPSHOT compile - - org.springframework - spring-core - 4.1.0.RC2 - compile - - - commons-logging - commons-logging - - - org.springframework spring-jdbc - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile org.springframework spring-webmvc - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile @@ -217,11 +186,29 @@ org.springframework spring-test - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT test /sample + + + + maven-compiler-plugin + + 1.7 + 1.7 + + + + maven-war-plugin + 2.3 + + false + + + + diff --git a/samples/insecure/pom.xml b/samples/insecure/pom.xml index b2e4a07d53..0a3e046c3d 100644 --- a/samples/insecure/pom.xml +++ b/samples/insecure/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.security spring-security-samples-insecure @@ -32,24 +31,6 @@ scm:git:git://github.com/spring-projects/spring-security https://github.com/spring-projects/spring-security - - - - maven-compiler-plugin - - 1.7 - 1.7 - - - - maven-war-plugin - 2.3 - - false - - - - spring-snasphot @@ -75,18 +56,6 @@ 1.7.5 compile - - org.springframework - spring-core - 4.1.0.RC2 - compile - - - commons-logging - commons-logging - - - commons-logging commons-logging @@ -181,11 +150,29 @@ org.springframework spring-test - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT test /sample + + + + maven-compiler-plugin + + 1.7 + 1.7 + + + + maven-war-plugin + 2.3 + + false + + + + diff --git a/samples/insecuremvc/pom.xml b/samples/insecuremvc/pom.xml index cf1ae392e7..0b6da7cb22 100644 --- a/samples/insecuremvc/pom.xml +++ b/samples/insecuremvc/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.security spring-security-samples-insecuremvc @@ -32,24 +31,6 @@ scm:git:git://github.com/spring-projects/spring-security https://github.com/spring-projects/spring-security - - - - maven-compiler-plugin - - 1.7 - 1.7 - - - - maven-war-plugin - 2.3 - - false - - - - spring-snasphot @@ -105,28 +86,16 @@ 4.0.0.CI-SNAPSHOT compile - - org.springframework - spring-core - 4.1.0.RC2 - compile - - - commons-logging - commons-logging - - - org.springframework spring-jdbc - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile org.springframework spring-webmvc - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile @@ -193,11 +162,29 @@ org.springframework spring-test - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT test /sample + + + + maven-compiler-plugin + + 1.7 + 1.7 + + + + maven-war-plugin + 2.3 + + false + + + + diff --git a/samples/jaas-xml/pom.xml b/samples/jaas-xml/pom.xml index 5c660aa5f2..63b55f2855 100644 --- a/samples/jaas-xml/pom.xml +++ b/samples/jaas-xml/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.security spring-security-samples-jaas-xml @@ -32,24 +31,6 @@ scm:git:git://github.com/spring-projects/spring-security https://github.com/spring-projects/spring-security - - - - maven-compiler-plugin - - 1.7 - 1.7 - - - - maven-war-plugin - 2.3 - - false - - - - spring-snasphot @@ -66,31 +47,19 @@ org.springframework spring-beans - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile org.springframework spring-context - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile - - org.springframework - spring-core - 4.1.0.RC2 - compile - - - commons-logging - commons-logging - - - org.springframework spring-web - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile @@ -151,7 +120,7 @@ org.springframework spring-context-support - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT runtime @@ -223,11 +192,29 @@ org.springframework spring-test - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT test /sample + + + + maven-compiler-plugin + + 1.7 + 1.7 + + + + maven-war-plugin + 2.3 + + false + + + + diff --git a/samples/jdbc-jc/pom.xml b/samples/jdbc-jc/pom.xml index 5ae1384b23..294b40a9a0 100644 --- a/samples/jdbc-jc/pom.xml +++ b/samples/jdbc-jc/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.security spring-security-samples-jdbc-jc @@ -32,24 +31,6 @@ scm:git:git://github.com/spring-projects/spring-security https://github.com/spring-projects/spring-security - - - - maven-compiler-plugin - - 1.7 - 1.7 - - - - maven-war-plugin - 2.3 - - false - - - - spring-snasphot @@ -123,28 +104,16 @@ 4.0.0.CI-SNAPSHOT compile - - org.springframework - spring-core - 4.1.0.RC2 - compile - - - commons-logging - commons-logging - - - org.springframework spring-jdbc - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile org.springframework spring-webmvc - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile @@ -259,11 +228,29 @@ org.springframework spring-test - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT test /sample + + + + maven-compiler-plugin + + 1.7 + 1.7 + + + + maven-war-plugin + 2.3 + + false + + + + diff --git a/samples/ldap-jc/pom.xml b/samples/ldap-jc/pom.xml index afa88bc65d..2431024154 100644 --- a/samples/ldap-jc/pom.xml +++ b/samples/ldap-jc/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.security spring-security-samples-ldap-jc @@ -32,24 +31,6 @@ scm:git:git://github.com/spring-projects/spring-security https://github.com/spring-projects/spring-security - - - - maven-compiler-plugin - - 1.7 - 1.7 - - - - maven-war-plugin - 2.3 - - false - - - - spring-snasphot @@ -165,28 +146,16 @@ 4.0.0.CI-SNAPSHOT compile - - org.springframework - spring-core - 4.1.0.RC2 - compile - - - commons-logging - commons-logging - - - org.springframework spring-jdbc - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile org.springframework spring-webmvc - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile @@ -301,11 +270,29 @@ org.springframework spring-test - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT test /sample + + + + maven-compiler-plugin + + 1.7 + 1.7 + + + + maven-war-plugin + 2.3 + + false + + + + diff --git a/samples/ldap-xml/pom.xml b/samples/ldap-xml/pom.xml index 5e3416991c..2a4a33e7d6 100644 --- a/samples/ldap-xml/pom.xml +++ b/samples/ldap-xml/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.security spring-security-samples-ldap-xml @@ -32,24 +31,6 @@ scm:git:git://github.com/spring-projects/spring-security https://github.com/spring-projects/spring-security - - - - maven-compiler-plugin - - 1.7 - 1.7 - - - - maven-war-plugin - 2.3 - - false - - - - spring-snasphot @@ -75,18 +56,6 @@ 4.0.0.CI-SNAPSHOT compile - - org.springframework - spring-core - 4.1.0.RC2 - compile - - - commons-logging - commons-logging - - - commons-logging commons-logging @@ -229,11 +198,29 @@ org.springframework spring-test - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT test /sample + + + + maven-compiler-plugin + + 1.7 + 1.7 + + + + maven-war-plugin + 2.3 + + false + + + + diff --git a/samples/messages-jc/pom.xml b/samples/messages-jc/pom.xml index efa6599ae5..ff31c1f73d 100644 --- a/samples/messages-jc/pom.xml +++ b/samples/messages-jc/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.security spring-security-samples-messages-jc @@ -31,17 +30,6 @@ scm:git:git://github.com/spring-projects/spring-security https://github.com/spring-projects/spring-security - - - - maven-compiler-plugin - - 1.7 - 1.7 - - - - spring-snasphot @@ -112,67 +100,55 @@ org.springframework spring-aop - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile org.springframework spring-aspects - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile org.springframework spring-beans - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile org.springframework spring-context - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile org.springframework spring-core - 4.1.0.RC2 - compile - - - commons-logging - commons-logging - - - - - org.springframework - spring-core - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile org.springframework spring-instrument - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile org.springframework spring-orm - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile org.springframework spring-tx - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile org.springframework spring-webmvc - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile @@ -233,8 +209,19 @@ org.springframework spring-test - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT test + + + + maven-compiler-plugin + + 1.7 + 1.7 + + + + diff --git a/samples/openid-jc/pom.xml b/samples/openid-jc/pom.xml index fd89b680b2..e7c2d368b4 100644 --- a/samples/openid-jc/pom.xml +++ b/samples/openid-jc/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.security spring-security-samples-openid-jc @@ -32,24 +31,6 @@ scm:git:git://github.com/spring-projects/spring-security https://github.com/spring-projects/spring-security - - - - maven-compiler-plugin - - 1.7 - 1.7 - - - - maven-war-plugin - 2.3 - - false - - - - spring-snasphot @@ -129,28 +110,16 @@ 4.0.0.CI-SNAPSHOT compile - - org.springframework - spring-core - 4.1.0.RC2 - compile - - - commons-logging - commons-logging - - - org.springframework spring-jdbc - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile org.springframework spring-webmvc - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile @@ -223,11 +192,29 @@ org.springframework spring-test - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT test /sample + + + + maven-compiler-plugin + + 1.7 + 1.7 + + + + maven-war-plugin + 2.3 + + false + + + + diff --git a/samples/openid-xml/pom.xml b/samples/openid-xml/pom.xml index 7e689adf51..981fce8464 100644 --- a/samples/openid-xml/pom.xml +++ b/samples/openid-xml/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.security spring-security-samples-openid-xml @@ -32,24 +31,6 @@ scm:git:git://github.com/spring-projects/spring-security https://github.com/spring-projects/spring-security - - - - maven-compiler-plugin - - 1.7 - 1.7 - - - - maven-war-plugin - 2.3 - - false - - - - spring-snasphot @@ -69,18 +50,6 @@ 4.0.0.CI-SNAPSHOT compile - - org.springframework - spring-core - 4.1.0.RC2 - compile - - - commons-logging - commons-logging - - - commons-logging commons-logging @@ -151,11 +120,29 @@ org.springframework spring-test - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT test /spring-security-samples-openid-xml + + + + maven-compiler-plugin + + 1.7 + 1.7 + + + + maven-war-plugin + 2.3 + + false + + + + diff --git a/samples/preauth-jc/pom.xml b/samples/preauth-jc/pom.xml index 3e0ebbc942..b2cef05d57 100644 --- a/samples/preauth-jc/pom.xml +++ b/samples/preauth-jc/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.security spring-security-samples-preauth-jc @@ -32,24 +31,6 @@ scm:git:git://github.com/spring-projects/spring-security https://github.com/spring-projects/spring-security - - - - maven-compiler-plugin - - 1.7 - 1.7 - - - - maven-war-plugin - 2.3 - - false - - - - spring-snasphot @@ -123,28 +104,16 @@ 4.0.0.CI-SNAPSHOT compile - - org.springframework - spring-core - 4.1.0.RC2 - compile - - - commons-logging - commons-logging - - - org.springframework spring-jdbc - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile org.springframework spring-webmvc - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile @@ -211,11 +180,29 @@ org.springframework spring-test - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT test /sample + + + + maven-compiler-plugin + + 1.7 + 1.7 + + + + maven-war-plugin + 2.3 + + false + + + + diff --git a/samples/preauth-xml/pom.xml b/samples/preauth-xml/pom.xml index 1a4b57df47..b56e7762b4 100644 --- a/samples/preauth-xml/pom.xml +++ b/samples/preauth-xml/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.security spring-security-samples-preauth-xml @@ -32,24 +31,6 @@ scm:git:git://github.com/spring-projects/spring-security https://github.com/spring-projects/spring-security - - - - maven-compiler-plugin - - 1.7 - 1.7 - - - - maven-war-plugin - 2.3 - - false - - - - spring-snasphot @@ -57,18 +38,6 @@ - - org.springframework - spring-core - 4.1.0.RC2 - compile - - - commons-logging - commons-logging - - - commons-logging commons-logging @@ -121,11 +90,29 @@ org.springframework spring-test - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT test /sample + + + + maven-compiler-plugin + + 1.7 + 1.7 + + + + maven-war-plugin + 2.3 + + false + + + + diff --git a/samples/rememberme-jc/pom.xml b/samples/rememberme-jc/pom.xml index a505b03caf..8441891108 100644 --- a/samples/rememberme-jc/pom.xml +++ b/samples/rememberme-jc/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.security spring-security-samples-rememberme-jc @@ -32,24 +31,6 @@ scm:git:git://github.com/spring-projects/spring-security https://github.com/spring-projects/spring-security - - - - maven-compiler-plugin - - 1.7 - 1.7 - - - - maven-war-plugin - 2.3 - - false - - - - spring-snasphot @@ -123,28 +104,16 @@ 4.0.0.CI-SNAPSHOT compile - - org.springframework - spring-core - 4.1.0.RC2 - compile - - - commons-logging - commons-logging - - - org.springframework spring-jdbc - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile org.springframework spring-webmvc - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile @@ -211,11 +180,29 @@ org.springframework spring-test - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT test /sample + + + + maven-compiler-plugin + + 1.7 + 1.7 + + + + maven-war-plugin + 2.3 + + false + + + + diff --git a/samples/servletapi-xml/pom.xml b/samples/servletapi-xml/pom.xml index 97912e8c5d..3a42897351 100644 --- a/samples/servletapi-xml/pom.xml +++ b/samples/servletapi-xml/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.security spring-security-samples-servletapi-xml @@ -32,24 +31,6 @@ scm:git:git://github.com/spring-projects/spring-security https://github.com/spring-projects/spring-security - - - - maven-compiler-plugin - - 1.7 - 1.7 - - - - maven-war-plugin - 2.3 - - false - - - - spring-snasphot @@ -78,37 +59,25 @@ org.springframework spring-beans - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile org.springframework spring-context - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile - - org.springframework - spring-core - 4.1.0.RC2 - compile - - - commons-logging - commons-logging - - - org.springframework spring-web - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile org.springframework spring-webmvc - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile @@ -157,7 +126,7 @@ org.springframework spring-context-support - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT runtime @@ -181,11 +150,29 @@ org.springframework spring-test - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT test /spring-security-samples-servletapi-xml + + + + maven-compiler-plugin + + 1.7 + 1.7 + + + + maven-war-plugin + 2.3 + + false + + + + diff --git a/samples/tutorial-xml/pom.xml b/samples/tutorial-xml/pom.xml index 3f695b7039..407b9637b9 100644 --- a/samples/tutorial-xml/pom.xml +++ b/samples/tutorial-xml/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.security spring-security-samples-tutorial-xml @@ -32,24 +31,6 @@ scm:git:git://github.com/spring-projects/spring-security https://github.com/spring-projects/spring-security - - - - maven-compiler-plugin - - 1.7 - 1.7 - - - - maven-war-plugin - 2.3 - - false - - - - spring-snasphot @@ -72,31 +53,19 @@ org.springframework spring-beans - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile - - org.springframework - spring-core - 4.1.0.RC2 - compile - - - commons-logging - commons-logging - - - org.springframework spring-web - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile org.springframework spring-webmvc - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile @@ -181,11 +150,29 @@ org.springframework spring-test - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT test /sample + + + + maven-compiler-plugin + + 1.7 + 1.7 + + + + maven-war-plugin + 2.3 + + false + + + + diff --git a/samples/x509-jc/pom.xml b/samples/x509-jc/pom.xml index 0e3b42d126..8195f2db07 100644 --- a/samples/x509-jc/pom.xml +++ b/samples/x509-jc/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.security spring-security-samples-x509-jc @@ -32,24 +31,6 @@ scm:git:git://github.com/spring-projects/spring-security https://github.com/spring-projects/spring-security - - - - maven-compiler-plugin - - 1.7 - 1.7 - - - - maven-war-plugin - 2.3 - - false - - - - spring-snasphot @@ -123,28 +104,16 @@ 4.0.0.CI-SNAPSHOT compile - - org.springframework - spring-core - 4.1.0.RC2 - compile - - - commons-logging - commons-logging - - - org.springframework spring-jdbc - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile org.springframework spring-webmvc - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile @@ -211,11 +180,29 @@ org.springframework spring-test - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT test /sample + + + + maven-compiler-plugin + + 1.7 + 1.7 + + + + maven-war-plugin + 2.3 + + false + + + + diff --git a/taglibs/pom.xml b/taglibs/pom.xml index cf7b0a7a1c..a97974f59e 100644 --- a/taglibs/pom.xml +++ b/taglibs/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.security spring-security-taglibs @@ -31,17 +30,6 @@ scm:git:git://github.com/spring-projects/spring-security https://github.com/spring-projects/spring-security - - - - maven-compiler-plugin - - 1.7 - 1.7 - - - - spring-snasphot @@ -70,25 +58,25 @@ org.springframework spring-aop - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile org.springframework spring-beans - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile org.springframework spring-context - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile org.springframework spring-core - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile @@ -100,13 +88,13 @@ org.springframework spring-expression - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile org.springframework spring-web - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile @@ -197,8 +185,19 @@ org.springframework spring-test - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT test + + + + maven-compiler-plugin + + 1.7 + 1.7 + + + + diff --git a/test/pom.xml b/test/pom.xml index 9feb64a6e0..e38555e9ce 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.security spring-security-test @@ -31,17 +30,6 @@ scm:git:git://github.com/spring-projects/spring-security https://github.com/spring-projects/spring-security - - - - maven-compiler-plugin - - 1.7 - 1.7 - - - - spring-snasphot @@ -64,7 +52,7 @@ org.springframework spring-core - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile @@ -76,7 +64,7 @@ org.springframework spring-test - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile @@ -174,8 +162,19 @@ org.springframework spring-webmvc - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT test + + + + maven-compiler-plugin + + 1.7 + 1.7 + + + + diff --git a/web/pom.xml b/web/pom.xml index 65b314fbf8..744bc5df73 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.security spring-security-web @@ -31,17 +30,6 @@ scm:git:git://github.com/spring-projects/spring-security https://github.com/spring-projects/spring-security - - - - maven-compiler-plugin - - 1.7 - 1.7 - - - - spring-snasphot @@ -64,19 +52,19 @@ org.springframework spring-beans - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile org.springframework spring-context - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile org.springframework spring-core - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile @@ -88,13 +76,13 @@ org.springframework spring-expression - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile org.springframework spring-web - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile @@ -107,21 +95,21 @@ org.springframework spring-jdbc - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile true org.springframework spring-tx - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile true org.springframework spring-webmvc - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT compile true @@ -248,8 +236,19 @@ org.springframework spring-test - 4.1.0.RC2 + 4.1.1.BUILD-SNAPSHOT test + + + + maven-compiler-plugin + + 1.7 + 1.7 + + + +