[Java] Upgrade to Aeron 1.47.0, Agrona 2.0.1 and SBE 1.34.1.

aeron-io · Jan 20, 2025 · 99e40f5 · 99e40f5
1 parent 3424c6f
commit 99e40f5
Show file tree

Hide file tree

Showing 50 changed files with 207 additions and 64 deletions.
diff --git a/aeron-core/build.gradle.kts b/aeron-core/build.gradle.kts
@@ -12,7 +12,7 @@ dependencies {
     "codecGeneration"(libs.sbe)
     checkstyle(libs.checkstyle)
     implementation(libs.agrona)
-    implementation(libs.aeron)
+    implementation(libs.aeron.archive)
     implementation(libs.slf4j)
     implementation(libs.logback)
     testImplementation(libs.bundles.testing)
@@ -33,6 +33,7 @@ tasks {
         inputs.files(codecsFile, sbeFile)
         outputs.dir(generatedDir)
         classpath = codecGeneration
+        jvmArgs("--add-opens", "java.base/jdk.internal.misc=ALL-UNNAMED")
         mainClass.set("uk.co.real_logic.sbe.SbeTool")
         args = listOf(codecsFile)
         systemProperties["sbe.output.dir"] = generatedDir
@@ -54,6 +55,16 @@ testing {
         val test by getting(JvmTestSuite::class) {
             // Use JUnit Jupiter test framework
             useJUnitJupiter(libs.versions.junitVersion.get())
+
+            targets {
+                all {
+                    testTask {
+                        jvmArgs(
+                            "--add-opens", "java.base/jdk.internal.misc=ALL-UNNAMED",
+                            "--add-opens", "java.base/java.util.zip=ALL-UNNAMED")
+                    }
+                }
+            }
         }
     }
 }
diff --git a/aeron-mdc/aeron-mdc-publisher/build.gradle.kts b/aeron-mdc/aeron-mdc-publisher/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
 dependencies {
     checkstyle(libs.checkstyle)
     implementation(libs.agrona)
-    implementation(libs.aeron)
+    implementation(libs.aeron.archive)
     implementation(libs.slf4j)
     implementation(libs.logback)
     testImplementation(libs.bundles.testing)
@@ -38,6 +38,16 @@ testing {
         val test by getting(JvmTestSuite::class) {
             // Use JUnit Jupiter test framework
             useJUnitJupiter(libs.versions.junitVersion.get())
+
+            targets {
+                all {
+                    testTask {
+                        jvmArgs(
+                            "--add-opens", "java.base/jdk.internal.misc=ALL-UNNAMED",
+                            "--add-opens", "java.base/java.util.zip=ALL-UNNAMED")
+                    }
+                }
+            }
         }
     }
 }
diff --git a/aeron-mdc/aeron-mdc-publisher/entrypoint.sh b/aeron-mdc/aeron-mdc-publisher/entrypoint.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-java --add-opens java.base/sun.nio.ch=ALL-UNNAMED \
-  -javaagent:/root/aeron/aeron-agent-1.42.0.jar \
+java --add-opens java.base/jdk.internal.misc=ALL-UNNAMED --add-opens java.base/java.util.zip=ALL-UNNAMED \
+  -javaagent:/root/aeron/aeron-agent-1.47.0.jar \
   -Djava.net.preferIPv4Stack=true \
   -Daeron.event.log=admin \
   -jar /root/jar/aeron-mdc-publisher-uber.jar
diff --git a/aeron-mdc/aeron-mdc-publisher/setup-docker.sh b/aeron-mdc/aeron-mdc-publisher/setup-docker.sh
@@ -21,7 +21,7 @@ apt-get install \
 mkdir /root/aeron
 mkdir /root/jar
 
-wget https://repo1.maven.org/maven2/io/aeron/aeron-all/1.46.7/aeron-all-1.46.7.jar -P /root/aeron/
-wget https://repo1.maven.org/maven2/io/aeron/aeron-agent/1.46.7/aeron-agent-1.46.7.jar -P /root/aeron/
+wget https://repo1.maven.org/maven2/io/aeron/aeron-all/1.47.0/aeron-all-1.47.0.jar -P /root/aeron/
+wget https://repo1.maven.org/maven2/io/aeron/aeron-agent/1.47.0/aeron-agent-1.47.0.jar -P /root/aeron/
 
 apt-get remove wget --quiet --assume-yes
diff --git a/aeron-mdc/aeron-mdc-subscriber/build.gradle.kts b/aeron-mdc/aeron-mdc-subscriber/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
 dependencies {
     checkstyle(libs.checkstyle)
     implementation(libs.agrona)
-    implementation(libs.aeron)
+    implementation(libs.aeron.archive)
     implementation(libs.slf4j)
     implementation(libs.logback)
     testImplementation(libs.bundles.testing)
@@ -37,6 +37,16 @@ testing {
         val test by getting(JvmTestSuite::class) {
             // Use JUnit Jupiter test framework
             useJUnitJupiter(libs.versions.junitVersion.get())
+
+            targets {
+                all {
+                    testTask {
+                        jvmArgs(
+                            "--add-opens", "java.base/jdk.internal.misc=ALL-UNNAMED",
+                            "--add-opens", "java.base/java.util.zip=ALL-UNNAMED")
+                    }
+                }
+            }
         }
     }
 }
diff --git a/aeron-mdc/aeron-mdc-subscriber/entrypoint.sh b/aeron-mdc/aeron-mdc-subscriber/entrypoint.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-java --add-opens java.base/sun.nio.ch=ALL-UNNAMED \
-  -javaagent:/root/aeron/aeron-agent-1.42.0.jar \
+java --add-opens java.base/jdk.internal.misc=ALL-UNNAMED --add-opens java.base/java.util.zip=ALL-UNNAMED \
+  -javaagent:/root/aeron/aeron-agent-1.47.0.jar \
   -Djava.net.preferIPv4Stack=true \
   -Daeron.event.log=admin \
   -jar /root/jar/aeron-mdc-subscriber-uber.jar
diff --git a/aeron-mdc/aeron-mdc-subscriber/setup-docker.sh b/aeron-mdc/aeron-mdc-subscriber/setup-docker.sh
@@ -21,7 +21,7 @@ apt-get install \
 mkdir /root/aeron
 mkdir /root/jar
 
-wget https://repo1.maven.org/maven2/io/aeron/aeron-all/1.46.7/aeron-all-1.46.7.jar -P /root/aeron/
-wget https://repo1.maven.org/maven2/io/aeron/aeron-agent/1.46.7/aeron-agent-1.46.7.jar -P /root/aeron/
+wget https://repo1.maven.org/maven2/io/aeron/aeron-all/1.47.0/aeron-all-1.47.0.jar -P /root/aeron/
+wget https://repo1.maven.org/maven2/io/aeron/aeron-agent/1.47.0/aeron-agent-1.47.0.jar -P /root/aeron/
 
 apt-get remove wget --quiet --assume-yes
diff --git a/agrona/build.gradle.kts b/agrona/build.gradle.kts
@@ -1,4 +1,3 @@
-
 plugins {
     application
     checkstyle
@@ -19,6 +18,14 @@ testing {
         val test by getting(JvmTestSuite::class) {
             // Use JUnit Jupiter test framework
             useJUnitJupiter(libs.versions.junitVersion.get())
+
+            targets {
+                all {
+                    testTask {
+                        jvmArgs("--add-opens", "java.base/jdk.internal.misc=ALL-UNNAMED")
+                    }
+                }
+            }
         }
     }
 }
diff --git a/archive-core/build.gradle.kts b/archive-core/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
 dependencies {
     checkstyle(libs.checkstyle)
     implementation(libs.agrona)
-    implementation(libs.aeron)
+    implementation(libs.aeron.archive)
     implementation(libs.slf4j)
     implementation(libs.logback)
     testImplementation(libs.bundles.testing)
@@ -20,6 +20,16 @@ testing {
         val test by getting(JvmTestSuite::class) {
             // Use JUnit Jupiter test framework
             useJUnitJupiter(libs.versions.junitVersion.get())
+
+            targets {
+                all {
+                    testTask {
+                        jvmArgs(
+                            "--add-opens", "java.base/jdk.internal.misc=ALL-UNNAMED",
+                            "--add-opens", "java.base/java.util.zip=ALL-UNNAMED")
+                    }
+                }
+            }
         }
     }
 }
diff --git a/archive-multi-host/archive-client/build.gradle.kts b/archive-multi-host/archive-client/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
 dependencies {
     checkstyle(libs.checkstyle)
     implementation(libs.agrona)
-    implementation(libs.aeron)
+    implementation(libs.aeron.archive)
     implementation(libs.slf4j)
     implementation(libs.logback)
     testImplementation(libs.bundles.testing)
@@ -38,6 +38,16 @@ testing {
         val test by getting(JvmTestSuite::class) {
             // Use JUnit Jupiter test framework
             useJUnitJupiter(libs.versions.junitVersion.get())
+
+            targets {
+                all {
+                    testTask {
+                        jvmArgs(
+                            "--add-opens", "java.base/jdk.internal.misc=ALL-UNNAMED",
+                            "--add-opens", "java.base/java.util.zip=ALL-UNNAMED")
+                    }
+                }
+            }
         }
     }
 }
diff --git a/archive-multi-host/archive-client/entrypoint.sh b/archive-multi-host/archive-client/entrypoint.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-java --add-opens java.base/sun.nio.ch=ALL-UNNAMED -Djava.net.preferIPv4Stack=true -jar /root/jar/archive-client-uber.jar
+java --add-opens java.base/jdk.internal.misc=ALL-UNNAMED --add-opens java.base/java.util.zip=ALL-UNNAMED -Djava.net.preferIPv4Stack=true -jar /root/jar/archive-client-uber.jar
diff --git a/archive-multi-host/archive-client/setup-docker.sh b/archive-multi-host/archive-client/setup-docker.sh
@@ -21,7 +21,7 @@ apt-get install \
 mkdir /root/aeron
 mkdir /root/jar
 
-wget https://repo1.maven.org/maven2/io/aeron/aeron-all/1.46.7/aeron-all-1.46.7.jar -P /root/aeron/
-wget https://repo1.maven.org/maven2/io/aeron/aeron-agent/1.46.7/aeron-agent-1.46.7.jar -P /root/aeron/
+wget https://repo1.maven.org/maven2/io/aeron/aeron-all/1.47.0/aeron-all-1.47.0.jar -P /root/aeron/
+wget https://repo1.maven.org/maven2/io/aeron/aeron-agent/1.47.0/aeron-agent-1.47.0.jar -P /root/aeron/
 
 apt-get remove wget --quiet --assume-yes
diff --git a/archive-multi-host/archive-host/build.gradle.kts b/archive-multi-host/archive-host/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
 dependencies {
     checkstyle(libs.checkstyle)
     implementation(libs.agrona)
-    implementation(libs.aeron)
+    implementation(libs.aeron.archive)
     implementation(libs.slf4j)
     implementation(libs.logback)
     testImplementation(libs.bundles.testing)
@@ -38,6 +38,16 @@ testing {
         val test by getting(JvmTestSuite::class) {
             // Use JUnit Jupiter test framework
             useJUnitJupiter(libs.versions.junitVersion.get())
+
+            targets {
+                all {
+                    testTask {
+                        jvmArgs(
+                            "--add-opens", "java.base/jdk.internal.misc=ALL-UNNAMED",
+                            "--add-opens", "java.base/java.util.zip=ALL-UNNAMED")
+                    }
+                }
+            }
         }
     }
 }
diff --git a/archive-multi-host/archive-host/entrypoint.sh b/archive-multi-host/archive-host/entrypoint.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-java --add-opens java.base/sun.nio.ch=ALL-UNNAMED -Djava.net.preferIPv4Stack=true -jar /root/jar/archive-host-uber.jar
+java --add-opens java.base/jdk.internal.misc=ALL-UNNAMED --add-opens java.base/java.util.zip=ALL-UNNAMED -Djava.net.preferIPv4Stack=true -jar /root/jar/archive-host-uber.jar
diff --git a/archive-multi-host/archive-host/setup-docker.sh b/archive-multi-host/archive-host/setup-docker.sh
@@ -21,7 +21,7 @@ apt-get install \
 mkdir /root/aeron
 mkdir /root/jar
 
-wget https://repo1.maven.org/maven2/io/aeron/aeron-all/1.46.7/aeron-all-1.46.7.jar -P /root/aeron/
-wget https://repo1.maven.org/maven2/io/aeron/aeron-agent/1.46.7/aeron-agent-1.46.7.jar -P /root/aeron/
+wget https://repo1.maven.org/maven2/io/aeron/aeron-all/1.47.0/aeron-all-1.47.0.jar -P /root/aeron/
+wget https://repo1.maven.org/maven2/io/aeron/aeron-agent/1.47.0/aeron-agent-1.47.0.jar -P /root/aeron/
 
 apt-get remove wget --quiet --assume-yes
diff --git a/archive-replication/archive-backup/build.gradle.kts b/archive-replication/archive-backup/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
 dependencies {
     checkstyle(libs.checkstyle)
     implementation(libs.agrona)
-    implementation(libs.aeron)
+    implementation(libs.aeron.archive)
     implementation(libs.slf4j)
     implementation(libs.logback)
     implementation(project(":archive-replication:common"))
@@ -39,6 +39,16 @@ testing {
         val test by getting(JvmTestSuite::class) {
             // Use JUnit Jupiter test framework
             useJUnitJupiter(libs.versions.junitVersion.get())
+
+            targets {
+                all {
+                    testTask {
+                        jvmArgs(
+                            "--add-opens", "java.base/jdk.internal.misc=ALL-UNNAMED",
+                            "--add-opens", "java.base/java.util.zip=ALL-UNNAMED")
+                    }
+                }
+            }
         }
     }
 }
diff --git a/archive-replication/archive-backup/entrypoint.sh b/archive-replication/archive-backup/entrypoint.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-java --add-opens java.base/sun.nio.ch=ALL-UNNAMED \
-  -javaagent:/root/aeron/aeron-agent-1.42.0.jar \
+java --add-opens java.base/jdk.internal.misc=ALL-UNNAMED --add-opens java.base/java.util.zip=ALL-UNNAMED \
+  -javaagent:/root/aeron/aeron-agent-1.47.0.jar \
   -Djava.net.preferIPv4Stack=true \
   -Daeron.event.log=admin \
   -Daeron.event.archive.log=all \

diff --git a/archive-replication/archive-backup/setup-docker.sh b/archive-replication/archive-backup/setup-docker.sh
@@ -21,7 +21,7 @@ apt-get install \
 mkdir /root/aeron
 mkdir /root/jar
 
-wget https://repo1.maven.org/maven2/io/aeron/aeron-all/1.46.7/aeron-all-1.46.7.jar -P /root/aeron/
-wget https://repo1.maven.org/maven2/io/aeron/aeron-agent/1.46.7/aeron-agent-1.46.7.jar -P /root/aeron/
+wget https://repo1.maven.org/maven2/io/aeron/aeron-all/1.47.0/aeron-all-1.47.0.jar -P /root/aeron/
+wget https://repo1.maven.org/maven2/io/aeron/aeron-agent/1.47.0/aeron-agent-1.47.0.jar -P /root/aeron/
 
 apt-get remove wget --quiet --assume-yes
diff --git a/archive-replication/archive-client/build.gradle.kts b/archive-replication/archive-client/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
 dependencies {
     checkstyle(libs.checkstyle)
     implementation(libs.agrona)
-    implementation(libs.aeron)
+    implementation(libs.aeron.archive)
     implementation(libs.slf4j)
     implementation(libs.logback)
     implementation(project(":archive-replication:common"))
@@ -39,6 +39,16 @@ testing {
         val test by getting(JvmTestSuite::class) {
             // Use JUnit Jupiter test framework
             useJUnitJupiter(libs.versions.junitVersion.get())
+
+            targets {
+                all {
+                    testTask {
+                        jvmArgs(
+                            "--add-opens", "java.base/jdk.internal.misc=ALL-UNNAMED",
+                            "--add-opens", "java.base/java.util.zip=ALL-UNNAMED")
+                    }
+                }
+            }
         }
     }
 }
diff --git a/archive-replication/archive-client/entrypoint.sh b/archive-replication/archive-client/entrypoint.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-java --add-opens java.base/sun.nio.ch=ALL-UNNAMED -Djava.net.preferIPv4Stack=true -jar /root/jar/archive-client-uber.jar
+java --add-opens java.base/jdk.internal.misc=ALL-UNNAMED --add-opens java.base/java.util.zip=ALL-UNNAMED -Djava.net.preferIPv4Stack=true -jar /root/jar/archive-client-uber.jar
diff --git a/archive-replication/archive-client/setup-docker.sh b/archive-replication/archive-client/setup-docker.sh
@@ -21,7 +21,7 @@ apt-get install \
 mkdir /root/aeron
 mkdir /root/jar
 
-wget https://repo1.maven.org/maven2/io/aeron/aeron-all/1.46.7/aeron-all-1.46.7.jar -P /root/aeron/
-wget https://repo1.maven.org/maven2/io/aeron/aeron-agent/1.46.7/aeron-agent-1.46.7.jar -P /root/aeron/
+wget https://repo1.maven.org/maven2/io/aeron/aeron-all/1.47.0/aeron-all-1.47.0.jar -P /root/aeron/
+wget https://repo1.maven.org/maven2/io/aeron/aeron-agent/1.47.0/aeron-agent-1.47.0.jar -P /root/aeron/
 
 apt-get remove wget --quiet --assume-yes
diff --git a/archive-replication/archive-host/build.gradle.kts b/archive-replication/archive-host/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
 dependencies {
     checkstyle(libs.checkstyle)
     implementation(libs.agrona)
-    implementation(libs.aeron)
+    implementation(libs.aeron.archive)
     implementation(libs.slf4j)
     implementation(libs.logback)
     implementation(project(":archive-replication:common"))
@@ -39,6 +39,16 @@ testing {
         val test by getting(JvmTestSuite::class) {
             // Use JUnit Jupiter test framework
             useJUnitJupiter(libs.versions.junitVersion.get())
+
+            targets {
+                all {
+                    testTask {
+                        jvmArgs(
+                            "--add-opens", "java.base/jdk.internal.misc=ALL-UNNAMED",
+                            "--add-opens", "java.base/java.util.zip=ALL-UNNAMED")
+                    }
+                }
+            }
         }
     }
 }
diff --git a/archive-replication/archive-host/entrypoint.sh b/archive-replication/archive-host/entrypoint.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-java --add-opens java.base/sun.nio.ch=ALL-UNNAMED \
+java --add-opens java.base/jdk.internal.misc=ALL-UNNAMED --add-opens java.base/java.util.zip=ALL-UNNAMED \
  -Djava.net.preferIPv4Stack=true \
  -jar /root/jar/archive-host-uber.jar
diff --git a/archive-replication/archive-host/setup-docker.sh b/archive-replication/archive-host/setup-docker.sh
@@ -21,7 +21,7 @@ apt-get install \
 mkdir /root/aeron
 mkdir /root/jar
 
-wget https://repo1.maven.org/maven2/io/aeron/aeron-all/1.46.7/aeron-all-1.46.7.jar -P /root/aeron/
-wget https://repo1.maven.org/maven2/io/aeron/aeron-agent/1.46.7/aeron-agent-1.46.7.jar -P /root/aeron/
+wget https://repo1.maven.org/maven2/io/aeron/aeron-all/1.47.0/aeron-all-1.47.0.jar -P /root/aeron/
+wget https://repo1.maven.org/maven2/io/aeron/aeron-agent/1.47.0/aeron-agent-1.47.0.jar -P /root/aeron/
 
 apt-get remove wget --quiet --assume-yes