Merge branch 'develop' into 09213-validations-dispatchSyntheticTxn

hashgraph · Nov 3, 2023 · 25a3da7 · 25a3da7
2 parents 46cd0e3 + a5505a7
commit 25a3da7
Show file tree

Hide file tree

Showing 427 changed files with 3,413 additions and 1,488 deletions.
diff --git a/.github/workflows/node-zxcron-release-fsts-regression.yaml b/.github/workflows/node-zxcron-release-fsts-regression.yaml
@@ -51,7 +51,7 @@ jobs:
             major="${BASH_REMATCH[1]}"
             minor="${BASH_REMATCH[2]}"
 
-            if [[ "${major}" -eq 0 && "${minor}" -lt 42 ]]; then
+            if [[ "${major}" -eq 0 && "${minor}" -lt 43 ]]; then
               continue
             fi
 

diff --git a/.github/workflows/platform-zxcron-release-jrs-regression.yaml b/.github/workflows/platform-zxcron-release-jrs-regression.yaml
@@ -51,7 +51,7 @@ jobs:
             major="${BASH_REMATCH[1]}"
             minor="${BASH_REMATCH[2]}"
 
-            if [[ "${major}" -eq 0 && "${minor}" -lt 42 ]]; then
+            if [[ "${major}" -eq 0 && "${minor}" -lt 43 ]]; then
               continue
             fi
 

diff --git a/build-logic/project-plugins/build.gradle.kts b/build-logic/project-plugins/build.gradle.kts
@@ -33,7 +33,7 @@ dependencies {
     implementation("gradle.plugin.lazy.zoo.gradle:git-data-plugin:1.2.2")
     implementation("me.champeau.jmh:jmh-gradle-plugin:0.7.1")
     implementation("net.swiftzer.semver:semver:1.3.0")
-    implementation("org.gradlex:extra-java-module-info:1.4.2")
+    implementation("org.gradlex:extra-java-module-info:1.5")
     implementation("org.gradlex:java-ecosystem-capabilities:1.3.1")
     implementation("org.gradlex:java-module-dependencies:1.4.1")
     implementation("org.owasp:dependency-check-gradle:8.4.2")

diff --git a/.../project-plugins/src/main/kotlin/com.hedera.hashgraph.jpms-module-dependencies.gradle.kts b/.../project-plugins/src/main/kotlin/com.hedera.hashgraph.jpms-module-dependencies.gradle.kts
@@ -34,42 +34,25 @@ javaModuleDependencies {
     moduleNameToGA.put("com.swirlds.config.api", "com.swirlds:swirlds-config-api")
     moduleNameToGA.put("com.swirlds.config.impl", "com.swirlds:swirlds-config-impl")
     moduleNameToGA.put("com.swirlds.merkle.test", "com.swirlds:swirlds-merkle-test")
+    moduleNameToGA.put("com.swirlds.merkledb", "com.swirlds:swirlds-merkledb")
     moduleNameToGA.put("com.swirlds.platform.core", "com.swirlds:swirlds-platform-core")
     moduleNameToGA.put("com.swirlds.platform.gui", "com.swirlds:swirlds-platform-gui")
     moduleNameToGA.put("com.swirlds.test.framework", "com.swirlds:swirlds-test-framework")
 
-    moduleNameToGA.put(
-        "com.hedera.hashgraph.protobuf.java.api",
-        "com.hedera.hashgraph:hedera-protobuf-java-api"
-    )
+    // Other Hedera modules
     moduleNameToGA.put("com.hedera.pbj.runtime", "com.hedera.pbj:pbj-runtime")
-    moduleNameToGA.put("hamcrest.core", "org.hamcrest:hamcrest-core")
-    moduleNameToGA.put("io.grpc", "io.helidon.grpc:io.grpc")
-    moduleNameToGA.put("io.helidon.webserver.http2", "io.helidon.webserver:helidon-webserver-http2")
-    moduleNameToGA.put("io.netty.codec.http", "io.netty:netty-codec-http")
-    moduleNameToGA.put("io.netty.codec.http2", "io.netty:netty-codec-http2")
-    moduleNameToGA.put("io.netty.codec.socks", "io.netty:netty-codec-socks")
-    moduleNameToGA.put("io.netty.handler.proxy", "io.netty:netty-handler-proxy")
-    moduleNameToGA.put("io.perfmark", "io.perfmark:perfmark-api")
-    moduleNameToGA.put(
-        "org.apache.logging.log4j.slf4j",
-        "org.apache.logging.log4j:log4j-slf4j2-impl"
-    )
-    moduleNameToGA.put("org.bouncycastle.util", "org.bouncycastle:bcutil-jdk15on")
+
+    // Third-party modules
     moduleNameToGA.put(
-        "org.eclipse.collections.api",
-        "org.eclipse.collections:eclipse-collections-api"
+        "io.netty.transport.epoll.linux.x86_64",
+        "io.netty:netty-transport-native-epoll|io.netty:netty-transport-native-epoll-linux-x86_64"
     )
     moduleNameToGA.put(
-        "org.eclipse.collections.impl",
-        "org.eclipse.collections:eclipse-collections"
+        "io.netty.transport.epoll.linux.aarch_64",
+        "io.netty:netty-transport-native-epoll|io.netty:netty-transport-native-epoll-linux-aarch_64"
     )
-    moduleNameToGA.put("org.hamcrest", "org.hamcrest:hamcrest")
-    moduleNameToGA.put("org.hyperledger.besu.datatypes", "org.hyperledger.besu:besu-datatypes")
-    moduleNameToGA.put("org.hyperledger.besu.evm", "org.hyperledger.besu:evm")
-    moduleNameToGA.put("org.hyperledger.besu.secp256k1", "org.hyperledger.besu:secp256k1")
-    moduleNameToGA.put("org.hyperledger.besu.internal.rlp", "org.hyperledger.besu.internal:rlp")
+
+    // Testing only
     moduleNameToGA.put("org.mockito.junit.jupiter", "org.mockito:mockito-junit-jupiter")
     moduleNameToGA.put("org.objenesis", "org.objenesis:objenesis")
-    moduleNameToGA.put("org.antlr.antlr4.runtime", "org.antlr:antlr4-runtime")
 }