You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ratis.apache.org by wi...@apache.org on 2025/01/10 02:08:43 UTC

(ratis) branch release-3.1.3 updated (4faadcf80 -> a84a924f4)

This is an automated email from the ASF dual-hosted git repository.

williamsong pushed a change to branch release-3.1.3
in repository https://gitbox.apache.org/repos/asf/ratis.git


 discard 4faadcf80 Change version for the version 3.1.3 -rc2
     new 24882c343 fix cherry-pick generated warnings
     new a84a924f4 Change version for the version 3.1.3 -rc2

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (4faadcf80)
            \
             N -- N -- N   refs/heads/release-3.1.3 (a84a924f4)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 pom.xml                                                                 | 2 +-
 .../src/main/java/org/apache/ratis/server/impl/RaftServerImpl.java      | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)


(ratis) 02/02: Change version for the version 3.1.3 -rc2

Posted by wi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

williamsong pushed a commit to branch release-3.1.3
in repository https://gitbox.apache.org/repos/asf/ratis.git

commit a84a924f4d698b40961b6e943b6b4f2b1258090c
Author: szywilliam <sz...@163.com>
AuthorDate: Fri Jan 10 10:06:10 2025 +0800

    Change version for the version 3.1.3 -rc2
---
 pom.xml                           | 4 ++--
 ratis-assembly/pom.xml            | 2 +-
 ratis-client/pom.xml              | 2 +-
 ratis-common/pom.xml              | 2 +-
 ratis-docs/pom.xml                | 2 +-
 ratis-examples/pom.xml            | 2 +-
 ratis-experiments/pom.xml         | 2 +-
 ratis-grpc/pom.xml                | 2 +-
 ratis-metrics-api/pom.xml         | 2 +-
 ratis-metrics-default/pom.xml     | 2 +-
 ratis-metrics-dropwizard3/pom.xml | 2 +-
 ratis-netty/pom.xml               | 2 +-
 ratis-proto/pom.xml               | 2 +-
 ratis-replicated-map/pom.xml      | 2 +-
 ratis-resource-bundle/pom.xml     | 2 +-
 ratis-server-api/pom.xml          | 2 +-
 ratis-server/pom.xml              | 2 +-
 ratis-shell/pom.xml               | 2 +-
 ratis-test/pom.xml                | 2 +-
 ratis-tools/pom.xml               | 2 +-
 20 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/pom.xml b/pom.xml
index d7019f0df..55b588cbf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
 
   <artifactId>ratis</artifactId>
   <groupId>org.apache.ratis</groupId>
-  <version>3.1.2</version>
+  <version>3.1.3</version>
   <name>Apache Ratis</name>
   <packaging>pom</packaging>
   <description>
@@ -158,7 +158,7 @@
 
 
   <properties>
-    <project.build.outputTimestamp>2024-11-04T07:06:57Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2025-01-10T02:06:09Z</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 -->
diff --git a/ratis-assembly/pom.xml b/ratis-assembly/pom.xml
index 34e6e52c5..276de0a6b 100644
--- a/ratis-assembly/pom.xml
+++ b/ratis-assembly/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <artifactId>ratis</artifactId>
     <groupId>org.apache.ratis</groupId>
-    <version>3.1.2</version>
+    <version>3.1.3</version>
   </parent>
 
   <artifactId>ratis-assembly</artifactId>
diff --git a/ratis-client/pom.xml b/ratis-client/pom.xml
index 707db06fe..9a8d228d3 100644
--- a/ratis-client/pom.xml
+++ b/ratis-client/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <artifactId>ratis</artifactId>
     <groupId>org.apache.ratis</groupId>
-    <version>3.1.2</version>
+    <version>3.1.3</version>
   </parent>
 
   <artifactId>ratis-client</artifactId>
diff --git a/ratis-common/pom.xml b/ratis-common/pom.xml
index 66af275ad..a09f44679 100644
--- a/ratis-common/pom.xml
+++ b/ratis-common/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <artifactId>ratis</artifactId>
     <groupId>org.apache.ratis</groupId>
-    <version>3.1.2</version>
+    <version>3.1.3</version>
   </parent>
 
   <artifactId>ratis-common</artifactId>
diff --git a/ratis-docs/pom.xml b/ratis-docs/pom.xml
index 578bef6c5..79f9d79b2 100644
--- a/ratis-docs/pom.xml
+++ b/ratis-docs/pom.xml
@@ -20,7 +20,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <artifactId>ratis</artifactId>
     <groupId>org.apache.ratis</groupId>
-    <version>3.1.2</version>
+    <version>3.1.3</version>
   </parent>
 
   <artifactId>ratis-docs</artifactId>
diff --git a/ratis-examples/pom.xml b/ratis-examples/pom.xml
index efd3ba67d..6b734a965 100644
--- a/ratis-examples/pom.xml
+++ b/ratis-examples/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <artifactId>ratis</artifactId>
     <groupId>org.apache.ratis</groupId>
-    <version>3.1.2</version>
+    <version>3.1.3</version>
   </parent>
 
   <artifactId>ratis-examples</artifactId>
diff --git a/ratis-experiments/pom.xml b/ratis-experiments/pom.xml
index 86ed7985f..467ff08eb 100644
--- a/ratis-experiments/pom.xml
+++ b/ratis-experiments/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <artifactId>ratis</artifactId>
     <groupId>org.apache.ratis</groupId>
-    <version>3.1.2</version>
+    <version>3.1.3</version>
   </parent>
 
   <artifactId>ratis-experiments</artifactId>
diff --git a/ratis-grpc/pom.xml b/ratis-grpc/pom.xml
index 7a8f1b6c8..536b2f70c 100644
--- a/ratis-grpc/pom.xml
+++ b/ratis-grpc/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <artifactId>ratis</artifactId>
     <groupId>org.apache.ratis</groupId>
-    <version>3.1.2</version>
+    <version>3.1.3</version>
   </parent>
 
   <artifactId>ratis-grpc</artifactId>
diff --git a/ratis-metrics-api/pom.xml b/ratis-metrics-api/pom.xml
index 2be02faa2..3f30339bd 100644
--- a/ratis-metrics-api/pom.xml
+++ b/ratis-metrics-api/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <artifactId>ratis</artifactId>
     <groupId>org.apache.ratis</groupId>
-    <version>3.1.2</version>
+    <version>3.1.3</version>
   </parent>
 
   <artifactId>ratis-metrics-api</artifactId>
diff --git a/ratis-metrics-default/pom.xml b/ratis-metrics-default/pom.xml
index 9f8bc550b..7e45f4294 100644
--- a/ratis-metrics-default/pom.xml
+++ b/ratis-metrics-default/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <artifactId>ratis</artifactId>
     <groupId>org.apache.ratis</groupId>
-    <version>3.1.2</version>
+    <version>3.1.3</version>
   </parent>
 
   <artifactId>ratis-metrics-default</artifactId>
diff --git a/ratis-metrics-dropwizard3/pom.xml b/ratis-metrics-dropwizard3/pom.xml
index bcb8a822f..d9bf14ddf 100644
--- a/ratis-metrics-dropwizard3/pom.xml
+++ b/ratis-metrics-dropwizard3/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <artifactId>ratis</artifactId>
     <groupId>org.apache.ratis</groupId>
-    <version>3.1.2</version>
+    <version>3.1.3</version>
   </parent>
 
   <artifactId>ratis-metrics-dropwizard3</artifactId>
diff --git a/ratis-netty/pom.xml b/ratis-netty/pom.xml
index 58605ca91..bbd6cbe94 100644
--- a/ratis-netty/pom.xml
+++ b/ratis-netty/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <artifactId>ratis</artifactId>
     <groupId>org.apache.ratis</groupId>
-    <version>3.1.2</version>
+    <version>3.1.3</version>
   </parent>
 
   <artifactId>ratis-netty</artifactId>
diff --git a/ratis-proto/pom.xml b/ratis-proto/pom.xml
index e6c16473e..c5fc03ac9 100644
--- a/ratis-proto/pom.xml
+++ b/ratis-proto/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <artifactId>ratis</artifactId>
     <groupId>org.apache.ratis</groupId>
-    <version>3.1.2</version>
+    <version>3.1.3</version>
   </parent>
 
   <artifactId>ratis-proto</artifactId>
diff --git a/ratis-replicated-map/pom.xml b/ratis-replicated-map/pom.xml
index b45b73574..a0c4f94c1 100644
--- a/ratis-replicated-map/pom.xml
+++ b/ratis-replicated-map/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <artifactId>ratis</artifactId>
     <groupId>org.apache.ratis</groupId>
-    <version>3.1.2</version>
+    <version>3.1.3</version>
   </parent>
 
   <artifactId>ratis-replicated-map</artifactId>
diff --git a/ratis-resource-bundle/pom.xml b/ratis-resource-bundle/pom.xml
index df59a55fd..3403fab8f 100644
--- a/ratis-resource-bundle/pom.xml
+++ b/ratis-resource-bundle/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>ratis</artifactId>
     <groupId>org.apache.ratis</groupId>
-    <version>3.1.2</version>
+    <version>3.1.3</version>
     <relativePath>..</relativePath>
   </parent>
 
diff --git a/ratis-server-api/pom.xml b/ratis-server-api/pom.xml
index ceeaeb1b2..7de592030 100644
--- a/ratis-server-api/pom.xml
+++ b/ratis-server-api/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <artifactId>ratis</artifactId>
     <groupId>org.apache.ratis</groupId>
-    <version>3.1.2</version>
+    <version>3.1.3</version>
   </parent>
 
   <artifactId>ratis-server-api</artifactId>
diff --git a/ratis-server/pom.xml b/ratis-server/pom.xml
index 70098160a..22041f0ee 100644
--- a/ratis-server/pom.xml
+++ b/ratis-server/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <artifactId>ratis</artifactId>
     <groupId>org.apache.ratis</groupId>
-    <version>3.1.2</version>
+    <version>3.1.3</version>
   </parent>
 
   <artifactId>ratis-server</artifactId>
diff --git a/ratis-shell/pom.xml b/ratis-shell/pom.xml
index 608e1e8f1..38eed1b98 100644
--- a/ratis-shell/pom.xml
+++ b/ratis-shell/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <artifactId>ratis</artifactId>
     <groupId>org.apache.ratis</groupId>
-    <version>3.1.2</version>
+    <version>3.1.3</version>
   </parent>
 
   <artifactId>ratis-shell</artifactId>
diff --git a/ratis-test/pom.xml b/ratis-test/pom.xml
index 5c0cefb25..69470bf0d 100644
--- a/ratis-test/pom.xml
+++ b/ratis-test/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <artifactId>ratis</artifactId>
     <groupId>org.apache.ratis</groupId>
-    <version>3.1.2</version>
+    <version>3.1.3</version>
   </parent>
 
   <artifactId>ratis-test</artifactId>
diff --git a/ratis-tools/pom.xml b/ratis-tools/pom.xml
index 03ca14bf4..49f36f0b7 100644
--- a/ratis-tools/pom.xml
+++ b/ratis-tools/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <artifactId>ratis</artifactId>
     <groupId>org.apache.ratis</groupId>
-    <version>3.1.2</version>
+    <version>3.1.3</version>
   </parent>
 
   <artifactId>ratis-tools</artifactId>


(ratis) 01/02: fix cherry-pick generated warnings

Posted by wi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

williamsong pushed a commit to branch release-3.1.3
in repository https://gitbox.apache.org/repos/asf/ratis.git

commit 24882c34321effa498b1c7936953ecda63e96cf3
Author: szywilliam <sz...@163.com>
AuthorDate: Fri Jan 10 10:05:09 2025 +0800

    fix cherry-pick generated warnings
---
 .../src/main/java/org/apache/ratis/server/impl/RaftServerImpl.java       | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerImpl.java b/ratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerImpl.java
index 14b09a023..02e038ef8 100644
--- a/ratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerImpl.java
+++ b/ratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerImpl.java
@@ -118,7 +118,6 @@ import java.io.IOException;
 import java.nio.file.NoSuchFileException;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Map;