feat(guava): update guava → 33.4.x

Updates the JPMS-enabled version of Guava to the
current latest release (33.4.x), and patches the
`gson` dependency to build against patched Guava
during integration testing.

- feat(guava): update `guava` → `33.4.0` (trunk)
- fix: usage of `mvnw` on linux while building bom
- test: patch `gson` for testing guava integration
- chore: update `gson` to latest mainline revision
- chore: bump and rebuild catalog tools → `1.0.10`
- chore: update gradle catalog versions + lib pins

Signed-off-by: Sam Gammon <[email protected]>

Author: sgammon

.gitmodules

@@ -2,56 +2,75 @@
 	path = org.checkerframework
 	url = [email protected]:typetools/checker-framework.git
 	branch = master
+	depth = 0
 [submodule "error-prone"]
 	path = com.google.errorprone
 	url = [email protected]:google/error-prone.git
 	branch = master
+        depth = 0
 [submodule "j2objc"]
 	path = com.google.j2objc
 	url = [email protected]:google/j2objc.git
 	branch = master
+        depth = 0
 [submodule "guava"]
 	path = com.google.guava
 	url = [email protected]:sgammon/guava.git
+	depth = 0
+	branch = feat/jpms-v2
 [submodule "reactive-streams"]
 	path = org.reactivestreams
 	url = [email protected]:sgammon/reactive-streams-jvm.git
+        depth = 0
 [submodule "protobuf"]
 	path = com.google.protobuf
 	url = [email protected]:sgammon/protobuf.git
+        depth = 0
 [submodule "dubbo"]
 	path = tests/integration/dubbo
 	url = [email protected]:javamodules/dubbo.git
+        depth = 0
 [submodule "pmd"]
 	path = tests/integration/pmd
 	url = [email protected]:javamodules/pmd.git
+        depth = 0
 [submodule "ghidra"]
 	path = tests/integration/ghidra
 	url = [email protected]:javamodules/ghidra.git
+        depth = 0
 [submodule "armeria"]
 	path = tests/integration/armeria
 	url = [email protected]:javamodules/armeria.git
+        depth = 0
 [submodule "bazel"]
 	path = tests/integration/bazel
 	url = [email protected]:bazelbuild/bazel.git
+        depth = 0
 [submodule "signal-server"]
 	path = tests/integration/signal-server
 	url = [email protected]:javamodules/Signal-Server.git
+        depth = 0
 [submodule "pkl"]
 	path = tests/integration/pkl
 	url = [email protected]:javamodules/pkl.git
+        depth = 0
 [submodule "checkstyle"]
 	path = tests/integration/checkstyle
 	url = [email protected]:javamodules/checkstyle.git
+        depth = 0
 [submodule "gson"]
 	path = tests/integration/gson
 	url = [email protected]:google/gson.git
+        depth = 0
 [submodule "geantyref"]
 	path = io.leangen.geantyref
 	url = [email protected]:leangen/geantyref.git
+        depth = 0
 [submodule "kotlinx-collections-immutable"]
 	path = kotlinx.collections.immutable
 	url = [email protected]:javamodules/kotlinx.collections.immutable.git
+        depth = 0
 [submodule "maven-resolver"]
 	path = org.apache.maven.resolver
 	url = [email protected]:javamodules/maven-resolver.git
+        depth = 0

.version

@@ -1 +1 @@
-1.0.9
+1.0.10

Makefile

@@ -41,7 +41,7 @@ export KOTLINX_COLLECTIONS_POSTFIX ?= SNAPSHOT
 export MAVEN_RESOLVER_VERSION ?= 2.0.0-SNAPSHOT
 else
 export CHECKER_FRAMEWORK_VERSION ?= 3.43.0-SNAPSHOT
-export GUAVA_VERSION ?= 33.1.0-jre-jpms
+export GUAVA_VERSION ?= 33.4.0-jre-jpms
 export GUAVA_FAILUREACCESS_VERSION ?= 1.0.3-jpms
 export REACTIVE_STREAMS_VERSION ?= 1.0.5-jpms
 export PROTOBUF_VERSION ?= 4.26.1-jpms
@@ -57,7 +57,7 @@ export DEV_BIN ?= $(DEV_ROOT)/bin
 export LIBS ?= $(PROJECT)/libs
 export PROJECT_PATH ?= $(DEV_BIN):$(shell echo $$PATH)
 
