build(deps): bump org.hiero.gradle.build to 0.6.0 / Gradle to 9.1

gradle.properties

@@ -1,6 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
-# Need increased heap for running Gradle itself, or SonarQube will run the JVM out of metaspace
-org.gradle.jvmargs=-Xmx6144m -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 
 # Enable Gradle caching
 org.gradle.configuration-cache=true
@@ -11,8 +10,3 @@ org.gradle.parallel=true
 
 # Limit parallel workers
 org.gradle.workers.max=6
-
-# Set to true to enable spotless to retrieve the license header years from git history. This is useful for PRs with
-# files which are moved or relocated. Use with caution as this is an expensive operation. The default should be restored
-# to false before committing or merging the PR.
-spotlessSetLicenseHeaderYearsFromGitHistory=false

gradle/aggregation/build.gradle.kts

@@ -1,13 +1,4 @@
 // SPDX-License-Identifier: Apache-2.0
-plugins {
-    id("org.hiero.gradle.base.lifecycle")
-    id("org.hiero.gradle.base.version")
-    id("org.hiero.gradle.report.code-coverage")
-    id("org.hiero.gradle.check.spotless")
-    id("org.hiero.gradle.check.spotless-kotlin")
-    id("org.hiero.gradle.feature.publish-maven-central-aggregation")
-}
-
 dependencies {
     published(project(":app"))
     published(project(":hedera-protobuf-java-api"))
@@ -18,7 +9,7 @@ dependencies {
     implementation(project(":ISSTestingTool"))
     implementation(project(":MigrationTestingTool"))
     implementation(project(":PlatformTestingTool"))
-    // projects that only contains tests (and no production code)
+    // projects that only contain tests (and no production code)
     implementation(project(":test-clients"))
     implementation(project(":consensus-otter-docker-app"))
     implementation(project(":consensus-otter-tests"))

gradle/wrapper/gradle-wrapper.properties

@@ -1,8 +1,7 @@
 # SPDX-License-Identifier: Apache-2.0
-
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -114,7 +114,6 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -172,7 +171,6 @@ fi
 # For Cygwin or MSYS, switch paths to Windows format before running java
 if "$cygwin" || "$msys" ; then
     APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
 
     JAVACMD=$( cygpath --unix "$JAVACMD" )
 
@@ -212,7 +210,6 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
         -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 

gradlew.bat

@@ -70,11 +70,10 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell

hapi/hapi/build.gradle.kts

@@ -3,8 +3,7 @@ plugins {
     id("org.hiero.gradle.module.library")
     id("org.hiero.gradle.feature.protobuf")
     id("org.hiero.gradle.feature.test-fixtures")
-    // ATTENTION: keep pbj version in sync with 'hiero-dependency-versions/build.gradle.kts'
-    id("com.hedera.pbj.pbj-compiler") version "0.12.2"
+    id("com.hedera.pbj.pbj-compiler")
 }
 
 description = "Hedera API"

hiero-dependency-versions/build.gradle.kts

@@ -1,11 +1,4 @@
 // SPDX-License-Identifier: Apache-2.0
-plugins {
-    id("org.hiero.gradle.base.lifecycle")
-    id("org.hiero.gradle.base.jpms-modules")
-    id("org.hiero.gradle.check.spotless")
-    id("org.hiero.gradle.check.spotless-kotlin")
-}
-
 dependencies {
     api(platform("io.netty:netty-bom:4.2.4.Final"))
 
@@ -27,7 +20,7 @@ val jackson = "2.19.0"
 val junit5 = "5.10.3!!" // no updates beyond 5.10.3 until #17125 is resolved
 val log4j = "2.25.0"
 val mockito = "5.18.0"
-val pbj = "0.12.2" // ATTENTION: keep in sync with plugin version in 'hapi/hapi/build.gradle.kts'
+val pbj = pluginVersions.version("com.hedera.pbj.pbj-compiler")
 val protobuf = "4.31.1"
 val blockNodeProtobufSources = "0.21.1"
 val testContainers = "1.21.3"
@@ -91,9 +84,6 @@ dependencies.constraints {
     api("net.i2p.crypto:eddsa:0.3.0") { because("net.i2p.crypto.eddsa") }
     api("org.antlr:antlr4-runtime:4.13.2") { because("org.antlr.antlr4.runtime") }
     api("commons-codec:commons-codec:1.18.0") { because("org.apache.commons.codec") }
-    api("org.apache.commons:commons-collections4:4.5.0") {
-        because("org.apache.commons.collections4")
-    }
     api("commons-io:commons-io:2.19.0") { because("org.apache.commons.io") }
     api("org.apache.commons:commons-lang3:3.18.0") { because("org.apache.commons.lang3") }
     api("org.apache.commons:commons-compress:1.27.1") { because("org.apache.commons.compress") }
@@ -120,15 +110,11 @@ dependencies.constraints {
     api("org.json:json:20250517") { because("org.json") }
     api("org.junit.jupiter:junit-jupiter-api:$junit5") { because("org.junit.jupiter.api") }
     api("org.junit.jupiter:junit-jupiter-engine:$junit5") { because("org.junit.jupiter.engine") }
-    api("org.junit-pioneer:junit-pioneer:2.3.0") { because("org.junitpioneer") }
     api("org.junit:junit-bom:$junit5")
     api("org.mockito:mockito-core:$mockito") { because("org.mockito") }
     api("org.mockito:mockito-junit-jupiter:$mockito") { because("org.mockito.junit.jupiter") }
     api("org.opentest4j:opentest4j:1.3.0") { because("org.opentest4j") }
     api("org.testcontainers:testcontainers:$testContainers") { because("org.testcontainers") }
-    api("org.testcontainers:junit-jupiter:$testContainers") {
-        because("org.testcontainers.junit.jupiter")
-    }
     api("org.yaml:snakeyaml:2.4") { because("org.yaml.snakeyaml") }
     api("io.tmio:tuweni-bytes:$tuweni") { because("tuweni.bytes") }
     api("io.tmio:tuweni-units:$tuweni") { because("tuweni.units") }
@@ -138,31 +124,22 @@ dependencies.constraints {
     api("uk.org.webcompere:system-stubs-jupiter:$webcompare") {
         because("uk.org.webcompere.systemstubs.jupiter")
     }
-    api("com.google.protobuf:protoc:$protobuf")
-    api("io.grpc:protoc-gen-grpc-java:$grpc")
-
-    api("com.hedera.cryptography:hedera-cryptography-blskeygen:$hederaCryptography") {
-        because("com.hedera.cryptography.blskeygen")
-    }
-    api("com.hedera.cryptography:hedera-cryptography-bls:$hederaCryptography") {
-        because("com.hedera.cryptography.bls")
-    }
-    api("com.hedera.cryptography:hedera-cryptography-pairings-api:$hederaCryptography") {
-        because("com.hedera.cryptography.pairings.api")
-    }
-    api("com.hedera.cryptography:hedera-cryptography-tss:$hederaCryptography") {
-        because("com.hedera.cryptography.tss")
-    }
-    api("com.hedera.cryptography:hedera-cryptography-utils:$hederaCryptography") {
-        because("com.hedera.cryptography.utils")
-    }
     api("com.hedera.cryptography:hedera-cryptography-rpm:$hederaCryptography") {
         because("com.hedera.cryptography.rpm")
     }
     api("com.hedera.cryptography:hedera-cryptography-hinTS:$hederaCryptography") {
         because("com.hedera.cryptography.hints")
     }
+
+    // Versions of additional tools that are not part of the product or test module paths
+    api("com.google.protobuf:protoc:${protobuf}")
+    api("io.grpc:protoc-gen-grpc-java:${grpc}")
     api("org.hiero.block:block-node-protobuf-sources:$blockNodeProtobufSources") {
         because("External block node protobuf sources")
     }
+    tasks.checkVersionConsistency {
+        excludes.add("com.google.protobuf:protoc")
+        excludes.add("io.grpc:protoc-gen-grpc-java")
+        excludes.add("org.hiero.block:block-node-protobuf-sources")
+    }
 }

settings.gradle.kts

@@ -1,5 +1,8 @@
 // SPDX-License-Identifier: Apache-2.0
-plugins { id("org.hiero.gradle.build") version "0.5.1" }
+plugins {
+    id("org.hiero.gradle.build") version "0.6.0"
+    id("com.hedera.pbj.pbj-compiler") version "0.12.2" apply false
+}
 
 javaModules {
     // This "intermediate parent project" should be removed