From 80c3ca190f61ade184a4a2eaff19e7038c10eb81 Mon Sep 17 00:00:00 2001 From: eugenp Date: Wed, 7 May 2014 11:55:30 +0300 Subject: [PATCH] maven upgrades, quick testing work --- core-java/pom.xml | 8 ++++---- experiments/pom.xml | 8 ++++---- guava/pom.xml | 8 ++++---- httpclient/pom.xml | 8 ++++---- jackson/pom.xml | 8 ++++---- mockito/pom.xml | 8 ++++---- spring-all/pom.xml | 8 ++++---- spring-exceptions/pom.xml | 8 ++++---- spring-hibernate3/pom.xml | 8 ++++---- spring-hibernate4/pom.xml | 8 ++++---- spring-jpa/pom.xml | 8 ++++---- spring-mvc-java/pom.xml | 8 ++++---- spring-mvc-no-xml/pom.xml | 4 ++-- spring-mvc-xml/pom.xml | 4 ++-- spring-rest/pom.xml | 8 ++++---- spring-security-basic-auth/pom.xml | 8 ++++---- spring-security-mvc-custom/pom.xml | 8 ++++---- spring-security-mvc-digest-auth/pom.xml | 8 ++++---- spring-security-mvc-login/pom.xml | 8 ++++---- spring-security-mvc-session/pom.xml | 8 ++++---- spring-security-rest-basic-auth/pom.xml | 12 ++++++------ ...tLiveTest.java => HttpsClientLiveManualTest.java} | 9 ++++++++- spring-security-rest-custom/pom.xml | 8 ++++---- spring-security-rest-digest-auth/pom.xml | 8 ++++---- spring-security-rest-full/pom.xml | 8 ++++---- spring-security-rest/pom.xml | 8 ++++---- 26 files changed, 106 insertions(+), 99 deletions(-) rename spring-security-rest-basic-auth/src/test/java/org/baeldung/client/{RawClientLiveTest.java => HttpsClientLiveManualTest.java} (95%) diff --git a/core-java/pom.xml b/core-java/pom.xml index fc621e362d..ab40590cb3 100644 --- a/core-java/pom.xml +++ b/core-java/pom.xml @@ -133,12 +133,12 @@ - 4.0.3.RELEASE + 4.0.4.RELEASE 3.2.3.RELEASE 4.3.5.Final - 5.1.29 + 5.1.30 2.3.2 @@ -151,7 +151,7 @@ 5.0.3.Final - 16.0.1 + 17.0 3.3.1 @@ -169,7 +169,7 @@ 2.4 2.17 2.6 - 1.4.7 + 1.4.8 diff --git a/experiments/pom.xml b/experiments/pom.xml index d54efcec80..606b1bfc49 100644 --- a/experiments/pom.xml +++ b/experiments/pom.xml @@ -255,12 +255,12 @@ - 4.0.3.RELEASE + 4.0.4.RELEASE 3.2.3.RELEASE 4.3.5.Final - 5.1.29 + 5.1.30 1.7.6 @@ -270,7 +270,7 @@ 5.0.3.Final - 16.0.1 + 17.0 3.3.1 @@ -288,7 +288,7 @@ 2.4 2.17 2.6 - 1.4.7 + 1.4.8 diff --git a/guava/pom.xml b/guava/pom.xml index f15b011ce8..b4abd03dc6 100644 --- a/guava/pom.xml +++ b/guava/pom.xml @@ -94,12 +94,12 @@ - 4.0.3.RELEASE + 4.0.4.RELEASE 3.2.3.RELEASE 4.3.5.Final - 5.1.29 + 5.1.30 1.7.6 @@ -109,7 +109,7 @@ 5.0.3.Final - 16.0.1 + 17.0 3.3.1 @@ -127,7 +127,7 @@ 2.4 2.17 2.6 - 1.4.7 + 1.4.8 diff --git a/httpclient/pom.xml b/httpclient/pom.xml index 1da5fe5166..c5cce96faf 100644 --- a/httpclient/pom.xml +++ b/httpclient/pom.xml @@ -130,12 +130,12 @@ - 4.0.3.RELEASE + 4.0.4.RELEASE 3.2.3.RELEASE 4.3.5.Final - 5.1.29 + 5.1.30 1.7.6 @@ -145,7 +145,7 @@ 5.0.3.Final - 16.0.1 + 17.0 3.3.1 @@ -163,7 +163,7 @@ 2.4 2.17 2.6 - 1.4.7 + 1.4.8 diff --git a/jackson/pom.xml b/jackson/pom.xml index c48d13d0a4..86ea96dceb 100644 --- a/jackson/pom.xml +++ b/jackson/pom.xml @@ -107,12 +107,12 @@ - 4.0.3.RELEASE + 4.0.4.RELEASE 3.2.3.RELEASE 4.3.5.Final - 5.1.29 + 5.1.30 2.3.2 @@ -125,7 +125,7 @@ 5.0.3.Final - 16.0.1 + 17.0 3.3.1 @@ -143,7 +143,7 @@ 2.4 2.17 2.6 - 1.4.7 + 1.4.8 diff --git a/mockito/pom.xml b/mockito/pom.xml index b5aeb6be8d..5f20d113fe 100644 --- a/mockito/pom.xml +++ b/mockito/pom.xml @@ -89,12 +89,12 @@ - 4.0.3.RELEASE + 4.0.4.RELEASE 3.2.3.RELEASE 4.3.5.Final - 5.1.29 + 5.1.30 1.7.6 @@ -104,7 +104,7 @@ 5.0.3.Final - 16.0.1 + 17.0 3.3.1 @@ -122,7 +122,7 @@ 2.4 2.17 2.6 - 1.4.7 + 1.4.8 diff --git a/spring-all/pom.xml b/spring-all/pom.xml index 0a9b6033fc..d736066861 100644 --- a/spring-all/pom.xml +++ b/spring-all/pom.xml @@ -192,14 +192,14 @@ - 4.0.3.RELEASE + 4.0.4.RELEASE 3.2.3.RELEASE 3.18.1-GA 1.2 4.3.5.Final - 5.1.29 + 5.1.30 1.7.6 @@ -209,7 +209,7 @@ 5.0.3.Final - 16.0.1 + 17.0 3.3.1 @@ -227,7 +227,7 @@ 2.4 2.17 2.6 - 1.4.7 + 1.4.8 diff --git a/spring-exceptions/pom.xml b/spring-exceptions/pom.xml index 472279056b..9fa76afdf4 100644 --- a/spring-exceptions/pom.xml +++ b/spring-exceptions/pom.xml @@ -204,14 +204,14 @@ - 4.0.3.RELEASE + 4.0.4.RELEASE 3.2.3.RELEASE 3.18.1-GA 1.2 4.3.5.Final - 5.1.29 + 5.1.30 7.0.42 @@ -222,7 +222,7 @@ 5.0.3.Final - 16.0.1 + 17.0 3.3.1 @@ -241,7 +241,7 @@ 2.4 2.17 2.6 - 1.4.7 + 1.4.8 diff --git a/spring-hibernate3/pom.xml b/spring-hibernate3/pom.xml index 272db2b63e..4b506d95e7 100644 --- a/spring-hibernate3/pom.xml +++ b/spring-hibernate3/pom.xml @@ -174,13 +174,13 @@ - 4.0.3.RELEASE + 4.0.4.RELEASE 3.2.3.RELEASE 3.18.1-GA 3.6.10.Final - 5.1.29 + 5.1.30 7.0.47 @@ -191,7 +191,7 @@ 5.0.3.Final - 16.0.1 + 17.0 3.3.1 @@ -209,7 +209,7 @@ 2.4 2.17 2.6 - 1.4.7 + 1.4.8 diff --git a/spring-hibernate4/pom.xml b/spring-hibernate4/pom.xml index ffd4202452..c6438f0076 100644 --- a/spring-hibernate4/pom.xml +++ b/spring-hibernate4/pom.xml @@ -182,13 +182,13 @@ - 4.0.3.RELEASE + 4.0.4.RELEASE 3.2.3.RELEASE 3.18.1-GA 4.3.5.Final - 5.1.29 + 5.1.30 7.0.42 @@ -199,7 +199,7 @@ 5.0.3.Final - 16.0.1 + 17.0 3.3.1 @@ -218,7 +218,7 @@ 2.4 2.17 2.6 - 1.4.7 + 1.4.8 diff --git a/spring-jpa/pom.xml b/spring-jpa/pom.xml index 81f7b8b070..8ec998095e 100644 --- a/spring-jpa/pom.xml +++ b/spring-jpa/pom.xml @@ -177,12 +177,12 @@ - 4.0.3.RELEASE + 4.0.4.RELEASE 3.2.3.RELEASE 4.3.5.Final - 5.1.29 + 5.1.30 1.7.6 @@ -192,7 +192,7 @@ 5.0.3.Final - 16.0.1 + 17.0 3.3.1 @@ -211,7 +211,7 @@ 2.4 2.17 2.6 - 1.4.7 + 1.4.8 diff --git a/spring-mvc-java/pom.xml b/spring-mvc-java/pom.xml index fde7cc4ffa..456b4e095e 100644 --- a/spring-mvc-java/pom.xml +++ b/spring-mvc-java/pom.xml @@ -141,12 +141,12 @@ - 4.0.3.RELEASE + 4.0.4.RELEASE 3.2.3.RELEASE 4.3.5.Final - 5.1.29 + 5.1.30 1.7.6 @@ -156,7 +156,7 @@ 5.0.3.Final - 16.0.1 + 17.0 3.3.1 @@ -174,7 +174,7 @@ 2.4 2.17 2.6 - 1.4.7 + 1.4.8 diff --git a/spring-mvc-no-xml/pom.xml b/spring-mvc-no-xml/pom.xml index 11fb31e3ff..f4db082541 100644 --- a/spring-mvc-no-xml/pom.xml +++ b/spring-mvc-no-xml/pom.xml @@ -145,7 +145,7 @@ - 4.0.3.RELEASE + 4.0.4.RELEASE 1.7.6 @@ -166,7 +166,7 @@ 2.4 2.17 2.6 - 1.4.7 + 1.4.8 diff --git a/spring-mvc-xml/pom.xml b/spring-mvc-xml/pom.xml index 2bd23fdb81..449bb0ded2 100644 --- a/spring-mvc-xml/pom.xml +++ b/spring-mvc-xml/pom.xml @@ -141,7 +141,7 @@ - 4.0.3.RELEASE + 4.0.4.RELEASE 1.7.6 @@ -162,7 +162,7 @@ 2.4 2.17 2.6 - 1.4.7 + 1.4.8 diff --git a/spring-rest/pom.xml b/spring-rest/pom.xml index a2095f8a62..f1d105d049 100644 --- a/spring-rest/pom.xml +++ b/spring-rest/pom.xml @@ -202,12 +202,12 @@ - 4.0.3.RELEASE + 4.0.4.RELEASE 3.2.3.RELEASE 4.3.5.Final - 5.1.29 + 5.1.30 @@ -217,7 +217,7 @@ 5.0.3.Final - 16.0.1 + 17.0 3.3.1 @@ -238,7 +238,7 @@ 3.1 2.4 2.17 - 1.4.7 + 1.4.8 diff --git a/spring-security-basic-auth/pom.xml b/spring-security-basic-auth/pom.xml index 2c8d949b64..4b4cec8f15 100644 --- a/spring-security-basic-auth/pom.xml +++ b/spring-security-basic-auth/pom.xml @@ -226,12 +226,12 @@ - 4.0.3.RELEASE + 4.0.4.RELEASE 3.2.3.RELEASE 4.3.5.Final - 5.1.29 + 5.1.30 1.7.6 @@ -241,7 +241,7 @@ 5.0.3.Final - 16.0.1 + 17.0 3.3.1 @@ -259,7 +259,7 @@ 2.4 2.17 2.6 - 1.4.7 + 1.4.8 diff --git a/spring-security-mvc-custom/pom.xml b/spring-security-mvc-custom/pom.xml index 945810b4d1..48b9b8e4c1 100644 --- a/spring-security-mvc-custom/pom.xml +++ b/spring-security-mvc-custom/pom.xml @@ -231,12 +231,12 @@ - 4.0.3.RELEASE + 4.0.4.RELEASE 3.2.3.RELEASE 4.3.5.Final - 5.1.29 + 5.1.30 1.7.6 @@ -246,7 +246,7 @@ 5.0.3.Final - 16.0.1 + 17.0 3.3.1 @@ -264,7 +264,7 @@ 2.4 2.17 2.6 - 1.4.7 + 1.4.8 diff --git a/spring-security-mvc-digest-auth/pom.xml b/spring-security-mvc-digest-auth/pom.xml index 2135c42234..91aab8b220 100644 --- a/spring-security-mvc-digest-auth/pom.xml +++ b/spring-security-mvc-digest-auth/pom.xml @@ -226,12 +226,12 @@ - 4.0.3.RELEASE + 4.0.4.RELEASE 3.2.3.RELEASE 4.3.5.Final - 5.1.29 + 5.1.30 1.7.6 @@ -241,7 +241,7 @@ 5.0.3.Final - 16.0.1 + 17.0 3.3.1 @@ -259,7 +259,7 @@ 2.4 2.17 2.6 - 1.4.7 + 1.4.8 diff --git a/spring-security-mvc-login/pom.xml b/spring-security-mvc-login/pom.xml index c4e654616f..556e6eb086 100644 --- a/spring-security-mvc-login/pom.xml +++ b/spring-security-mvc-login/pom.xml @@ -223,12 +223,12 @@ - 4.0.3.RELEASE + 4.0.4.RELEASE 3.2.3.RELEASE 4.3.5.Final - 5.1.29 + 5.1.30 1.7.6 @@ -238,7 +238,7 @@ 5.0.3.Final - 16.0.1 + 17.0 3.3.1 @@ -256,7 +256,7 @@ 2.4 2.17 2.6 - 1.4.7 + 1.4.8 diff --git a/spring-security-mvc-session/pom.xml b/spring-security-mvc-session/pom.xml index dd3fb4c5f3..c0a91edc7b 100644 --- a/spring-security-mvc-session/pom.xml +++ b/spring-security-mvc-session/pom.xml @@ -231,12 +231,12 @@ - 4.0.3.RELEASE + 4.0.4.RELEASE 3.2.3.RELEASE 4.3.5.Final - 5.1.29 + 5.1.30 1.7.6 @@ -246,7 +246,7 @@ 5.0.3.Final - 16.0.1 + 17.0 3.3.1 @@ -264,7 +264,7 @@ 2.4 2.17 2.6 - 1.4.7 + 1.4.8 diff --git a/spring-security-rest-basic-auth/pom.xml b/spring-security-rest-basic-auth/pom.xml index f3fa27447a..64d5015a7b 100644 --- a/spring-security-rest-basic-auth/pom.xml +++ b/spring-security-rest-basic-auth/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.baeldung spring-security-rest-basic-auth - 0.1-SNAPSHOT + 0.2-SNAPSHOT spring-security-rest-basic-auth war @@ -88,7 +88,7 @@ com.fasterxml.jackson.core jackson-databind - 2.2.2 + 2.2.3 @@ -286,12 +286,12 @@ - 4.0.3.RELEASE + 4.0.4.RELEASE 3.2.3.RELEASE 4.3.5.Final - 5.1.29 + 5.1.30 4.3.2 @@ -305,7 +305,7 @@ 5.0.3.Final - 16.0.1 + 17.0 3.3.1 @@ -319,7 +319,7 @@ 3.1 2.4 2.17 - 1.4.7 + 1.4.8 diff --git a/spring-security-rest-basic-auth/src/test/java/org/baeldung/client/RawClientLiveTest.java b/spring-security-rest-basic-auth/src/test/java/org/baeldung/client/HttpsClientLiveManualTest.java similarity index 95% rename from spring-security-rest-basic-auth/src/test/java/org/baeldung/client/RawClientLiveTest.java rename to spring-security-rest-basic-auth/src/test/java/org/baeldung/client/HttpsClientLiveManualTest.java index e99745c3d3..370ac79f6f 100644 --- a/spring-security-rest-basic-auth/src/test/java/org/baeldung/client/RawClientLiveTest.java +++ b/spring-security-rest-basic-auth/src/test/java/org/baeldung/client/HttpsClientLiveManualTest.java @@ -31,7 +31,11 @@ import org.apache.http.impl.conn.PoolingClientConnectionManager; import org.junit.Ignore; import org.junit.Test; -public class RawClientLiveTest { +/** + * This test requires a localhost server over HTTPS
+ * It should only be manually run, not part of the automated build + * */ +public class HttpsClientLiveManualTest { // tests @@ -70,6 +74,7 @@ public class RawClientLiveTest { assertThat(response.getStatusLine().getStatusCode(), equalTo(200)); } + @SuppressWarnings("deprecation") @Test public final void givenHttpClientPre4_3_whenAcceptingAllCertificates_thenCanConsumeHttpsUriWithSelfSignedCertificate() throws IOException, GeneralSecurityException { final TrustStrategy acceptingTrustStrategy = new TrustStrategy() { @@ -89,6 +94,8 @@ public class RawClientLiveTest { final HttpGet getMethod = new HttpGet(urlOverHttps); final HttpResponse response = httpClient.execute(getMethod); assertThat(response.getStatusLine().getStatusCode(), equalTo(200)); + + httpClient.close(); } @Test diff --git a/spring-security-rest-custom/pom.xml b/spring-security-rest-custom/pom.xml index 43f14d0b32..d5631e4121 100644 --- a/spring-security-rest-custom/pom.xml +++ b/spring-security-rest-custom/pom.xml @@ -251,12 +251,12 @@ - 4.0.3.RELEASE + 4.0.4.RELEASE 3.2.3.RELEASE 4.3.5.Final - 5.1.29 + 5.1.30 1.7.6 @@ -266,7 +266,7 @@ 5.0.3.Final - 16.0.1 + 17.0 3.3.1 @@ -283,7 +283,7 @@ 3.1 2.4 2.17 - 1.4.7 + 1.4.8 diff --git a/spring-security-rest-digest-auth/pom.xml b/spring-security-rest-digest-auth/pom.xml index 4ddab86ee9..e97df2100c 100644 --- a/spring-security-rest-digest-auth/pom.xml +++ b/spring-security-rest-digest-auth/pom.xml @@ -275,12 +275,12 @@ - 4.0.3.RELEASE + 4.0.4.RELEASE 3.2.3.RELEASE 4.3.5.Final - 5.1.29 + 5.1.30 4.3.2 @@ -294,7 +294,7 @@ 5.0.3.Final - 16.0.1 + 17.0 3.3.1 @@ -308,7 +308,7 @@ 3.1 2.4 2.17 - 1.4.7 + 1.4.8 diff --git a/spring-security-rest-full/pom.xml b/spring-security-rest-full/pom.xml index d17388f539..4f702de829 100644 --- a/spring-security-rest-full/pom.xml +++ b/spring-security-rest-full/pom.xml @@ -301,12 +301,12 @@ - 4.0.3.RELEASE + 4.0.4.RELEASE 3.2.3.RELEASE 4.3.5.Final - 5.1.29 + 5.1.30 1.4.3.RELEASE @@ -321,7 +321,7 @@ 5.0.3.Final - 16.0.1 + 17.0 3.3.1 @@ -338,7 +338,7 @@ 3.1 2.4 2.17 - 1.4.7 + 1.4.8 diff --git a/spring-security-rest/pom.xml b/spring-security-rest/pom.xml index da5ed3d24e..b6a9ebbbb4 100644 --- a/spring-security-rest/pom.xml +++ b/spring-security-rest/pom.xml @@ -214,12 +214,12 @@ - 4.0.3.RELEASE + 4.0.4.RELEASE 3.2.3.RELEASE 4.3.5.Final - 5.1.29 + 5.1.30 1.7.6 @@ -229,7 +229,7 @@ 5.0.3.Final - 16.0.1 + 17.0 3.3.1 @@ -246,7 +246,7 @@ 3.1 2.4 2.17 - 1.4.7 + 1.4.8