diff --git a/build-tools/docker/Dockerfile b/build-tools/docker/Dockerfile index 7c3a760754..5441889d16 100644 --- a/build-tools/docker/Dockerfile +++ b/build-tools/docker/Dockerfile @@ -186,12 +186,15 @@ RUN mkdir -p /opt/spotbugs \ ENV SPOTBUGS_HOME /opt/spotbugs ###### -# Install maven +# Install Maven 3.9.14 ###### -# hadolint ignore=DL3008 -RUN apt-get -q update && apt-get -q install --no-install-recommends -y maven \ - && apt-get clean \ - && rm -rf /var/lib/apt/lists/* +RUN mkdir -p /opt/maven \ + && curl -L -s -S https://dlcdn.apache.org/maven/maven-3/3.9.14/binaries/apache-maven-3.9.14-bin.tar.gz \ + -o /opt/maven.tar.gz \ + && tar xzf /opt/maven.tar.gz --strip-components 1 -C /opt/maven \ + && ln -s /opt/maven/bin/mvn /usr/bin/mvn \ + && rm /opt/maven.tar.gz +ENV MAVEN_HOME /opt/maven ###### # Install python3 and pylint4 diff --git a/docs/pom.xml b/docs/pom.xml index dd3fcf0faa..daf8bdb462 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -467,7 +467,6 @@ org.apache.maven.plugins maven-site-plugin - ${maven-site-plugin.version} ./target @@ -488,7 +487,6 @@ org.apache.maven.plugins maven-project-info-reports-plugin - ${maven-project-info-reports-plugin.version} ${project.basedir}/src/site/custom/project-info-report.properties false diff --git a/pom.xml b/pom.xml index 8ba68f7e09..694c417da9 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ org.apache apache - 23 + 37 org.apache.tez tez @@ -30,23 +30,22 @@ The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt + https://www.apache.org/licenses/LICENSE-2.0.txt Apache Software Foundation - http://www.apache.org + https://www.apache.org - 21 - 21 + 21 + 21 true - 3.0.0-M4 false UTF-8 ${maven.build.timestamp} @@ -72,26 +71,18 @@ 3.19.0 5.9.0 3.2.0 - 3.8.1 4.9.3 4.9.3.0 2.3.0 1.15.0 32.0.1-jre 3.4.2 - 1.8 1.19.4 1.5.4 3.0.0 4.13.2 1.8 1.0.0 - 3.6.0 - 3.0.0 - 3.12.0 - 3.1.2 - 3.6.0 - 3.12.1 3.1.0 4.8.1 4.1.130.Final @@ -778,9 +769,9 @@ test - com.google.protobuf - protobuf-java - ${protobuf.version} + com.google.protobuf + protobuf-java + ${protobuf.version} com.google.guava @@ -795,7 +786,7 @@ com.sun.jersey jersey-client - ${jersey.version} + ${jersey.version} com.sun.jersey @@ -849,11 +840,6 @@ - - org.apache.maven.plugins - maven-dependency-plugin - ${dependency-maven-plugin.version} - org.apache.maven.plugins maven-jar-plugin @@ -887,9 +873,9 @@ org.apache.maven.plugins maven-javadoc-plugin - ${maven-javadoc-plugin.version} none + true @@ -975,7 +961,6 @@ org.apache.maven.plugins maven-checkstyle-plugin - ${maven-checkstyle-plugin.version} org.apache.tez @@ -1099,18 +1084,18 @@ - + ro.isdc.wro4j wro4j-maven-plugin ${wro4j-maven-plugin.version} - - - - org.mockito - mockito-core - 2.18.0 - - + + + + org.mockito + mockito-core + 2.18.0 + + @@ -1119,7 +1104,6 @@ org.apache.maven.plugins maven-enforcer-plugin - ${maven-enforcer-plugin.version} de.skuzzle.enforcer @@ -1128,22 +1112,6 @@ - - clean - - enforce - - - - - [3.6.3,) - - - [${maven.compiler.target},) - - - - banned-illegal-imports process-sources @@ -1168,34 +1136,14 @@ org.apache.rat apache-rat-plugin - - org.apache.maven.plugins - maven-deploy-plugin - - - org.apache.maven.plugins - maven-gpg-plugin - org.codehaus.mojo buildnumber-maven-plugin - - org.apache.maven.plugins - maven-jar-plugin - org.codehaus.mojo build-helper-maven-plugin - - com.github.spotbugs - spotbugs-maven-plugin - - ${basedir}/findbugs-exclude.xml - false - - com.diffplug.spotless spotless-maven-plugin @@ -1210,39 +1158,19 @@ - - org.owasp - dependency-check-maven - - + org.owasp + dependency-check-maven + + - - sign - - - - org.apache.maven.plugins - maven-gpg-plugin - - - sign-artifacts - verify - - sign - - - - - - - jacoco @@ -1302,47 +1230,6 @@ - - sources - - - - org.apache.maven.plugins - maven-source-plugin - - - attach-sources - - jar - - - - - - - - - javadoc - - - - org.apache.maven.plugins - maven-javadoc-plugin - - true - - - - attach-javadocs - - jar - - - - - - - test-patch @@ -1364,21 +1251,6 @@ - - jdk1.8 - - 1.8 - - - - jdk.tools - jdk.tools - ${jdk.tools.version} - system - ${java.home}/../lib/tools.jar - - - diff --git a/tez-dag/pom.xml b/tez-dag/pom.xml index 908b281b68..22f17a2364 100644 --- a/tez-dag/pom.xml +++ b/tez-dag/pom.xml @@ -193,10 +193,10 @@ generate-sources generate-sources - + - + run diff --git a/tez-ext-service-tests/pom.xml b/tez-ext-service-tests/pom.xml index 0231a7a0d9..ef1d8c29d1 100644 --- a/tez-ext-service-tests/pom.xml +++ b/tez-ext-service-tests/pom.xml @@ -142,10 +142,10 @@ generate-sources generate-sources - + - + run diff --git a/tez-plugins/tez-aux-services/pom.xml b/tez-plugins/tez-aux-services/pom.xml index 79960241ea..d935d8ef74 100644 --- a/tez-plugins/tez-aux-services/pom.xml +++ b/tez-plugins/tez-aux-services/pom.xml @@ -195,7 +195,6 @@ org.apache.maven.plugins maven-shade-plugin - ${maven-shade-plugin.version} package diff --git a/tez-tests/pom.xml b/tez-tests/pom.xml index cf76bdd3bd..46016d383f 100644 --- a/tez-tests/pom.xml +++ b/tez-tests/pom.xml @@ -141,10 +141,10 @@ generate-sources generate-sources - + - + run