From a703253af91d13740e95584f85325110eded3249 Mon Sep 17 00:00:00 2001 From: eugenp Date: Sat, 28 Mar 2015 01:19:24 +0200 Subject: [PATCH] maven work --- spring-all/pom.xml | 8 +- spring-exceptions/pom.xml | 8 +- spring-hibernate3/pom.xml | 8 +- spring-hibernate4/pom.xml | 8 +- spring-jpa/pom.xml | 10 +- spring-mvc-java/pom.xml | 8 +- spring-mvc-no-xml/pom.xml | 8 +- spring-mvc-xml/pom.xml | 6 +- spring-rest/pom.xml | 433 +++++++++--------- spring-security-basic-auth/pom.xml | 8 +- .../pom.xml | 4 +- spring-security-mvc-custom/pom.xml | 8 +- spring-security-mvc-digest-auth/pom.xml | 8 +- spring-security-mvc-ldap/.classpath | 1 - spring-security-mvc-ldap/pom.xml | 2 +- spring-security-mvc-login/pom.xml | 8 +- spring-security-mvc-session/pom.xml | 8 +- spring-security-oauth/pom.xml | 18 +- spring-security-rest-basic-auth/pom.xml | 10 +- spring-security-rest-custom/pom.xml | 10 +- spring-security-rest-digest-auth/pom.xml | 12 +- spring-security-rest-full/.classpath | 12 +- spring-security-rest-full/pom.xml | 39 +- spring-security-rest/pom.xml | 10 +- 24 files changed, 332 insertions(+), 323 deletions(-) diff --git a/spring-all/pom.xml b/spring-all/pom.xml index 387e312a36..81b7c88bf7 100644 --- a/spring-all/pom.xml +++ b/spring-all/pom.xml @@ -202,11 +202,11 @@ 4.3.8.Final - 5.1.34 + 5.1.35 - 1.7.9 - 1.1.2 + 1.7.12 + 1.1.3 5.1.3.Final @@ -226,7 +226,7 @@ 2.4.0 - 3.2 + 3.3 2.6 2.18.1 2.7 diff --git a/spring-exceptions/pom.xml b/spring-exceptions/pom.xml index 27035996cd..f07aec234d 100644 --- a/spring-exceptions/pom.xml +++ b/spring-exceptions/pom.xml @@ -211,12 +211,12 @@ 4.3.8.Final - 5.1.34 + 5.1.35 7.0.42 - 1.7.9 - 1.1.2 + 1.7.12 + 1.1.3 5.1.3.Final @@ -237,7 +237,7 @@ 1.8.9 - 3.2 + 3.3 2.6 2.18.1 2.7 diff --git a/spring-hibernate3/pom.xml b/spring-hibernate3/pom.xml index 640d935ce8..ea80ce2afb 100644 --- a/spring-hibernate3/pom.xml +++ b/spring-hibernate3/pom.xml @@ -169,12 +169,12 @@ 3.6.10.Final - 5.1.34 + 5.1.35 7.0.47 - 1.7.9 - 1.1.2 + 1.7.12 + 1.1.3 5.1.3.Final @@ -194,7 +194,7 @@ 2.4.0 - 3.2 + 3.3 2.18.1 2.7 1.4.12 diff --git a/spring-hibernate4/pom.xml b/spring-hibernate4/pom.xml index 564ba15e02..6cef1aca78 100644 --- a/spring-hibernate4/pom.xml +++ b/spring-hibernate4/pom.xml @@ -176,12 +176,12 @@ 4.3.8.Final - 5.1.34 + 5.1.35 7.0.42 - 1.7.9 - 1.1.2 + 1.7.12 + 1.1.3 5.1.3.Final @@ -201,7 +201,7 @@ 2.4.0 - 3.2 + 3.3 2.18.1 2.7 1.4.12 diff --git a/spring-jpa/pom.xml b/spring-jpa/pom.xml index be82b8d42d..f5b522d2a9 100644 --- a/spring-jpa/pom.xml +++ b/spring-jpa/pom.xml @@ -38,7 +38,7 @@ org.javassist javassist - 3.18.2-GA + 3.19.0-GA mysql @@ -181,11 +181,11 @@ 4.3.8.Final - 5.1.34 + 5.1.35 - 1.7.9 - 1.1.2 + 1.7.12 + 1.1.3 5.1.3.Final @@ -205,7 +205,7 @@ 2.4.0 - 3.2 + 3.3 2.18.1 2.7 1.4.12 diff --git a/spring-mvc-java/pom.xml b/spring-mvc-java/pom.xml index 0d0482ea5a..f06b1c9d7a 100644 --- a/spring-mvc-java/pom.xml +++ b/spring-mvc-java/pom.xml @@ -146,11 +146,11 @@ 4.3.8.Final - 5.1.34 + 5.1.35 - 1.7.9 - 1.1.2 + 1.7.12 + 1.1.3 5.1.3.Final @@ -170,7 +170,7 @@ 2.4.0 - 3.2 + 3.3 2.6 2.18.1 2.7 diff --git a/spring-mvc-no-xml/pom.xml b/spring-mvc-no-xml/pom.xml index 684f0f9f78..01b5aac09e 100644 --- a/spring-mvc-no-xml/pom.xml +++ b/spring-mvc-no-xml/pom.xml @@ -109,7 +109,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.1 + ${maven-compiler-plugin.version} 1.7 1.7 @@ -148,8 +148,8 @@ 4.1.6.RELEASE - 1.7.9 - 1.1.2 + 1.7.12 + 1.1.3 1.3 @@ -162,7 +162,7 @@ 2.4.0 - 3.2 + 3.3 2.6 2.18.1 2.7 diff --git a/spring-mvc-xml/pom.xml b/spring-mvc-xml/pom.xml index 5db020a5dc..392bce3d03 100644 --- a/spring-mvc-xml/pom.xml +++ b/spring-mvc-xml/pom.xml @@ -150,8 +150,8 @@ 4.1.6.RELEASE - 1.7.9 - 1.1.2 + 1.7.12 + 1.1.3 1.3 @@ -164,7 +164,7 @@ 2.4.0 - 3.2 + 3.3 2.6 2.18.1 2.7 diff --git a/spring-rest/pom.xml b/spring-rest/pom.xml index a3ca9bd6f3..fae5e12095 100644 --- a/spring-rest/pom.xml +++ b/spring-rest/pom.xml @@ -1,250 +1,267 @@ - - 4.0.0 - org.baeldung - spring-rest - 0.1-SNAPSHOT + + 4.0.0 + org.baeldung + spring-rest + 0.1-SNAPSHOT - spring-rest - war + spring-rest + war - + - - - org.springframework - spring-web - ${org.springframework.version} - - - commons-logging - commons-logging - - - - - org.springframework - spring-webmvc - ${org.springframework.version} - - - org.springframework - spring-oxm - ${org.springframework.version} - + + + org.springframework.boot + spring-boot-starter-security + + + org.springframework.boot + spring-boot-starter-thymeleaf + + + org.springframework.boot + spring-boot-starter-actuator + - - commons-fileupload - commons-fileupload - 1.3.1 - - + - - javax.servlet - javax.servlet-api - 3.0.1 - provided - + + org.springframework + spring-web + ${org.springframework.version} + + + commons-logging + commons-logging + + + + + org.springframework + spring-webmvc + ${org.springframework.version} + + + org.springframework + spring-oxm + ${org.springframework.version} + - - javax.servlet - jstl - 1.2 - runtime - + + commons-fileupload + commons-fileupload + 1.3.1 + + - + + javax.servlet + javax.servlet-api + 3.0.1 + provided + - - com.fasterxml.jackson.core - jackson-databind - ${jackson.version} - + + javax.servlet + jstl + runtime + - - com.thoughtworks.xstream - xstream - 1.4.6 - + - + + com.fasterxml.jackson.core + jackson-databind + - - com.google.guava - guava - ${guava.version} - + + com.thoughtworks.xstream + xstream + 1.4.8 + - - org.apache.commons - commons-lang3 - 3.2.1 - + - + + com.google.guava + guava + ${guava.version} + - - org.slf4j - slf4j-api - ${org.slf4j.version} - - - ch.qos.logback - logback-classic - ${logback.version} - - - - org.slf4j - jcl-over-slf4j - ${org.slf4j.version} - - - - org.slf4j - log4j-over-slf4j - ${org.slf4j.version} - + + org.apache.commons + commons-lang3 + 3.2.1 + - + - - junit - junit-dep - ${junit.version} - test - + + org.slf4j + slf4j-api + ${org.slf4j.version} + + + ch.qos.logback + logback-classic + ${logback.version} + + + + org.slf4j + jcl-over-slf4j + ${org.slf4j.version} + + + + org.slf4j + log4j-over-slf4j + ${org.slf4j.version} + - - org.hamcrest - hamcrest-core - ${org.hamcrest.version} - test - - - org.hamcrest - hamcrest-library - ${org.hamcrest.version} - test - + - - org.mockito - mockito-core - ${mockito.version} - test - + + junit + junit-dep + ${junit.version} + test + - + + org.hamcrest + hamcrest-core + ${org.hamcrest.version} + test + + + org.hamcrest + hamcrest-library + ${org.hamcrest.version} + test + - - spring-rest - - - src/main/resources - true - - + + org.mockito + mockito-core + ${mockito.version} + test + - + - - org.apache.maven.plugins - maven-compiler-plugin - 3.1 - - 1.7 - 1.7 - - + + spring-rest + + + src/main/resources + true + + - - org.apache.maven.plugins - maven-war-plugin - ${maven-war-plugin.version} - + - - org.apache.maven.plugins - maven-surefire-plugin - ${maven-surefire-plugin.version} - - - - - - - - - + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + + 1.7 + 1.7 + + - - org.codehaus.cargo - cargo-maven2-plugin - ${cargo-maven2-plugin.version} - - true - - jetty8x - embedded - - - - - - - 8082 - - - - + + org.apache.maven.plugins + maven-war-plugin + ${maven-war-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 + + + + - - - 4.1.6.RELEASE - 3.2.7.RELEASE + - - 4.3.8.Final - 5.1.34 + - + + + 4.1.6.RELEASE + 3.2.7.RELEASE - 2.4.4 + + 4.3.8.Final + 5.1.35 - - 5.1.3.Final + - - 18.0 - 3.3.2 + 2.5.1 - - 1.3 - 4.11 - 1.10.19 + + 5.1.3.Final - 4.4 - 4.4 + + 18.0 + 3.3.2 - 2.4.0 + + 1.3 + 4.11 + 1.10.19 - - 1.7.9 - 1.1.2 + 4.4 + 4.4 - - 3.2 - 2.6 - 2.18.1 - 1.4.12 + 2.4.0 - + + 1.7.12 + 1.1.3 + + 3.3 + 2.6 + 2.18.1 + 1.4.12 + + + + + org.springframework.boot + spring-boot-starter-parent + 1.2.2.RELEASE + \ No newline at end of file diff --git a/spring-security-basic-auth/pom.xml b/spring-security-basic-auth/pom.xml index 8bc6d54284..05c138cba0 100644 --- a/spring-security-basic-auth/pom.xml +++ b/spring-security-basic-auth/pom.xml @@ -231,11 +231,11 @@ 4.3.8.Final - 5.1.34 + 5.1.35 - 1.7.9 - 1.1.2 + 1.7.12 + 1.1.3 5.1.3.Final @@ -255,7 +255,7 @@ 2.4.0 - 3.2 + 3.3 2.6 2.18.1 2.7 diff --git a/spring-security-login-and-registration/pom.xml b/spring-security-login-and-registration/pom.xml index c01a24b8de..89ef8d571c 100644 --- a/spring-security-login-and-registration/pom.xml +++ b/spring-security-login-and-registration/pom.xml @@ -173,8 +173,8 @@ 3.2.7.RELEASE - 1.7.7 - 1.1.2 + 1.7.12 + 1.1.3 2.3.2-b01 diff --git a/spring-security-mvc-custom/pom.xml b/spring-security-mvc-custom/pom.xml index de08328ecf..59029bde77 100644 --- a/spring-security-mvc-custom/pom.xml +++ b/spring-security-mvc-custom/pom.xml @@ -236,11 +236,11 @@ 4.3.8.Final - 5.1.34 + 5.1.35 - 1.7.9 - 1.1.2 + 1.7.12 + 1.1.3 5.1.3.Final @@ -260,7 +260,7 @@ 2.4.0 - 3.2 + 3.3 2.6 2.18.1 2.7 diff --git a/spring-security-mvc-digest-auth/pom.xml b/spring-security-mvc-digest-auth/pom.xml index 3fe95e9200..0b2b0246ef 100644 --- a/spring-security-mvc-digest-auth/pom.xml +++ b/spring-security-mvc-digest-auth/pom.xml @@ -231,11 +231,11 @@ 4.3.8.Final - 5.1.34 + 5.1.35 - 1.7.9 - 1.1.2 + 1.7.12 + 1.1.3 5.1.3.Final @@ -255,7 +255,7 @@ 2.4.0 - 3.2 + 3.3 2.6 2.18.1 2.7 diff --git a/spring-security-mvc-ldap/.classpath b/spring-security-mvc-ldap/.classpath index c99cf86462..534b5e52fa 100644 --- a/spring-security-mvc-ldap/.classpath +++ b/spring-security-mvc-ldap/.classpath @@ -30,7 +30,6 @@ - diff --git a/spring-security-mvc-ldap/pom.xml b/spring-security-mvc-ldap/pom.xml index 4c0f7adf9b..411d9a8191 100644 --- a/spring-security-mvc-ldap/pom.xml +++ b/spring-security-mvc-ldap/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 1.1.1.RELEASE + 1.2.2.RELEASE diff --git a/spring-security-mvc-login/pom.xml b/spring-security-mvc-login/pom.xml index c89886ce7a..a26d9cddb9 100644 --- a/spring-security-mvc-login/pom.xml +++ b/spring-security-mvc-login/pom.xml @@ -228,11 +228,11 @@ 4.3.8.Final - 5.1.34 + 5.1.35 - 1.7.9 - 1.1.2 + 1.7.12 + 1.1.3 5.1.3.Final @@ -252,7 +252,7 @@ 2.4.0 - 3.2 + 3.3 2.6 2.18.1 2.7 diff --git a/spring-security-mvc-session/pom.xml b/spring-security-mvc-session/pom.xml index d1e90f1e9f..16bd0d1ff2 100644 --- a/spring-security-mvc-session/pom.xml +++ b/spring-security-mvc-session/pom.xml @@ -236,11 +236,11 @@ 4.3.8.Final - 5.1.34 + 5.1.35 - 1.7.9 - 1.1.2 + 1.7.12 + 1.1.3 5.1.3.Final @@ -260,7 +260,7 @@ 2.4.0 - 3.2 + 3.3 2.6 2.18.1 2.7 diff --git a/spring-security-oauth/pom.xml b/spring-security-oauth/pom.xml index 3172113b8f..f38f016e10 100644 --- a/spring-security-oauth/pom.xml +++ b/spring-security-oauth/pom.xml @@ -131,7 +131,7 @@ org.javassist javassist - 3.18.2-GA + 3.19.0-GA mysql @@ -168,7 +168,7 @@ com.thoughtworks.xstream xstream - 1.4.7 + 1.4.8 @@ -243,7 +243,7 @@ com.jayway.restassured rest-assured - 2.3.0 + 2.4.0 test @@ -269,7 +269,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.1 + ${maven-compiler-plugin.version} 1.7 1.7 @@ -391,16 +391,16 @@ 4.3.8.Final - 5.1.34 + 5.1.35 1.7.1.RELEASE - 2.4.4 + 2.5.1 - 1.7.9 - 1.1.2 + 1.7.12 + 1.1.3 5.1.3.Final @@ -420,7 +420,7 @@ 2.4.0 - 3.2 + 3.3 2.6 2.18.1 1.4.12 diff --git a/spring-security-rest-basic-auth/pom.xml b/spring-security-rest-basic-auth/pom.xml index 78601de6a8..cc6cc7a419 100644 --- a/spring-security-rest-basic-auth/pom.xml +++ b/spring-security-rest-basic-auth/pom.xml @@ -230,7 +230,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.1 + ${maven-compiler-plugin.version} 1.7 1.7 @@ -292,15 +292,15 @@ 4.3.8.Final - 5.1.34 + 5.1.35 4.4 4.4 - 1.7.9 - 1.1.2 + 1.7.12 + 1.1.3 5.1.3.Final @@ -317,7 +317,7 @@ 2.4.0 - 3.2 + 3.3 2.6 2.18.1 1.4.12 diff --git a/spring-security-rest-custom/pom.xml b/spring-security-rest-custom/pom.xml index 36853edd56..9052e3c65e 100644 --- a/spring-security-rest-custom/pom.xml +++ b/spring-security-rest-custom/pom.xml @@ -192,7 +192,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.1 + ${maven-compiler-plugin.version} 1.7 1.7 @@ -256,11 +256,11 @@ 4.3.8.Final - 5.1.34 + 5.1.35 - 1.7.9 - 1.1.2 + 1.7.12 + 1.1.3 5.1.3.Final @@ -280,7 +280,7 @@ 2.4.0 - 3.2 + 3.3 2.6 2.18.1 1.4.12 diff --git a/spring-security-rest-digest-auth/pom.xml b/spring-security-rest-digest-auth/pom.xml index 3d3b9bfd47..516c0ce7eb 100644 --- a/spring-security-rest-digest-auth/pom.xml +++ b/spring-security-rest-digest-auth/pom.xml @@ -219,7 +219,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.1 + ${maven-compiler-plugin.version} 1.7 1.7 @@ -280,18 +280,18 @@ 4.3.8.Final - 5.1.34 + 5.1.35 4.4 4.4 - 1.7.9 - 1.1.2 + 1.7.12 + 1.1.3 - 2.4.4 + 2.5.1 5.1.3.Final @@ -308,7 +308,7 @@ 2.4.0 - 3.2 + 3.3 2.6 2.18.1 1.4.12 diff --git a/spring-security-rest-full/.classpath b/spring-security-rest-full/.classpath index 4afacb7ebf..8b995fcb09 100644 --- a/spring-security-rest-full/.classpath +++ b/spring-security-rest-full/.classpath @@ -6,12 +6,6 @@ - - - - - - @@ -39,5 +33,11 @@ + + + + + + diff --git a/spring-security-rest-full/pom.xml b/spring-security-rest-full/pom.xml index 1751ca06c4..a1c688aea6 100644 --- a/spring-security-rest-full/pom.xml +++ b/spring-security-rest-full/pom.xml @@ -79,22 +79,15 @@ - - com.mysema.querydsl - querydsl-core - 3.6.0 - - com.mysema.querydsl querydsl-apt - 3.6.0 + 3.6.2 - com.mysema.querydsl querydsl-jpa - 3.6.0 + 3.6.2 @@ -102,7 +95,6 @@ org.apache.httpcomponents httpclient - ${httpclient.version} commons-logging @@ -141,7 +133,7 @@ org.javassist javassist - 3.18.2-GA + 3.19.0-GA mysql @@ -162,7 +154,6 @@ javax.servlet jstl - 1.2 runtime @@ -177,7 +168,7 @@ com.thoughtworks.xstream xstream - 1.4.7 + 1.4.8 @@ -232,27 +223,24 @@ org.hamcrest hamcrest-core - ${org.hamcrest.version} test org.hamcrest hamcrest-library - ${org.hamcrest.version} test org.mockito mockito-core - ${mockito.version} test com.jayway.restassured rest-assured - 2.3.0 + 2.4.0 test @@ -278,7 +266,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.1 + ${maven-compiler-plugin.version} 1.7 1.7 @@ -419,16 +407,16 @@ 4.3.8.Final - 5.1.34 + 5.1.35 1.7.1.RELEASE - 2.4.4 + 2.5.1 - 1.7.9 - 1.1.2 + 1.7.12 + 1.1.3 5.1.3.Final @@ -448,11 +436,16 @@ 2.4.0 - 3.2 + 3.3 2.6 2.18.1 1.4.12 + + org.springframework.boot + spring-boot-starter-parent + 1.2.2.RELEASE + \ No newline at end of file diff --git a/spring-security-rest/pom.xml b/spring-security-rest/pom.xml index 2b35f94eae..d6561186b7 100644 --- a/spring-security-rest/pom.xml +++ b/spring-security-rest/pom.xml @@ -184,7 +184,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.1 + ${maven-compiler-plugin.version} 1.7 1.7 @@ -243,11 +243,11 @@ 4.3.8.Final - 5.1.34 + 5.1.35 - 1.7.9 - 1.1.2 + 1.7.12 + 1.1.3 5.1.3.Final @@ -267,7 +267,7 @@ 2.4.0 - 3.2 + 3.3 2.6 2.18.1 1.4.12