Skip to content

Commit

Permalink
TEZ-4478: Refactor dependency versions into properties in pom.
Browse files Browse the repository at this point in the history
Change-Id: Iefa56a3defaad073f439ce30b980853c3a8ce54f
  • Loading branch information
ayushtkn committed Jun 19, 2023
1 parent 86b1199 commit 7d3c517
Show file tree
Hide file tree
Showing 10 changed files with 62 additions and 40 deletions.
4 changes: 2 additions & 2 deletions docs/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
89 changes: 59 additions & 30 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -56,26 +56,50 @@
<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>
</properties>
<scm>
<connection>${scm.url}</connection>
Expand Down Expand Up @@ -231,7 +255,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>
Expand All @@ -246,7 +270,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>
Expand All @@ -262,12 +286,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>
Expand All @@ -278,12 +302,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>
Expand Down Expand Up @@ -708,22 +732,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>
Expand All @@ -739,12 +763,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>
Expand All @@ -771,7 +795,7 @@
<dependency>
<groupId>org.fusesource.leveldbjni</groupId>
<artifactId>leveldbjni-all</artifactId>
<version>1.8</version>
<version>${leveldbjni-all.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
Expand Down Expand Up @@ -849,7 +873,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>
Expand Down Expand Up @@ -880,6 +904,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>
Expand Down Expand Up @@ -938,7 +967,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>
Expand All @@ -952,7 +981,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>
Expand All @@ -969,7 +998,7 @@
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
<version>1.0.0</version>
<version>${lifecycle-mapping.version}</version>
<configuration>
<lifecycleMappingMetadata>
<pluginExecutions>
Expand All @@ -993,7 +1022,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>
Expand Down Expand Up @@ -1291,7 +1320,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>
Expand Down
1 change: 0 additions & 1 deletion tez-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,6 @@
<plugin>
<groupId>com.github.os72</groupId>
<artifactId>protoc-jar-maven-plugin</artifactId>
<version>3.11.4</version>
<executions>
<execution>
<phase>generate-sources</phase>
Expand Down
1 change: 0 additions & 1 deletion tez-dag/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 0 additions & 1 deletion tez-ext-service-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 0 additions & 1 deletion tez-mapreduce/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,6 @@
<plugin>
<groupId>com.github.os72</groupId>
<artifactId>protoc-jar-maven-plugin</artifactId>
<version>3.11.4</version>
<executions>
<execution>
<phase>generate-sources</phase>
Expand Down
2 changes: 1 addition & 1 deletion tez-plugins/tez-aux-services/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 0 additions & 1 deletion tez-plugins/tez-protobuf-history-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 0 additions & 1 deletion tez-runtime-internals/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 0 additions & 1 deletion tez-runtime-library/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,6 @@
<plugin>
<groupId>com.github.os72</groupId>
<artifactId>protoc-jar-maven-plugin</artifactId>
<version>3.11.4</version>
<executions>
<execution>
<phase>generate-sources</phase>
Expand Down

0 comments on commit 7d3c517

Please sign in to comment.