-DEPS ?= com.google.guava org.checkerframework org.reactivestreams com.google.protobuf io.leangen.geantyref kotlinx.collections.immutable
+DEPS ?= com.google.guava org.reactivestreams com.google.protobuf kotlinx.collections.immutable
 POSIX_FLAGS ?=
 
 ifeq ($(VERBOSE),yes)
@@ -84,11 +84,17 @@ setup: node_modules/  ## Setup local codebase features; performs first-run stuff
 node_modules/:
 	$(RULE)$(PNPM) install --frozen-lockfile --strict-peer-dependencies
 
-repository: $(DEPS) $(LIBS) prebuilts  ## Build the repository layout.
+repository: gradle-tools $(DEPS) $(LIBS) prebuilts  ## Build the repository layout.
 	$(info Building repository layout...)
 	@echo "Repository info:"
 	@echo "- Location: $(REPOSITORY)"
 
+gradle-tools:  ## Copy Gradle utility scripts into the repository root.
+	$(info Mounting Gradle utility scripts...)
+	$(RULE)$(MKDIR) $(REPOSITORY)/gradle
+	$(RULE)$(CP) gradle/* $(REPOSITORY)/gradle/
+	@echo "Utility scripts ready."
+
 #
 # Library: Error Prone ---------------------------------------------------------------------
 
@@ -387,7 +393,7 @@ org.checkerframework/checker-qual/build/libs:
 # Library: Guava ---------------------------------------------------------------------------
 
 guava: com.google.guava  ## Build Guava and all requisite dependencies.
-com.google.guava: org.checkerframework com.google.guava/guava/target
+com.google.guava: com.google.guava/guava/target
 com.google.guava/guava/target: com.google.guava/guava/futures/failureaccess/target
 	$(info Building Guava...)
 	$(RULE)cd com.google.guava \

README.md

@@ -22,7 +22,7 @@
 
 # JPMS Attic Repository
 
-> Latest Release: `1.0.9`
+> Latest Release: `1.0.10`
 
 - [GitHub Repo](https://github.com/javamodules/attic)
 - [Docs](https://javamodules.dev)
@@ -232,7 +232,7 @@ dependencyResolutionManagement {
 
   versionCatalogs {
     create("attic") {
-      from("dev.javamodules:jpms-catalog:1.0.9")
+      from("dev.javamodules:jpms-catalog:1.0.10")
     }
   }
 }
@@ -252,7 +252,7 @@ To use the Gradle Platform to constrain your versions, map the repository as usu
 
 ```kotlin
 dependencies {
-  api(platform("dev.javamodules:jpms-platform:1.0.9"))
+  api(platform("dev.javamodules:jpms-platform:1.0.10"))
 }
 ```
 

com.google.guava

@@ -0,0 +1,4 @@
+
+## Gradle Integration
+
+This directory provides scripts which help integrate Gradle with the JPMS Attic repo.

gradle/README.md

@@ -0,0 +1,10 @@
+initscript {
+  repositories {
+    mavenCentral()
+
+    maven {
+      name = "jpms-attic"
+      url = uri("https://jpms.pkg.st/repository")
+    }
+  }
+}

gradle/init.kts

@@ -0,0 +1,18 @@
+val latestAtticRelease = "1.0.10"
+
+dependencyResolutionManagement {
+  repositories {
+    mavenCentral()
+
+    maven {
+      name = "jpms-attic"
+      url = uri("https://jpms.pkg.st/repository")
+    }
+  }
+
+  versionCatalogs {
+    create("attic") {
+      from("dev.javamodules:jpms-catalog:$latestAtticRelease")
+    }
+  }
+}

gradle/jpms.kts

@@ -1,6 +1,6 @@
 {
   "name": "@javamodules/gradle",
-  "version": "1.0.9",
+  "version": "1.0.10",
   "sideEffects": false,
   "description": "Tools for working with Gradle Module metadata from JavaScript.",
   "keywords": [

packages/gradle/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@javamodules/indexer",
-  "version": "1.0.9",
+  "version": "1.0.10",
   "sideEffects": false,
   "description": "Generates JSON indexes for Maven repositories.",
   "keywords": [