This is an automated email from the ASF dual-hosted git repository.
abstractdog pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tez.git
The following commit(s) were added to refs/heads/master by this push:
new d20f3347d TEZ-4478: Refactor dependency versions into properties in
pom. (#291) (Ayush Saxena reviewed by Laszlo Bodor)
d20f3347d is described below
commit d20f3347d166d93c1bc03de33532d60918ff320d
Author: Ayush Saxena <ayushsax...@apache.org>
AuthorDate: Tue Jun 20 11:16:40 2023 +0530
TEZ-4478: Refactor dependency versions into properties in pom. (#291)
(Ayush Saxena reviewed by Laszlo Bodor)
---
docs/pom.xml | 4 +-
pom.xml | 90 ++++++++++++++++---------
tez-api/pom.xml | 1 -
tez-dag/pom.xml | 1 -
tez-ext-service-tests/pom.xml | 1 -
tez-mapreduce/pom.xml | 1 -
tez-plugins/tez-aux-services/pom.xml | 2 +-
tez-plugins/tez-protobuf-history-plugin/pom.xml | 1 -
tez-runtime-internals/pom.xml | 1 -
tez-runtime-library/pom.xml | 1 -
10 files changed, 63 insertions(+), 40 deletions(-)
diff --git a/docs/pom.xml b/docs/pom.xml
index 405902fc7..41ad1bdef 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -467,7 +467,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>2.4</version>
+ <version>${maven-site-plugin.version}</version>
<configuration>
<outputDirectory>./target</outputDirectory>
</configuration>
@@ -488,7 +488,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>3.1.2</version>
+ <version>${maven-project-info-reports-plugin.version}</version>
<configuration>
<customBundle>${project.basedir}/src/site/custom/project-info-report.properties</customBundle>
<dependencyLocationsEnabled>false</dependencyLocationsEnabled>
diff --git a/pom.xml b/pom.xml
index b72a99835..f1da33dd1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,26 +56,51 @@
<distMgmtStagingName>Apache Release Distribution
Repository</distMgmtStagingName>
<distMgmtStagingUrl>https://repository.apache.org/service/local/staging/deploy/maven2</distMgmtStagingUrl>
+ <!--dependency versions in alphabetical order-->
+ <asynchttpclient.version>2.12.3</asynchttpclient.version>
+ <bouncycastle.version>1.70</bouncycastle.version>
+ <build-helper-maven-plugin.version>1.8</build-helper-maven-plugin.version>
+ <buildnumber-maven-plugin.version>1.1</buildnumber-maven-plugin.version>
+ <checkstyle.version>8.35</checkstyle.version>
+ <codehaus.mojo.version>1.3.2</codehaus.mojo.version>
+ <commons-cli.version>1.2</commons-cli.version>
+ <commons-codec.version>1.13</commons-codec.version>
+ <commons-collections4.version>4.1</commons-collections4.version>
+ <commons-io.version>2.8.0</commons-io.version>
+ <commons-lang.version>2.6</commons-lang.version>
<clover.license>${user.home}/clover.license</clover.license>
+ <dependency-check-maven.version>1.3.6</dependency-check-maven.version>
+ <findbugs-maven-plugin.version>3.0.5</findbugs-maven-plugin.version>
+ <frontend-maven-plugin.version>1.8.0</frontend-maven-plugin.version>
<guava.version>31.1-jre</guava.version>
<hadoop.version>3.3.4</hadoop.version>
+ <jdk.tools.version>1.8</jdk.tools.version>
+ <jersey.version>1.19</jersey.version>
+ <jettison.version>1.5.4</jettison.version>
+ <jsr305.version>3.0.0</jsr305.version>
+ <junit.version>4.13.2</junit.version>
+ <leveldbjni-all.version>1.8</leveldbjni-all.version>
+ <lifecycle-mapping.version>1.0.0</lifecycle-mapping.version>
+ <maven-checkstyle-plugin.version>3.1.1</maven-checkstyle-plugin.version>
+ <maven-enforcer-plugin.version>3.0.0</maven-enforcer-plugin.version>
+
<maven-project-info-reports-plugin.version>3.1.2</maven-project-info-reports-plugin.version>
+ <maven-shade-plugin.version>3.2.4</maven-shade-plugin.version>
+ <maven-site-plugin.version>2.4</maven-site-plugin.version>
+ <metrics-core.version>3.1.0</metrics-core.version>
+ <mockito-core.version>4.3.1</mockito-core.version>
<netty.version>4.1.72.Final</netty.version>
<pig.version>0.13.0</pig.version>
- <jersey.version>1.19</jersey.version>
- <slf4j.version>1.7.36</slf4j.version>
<protobuf.version>3.21.1</protobuf.version>
- <roaringbitmap.version>0.7.45</roaringbitmap.version>
- <bouncycastle.version>1.70</bouncycastle.version>
+ <protoc-jar-maven-plugin.version>3.11.4</protoc-jar-maven-plugin.version>
<protoc.path>${env.PROTOC_PATH}</protoc.path>
- <scm.url>scm:git:https://gitbox.apache.org/repos/asf/tez.git</scm.url>
- <frontend-maven-plugin.version>1.8.0</frontend-maven-plugin.version>
- <findbugs-maven-plugin.version>3.0.5</findbugs-maven-plugin.version>
- <maven-checkstyle-plugin.version>3.1.1</maven-checkstyle-plugin.version>
- <maven-enforcer-plugin.version>3.0.0</maven-enforcer-plugin.version>
- <checkstyle.version>8.35</checkstyle.version>
- <dependency-check-maven.version>1.3.6</dependency-check-maven.version>
<restrict-imports.enforcer.version>2.0.0</restrict-imports.enforcer.version>
+ <roaringbitmap.version>0.7.45</roaringbitmap.version>
+ <scm.url>scm:git:https://gitbox.apache.org/repos/asf/tez.git</scm.url>
+ <servlet-api.version>3.1.0</servlet-api.version>
+ <slf4j.version>1.7.36</slf4j.version>
<test.build.data>${project.build.directory}/tmp</test.build.data>
+ <wro4j-maven-plugin.version>1.7.9</wro4j-maven-plugin.version>
+
<maven.javadoc.skip>true</maven.javadoc.skip> <!-- enabled only in
relevant modules separately -->
</properties>
<scm>
@@ -232,7 +257,7 @@
<dependency>
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-core</artifactId>
- <version>3.1.0</version>
+ <version>${metrics-core.version}</version>
</dependency>
<dependency>
<groupId>org.roaringbitmap</groupId>
@@ -247,7 +272,7 @@
<dependency>
<groupId>org.asynchttpclient</groupId>
<artifactId>async-http-client</artifactId>
- <version>2.12.3</version>
+ <version>${asynchttpclient.version}</version>
<exclusions>
<exclusion>
<groupId>io.netty</groupId>
@@ -263,12 +288,12 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.8.0</version>
+ <version>${commons-io.version}</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.6</version>
+ <version>${commons-lang.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
@@ -279,12 +304,12 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
- <version>3.1.0</version>
+ <version>${servlet-api.version}</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.13</version>
+ <version>${commons-codec.version}</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
@@ -709,22 +734,22 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>4.3.1</version>
+ <version>${mockito-core.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-collections4</artifactId>
- <version>4.1</version>
+ <version>${commons-collections4.version}</version>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
- <version>1.2</version>
+ <version>${commons-cli.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.13.2</version>
+ <version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -740,12 +765,12 @@
<dependency>
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
- <version>1.5.4</version>
+ <version>${jettison.version}</version>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
- <version>3.0.0</version>
+ <version>${jsr305.version}</version>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
@@ -772,7 +797,7 @@
<dependency>
<groupId>org.fusesource.leveldbjni</groupId>
<artifactId>leveldbjni-all</artifactId>
- <version>1.8</version>
+ <version>${leveldbjni-all.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
@@ -850,7 +875,7 @@
<plugin>
<artifactId>exec-maven-plugin</artifactId>
<groupId>org.codehaus.mojo</groupId>
- <version>1.3.2</version>
+ <version>${codehaus.mojo.version}</version>
</plugin>
<plugin>
<groupId>org.apache.rat</groupId>
@@ -881,6 +906,11 @@
</excludes>
</configuration>
</plugin>
+ <plugin>
+ <groupId>com.github.os72</groupId>
+ <artifactId>protoc-jar-maven-plugin</artifactId>
+ <version>${protoc-jar-maven-plugin.version}</version>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
@@ -939,7 +969,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>1.8</version>
+ <version>${build-helper-maven-plugin.version}</version>
<executions>
<execution>
<phase>validate</phase>
@@ -953,7 +983,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
- <version>1.1</version>
+ <version>${buildnumber-maven-plugin.version}</version>
<executions>
<execution>
<phase>validate</phase>
@@ -970,7 +1000,7 @@
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
+ <version>${lifecycle-mapping.version}</version>
<configuration>
<lifecycleMappingMetadata>
<pluginExecutions>
@@ -994,7 +1024,7 @@
<plugin>
<groupId>ro.isdc.wro4j</groupId>
<artifactId>wro4j-maven-plugin</artifactId>
- <version>1.7.9</version>
+ <version>${wro4j-maven-plugin.version}</version>
<dependencies>
<!-- TODO: Remove this dependency after upgrading
wro4j-maven-plugin to 1.8.1 or later. -->
<dependency>
@@ -1292,7 +1322,7 @@
<dependency>
<groupId>jdk.tools</groupId>
<artifactId>jdk.tools</artifactId>
- <version>1.8</version>
+ <version>${jdk.tools.version}</version>
<scope>system</scope>
<systemPath>${java.home}/../lib/tools.jar</systemPath>
</dependency>
diff --git a/tez-api/pom.xml b/tez-api/pom.xml
index 523fa6ed6..891e5c985 100644
--- a/tez-api/pom.xml
+++ b/tez-api/pom.xml
@@ -152,7 +152,6 @@
<plugin>
<groupId>com.github.os72</groupId>
<artifactId>protoc-jar-maven-plugin</artifactId>
- <version>3.11.4</version>
<executions>
<execution>
<phase>generate-sources</phase>
diff --git a/tez-dag/pom.xml b/tez-dag/pom.xml
index c2baf0c0d..47e078aa6 100644
--- a/tez-dag/pom.xml
+++ b/tez-dag/pom.xml
@@ -213,7 +213,6 @@
<plugin>
<groupId>com.github.os72</groupId>
<artifactId>protoc-jar-maven-plugin</artifactId>
- <version>3.11.4</version>
<executions>
<execution>
<phase>generate-sources</phase>
diff --git a/tez-ext-service-tests/pom.xml b/tez-ext-service-tests/pom.xml
index ddf5392fa..a96be33ce 100644
--- a/tez-ext-service-tests/pom.xml
+++ b/tez-ext-service-tests/pom.xml
@@ -167,7 +167,6 @@
<plugin>
<groupId>com.github.os72</groupId>
<artifactId>protoc-jar-maven-plugin</artifactId>
- <version>3.11.4</version>
<executions>
<execution>
<phase>generate-sources</phase>
diff --git a/tez-mapreduce/pom.xml b/tez-mapreduce/pom.xml
index 7a70d5eca..9dd20a02f 100644
--- a/tez-mapreduce/pom.xml
+++ b/tez-mapreduce/pom.xml
@@ -143,7 +143,6 @@
<plugin>
<groupId>com.github.os72</groupId>
<artifactId>protoc-jar-maven-plugin</artifactId>
- <version>3.11.4</version>
<executions>
<execution>
<phase>generate-sources</phase>
diff --git a/tez-plugins/tez-aux-services/pom.xml
b/tez-plugins/tez-aux-services/pom.xml
index 32a0f2de9..54957d1cf 100644
--- a/tez-plugins/tez-aux-services/pom.xml
+++ b/tez-plugins/tez-aux-services/pom.xml
@@ -195,7 +195,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>3.2.4</version>
+ <version>${maven-shade-plugin.version}</version>
<executions>
<execution>
<phase>package</phase>
diff --git a/tez-plugins/tez-protobuf-history-plugin/pom.xml
b/tez-plugins/tez-protobuf-history-plugin/pom.xml
index 98678fd53..9283d27c5 100644
--- a/tez-plugins/tez-protobuf-history-plugin/pom.xml
+++ b/tez-plugins/tez-protobuf-history-plugin/pom.xml
@@ -61,7 +61,6 @@
<plugin>
<groupId>com.github.os72</groupId>
<artifactId>protoc-jar-maven-plugin</artifactId>
- <version>3.11.4</version>
<executions>
<execution>
<phase>generate-sources</phase>
diff --git a/tez-runtime-internals/pom.xml b/tez-runtime-internals/pom.xml
index 66090c576..4942929e0 100644
--- a/tez-runtime-internals/pom.xml
+++ b/tez-runtime-internals/pom.xml
@@ -93,7 +93,6 @@
<plugin>
<groupId>com.github.os72</groupId>
<artifactId>protoc-jar-maven-plugin</artifactId>
- <version>3.11.4</version>
<executions>
<execution>
<phase>generate-sources</phase>
diff --git a/tez-runtime-library/pom.xml b/tez-runtime-library/pom.xml
index b83ae463d..c1b40bac8 100644
--- a/tez-runtime-library/pom.xml
+++ b/tez-runtime-library/pom.xml
@@ -120,7 +120,6 @@
<plugin>
<groupId>com.github.os72</groupId>
<artifactId>protoc-jar-maven-plugin</artifactId>
- <version>3.11.4</version>
<executions>
<execution>
<phase>generate-sources</phase>
