diff --git a/build.gradle b/build.gradle
index 3fe343adc..cb144ade7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -195,10 +195,6 @@ subprojects {
     }
 
     tasks.withType(JavaCompile).configureEach {
-        doFirst {
-            mkdir 'build/resources/main' // Avoid Javac warning about non-existing directory
-        }
-
         options.compilerArgs.add('--release')
         options.compilerArgs.add(java.sourceCompatibility.majorVersion)
         options.compilerArgs.addAll(['-Xlint:all', '-Werror']) // Enable all warnings and treat them as errors
@@ -314,6 +310,9 @@ project(':agrona') {
         from sourceSets.generated.output
 
         bundle {
+            // workaround for https://github.com/bndtools/bnd/issues/6346
+            properties.put("project.group", provider({project.group}))
+            // workaround
             bnd """
                 Automatic-Module-Name:  org.agrona.core
                 Bundle-Name:            org.agrona.core
@@ -359,7 +358,7 @@ project(':agrona') {
         repositories {
             maven {
                 name = 'MavenCentral'
-                url(!isReleaseVersion ? ossrhSnapshotsRepoUrl : ossrhReleasesRepoUrl)
+                url = !isReleaseVersion ? ossrhSnapshotsRepoUrl : ossrhReleasesRepoUrl
                 credentials {
                     username = ossrhUsername
                     password = ossrhPassword
@@ -445,7 +444,7 @@ project(':agrona-agent') {
         repositories {
             maven {
                 name = 'MavenCentral'
-                url(!isReleaseVersion ? ossrhSnapshotsRepoUrl : ossrhReleasesRepoUrl)
+                url = !isReleaseVersion ? ossrhSnapshotsRepoUrl : ossrhReleasesRepoUrl
                 credentials {
                     username = ossrhUsername
                     password = ossrhPassword
@@ -517,7 +516,7 @@ project(':agrona-concurrency-tests') {
 
     tasks.register('parseResultsFile', JavaExec) {
         dependsOn shadowJar
-        group 'verification'
+        group = 'verification'
         classpath = files(tasks.shadowJar)
         workingDir = layout.buildDirectory.get()
         args = ['-p', jcstressResults, '-r', 'reports/jcstress']
@@ -561,7 +560,7 @@ tasks.register('tarTestLogs', Tar) {
     dependsOn tasks.named('copyTestLogs')
     archiveBaseName.set('test_logs')
     from 'build/test_logs'
-    compression Compression.BZIP2
+    compression = Compression.BZIP2
 }
 
 wrapper {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 4f7454a39..bdcd9dfeb 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -6,7 +6,7 @@ commons-codec = "1.15"
 commons-lang3 = "3.8.1"
 findbugs = "3.0.1"
 guava = "33.4.0-jre"
-gradle = "8.11.1"
+gradle = "8.12.1"
 hamcrest = "3.0"
 httpcore = "4.4.14"
 jcstress = "0.16"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index c1d5e0185..d9fbee2e1 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index f5feea6d6..f3b75f3b0 100755
--- a/gradlew
+++ b/gradlew
@@ -86,8 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum