Merge pull request #489 from rhusar/jgroups-5.4

[3.1.x] Upgrade jgroups to 5.4.11.Final

Author: rhusar

README.adoc

@@ -16,7 +16,7 @@ The benefit is a more stable connection as well as usage of IAM server profiles
 <dependency>
     <groupId>org.jgroups.aws</groupId>
     <artifactId>jgroups-aws</artifactId>
-    <version>3.0.1.Final</version>
+    <version>3.1.0.Final</version>
 </dependency>
 ----
 
@@ -115,15 +115,12 @@ Based on standard tcp.xml with discovery replaced with aws.S3_PING.
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xmlns="urn:org:jgroups"
-        xsi:schemaLocation="urn:org:jgroups http://www.jgroups.org/schema/jgroups-5.3.xsd">
+        xsi:schemaLocation="urn:org:jgroups http://www.jgroups.org/schema/jgroups-5.4.xsd">
     <TCP bind_addr="${jgroups.bind_addr:site_local}"
          bind_port="${jgroups.bind_port:7800}"
-         external_addr="${jgroups.external_addr}"
-         external_port="${jgroups.external_port}"
          thread_pool.min_threads="0"
          thread_pool.max_threads="200"
-         thread_pool.keep_alive_time="30000"
-         diag.enabled="false"/>
+         thread_pool.keep_alive_time="30000"/>
     <NON_BLOCKING_SENDS/>
     <aws.S3_PING/>
     <MERGE3 min_interval="10s"
@@ -176,9 +173,11 @@ https://github.com/jgroups-extras/jgroups-aws/issues
 == Support Matrix
 
 |===
-|Version (branch) |JGroups version |AWS SDK
+|Version/Branch |JGroups Version |AWS SDK Version |Base JDK Version
 
-|`3.x` (`main`) |5.2.x - 5.3.x |2.x
-|`2.x` |5.2.x |1.x
-|`1.x` |4.2.x |1.x
+|`4.x`/`main` |`5.5.x`           |`2.x` |17
+|`3.1.x`      |`5.4.x`           |`2.x` |11
+|`3.0.x`      |`5.2.x` – `5.3.x` |`2.x` |11
+|`2.x`        |`5.2.x`           |`1.x` |11
+|`1.x`        |`4.2.x`           |`1.x` |8
 |===

pom.xml

@@ -21,12 +21,13 @@
         <jdk.min.version>11</jdk.min.version>
         <nexus.staging.tag>${project.groupId}-${project.version}</nexus.staging.tag>
         <!-- Temporary version bump of the nxrm3 plugin until jboss-parent catches up -->
+        <!-- https://central.sonatype.com/artifact/org.sonatype.plugins/nxrm3-maven-plugin/versions -->
         <version.nxrm3.plugin>1.0.13</version.nxrm3.plugin>
 
         <!-- https://mvnrepository.com/artifact/org.jgroups/jgroups -->
-        <jgroups.version>5.3.21.Final</jgroups.version>
+        <jgroups.version>5.4.11.Final</jgroups.version>
         <!-- https://mvnrepository.com/artifact/software.amazon.awssdk/bom -->
-        <aws.version>2.35.2</aws.version>
+        <aws.version>2.35.7</aws.version>
     </properties>
 
     <description>Discovery protocol for JGroups using AWS S3 buckets as cluster information store</description>

src/test/resources/org/jgroups/protocols/aws/tcp-NATIVE_S3_PING.xml

@@ -15,7 +15,7 @@
   -->
 
 <!--
-  Formatted copy of the original jgroups-5.3.13.Final.jar!/tcp.xml reconfigured to use NATIVE_S3_PING and disabled diagnostics.
+  Formatted copy of the original jgroups-5.4.11.Final.jar!/tcp.xml reconfigured to use NATIVE_S3_PING and disabled diagnostics.
 -->
 
 <!--
@@ -27,15 +27,12 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xmlns="urn:org:jgroups"
-        xsi:schemaLocation="urn:org:jgroups http://www.jgroups.org/schema/jgroups-5.3.xsd">
+        xsi:schemaLocation="urn:org:jgroups http://www.jgroups.org/schema/jgroups-5.4.xsd">
     <TCP bind_addr="${jgroups.bind_addr:site_local}"
          bind_port="${jgroups.bind_port:7800}"
-         external_addr="${jgroups.external_addr}"
-         external_port="${jgroups.external_port}"
          thread_pool.min_threads="0"
          thread_pool.max_threads="200"
-         thread_pool.keep_alive_time="30000"
-         diag.enabled="false"/>
+         thread_pool.keep_alive_time="30000"/>
     <NON_BLOCKING_SENDS/>
     <org.jgroups.aws.s3.NATIVE_S3_PING/>
     <MERGE3 min_interval="10s"

src/test/resources/org/jgroups/protocols/aws/tcp-S3_PING.xml

@@ -15,7 +15,7 @@
   -->
 
 <!--
-  Formatted copy of the original jgroups-5.3.13.Final.jar!/tcp.xml reconfigured to use S3_PING and disabled diagnostics.
+  Formatted copy of the original jgroups-5.4.11.Final.jar!/tcp.xml reconfigured to use S3_PING and disabled diagnostics.
 -->
 
 <!--
@@ -27,15 +27,12 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xmlns="urn:org:jgroups"
-        xsi:schemaLocation="urn:org:jgroups http://www.jgroups.org/schema/jgroups-5.3.xsd">
+        xsi:schemaLocation="urn:org:jgroups http://www.jgroups.org/schema/jgroups-5.4.xsd">
     <TCP bind_addr="${jgroups.bind_addr:site_local}"
          bind_port="${jgroups.bind_port:7800}"
-         external_addr="${jgroups.external_addr}"
-         external_port="${jgroups.external_port}"
          thread_pool.min_threads="0"
          thread_pool.max_threads="200"
-         thread_pool.keep_alive_time="30000"
-         diag.enabled="false"/>
+         thread_pool.keep_alive_time="30000"/>
     <NON_BLOCKING_SENDS/>
     <aws.S3_PING/>
     <MERGE3 min_interval="10s"