diff --git a/agent-it/pom.xml b/agent-it/pom.xml index 546717b552d6..8ce57ad3f3ec 100644 --- a/agent-it/pom.xml +++ b/agent-it/pom.xml @@ -321,7 +321,7 @@ org.apache.maven.plugins maven-surefire-plugin - ${plugin.surefire.verison} + ${plugin.surefire.version} true @@ -329,7 +329,7 @@ org.apache.maven.plugins maven-failsafe-plugin - ${plugin.failsafe.verison} + ${plugin.failsafe.version} ${env.JAVA_8_HOME}/bin/java diff --git a/agent/pom.xml b/agent/pom.xml index 41c70f687685..0d3f9033311f 100644 --- a/agent/pom.xml +++ b/agent/pom.xml @@ -99,7 +99,7 @@ org.apache.maven.plugins maven-assembly-plugin - 3.1.0 + ${plugin.assembly.version} src/assembly/distribution.xml diff --git a/agent/src/assembly/distribution.xml b/agent/src/assembly/distribution.xml index 2cb8ae0e28b8..387578aae664 100644 --- a/agent/src/assembly/distribution.xml +++ b/agent/src/assembly/distribution.xml @@ -27,7 +27,7 @@ ${basedir}/src/main/resources-${env} - + ./ diff --git a/bootstrap-java9/pom.xml b/bootstrap-java9/pom.xml index dc7c08c5d8df..028e02e037da 100644 --- a/bootstrap-java9/pom.xml +++ b/bootstrap-java9/pom.xml @@ -75,7 +75,7 @@ org.openclover clover - 4.2.1 + ${plugin.clover.version} test @@ -124,7 +124,7 @@ org.codehaus.mojo animal-sniffer-maven-plugin - 1.16 + ${plugin.animal-sniffer.version} true @@ -133,7 +133,7 @@ org.apache.maven.plugins maven-surefire-plugin - 2.21.0 + ${plugin.surefire.version} **/Mock* @@ -159,7 +159,7 @@ - 4.2.1 + ${plugin.clover.version} true diff --git a/flink/pom.xml b/flink/pom.xml index 9afebeb7a2c0..3eb79256a3c5 100644 --- a/flink/pom.xml +++ b/flink/pom.xml @@ -1,12 +1,12 @@ + 4.0.0 @@ -62,7 +78,7 @@ org.apache.maven.plugins maven-shade-plugin - 3.1.1 + ${plugin.shade.version} package diff --git a/plugins/weblogic/pom.xml b/plugins/weblogic/pom.xml index da168ea62721..a71112dd1625 100644 --- a/plugins/weblogic/pom.xml +++ b/plugins/weblogic/pom.xml @@ -81,7 +81,7 @@ org.apache.maven.plugins maven-shade-plugin - 3.1.1 + ${plugin.shade.version} package diff --git a/plugins/websphere/pom.xml b/plugins/websphere/pom.xml index 9e358ac90293..26d202f61348 100644 --- a/plugins/websphere/pom.xml +++ b/plugins/websphere/pom.xml @@ -1,3 +1,19 @@ + + 4.0.0 @@ -62,7 +78,7 @@ org.apache.maven.plugins maven-shade-plugin - 3.1.1 + ${plugin.shade.version} package diff --git a/pom.xml b/pom.xml index afb17aa82cf5..a44459d315ad 100644 --- a/pom.xml +++ b/pom.xml @@ -102,10 +102,23 @@ java16 6.1 - 2.22.0 - 2.22.0 + + 3.8.0 + 3.1.0 + 2.22.0 + 2.22.0 + 3.1.1 + 3.1.0 + 3.2.2 + 3.1.0 + - 4.2.1 + 4.2.1 + 3.1.3 + 3.10.0 + + 3.0.0-M2 + 1.16 @@ -681,12 +694,14 @@ ${basedir}/src/test/resources + + org.apache.maven.plugins maven-war-plugin - 3.2.0 + ${plugin.war.version} true classes @@ -696,15 +711,17 @@ org.apache.maven.plugins maven-jar-plugin - 3.0.0 + ${plugin.jar.version} + + org.apache.maven.plugins maven-resources-plugin - 3.0.2 + ${plugin.resources.version} ${encoding} @@ -712,7 +729,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.7.0 + ${plugin.compiler.version} ${jdk.version} ${jdk.version} @@ -728,7 +745,7 @@ org.apache.maven.plugins maven-surefire-plugin - ${plugin.surefire.verison} + ${plugin.surefire.version} **/Mock* @@ -744,7 +761,7 @@ org.openclover clover-maven-plugin - ${plugin.clover.verison} + ${plugin.clover.version} ${encoding} ${jdk.version} @@ -773,15 +790,15 @@ com.github.spotbugs spotbugs-maven-plugin - 3.1.3 + ${plugin.spotbugs.version} - spotbugs-exclude.xml + ${maven.multiModuleProjectDirectory}/spotbugs-exclude.xml org.apache.maven.plugins maven-enforcer-plugin - 1.4.1 + ${plugin.enforcer.version} enforce-pinpoint-build-requirements @@ -792,7 +809,7 @@ - 3.2 + 3.5 1.8 @@ -821,7 +838,7 @@ org.apache.maven.plugins maven-pmd-plugin - 3.9.0 + ${plugin.pmd.version} true ${encoding} @@ -864,7 +881,7 @@ org.codehaus.mojo animal-sniffer-maven-plugin - 1.16 + ${plugin.animal-sniffer.version} org.codehaus.mojo.signature @@ -885,38 +902,31 @@ + + + org.apache.maven.plugins + maven-site-plugin + 3.7.1 + - - org.apache.maven.plugins - maven-jxr-plugin - false - - true - ${encoding} - ${encoding} - Pinpoint ${project.version} Cross Reference - Pinpoint ${project.version} Cross Reference - - 2.5 - com.github.spotbugs spotbugs-maven-plugin + ${plugin.spotbugs.version} - spotbugs-exclude.xml + ${maven.multiModuleProjectDirectory}/spotbugs-exclude.xml true ${project.build.directory}/spotbugs - 3.1.3 org.apache.maven.plugins maven-pmd-plugin - 3.9.0 + ${plugin.pmd.version} true ${encoding} @@ -935,7 +945,7 @@ org.openclover clover-maven-plugin - ${plugin.clover.verison} + ${plugin.clover.version} true @@ -957,6 +967,26 @@ + + + + org.apache.maven.plugins + maven-site-plugin + 3.7.1 + + + org.apache.maven.plugins + maven-jxr-plugin + 2.5 + false + + true + ${encoding} + ${encoding} + Pinpoint ${project.version} Cross Reference + Pinpoint ${project.version} Cross Reference + + diff --git a/profiler-optional/pom.xml b/profiler-optional/pom.xml index 05774ac8d472..4094e321c040 100644 --- a/profiler-optional/pom.xml +++ b/profiler-optional/pom.xml @@ -1,3 +1,19 @@ + + 4.0.0 @@ -47,7 +63,7 @@ org.codehaus.mojo animal-sniffer-maven-plugin - 1.16 + ${plugin.animal-sniffer.version} true diff --git a/profiler-optional/profiler-optional-jdk7/pom.xml b/profiler-optional/profiler-optional-jdk7/pom.xml index cb94ed042a96..220ceb3f5cfa 100644 --- a/profiler-optional/profiler-optional-jdk7/pom.xml +++ b/profiler-optional/profiler-optional-jdk7/pom.xml @@ -1,4 +1,20 @@ + + @@ -58,7 +74,7 @@ org.codehaus.mojo animal-sniffer-maven-plugin - 1.16 + ${plugin.animal-sniffer.version} org.codehaus.mojo.signature diff --git a/profiler-optional/profiler-optional-jdk8/pom.xml b/profiler-optional/profiler-optional-jdk8/pom.xml index 6e84064680d9..fc9fbea2d94d 100644 --- a/profiler-optional/profiler-optional-jdk8/pom.xml +++ b/profiler-optional/profiler-optional-jdk8/pom.xml @@ -60,7 +60,7 @@ org.apache.maven.plugins maven-failsafe-plugin - ${plugin.failsafe.verison} + ${plugin.failsafe.version} diff --git a/profiler-optional/profiler-optional-jdk9/pom.xml b/profiler-optional/profiler-optional-jdk9/pom.xml index 41e9d4581054..95464b826df8 100644 --- a/profiler-optional/profiler-optional-jdk9/pom.xml +++ b/profiler-optional/profiler-optional-jdk9/pom.xml @@ -72,7 +72,7 @@ org.codehaus.mojo animal-sniffer-maven-plugin - 1.16 + ${plugin.animal-sniffer.version} true @@ -101,7 +101,7 @@ org.apache.maven.plugins maven-surefire-plugin - ${plugin.surefire.verison} + ${plugin.surefire.version} **/Mock* @@ -126,7 +126,7 @@ - ${plugin.clover.verison} + ${plugin.clover.version} true diff --git a/quickstart/testapp/pom.xml b/quickstart/testapp/pom.xml index 06c39cc196a0..5adf6909866e 100644 --- a/quickstart/testapp/pom.xml +++ b/quickstart/testapp/pom.xml @@ -1,3 +1,19 @@ + + 4.0.0 @@ -149,7 +165,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.5.1 + 3.8.0 ${jdk.version} ${jdk.version} @@ -162,7 +178,7 @@ org.apache.maven.plugins maven-war-plugin - 2.4 + 3.2.2 ${basedir}/target/deploy diff --git a/rpc/pom.xml b/rpc/pom.xml index 17fa003d9490..84454908f062 100644 --- a/rpc/pom.xml +++ b/rpc/pom.xml @@ -1,4 +1,20 @@ + + @@ -71,7 +87,7 @@ org.apache.maven.plugins maven-jar-plugin - 2.4 + ${plugin.jar.version} diff --git a/web/pom.xml b/web/pom.xml index 5da9e0b31f48..56207ed82693 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -394,7 +394,7 @@ com.github.eirslett frontend-maven-plugin - 1.0 + 1.6 ${basedir}/target ${basedir}/target/main/webapp