diff --git a/logback-access/pom.xml b/logback-access/pom.xml index 13df6b597a..4aa86f6fd0 100755 --- a/logback-access/pom.xml +++ b/logback-access/pom.xml @@ -99,9 +99,10 @@ org.apache.maven.plugins maven-surefire-plugin - ${surefire.version} + ${maven-surefire-plugin.version} once + plain true @@ -115,6 +116,7 @@ org.apache.maven.plugins maven-jar-plugin + ${maven-jar-plugin.version} ${project.build.outputDirectory}/META-INF/MANIFEST.MF diff --git a/logback-classic/pom.xml b/logback-classic/pom.xml index 9b12ee3c66..c88c89179c 100755 --- a/logback-classic/pom.xml +++ b/logback-classic/pom.xml @@ -196,15 +196,6 @@ - - org.apache.maven.plugins - maven-compiler-plugin - - 1.5 - 1.5 - - - org.codehaus.gmaven gmaven-plugin @@ -235,6 +226,7 @@ org.apache.maven.plugins maven-jar-plugin + ${maven-jar-plugin.version} @@ -308,10 +300,11 @@ org.apache.maven.plugins maven-surefire-plugin - ${surefire.version} + ${maven-surefire-plugin.version} once + plain false diff --git a/logback-core/pom.xml b/logback-core/pom.xml index 41d3fc7d50..cac32b23f6 100755 --- a/logback-core/pom.xml +++ b/logback-core/pom.xml @@ -87,23 +87,14 @@ - - org.apache.maven.plugins - maven-compiler-plugin - - 1.5 - 1.5 - - - org.apache.maven.plugins maven-surefire-plugin - ${surefire.version} + ${maven-surefire-plugin.version} once plain - classes + false **/All*Test.java @@ -118,6 +109,7 @@ org.apache.maven.plugins maven-jar-plugin + ${maven-jar-plugin.version} ${project.build.outputDirectory}/META-INF/MANIFEST.MF diff --git a/pom.xml b/pom.xml index f1568413da..b14fa7ac41 100755 --- a/pom.xml +++ b/pom.xml @@ -47,8 +47,9 @@ + + 1.5 UTF-8 - 2.12.4 1.7.4 @@ -61,9 +62,13 @@ 7.0.21 7.5.1.v20110908 1.8 - 2.5 - 1.9.0 + 2.3.2 + 2.3.1 + 2.14.1 + 1.9.0 + 2.5 + @@ -223,17 +228,17 @@ org.apache.maven.plugins maven-compiler-plugin - 2.3.2 + ${maven-compiler-plugin.version} - 1.5 - 1.5 + ${jdk.version} + ${jdk.version} org.apache.maven.plugins maven-surefire-plugin - 2.10 + ${maven-surefire-plugin.version} @@ -249,10 +254,11 @@ + org.apache.maven.plugins maven-jar-plugin - 2.3.1 + ${maven-jar-plugin.version} @@ -291,7 +297,7 @@ org.codehaus.mojo findbugs-maven-plugin - ${findbugs.version} + ${findbugs-maven-plugin.version} High