From 63ab70bdc9dd4faad4e65db6d966a190232e976f Mon Sep 17 00:00:00 2001 From: Peter Somogyi Date: Thu, 29 Jun 2017 15:37:22 +0200 Subject: [PATCH] HBASE-18264 Update pom plugins Update plugins in main and subprojects Unified versions to use variable instead of direct values Affected plugins: - apache-rat-plugin 0.11 -> 0.12 - asciidoctor-maven-plugin 1.5.2.1 -> 1.5.5 - asciidoctorj-pdf 1.5.0-alpha.6 -> 1.5.0-alpha.15 - build-helper-maven-plugin 1.9.1 -> 3.0.0 - buildnumber-maven-plugin 1.3 -> 1.4 - exec-maven-plugin 1.2.1/1.4.0 -> 1.6.0 - extra-enforcer-rules 1.0-beta-3 -> 1.0-beta-6 - findbugs-maven-plugin 3.0.0 -> 3.0.4 - jamon-maven-plugin 2.4.1 -> 2.4.2 - maven-bundle-plugin 2.5.3 -> 3.3.0 - maven-compiler-plugin 3.2/3.5.1 -> 3.6.1 - maven-eclipse-plugin 2.9 -> 2.10 - maven-shade-plugin 2.4.1 -> 3.0.0 - maven-surefire-plugin 2.18.1 -> 2.20 - maven-surefire-report-plugin 2.7.2 -> 2.20 - scala-maven-plugin 3.2.0 -> 3.2.2 - spotbugs 3.1.0-RC1 -> 3.1.0-RC3 - wagon-ssh 2.2 -> 2.12 - xml-maven-plugin 1.0 -> 1.0.1 - maven-assembly-plugin 2.4 -> 2.6(inherited) - maven-dependency-plugin 2.4 -> 2.10 (inherited) - maven-enforcer-plugin 1.3.1 -> 1.4.1 (inherited) - maven-javadoc-plugin 2.10.3 -> 2.10.4 (inherited) - maven-resources-plugin 2.7 (inherited) - maven-site-plugin 3.4 -> 3.5.1 (inherited) Change-Id: I84539f555be498dff18caed1e3eea1e1aeb2143a --- hbase-archetypes/hbase-archetype-builder/pom.xml | 4 +- hbase-assembly/pom.xml | 3 +- hbase-client/pom.xml | 1 - hbase-common/pom.xml | 1 - hbase-endpoint/pom.xml | 1 - hbase-examples/pom.xml | 1 - hbase-external-blockcache/pom.xml | 1 - hbase-hadoop-compat/pom.xml | 1 - hbase-hadoop2-compat/pom.xml | 3 - hbase-it/pom.xml | 3 +- hbase-prefix-tree/pom.xml | 1 - hbase-protocol-shaded/pom.xml | 10 ++- hbase-protocol/pom.xml | 1 - hbase-rest/pom.xml | 1 - hbase-rsgroup/pom.xml | 1 - hbase-server/pom.xml | 1 - hbase-shaded/pom.xml | 1 - hbase-shell/pom.xml | 1 - hbase-spark/pom.xml | 4 +- hbase-thrift/pom.xml | 4 +- pom.xml | 82 ++++++++++++++---------- 21 files changed, 59 insertions(+), 67 deletions(-) diff --git a/hbase-archetypes/hbase-archetype-builder/pom.xml b/hbase-archetypes/hbase-archetype-builder/pom.xml index 6d793742ff..39f53639e3 100644 --- a/hbase-archetypes/hbase-archetype-builder/pom.xml +++ b/hbase-archetypes/hbase-archetype-builder/pom.xml @@ -50,7 +50,6 @@ maven-resources-plugin - 2.7 @@ -246,7 +244,7 @@ org.codehaus.mojo exec-maven-plugin - 1.4.0 + ${exec.maven.version} diff --git a/hbase-assembly/pom.xml b/hbase-assembly/pom.xml index b0e6fb8400..837626b57e 100644 --- a/hbase-assembly/pom.xml +++ b/hbase-assembly/pom.xml @@ -57,7 +57,6 @@ org.apache.maven.plugins maven-remote-resources-plugin - 1.5 aggregate-licenses @@ -160,7 +159,7 @@ org.codehaus.mojo exec-maven-plugin - 1.4.0 + ${exec.maven.version} concat-NOTICE-files diff --git a/hbase-client/pom.xml b/hbase-client/pom.xml index 4c51625776..583d17b887 100644 --- a/hbase-client/pom.xml +++ b/hbase-client/pom.xml @@ -63,7 +63,6 @@ org.eclipse.m2e lifecycle-mapping - 1.0.0 diff --git a/hbase-common/pom.xml b/hbase-common/pom.xml index 6e14b02986..ae0f6923cb 100644 --- a/hbase-common/pom.xml +++ b/hbase-common/pom.xml @@ -152,7 +152,6 @@ org.eclipse.m2e lifecycle-mapping - 1.0.0 diff --git a/hbase-endpoint/pom.xml b/hbase-endpoint/pom.xml index fd16654fda..bae24334a8 100644 --- a/hbase-endpoint/pom.xml +++ b/hbase-endpoint/pom.xml @@ -65,7 +65,6 @@ org.eclipse.m2e lifecycle-mapping - 1.0.0 diff --git a/hbase-examples/pom.xml b/hbase-examples/pom.xml index 0da0f74299..b81890d5ef 100644 --- a/hbase-examples/pom.xml +++ b/hbase-examples/pom.xml @@ -69,7 +69,6 @@ org.eclipse.m2e lifecycle-mapping - 1.0.0 diff --git a/hbase-external-blockcache/pom.xml b/hbase-external-blockcache/pom.xml index 12083fed9b..e750653538 100644 --- a/hbase-external-blockcache/pom.xml +++ b/hbase-external-blockcache/pom.xml @@ -103,7 +103,6 @@ org.eclipse.m2e lifecycle-mapping - 1.0.0 diff --git a/hbase-hadoop-compat/pom.xml b/hbase-hadoop-compat/pom.xml index 121998da65..7b90d7b434 100644 --- a/hbase-hadoop-compat/pom.xml +++ b/hbase-hadoop-compat/pom.xml @@ -65,7 +65,6 @@ org.eclipse.m2e lifecycle-mapping - 1.0.0 diff --git a/hbase-hadoop2-compat/pom.xml b/hbase-hadoop2-compat/pom.xml index a905966213..e52db17f9e 100644 --- a/hbase-hadoop2-compat/pom.xml +++ b/hbase-hadoop2-compat/pom.xml @@ -50,7 +50,6 @@ limitations under the License. maven-assembly-plugin - ${maven.assembly.version} true @@ -58,7 +57,6 @@ limitations under the License. org.apache.maven.plugins maven-dependency-plugin - 2.4 create-mrapp-generated-classpath @@ -85,7 +83,6 @@ limitations under the License. org.eclipse.m2e lifecycle-mapping - 1.0.0 diff --git a/hbase-it/pom.xml b/hbase-it/pom.xml index 9bc85c8cbf..4383b2a552 100644 --- a/hbase-it/pom.xml +++ b/hbase-it/pom.xml @@ -123,7 +123,6 @@ org.eclipse.m2e lifecycle-mapping - 1.0.0 @@ -393,7 +392,7 @@ org.apache.maven.plugins maven-surefire-report-plugin - 2.7.2 + ${surefire.version} integration-tests diff --git a/hbase-prefix-tree/pom.xml b/hbase-prefix-tree/pom.xml index 4c6dc7bfe1..3d2235a9f0 100644 --- a/hbase-prefix-tree/pom.xml +++ b/hbase-prefix-tree/pom.xml @@ -62,7 +62,6 @@ org.eclipse.m2e lifecycle-mapping - 1.0.0 diff --git a/hbase-protocol-shaded/pom.xml b/hbase-protocol-shaded/pom.xml index 48c6430e81..a4ce95d80f 100644 --- a/hbase-protocol-shaded/pom.xml +++ b/hbase-protocol-shaded/pom.xml @@ -88,7 +88,6 @@ org.eclipse.m2e lifecycle-mapping - 1.0.0 @@ -244,7 +243,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.0.2 + ${maven.jar.version} ${jar.finalName} @@ -252,7 +251,7 @@ org.apache.maven.plugins maven-shade-plugin - 2.4.3 + ${maven.shade.version} package @@ -301,7 +300,6 @@ org.apache.maven.plugins maven-dependency-plugin - 2.10 unpack @@ -329,7 +327,7 @@ org.apache.maven.plugins maven-patch-plugin - 1.2 + ${maven.patch.version} ${basedir}/.. @@ -355,7 +353,7 @@ org.apache.maven.plugins maven-install-plugin - 2.5.2 + ${maven.install.version} true diff --git a/hbase-protocol/pom.xml b/hbase-protocol/pom.xml index 6fecf3878e..9e66f96f31 100644 --- a/hbase-protocol/pom.xml +++ b/hbase-protocol/pom.xml @@ -80,7 +80,6 @@ org.eclipse.m2e lifecycle-mapping - 1.0.0 diff --git a/hbase-rest/pom.xml b/hbase-rest/pom.xml index 4c98304da9..8dda9309d5 100644 --- a/hbase-rest/pom.xml +++ b/hbase-rest/pom.xml @@ -154,7 +154,6 @@ org.eclipse.m2e lifecycle-mapping - 1.0.0 diff --git a/hbase-rsgroup/pom.xml b/hbase-rsgroup/pom.xml index c8220becb1..c71638b270 100644 --- a/hbase-rsgroup/pom.xml +++ b/hbase-rsgroup/pom.xml @@ -63,7 +63,6 @@ org.eclipse.m2e lifecycle-mapping - 1.0.0 diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml index 2412c3bbb2..c060b5163d 100644 --- a/hbase-server/pom.xml +++ b/hbase-server/pom.xml @@ -277,7 +277,6 @@ org.eclipse.m2e lifecycle-mapping - 1.0.0 diff --git a/hbase-shaded/pom.xml b/hbase-shaded/pom.xml index b2f503f159..3f9a317606 100644 --- a/hbase-shaded/pom.xml +++ b/hbase-shaded/pom.xml @@ -69,7 +69,6 @@ org.apache.maven.plugins maven-remote-resources-plugin - 1.5 aggregate-licenses diff --git a/hbase-shell/pom.xml b/hbase-shell/pom.xml index d9347d255c..cfe0312bdd 100644 --- a/hbase-shell/pom.xml +++ b/hbase-shell/pom.xml @@ -153,7 +153,6 @@ org.eclipse.m2e lifecycle-mapping - 1.0.0 diff --git a/hbase-spark/pom.xml b/hbase-spark/pom.xml index b57e59a921..3920342d5b 100644 --- a/hbase-spark/pom.xml +++ b/hbase-spark/pom.xml @@ -538,7 +538,7 @@ net.alchim31.maven scala-maven-plugin - 3.2.0 + ${scala.maven.version} ${project.build.sourceEncoding} ${scala.version} @@ -568,7 +568,7 @@ org.scalatest scalatest-maven-plugin - 1.0 + ${scalatest.maven.version} ${project.build.directory}/surefire-reports . diff --git a/hbase-thrift/pom.xml b/hbase-thrift/pom.xml index b6253869bf..8336613696 100644 --- a/hbase-thrift/pom.xml +++ b/hbase-thrift/pom.xml @@ -148,7 +148,6 @@ org.eclipse.m2e lifecycle-mapping - 1.0.0 @@ -351,7 +350,6 @@ org.apache.maven.plugins maven-enforcer-plugin - 1.3.1 enforce-thrift-version @@ -384,7 +382,7 @@ org.codehaus.mojo exec-maven-plugin - 1.2.1 + ${exec.maven.version} check-thrift-version diff --git a/pom.xml b/pom.xml index 1b87973a2e..e7ed6be50f 100644 --- a/pom.xml +++ b/pom.xml @@ -529,25 +529,26 @@ kr.motd.maven os-maven-plugin - 1.5.0.Final + ${os.maven.version} + org.apache.maven.plugins maven-javadoc-plugin - ${javadoc.version} org.apache.maven.plugins maven-remote-resources-plugin - 1.5 org.apache.maven.plugins maven-shade-plugin - 2.4.1 + ${maven.shade.version} org.apache.maven.plugins @@ -569,7 +570,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.2 + ${maven.compiler.version} ${compileSource} ${compileSource} @@ -654,12 +655,12 @@ org.codehaus.mojo buildnumber-maven-plugin - 1.3 + ${buildnumber.maven.version} org.codehaus.mojo findbugs-maven-plugin - 3.0.0 + ${findbugs.maven.version} ${project.basedir}/../dev-support/findbugs-exclude.xml @@ -678,7 +679,7 @@ org.codehaus.mojo build-helper-maven-plugin - 1.9.1 + ${build.helper.maven.version} maven-antrun-plugin @@ -738,7 +739,7 @@ org.apache.maven.plugins maven-eclipse-plugin - 2.9 + ${maven.eclipse.version} org.apache.rat apache-rat-plugin - 0.11 + ${apache.rat.version} **/*.versionsBackup @@ -869,7 +870,6 @@ maven-assembly-plugin - ${maven.assembly.version} @@ -891,7 +891,7 @@ org.apache.maven.plugins maven-checkstyle-plugin - 2.17 + ${maven.checkstyle.version} org.apache.hbase @@ -933,7 +933,6 @@ org.apache.maven.plugins maven-enforcer-plugin - 1.4 org.codehaus.mojo @@ -1068,7 +1067,7 @@ org.codehaus.mojo xml-maven-plugin - 1.0 + ${xml.maven.version} false @@ -1140,14 +1139,13 @@ org.apache.maven.plugins maven-site-plugin - 3.4 false org.apache.maven.wagon wagon-ssh - 2.2 + ${wagon.ssh.version} @@ -1167,7 +1165,7 @@ org.asciidoctor asciidoctorj-pdf - 1.5.0-alpha.6 + ${asciidoctorj.pdf.version} @@ -1300,14 +1298,14 @@ org.apache.felix maven-bundle-plugin - 2.5.3 + ${maven.bundle.version} true true org.scala-tools maven-scala-plugin - 2.15.2 + ${maven.scala.version} @@ -1396,14 +1394,34 @@ 1.0.0 2.12.0 - 2.4 - 1.8 - 2.4.1 - 1.3.9-1 + 0.12 + 1.5.5 + 1.5.0-alpha.15 + 3.0.0 + 1.4 6.18 - 2.10.3 - 1.5.2.1 - 3.1.0-RC1 + 1.6.0 + 1.3.9-1 + 3.0.4 + 2.4.2 + 1.0.0 + 1.8 + 3.3.0 + 2.17 + 3.6.1 + 2.10 + 2.5.2 + 3.0.2 + 1.2 + 2.15.2 + 3.0.0 + 3.0.1 + 1.5.0.Final + 3.2.2 + 1.0 + 3.1.0-RC3 + 2.12 + 1.0.1 /usr /etc/hbase @@ -1420,7 +1438,7 @@ hbase-it-${project.version}-tests.jar hbase-annotations-${project.version}-tests.jar hbase-rsgroup-${project.version}-tests.jar - 2.18.1 + 2.20 surefire-junit47 false @@ -1449,7 +1467,7 @@ ${hbase-surefire.argLine} 0.7.5.201505241946 - 1.0-beta-3 + 1.0-beta-6 ${project.build.directory}/test-classes yyyy-MM-dd'T'HH:mm:ss'Z' @@ -3049,7 +3067,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.5.1 + ${maven.compiler.version} javac-with-errorprone true @@ -3071,7 +3089,6 @@ maven-project-info-reports-plugin - 2.7 @@ -3101,7 +3118,6 @@ org.apache.maven.plugins maven-javadoc-plugin - ${javadoc.version} @@ -3311,7 +3327,7 @@ org.apache.maven.plugins maven-checkstyle-plugin - 2.17 + ${maven.checkstyle.version} target/** hbase/checkstyle.xml -- 2.13.1