From 6b0dd70f2bd6b2b6fd17e4d7607fab471866f23c Mon Sep 17 00:00:00 2001 From: eugenp Date: Fri, 31 May 2013 22:56:25 +0300 Subject: [PATCH] maven cleanup --- spring-all/pom.xml | 24 +- spring-hibernate3/pom.xml | 28 +- spring-hibernate4/pom.xml | 24 +- spring-jpa/pom.xml | 37 ++- spring-mvc-java/pom.xml | 16 ++ .../.settings/org.eclipse.jdt.core.prefs | 6 - spring-mvc/pom.xml | 247 ++++++++++-------- spring-security-basic-auth/pom.xml | 45 ++-- 8 files changed, 266 insertions(+), 161 deletions(-) diff --git a/spring-all/pom.xml b/spring-all/pom.xml index 546375fadd..6f3ff2c355 100644 --- a/spring-all/pom.xml +++ b/spring-all/pom.xml @@ -37,7 +37,7 @@ org.hibernate hibernate-core - 4.2.2.Final + ${hibernate.version} org.javassist @@ -47,7 +47,7 @@ mysql mysql-connector-java - 5.1.25 + ${mysql-connector-java.version} runtime @@ -56,7 +56,7 @@ org.hibernate hibernate-validator - 5.0.1.Final + ${hibernate-validator.version} @@ -80,7 +80,7 @@ com.google.guava guava - 14.0.1 + ${guava.version} @@ -128,6 +128,7 @@ org.apache.maven.plugins maven-surefire-plugin + ${maven-surefire-plugin.version} @@ -141,6 +142,7 @@ org.codehaus.cargo cargo-maven2-plugin + ${cargo-maven2-plugin.version} true @@ -166,10 +168,21 @@ 3.2.3.RELEASE + + 4.2.2.Final + 5.1.25 + 1.7.5 1.0.11 + + 5.0.1.Final + + + 14.0.1 + 3.1 + 1.3 4.11 @@ -181,6 +194,9 @@ 1.8.0 1.8.9 + + 1.4.2 + 2.14.1 \ No newline at end of file diff --git a/spring-hibernate3/pom.xml b/spring-hibernate3/pom.xml index 69d9da3294..e23ae24f11 100644 --- a/spring-hibernate3/pom.xml +++ b/spring-hibernate3/pom.xml @@ -32,7 +32,7 @@ org.hibernate hibernate-core - 3.6.10.Final + ${hibernate.version} org.javassist @@ -42,7 +42,7 @@ mysql mysql-connector-java - 5.1.25 + ${mysql-connector-java.version} runtime @@ -51,7 +51,7 @@ com.google.guava guava - 14.0.1 + ${guava.version} @@ -59,7 +59,7 @@ org.apache.commons commons-lang3 - 3.1 + ${commons-lang3.version} test @@ -113,6 +113,7 @@ org.apache.maven.plugins maven-surefire-plugin + ${maven-surefire-plugin.version} @@ -126,6 +127,7 @@ org.codehaus.cargo cargo-maven2-plugin + ${cargo-maven2-plugin.version} true @@ -149,23 +151,37 @@ - 3.2.2.RELEASE + 3.2.3.RELEASE + + + 3.6.10.Final + 5.1.25 1.7.5 1.0.11 + + 5.0.1.Final + + + 14.0.1 + 3.1 + 1.3 4.11 1.9.5 4.2.4 - 4.2.4 + 4.2.5 1.8.0 1.8.9 + + 1.4.2 + 2.14.1 \ No newline at end of file diff --git a/spring-hibernate4/pom.xml b/spring-hibernate4/pom.xml index 7b8668cda1..52ad280548 100644 --- a/spring-hibernate4/pom.xml +++ b/spring-hibernate4/pom.xml @@ -32,7 +32,7 @@ org.hibernate hibernate-core - 4.2.2.Final + ${hibernate.version} org.javassist @@ -42,7 +42,7 @@ mysql mysql-connector-java - 5.1.25 + ${mysql-connector-java.version} runtime @@ -51,7 +51,7 @@ org.hibernate hibernate-validator - 5.0.1.Final + ${hibernate-validator.version} @@ -59,7 +59,7 @@ com.google.guava guava - 14.0.1 + ${guava.version} @@ -121,6 +121,7 @@ org.apache.maven.plugins maven-surefire-plugin + ${maven-surefire-plugin.version} @@ -134,6 +135,7 @@ org.codehaus.cargo cargo-maven2-plugin + ${cargo-maven2-plugin.version} true @@ -159,10 +161,21 @@ 3.2.3.RELEASE + + 4.2.2.Final + 5.1.25 + 1.7.5 1.0.11 + + 5.0.1.Final + + + 14.0.1 + 3.1 + 1.3 4.11 @@ -174,6 +187,9 @@ 1.8.0 1.8.9 + + 1.4.2 + 2.14.1 \ No newline at end of file diff --git a/spring-jpa/pom.xml b/spring-jpa/pom.xml index d7c3bc3dac..e2dfda178f 100644 --- a/spring-jpa/pom.xml +++ b/spring-jpa/pom.xml @@ -1,11 +1,12 @@ 4.0.0 + org.baeldung spring-jpa 0.1-SNAPSHOT - - spring-jpa + war + spring-jpa @@ -32,12 +33,12 @@ org.hibernate hibernate-core - 4.2.1.Final + ${hibernate.version} org.hibernate hibernate-entitymanager - 4.2.1.Final + ${hibernate.version} org.javassist @@ -47,7 +48,7 @@ mysql mysql-connector-java - 5.1.25 + ${mysql-connector-java.version} runtime @@ -56,7 +57,7 @@ org.hibernate hibernate-validator - 5.0.1.Final + ${hibernate-validator.version} @@ -64,7 +65,7 @@ com.google.guava guava - 14.0.1 + ${guava.version} @@ -72,7 +73,7 @@ org.apache.commons commons-lang3 - 3.1 + ${commons-lang3.version} test @@ -126,6 +127,7 @@ org.apache.maven.plugins maven-surefire-plugin + ${maven-surefire-plugin.version} @@ -139,6 +141,7 @@ org.codehaus.cargo cargo-maven2-plugin + ${cargo-maven2-plugin.version} true @@ -162,23 +165,37 @@ - 3.2.2.RELEASE + 3.2.3.RELEASE + + + 4.2.2.Final + 5.1.25 1.7.5 1.0.11 + + 5.0.1.Final + + + 14.0.1 + 3.1 + 1.3 4.11 1.9.5 4.2.4 - 4.2.4 + 4.2.5 1.8.0 1.8.9 + + 1.4.2 + 2.14.1 \ No newline at end of file diff --git a/spring-mvc-java/pom.xml b/spring-mvc-java/pom.xml index 913aa5058c..81428ddb2e 100644 --- a/spring-mvc-java/pom.xml +++ b/spring-mvc-java/pom.xml @@ -83,6 +83,7 @@ org.apache.maven.plugins maven-surefire-plugin + ${maven-surefire-plugin.version} @@ -96,6 +97,7 @@ org.codehaus.cargo cargo-maven2-plugin + ${cargo-maven2-plugin.version} true @@ -121,10 +123,21 @@ 3.2.3.RELEASE + + 4.2.2.Final + 5.1.25 + 1.7.5 1.0.11 + + 5.0.1.Final + + + 14.0.1 + 3.1 + 1.3 4.11 @@ -136,6 +149,9 @@ 1.8.0 1.8.9 + + 1.4.2 + 2.14.1 \ No newline at end of file diff --git a/spring-mvc/.settings/org.eclipse.jdt.core.prefs b/spring-mvc/.settings/org.eclipse.jdt.core.prefs index 0924ed68cf..747acb8091 100644 --- a/spring-mvc/.settings/org.eclipse.jdt.core.prefs +++ b/spring-mvc/.settings/org.eclipse.jdt.core.prefs @@ -4,11 +4,7 @@ org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonN org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 -org.eclipse.jdt.core.compiler.compliance=1.7 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.autoboxing=ignore org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning org.eclipse.jdt.core.compiler.problem.deadCode=warning @@ -17,7 +13,6 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled org.eclipse.jdt.core.compiler.problem.discouragedReference=warning org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled @@ -88,4 +83,3 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.7 diff --git a/spring-mvc/pom.xml b/spring-mvc/pom.xml index 3700a428dd..8e8969f0fd 100644 --- a/spring-mvc/pom.xml +++ b/spring-mvc/pom.xml @@ -1,142 +1,157 @@ - - 4.0.0 - org.baeldung - spring-mvc - 0.1-SNAPSHOT + + 4.0.0 + org.baeldung + spring-mvc + 0.1-SNAPSHOT - spring-mvc - war + spring-mvc + war - + - + - - 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-mvc - - - src/main/resources - true - - + + spring-mvc + + + src/main/resources + true + + - + - - org.apache.maven.plugins - maven-surefire-plugin - - - - - - - - - + + org.apache.maven.plugins + maven-surefire-plugin + ${maven-surefire-plugin.version} + + + + + + + + + - - org.codehaus.cargo - cargo-maven2-plugin - - true - - jetty8x - embedded - - - - - - - 8082 - - - - + + org.codehaus.cargo + cargo-maven2-plugin + ${cargo-maven2-plugin.version} + + true + + jetty8x + embedded + + + + + + + 8082 + + + + - + - + - - - 3.2.2.RELEASE + + + 3.2.3.RELEASE - - 1.7.5 - 1.0.11 + + 4.2.2.Final + 5.1.25 - - 1.3 - 4.11 - 1.9.5 + + 1.7.5 + 1.0.11 - 4.2.4 - 4.2.4 + + 5.0.1.Final - 1.8.0 - 1.8.9 + + 14.0.1 + 3.1 - + + 1.3 + 4.11 + 1.9.5 + + 4.2.4 + 4.2.5 + + 1.8.0 + 1.8.9 + + + 1.4.2 + 2.14.1 + \ No newline at end of file diff --git a/spring-security-basic-auth/pom.xml b/spring-security-basic-auth/pom.xml index 9a9c7f0527..0b820e53d1 100644 --- a/spring-security-basic-auth/pom.xml +++ b/spring-security-basic-auth/pom.xml @@ -141,6 +141,7 @@ org.apache.maven.plugins maven-surefire-plugin + ${maven-surefire-plugin.version} @@ -154,6 +155,7 @@ org.codehaus.cargo cargo-maven2-plugin + ${cargo-maven2-plugin.version} true @@ -176,25 +178,38 @@ - - 3.2.3.RELEASE - 3.1.4.RELEASE + + 3.2.3.RELEASE - - 1.7.5 - 1.0.11 + + 4.2.2.Final + 5.1.25 - - 1.3 - 4.11 - 1.9.5 + + 1.7.5 + 1.0.11 - 4.2.4 - 4.2.5 + + 5.0.1.Final - 1.8.0 - 1.8.9 + + 14.0.1 + 3.1 - + + 1.3 + 4.11 + 1.9.5 + + 4.2.4 + 4.2.5 + + 1.8.0 + 1.8.9 + + + 1.4.2 + 2.14.1 + \ No newline at end of file