You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ratis.apache.org by sz...@apache.org on 2023/03/22 00:17:40 UTC
[ratis] branch master updated: RATIS-1820. Update apache parent pom version and other versions. (#861)
This is an automated email from the ASF dual-hosted git repository.
szetszwo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ratis.git
The following commit(s) were added to refs/heads/master by this push:
new 60962832c RATIS-1820. Update apache parent pom version and other versions. (#861)
60962832c is described below
commit 60962832c4d409d50dd1e28f653658d20c6c232c
Author: Tsz-Wo Nicholas Sze <sz...@apache.org>
AuthorDate: Wed Mar 22 08:17:34 2023 +0800
RATIS-1820. Update apache parent pom version and other versions. (#861)
---
pom.xml | 46 ++++++++++------------
ratis-assembly/pom.xml | 1 +
.../org/apache/ratis/client/DataStreamClient.java | 2 +-
.../java/org/apache/ratis/client/RaftClient.java | 2 +-
.../org/apache/ratis/protocol/RoutingTable.java | 2 +-
.../java/org/apache/ratis/retry/RetryPolicies.java | 6 +--
.../main/java/org/apache/ratis/util/ExitUtils.java | 2 +-
ratis-examples/pom.xml | 5 +++
.../examples/arithmetic/expression/Expression.java | 6 +--
ratis-test/pom.xml | 4 ++
10 files changed, 39 insertions(+), 37 deletions(-)
diff --git a/pom.xml b/pom.xml
index f00f047b0..df6975b97 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>23</version>
+ <version>25</version>
<relativePath /> <!-- resolve from repository -->
</parent>
@@ -162,6 +162,7 @@
<properties>
+ <project.build.outputTimestamp>2023-01-01T00:00:00Z</project.build.outputTimestamp>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<!-- where to find the generated LICENSE files -->
@@ -171,26 +172,26 @@
<license.bundles.dependencies>false</license.bundles.dependencies>
<!-- Maven plugin versions -->
- <maven-bundle-plugin.version>2.5.3</maven-bundle-plugin.version>
- <maven-clover2-plugin.version>3.3.0</maven-clover2-plugin.version>
- <maven-install-plugin.version>3.0.0-M1</maven-install-plugin.version>
- <maven-pdf-plugin.version>1.2</maven-pdf-plugin.version>
- <maven-stylus-skin.version>1.5</maven-stylus-skin.version>
- <maven-surefire-plugin.version>3.0.0-M1</maven-surefire-plugin.version>
- <maven-checkstyle-plugin.version>3.1.2</maven-checkstyle-plugin.version>
- <maven-assembly-plugin.version>3.4.1</maven-assembly-plugin.version>
+ <maven-bundle-plugin.version>5.1.8</maven-bundle-plugin.version>
+ <maven-checkstyle-plugin.version>3.2.1</maven-checkstyle-plugin.version>
+ <maven-clover2-plugin.version>4.0.6</maven-clover2-plugin.version>
+ <maven-pdf-plugin.version>1.6.1</maven-pdf-plugin.version>
+ <maven-surefire-plugin.version>3.0.0</maven-surefire-plugin.version>
+ <wagon-ssh.version>3.5.3</wagon-ssh.version>
- <checkstyle.version>9.3</checkstyle.version>
- <protobuf-maven-plugin.version>0.5.1</protobuf-maven-plugin.version>
- <license-maven-plugin.version>1.19</license-maven-plugin.version>
+ <!-- org.codehaus.mojo -->
+ <build-helper-maven-plugin.version>3.3.0</build-helper-maven-plugin.version>
+ <exec-maven-plugin.version>3.1.0</exec-maven-plugin.version>
+ <extra-enforcer-rules.version>1.6.1</extra-enforcer-rules.version>
+ <license-maven-plugin.version>4.1</license-maven-plugin.version>
+
+ <protobuf-maven-plugin.version>0.6.1</protobuf-maven-plugin.version>
<copy-rename-maven-plugin.version>1.0</copy-rename-maven-plugin.version>
- <build-helper-maven-plugin.version>1.9</build-helper-maven-plugin.version>
- <exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
+ <checkstyle.version>10.9.2</checkstyle.version>
<spotbugs.version>4.2.1</spotbugs.version>
<spotbugs-plugin.version>4.2.0</spotbugs-plugin.version>
- <wagon-ssh.version>1.0</wagon-ssh.version>
<distMgmtSnapshotsId>apache.snapshots.https</distMgmtSnapshotsId>
<distMgmtSnapshotsName>Apache Development Snapshot Repository</distMgmtSnapshotsName>
@@ -219,8 +220,7 @@
<!-- number of threads/forks to use when running tests in parallel, see parallel-tests profile -->
<testsThreadCount>4</testsThreadCount>
- <bouncycastle.version>1.70</bouncycastle.version>
- <slf4j.version>1.7.36</slf4j.version>
+ <slf4j.version>2.0.7</slf4j.version>
</properties>
<dependencyManagement>
@@ -415,11 +415,6 @@
<version>${slf4j.version}</version>
</dependency>
- <dependency>
- <groupId>com.beust</groupId>
- <artifactId>jcommander</artifactId>
- <version>1.72</version>
- </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -482,12 +477,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
- <version>${maven-install-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
+ <source>8</source>
<additionalJOptions>
<additionalJOption>-Xmaxwarns</additionalJOption>
<additionalJOption>10000</additionalJOption>
@@ -539,7 +534,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>${maven-assembly-plugin.version}</version>
<configuration>
<!--Defer to the ratis-assembly sub-module. It does all assembly-->
<skipAssembly>true</skipAssembly>
@@ -881,7 +875,7 @@
<goal>jar</goal>
</goals>
<configuration>
- <destDir>${project.build.directory}</destDir>
+ <outputDirectory>${project.build.directory}</outputDirectory>
</configuration>
</execution>
</executions>
@@ -926,7 +920,7 @@
<dependency>
<groupId>org.codehaus.mojo</groupId>
<artifactId>extra-enforcer-rules</artifactId>
- <version>1.0-beta-6</version>
+ <version>${extra-enforcer-rules.version}</version>
</dependency>
</dependencies>
<executions>
diff --git a/ratis-assembly/pom.xml b/ratis-assembly/pom.xml
index 73eb583e8..f0637a48d 100644
--- a/ratis-assembly/pom.xml
+++ b/ratis-assembly/pom.xml
@@ -117,6 +117,7 @@
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<!--Else will use ratis-assembly as final name.-->
diff --git a/ratis-client/src/main/java/org/apache/ratis/client/DataStreamClient.java b/ratis-client/src/main/java/org/apache/ratis/client/DataStreamClient.java
index 94b9252c8..3916725e9 100644
--- a/ratis-client/src/main/java/org/apache/ratis/client/DataStreamClient.java
+++ b/ratis-client/src/main/java/org/apache/ratis/client/DataStreamClient.java
@@ -50,7 +50,7 @@ public interface DataStreamClient extends DataStreamRpcApi, Closeable {
}
/** To build {@link DataStreamClient} objects */
- class Builder {
+ final class Builder {
private RaftPeer dataStreamServer;
private DataStreamClientRpc dataStreamClientRpc;
private RaftProperties properties;
diff --git a/ratis-client/src/main/java/org/apache/ratis/client/RaftClient.java b/ratis-client/src/main/java/org/apache/ratis/client/RaftClient.java
index 60877b33b..244a5d05f 100644
--- a/ratis-client/src/main/java/org/apache/ratis/client/RaftClient.java
+++ b/ratis-client/src/main/java/org/apache/ratis/client/RaftClient.java
@@ -89,7 +89,7 @@ public interface RaftClient extends Closeable {
}
/** To build {@link RaftClient} objects. */
- class Builder {
+ final class Builder {
private ClientId clientId;
private RaftClientRpc clientRpc;
private RaftGroup group;
diff --git a/ratis-common/src/main/java/org/apache/ratis/protocol/RoutingTable.java b/ratis-common/src/main/java/org/apache/ratis/protocol/RoutingTable.java
index d6fc1a512..0157fe49a 100644
--- a/ratis-common/src/main/java/org/apache/ratis/protocol/RoutingTable.java
+++ b/ratis-common/src/main/java/org/apache/ratis/protocol/RoutingTable.java
@@ -52,7 +52,7 @@ public interface RoutingTable {
}
/** To build a {@link RoutingTable}. */
- class Builder {
+ final class Builder {
private final AtomicReference<Map<RaftPeerId, Set<RaftPeerId>>> ref = new AtomicReference<>(new HashMap<>());
private Builder() {}
diff --git a/ratis-common/src/main/java/org/apache/ratis/retry/RetryPolicies.java b/ratis-common/src/main/java/org/apache/ratis/retry/RetryPolicies.java
index 7c22d767c..803070557 100644
--- a/ratis-common/src/main/java/org/apache/ratis/retry/RetryPolicies.java
+++ b/ratis-common/src/main/java/org/apache/ratis/retry/RetryPolicies.java
@@ -52,7 +52,7 @@ public interface RetryPolicies {
private static final NoRetry NO_RETRY = new NoRetry();
}
- class RetryForeverNoSleep implements RetryPolicy {
+ final class RetryForeverNoSleep implements RetryPolicy {
private RetryForeverNoSleep() {}
@Override
@@ -66,7 +66,7 @@ public interface RetryPolicies {
}
}
- class NoRetry implements RetryPolicy {
+ final class NoRetry implements RetryPolicy {
private NoRetry() {}
@Override
@@ -101,7 +101,7 @@ public interface RetryPolicies {
}
/** For any requests, keep retrying a limited number of attempts with a fixed sleep time between attempts. */
- class RetryLimited extends RetryForeverWithSleep {
+ final class RetryLimited extends RetryForeverWithSleep {
private final int maxAttempts;
private final Supplier<String> myString;
diff --git a/ratis-common/src/main/java/org/apache/ratis/util/ExitUtils.java b/ratis-common/src/main/java/org/apache/ratis/util/ExitUtils.java
index 2f66db6aa..2ff3464f5 100644
--- a/ratis-common/src/main/java/org/apache/ratis/util/ExitUtils.java
+++ b/ratis-common/src/main/java/org/apache/ratis/util/ExitUtils.java
@@ -40,7 +40,7 @@ public interface ExitUtils {
}
}
- class States {
+ final class States {
private static final Logger LOG = LoggerFactory.getLogger(ExitUtils.class);
private static final States INSTANCE = new States();
diff --git a/ratis-examples/pom.xml b/ratis-examples/pom.xml
index 2f4eb2c72..0fa97cf75 100644
--- a/ratis-examples/pom.xml
+++ b/ratis-examples/pom.xml
@@ -23,6 +23,10 @@
<artifactId>ratis-examples</artifactId>
<name>Apache Ratis Examples</name>
+ <properties>
+ <jcommander.version>1.82</jcommander.version>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.ratis</groupId>
@@ -100,6 +104,7 @@
<dependency>
<groupId>com.beust</groupId>
<artifactId>jcommander</artifactId>
+ <version>${jcommander.version}</version>
</dependency>
<dependency>
diff --git a/ratis-examples/src/main/java/org/apache/ratis/examples/arithmetic/expression/Expression.java b/ratis-examples/src/main/java/org/apache/ratis/examples/arithmetic/expression/Expression.java
index af7b62526..2511b1b44 100644
--- a/ratis-examples/src/main/java/org/apache/ratis/examples/arithmetic/expression/Expression.java
+++ b/ratis-examples/src/main/java/org/apache/ratis/examples/arithmetic/expression/Expression.java
@@ -44,10 +44,8 @@ public interface Expression extends Evaluable {
int length();
- class Utils {
- private Utils() {
-
- }
+ final class Utils {
+ private Utils() {}
public static Message toMessage(final Expression e) {
final byte[] buf = new byte[e.length()];
diff --git a/ratis-test/pom.xml b/ratis-test/pom.xml
index df5c1ca65..94935d845 100644
--- a/ratis-test/pom.xml
+++ b/ratis-test/pom.xml
@@ -23,6 +23,10 @@
<artifactId>ratis-test</artifactId>
<name>Apache Ratis Test</name>
+ <properties>
+ <bouncycastle.version>1.70</bouncycastle.version>
+ </properties>
+
<dependencies>
<dependency>
<artifactId>ratis-common</artifactId>