Merge branch 'main' into fix/claude-v3-bedrock-support

Author: sonianuj287

.github/workflows/maven-publish.yml

@@ -5,8 +5,8 @@ on:
   push:
     branches:
       - main
-      - 1.*
-      - 2.*
+      - '[0-9]+.[0-9]+'
+      - '[0-9]+.x'
 
 jobs:
   build-and-publish-snapshots:

build.gradle

@@ -96,6 +96,15 @@ subprojects {
         // Force spotless depending on newer version of guava due to CVE-2023-2976. Remove after spotless upgrades.
         resolutionStrategy.force "com.google.guava:guava:32.1.3-jre"
         resolutionStrategy.force 'org.apache.commons:commons-compress:1.26.0'
+        resolutionStrategy.force "io.netty:netty-buffer:${versions.netty}"
+        resolutionStrategy.force "io.netty:netty-codec:${versions.netty}"
+        resolutionStrategy.force "io.netty:netty-codec-http:${versions.netty}"
+        resolutionStrategy.force "io.netty:netty-codec-http2:${versions.netty}"
+        resolutionStrategy.force "io.netty:netty-common:${versions.netty}"
+        resolutionStrategy.force "io.netty:netty-handler:${versions.netty}"
+        resolutionStrategy.force "io.netty:netty-resolver:${versions.netty}"
+        resolutionStrategy.force "io.netty:netty-transport:${versions.netty}"
+        resolutionStrategy.force "io.netty:netty-transport-native-unix-common:${versions.netty}"
     }
 
     apply plugin: 'com.diffplug.spotless'