From f1f06b32419dc27a4c65e97e3b14dfc2e429b27e Mon Sep 17 00:00:00 2001 From: Michael Vorburger Date: Sat, 8 Nov 2025 18:39:52 +0100 Subject: [PATCH] deps: Bump MIMA, Spotbugs Annotations, fix Java CID --- MODULE.bazel | 10 ++--- MODULE.bom.handlebars.yaml | 11 ++--- docs/dev/dependencies.txt | 14 +++---- java/dev/enola/ai/adk/tool/TestToolTest.java | 2 +- maven_install.json | 44 ++++++++++---------- 5 files changed, 41 insertions(+), 40 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index d22e80a2e..0a2299637 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -87,18 +87,18 @@ maven.install( "dev.langchain4j:langchain4j-anthropic:1.7.1", "dev.langchain4j:langchain4j-easy-rag:1.7.1-beta14", "io.github.ollama4j:ollama4j:1.0.100", - "com.github.spotbugs:spotbugs-annotations:4.9.6", + "com.github.spotbugs:spotbugs-annotations:4.9.8", "io.github.java-diff-utils:java-diff-utils:4.16", "org.jsoup:jsoup:1.21.2", "com.github.package-url:packageurl-java:1.5.0", - "eu.maveniverse.maven.mima.runtime:standalone-static:2.4.34", - "eu.maveniverse.maven.mima:context:2.4.34", - "eu.maveniverse.maven.mima.extensions:mmr:2.4.34", + "eu.maveniverse.maven.mima.runtime:standalone-static:2.4.36", + "eu.maveniverse.maven.mima:context:2.4.36", + "eu.maveniverse.maven.mima.extensions:mmr:2.4.36", "org.apache.maven.resolver:maven-resolver-api:2.0.11", "org.apache.maven.resolver:maven-resolver-util:2.0.11", "org.apache.maven:maven-model:3.9.11", "org.codehaus.plexus:plexus-xml:4.1.0", - "com.github.ipld:java-cid:v1.3.10", + "com.github.ipld:java-cid:1.3.10", "com.github.ipfs:java-ipfs-http-client:d982fc0fa1", "com.github.multiformats:java-multibase:03702505e959cafbebfcf7990848ee124017c27d", "com.github.multiformats:java-multihash:d238c77f11a0ff33970ad43578ae11f049324848", diff --git a/MODULE.bom.handlebars.yaml b/MODULE.bom.handlebars.yaml index 8d97611d3..e5fbc0911 100644 --- a/MODULE.bom.handlebars.yaml +++ b/MODULE.bom.handlebars.yaml @@ -21,6 +21,7 @@ version: adk: e60bddf6502bbfac5af3fb993acc100439c0d90f rdf4j: 5.1.4 grpc: 1.75.0 + mima: 2.4.36 bom: - "com.google.code.findbugs:jsr305:3.0.2" @@ -93,22 +94,22 @@ bom: # TODO - "dev.langchain4j:langchain4j-easy-rag:{{version.langchain4j}}" - "dev.langchain4j:langchain4j-easy-rag:{{version.langchain4j-beta}}" - "io.github.ollama4j:ollama4j:1.0.100" - - "com.github.spotbugs:spotbugs-annotations:4.9.6" + - "com.github.spotbugs:spotbugs-annotations:4.9.8" - "io.github.java-diff-utils:java-diff-utils:4.16" - "org.jsoup:jsoup:1.21.2" - "com.github.package-url:packageurl-java:1.5.0" # Maven Connector - - "eu.maveniverse.maven.mima.runtime:standalone-static:2.4.34" - - "eu.maveniverse.maven.mima:context:2.4.34" - - "eu.maveniverse.maven.mima.extensions:mmr:2.4.34" + - "eu.maveniverse.maven.mima.runtime:standalone-static:{{version.mima}}" + - "eu.maveniverse.maven.mima:context:{{version.mima}}" + - "eu.maveniverse.maven.mima.extensions:mmr:{{version.mima}}" - "org.apache.maven.resolver:maven-resolver-api:2.0.11" - "org.apache.maven.resolver:maven-resolver-util:2.0.11" - "org.apache.maven:maven-model:3.9.11" - "org.codehaus.plexus:plexus-xml:4.1.0" # IPFS & IPLD etc. - - "com.github.ipld:java-cid:v1.3.10" + - "com.github.ipld:java-cid:1.3.10" - "com.github.ipfs:java-ipfs-http-client:d982fc0fa1" - "com.github.multiformats:java-multibase:03702505e959cafbebfcf7990848ee124017c27d" - "com.github.multiformats:java-multihash:d238c77f11a0ff33970ad43578ae11f049324848" diff --git a/docs/dev/dependencies.txt b/docs/dev/dependencies.txt index 652c6e54e..f5ef31060 100644 --- a/docs/dev/dependencies.txt +++ b/docs/dev/dependencies.txt @@ -33,7 +33,7 @@ com.github.docker-java:docker-java-transport-netty:3.3.6 com.github.hypfvieh:dbus-java-core:4.3.1 com.github.hypfvieh:dbus-java-transport-native-unixsocket:4.3.1 com.github.ipfs:java-ipfs-http-client:d982fc0fa1 -com.github.ipld:java-cid:v1.3.10 +com.github.ipld:java-cid:1.3.10 com.github.jai-imageio:jai-imageio-core:1.4.0 com.github.java-json-tools:btf:1.3 com.github.java-json-tools:msg-simple:1.2 @@ -45,7 +45,7 @@ com.github.multiformats:java-multiaddr:v1.4.12 com.github.multiformats:java-multibase:03702505e959cafbebfcf7990848ee124017c27d com.github.multiformats:java-multihash:1.3.6 com.github.package-url:packageurl-java:1.5.0 -com.github.spotbugs:spotbugs-annotations:4.9.6 +com.github.spotbugs:spotbugs-annotations:4.9.8 com.github.valfirst:slf4j-test:3.0.3 com.github.virtuald:curvesapi:1.08 com.github.vorburger.adk-java:google-adk:e60bddf6502bbfac5af3fb993acc100439c0d90f @@ -125,7 +125,7 @@ com.squareup.okio:okio:3.6.0 com.squareup.okio:okio-jvm:3.6.0 com.sun.istack:istack-commons-runtime:4.1.2 com.zaxxer:SparseBitSet:1.3 -commons-codec:commons-codec:1.19.0 +commons-codec:commons-codec:1.20.0 commons-io:commons-io:2.20.0 de.swiesend:secret-service:2.0.1-alpha dev.dirs:directories:26 @@ -140,10 +140,10 @@ dev.langchain4j:langchain4j-google-ai-gemini:1.7.1 dev.langchain4j:langchain4j-http-client:1.7.1 dev.langchain4j:langchain4j-http-client-jdk:1.7.1 dev.langchain4j:langchain4j-ollama:1.7.1 -eu.maveniverse.maven.mima.extensions:mmr:2.4.34 -eu.maveniverse.maven.mima.runtime:standalone-shared:2.4.34 -eu.maveniverse.maven.mima.runtime:standalone-static:2.4.34 -eu.maveniverse.maven.mima:context:2.4.34 +eu.maveniverse.maven.mima.extensions:mmr:2.4.36 +eu.maveniverse.maven.mima.runtime:standalone-shared:2.4.36 +eu.maveniverse.maven.mima.runtime:standalone-static:2.4.36 +eu.maveniverse.maven.mima:context:2.4.36 guru.nidi.com.eclipsesource.j2v8:j2v8_linux_x86_64:4.6.0 guru.nidi.com.kitfox:svgSalamander:1.1.3 guru.nidi:graphviz-java:0.18.1 diff --git a/java/dev/enola/ai/adk/tool/TestToolTest.java b/java/dev/enola/ai/adk/tool/TestToolTest.java index 0d6380c86..33e24224d 100644 --- a/java/dev/enola/ai/adk/tool/TestToolTest.java +++ b/java/dev/enola/ai/adk/tool/TestToolTest.java @@ -50,7 +50,7 @@ public void noArgumentReturnObject() throws IOException { agentTester.assertTextResponseContainsAll( "Execute a test tool without arguments which returns an object.", - "The test tool executed successfully", + "tool executed successfully", "Hello from TestTool!", "the number 42", "status", diff --git a/maven_install.json b/maven_install.json index 309b26c1c..a1f7f9bc2 100644 --- a/maven_install.json +++ b/maven_install.json @@ -1,7 +1,7 @@ { "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL", - "__INPUT_ARTIFACTS_HASH": 1629380533, - "__RESOLVED_ARTIFACTS_HASH": 528166360, + "__INPUT_ARTIFACTS_HASH": 2068124105, + "__RESOLVED_ARTIFACTS_HASH": -1604741540, "conflict_resolution": { "com.github.multiformats:java-multihash:d238c77f11a0ff33970ad43578ae11f049324848": "com.github.multiformats:java-multihash:1.3.6", "com.google.j2objc:j2objc-annotations:2.8": "com.google.j2objc:j2objc-annotations:3.1" @@ -253,10 +253,10 @@ }, "com.github.ipld:java-cid": { "shasums": { - "jar": "26beb73829cf66516dc5bcc95944ead203c3d1ef0e272920bb5b5d8561a3f1c8", - "sources": "c011a4cccee3a0db646fdf14577daa0c2717dd93d256f6b3bea8ee7d8629de7f" + "jar": "df6b3d6795976df7d5e7f4913bea9f5eed78ace788cda1df28ddbbdb3ed35429", + "sources": "b5f2f97c60901a0c43ff1246c95b48cf4e566e8a9260d9746ddbc525c11eb118" }, - "version": "v1.3.10" + "version": "1.3.10" }, "com.github.jai-imageio:jai-imageio-core": { "shasums": { @@ -337,10 +337,10 @@ }, "com.github.spotbugs:spotbugs-annotations": { "shasums": { - "jar": "523d394a6b36174ad0a22f0c1c75b105ccff42869a8b7ce86e7fd339ca6f86ce", + "jar": "6f69d6fe9c55a54dcb30e87d8fa2d5f52246af50d7a3445246d9539ef221be1c", "sources": "075b2eed660c2fe2fb1ad1de028f8fdff5f358e25c1318706b95ab17bb28be44" }, - "version": "4.9.6" + "version": "4.9.8" }, "com.github.valfirst:slf4j-test": { "shasums": { @@ -893,10 +893,10 @@ }, "commons-codec:commons-codec": { "shasums": { - "jar": "5c3881e4f556855e9c532927ee0c9dfde94cc66760d5805c031a59887070af5f", - "sources": "b0462142585d45fc15bc8091b7b02f1e3a85c83595068659548c82cac9cdc7a2" + "jar": "6af66595f9f6a7bb58ce66518d6888d40b547c366d2262f06676eee19528ff66", + "sources": "ad76b2fe9ac7e07e75dfc605055e7235b9a831d1a138e42cb5e198e515f461f4" }, - "version": "1.19.0" + "version": "1.20.0" }, "commons-io:commons-io": { "shasums": { @@ -998,31 +998,31 @@ }, "eu.maveniverse.maven.mima.extensions:mmr": { "shasums": { - "jar": "e99383496a12d4ca3ac8643d651f1bc3d509dc7ee29450fa5c3fc1d95ec5658b", - "sources": "f6f07f37df984886854661679fe56f249631468816a169d3fa08780f511c74eb" + "jar": "67784a1400bcac85cfd7a7c24945b7dbf4c1a79bf119ffe580a551312aff24a5", + "sources": "15320e5675104cc9dcb76353f70ce73facb8c0c36b5bdf272ddfef958fd16a3a" }, - "version": "2.4.34" + "version": "2.4.36" }, "eu.maveniverse.maven.mima.runtime:standalone-shared": { "shasums": { - "jar": "c087870e78b2b5687ee362600094bf5b4756ebe089a1390176b9c7a7a9839b2e", - "sources": "8e1968fbd7d1afec10e34c632733aa3cb770e33cde99608887d5c1afad06fdef" + "jar": "e46a04809f7bde92e7a766dd79454e5a0acedfae1b13a4d10b056fcbb1f51d93", + "sources": "843bada94d5909c88b533ec7146aa8f25e8128a1eb6096516d6621fd134848ac" }, - "version": "2.4.34" + "version": "2.4.36" }, "eu.maveniverse.maven.mima.runtime:standalone-static": { "shasums": { - "jar": "7df0614e884f3d9d21497d5ac44b43e8fecdaf85885321d9a206472697978784", - "sources": "35b8711d3b8500e5495b08128c363bc1436546be520912bdd25cbb5c5f3edb91" + "jar": "d12a2043dd8f64b2ede2c507aa33f4ecf5e52549f3677712a14909bb6cbc418b", + "sources": "f1b5c9e8ddb739292328811cf8f0be9e1272c2815a6b6730f2defca1960df19d" }, - "version": "2.4.34" + "version": "2.4.36" }, "eu.maveniverse.maven.mima:context": { "shasums": { - "jar": "d278aeefe24dd7fdedc80429d12fe6ab33506e0e7004327c43868893d533bba6", - "sources": "6c5c259b6db6a20fb17994617c69ddfaf8de4edd384afc5dd12d74d27cbbc94f" + "jar": "1649a5d0801580925095e8eb362f3a0cd22125da14e30e10069fe4209a4850b4", + "sources": "e2b67fe7ef531a21cae7f5121619db19462a89b9caf5e268d98f95b61a06f48a" }, - "version": "2.4.34" + "version": "2.4.36" }, "guru.nidi.com.eclipsesource.j2v8:j2v8_linux_x86_64": { "shasums": {