This is an automated email from the ASF dual-hosted git repository.
msingh pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ratis-thirdparty.git
The following commit(s) were added to refs/heads/master by this push:
new 3a613f8 RATIS-1073. Move all version declarations to root pom (#10)
3a613f8 is described below
commit 3a613f8fddaf15ef33187a43a5046e0e63274e66
Author: Kevin Risden <[email protected]>
AuthorDate: Sat Sep 26 05:39:07 2020 -0400
RATIS-1073. Move all version declarations to root pom (#10)
---
misc/pom.xml | 14 ++-----------
pom.xml | 66 +++++++++++++++++++++++++++++++++++++++++++++++++-----------
test/pom.xml | 13 ++++--------
3 files changed, 60 insertions(+), 33 deletions(-)
diff --git a/misc/pom.xml b/misc/pom.xml
index ae21606..1fcfaed 100644
--- a/misc/pom.xml
+++ b/misc/pom.xml
@@ -27,42 +27,34 @@
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
- <version>${shaded.protobuf.version}</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-netty</artifactId>
- <version>${shaded.grpc.version}</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
- <version>${shaded.grpc.version}</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-stub</artifactId>
- <version>${shaded.grpc.version}</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-context</artifactId>
- <version>${shaded.grpc.version}</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>${guava.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
- <version>${shaded.netty.version}</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
- <version>2.8.2</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
@@ -71,12 +63,10 @@
<dependency>
<groupId>io.opencensus</groupId>
<artifactId>opencensus-api</artifactId>
- <version>${io.opencensus.version}</version>
</dependency>
<dependency>
<groupId>io.opencensus</groupId>
<artifactId>opencensus-contrib-grpc-metrics</artifactId>
- <version>${io.opencensus.version}</version>
</dependency>
</dependencies>
@@ -208,7 +198,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>3.0.2</version>
+ <version>${maven-dependency-plugin.version}</version>
<executions>
<execution>
<id>unpack-dependencies</id>
@@ -231,7 +221,7 @@
<plugin>
<groupId>com.coderplus.maven.plugins</groupId>
<artifactId>copy-rename-maven-plugin</artifactId>
- <version>1.0</version>
+ <version>${copy-rename-maven-plugin.version}</version>
<executions>
<execution>
<id>rename-file</id>
diff --git a/pom.xml b/pom.xml
index 68183f6..21f2090 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,11 +52,15 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<!-- Maven plugin versions -->
+ <copy-rename-maven-plugin.version>1.0</copy-rename-maven-plugin.version>
+ <exec-maven-plugin.version>1.3.1</exec-maven-plugin.version>
<maven-bundle-plugin.version>2.5.3</maven-bundle-plugin.version>
<maven-checkstyle-plugin.version>2.15</maven-checkstyle-plugin.version>
+ <maven-dependency-plugin.version>3.0.2</maven-dependency-plugin.version>
<maven-javadoc-plugin.version>3.0.1</maven-javadoc-plugin.version>
- <exec-maven-plugin.version>1.3.1</exec-maven-plugin.version>
+ <maven-replacer-plugin.version>1.5.3</maven-replacer-plugin.version>
<native-maven-plugin.version>1.0-alpha-8</native-maven-plugin.version>
+ <os-maven-plugin.version>1.5.0.Final</os-maven-plugin.version>
<!-- define the Java language version used by the compiler -->
<maven.compiler.source>1.8</maven.compiler.source>
@@ -74,19 +78,39 @@
<!--Version of tcnative to be shaded -->
<shaded.netty.tcnative.version>2.0.28.Final</shaded.netty.tcnative.version>
+ <!-- third party library versions -->
+ <commons-lang3.version>3.8.1</commons-lang3.version>
+ <gson.version>2.8.2</gson.version>
+ <guava.version>28.2-jre</guava.version>
<io.opencensus.version>0.21.0</io.opencensus.version>
+ <junit.version>4.13</junit.version>
+ <log4j.version>1.2.17</log4j.version>
+ <slf4j.version>1.7.30</slf4j.version>
+
<ratis.thirdparty.shaded.prefix>org.apache.ratis.thirdparty</ratis.thirdparty.shaded.prefix>
<ratis.thirdparty.shaded.native.prefix>org_apache_ratis_thirdparty_</ratis.thirdparty.shaded.native.prefix>
- <guava.version>28.2-jre</guava.version>
</properties>
<dependencyManagement>
<dependencies>
+ <!-- Project dependencies -->
<dependency>
<groupId>org.apache.ratis</groupId>
<artifactId>ratis-thirdparty-misc</artifactId>
<version>${project.version}</version>
</dependency>
+
+ <!-- Third party dependencies - alphabetically by group -->
+ <dependency>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ <version>${gson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>${guava.version}</version>
+ </dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
@@ -113,11 +137,6 @@
<version>${shaded.grpc.version}</version>
</dependency>
<dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>${guava.version}</version>
- </dependency>
- <dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
<version>${shaded.netty.version}</version>
@@ -128,11 +147,6 @@
<version>${shaded.netty.tcnative.version}</version>
</dependency>
<dependency>
- <groupId>com.google.code.gson</groupId>
- <artifactId>gson</artifactId>
- <version>2.8.2</version>
- </dependency>
- <dependency>
<groupId>io.opencensus</groupId>
<artifactId>opencensus-api</artifactId>
<version>${io.opencensus.version}</version>
@@ -142,6 +156,34 @@
<artifactId>opencensus-contrib-grpc-metrics</artifactId>
<version>${io.opencensus.version}</version>
</dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>${log4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>${commons-lang3.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+
+ <!-- Test only dependencies -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</dependencyManagement>
diff --git a/test/pom.xml b/test/pom.xml
index 3b944f7..f13af35 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -20,7 +20,6 @@
<artifactId>ratis-thirdparty</artifactId>
<version>0.6.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.ratis</groupId>
<artifactId>ratis-thirdparty-test</artifactId>
<name>Apache Ratis Thirdparty Test</name>
<packaging>jar</packaging>
@@ -35,23 +34,19 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.11</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.7.25</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.7.25</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>3.8.1</version>
</dependency>
</dependencies>
@@ -60,7 +55,7 @@
<extension>
<groupId>kr.motd.maven</groupId>
<artifactId>os-maven-plugin</artifactId>
- <version>1.5.0.Final</version>
+ <version>${os-maven-plugin.version}</version>
</extension>
</extensions>
<plugins>
@@ -94,7 +89,7 @@
<plugin>
<groupId>com.google.code.maven-replacer-plugin</groupId>
<artifactId>replacer</artifactId>
- <version>1.5.3</version>
+ <version>${maven-replacer-plugin.version}</version>
<executions>
<execution>
<phase>process-sources</phase>
@@ -124,8 +119,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>8</source>
- <target>8</target>
+ <source>${maven.compiler.source}</source>
+ <target>${maven.compiler.target}</target>
</configuration>
</plugin>
<plugin>
