From a759120fafd1b075db90df097c855c4f031aadd8 Mon Sep 17 00:00:00 2001
From: Lianghui Yu <liyu@redhat.com>
Date: Thu, 19 Mar 2026 18:57:46 +0800
Subject: [PATCH] bump Galley dependency version to 1.22-SNAPSHOT

o11yphant has been removed completely from galley, now we bump up the
version add modified some function call base on it
---
 .../indy/koji/content/KojiMavenMetadataProviderTest.java   | 2 +-
 .../MavenContentFilteringTransferDecoratorTest.java        | 2 +-
 .../indy/core/bind/jaxrs/admin/ContentAdminResource.java   | 2 +-
 pom.xml                                                    | 7 ++++++-
 subsys/metrics/pom.xml                                     | 4 ++++
 5 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/addons/koji/common/src/test/java/org/commonjava/indy/koji/content/KojiMavenMetadataProviderTest.java b/addons/koji/common/src/test/java/org/commonjava/indy/koji/content/KojiMavenMetadataProviderTest.java
index b1d6f29051..609d0ead51 100644
--- a/addons/koji/common/src/test/java/org/commonjava/indy/koji/content/KojiMavenMetadataProviderTest.java
+++ b/addons/koji/common/src/test/java/org/commonjava/indy/koji/content/KojiMavenMetadataProviderTest.java
@@ -333,7 +333,7 @@ private void initKojiClient( String exchangeName, boolean verifyArtifacts )
         GalleyCore galley = new GalleyCoreBuilder(
                 new FileCacheProviderFactory( temp.newFolder( "cache" ) ) ).withEnabledTransports(
                 new HttpClientTransport( new HttpImpl( new org.commonjava.maven.galley.auth.MemoryPasswordManager() ),
-                                         new IndyObjectMapper( true ), new GlobalHttpConfiguration().getGlobalProxyConfig(), null, null ) ).build();
+                                         new IndyObjectMapper( true ), new GlobalHttpConfiguration().getGlobalProxyConfig()) ).build();
 
         WeftExecutorService rescanService =
                         new PoolWeftExecutorService( "test-rescan-executor", (ThreadPoolExecutor) Executors.newCachedThreadPool(), 2, 10f, false,null, null );
diff --git a/addons/pkg-maven/common/src/test/java/org/commonjava/indy/pkg/maven/content/MavenContentFilteringTransferDecoratorTest.java b/addons/pkg-maven/common/src/test/java/org/commonjava/indy/pkg/maven/content/MavenContentFilteringTransferDecoratorTest.java
index 4ad9b4117e..d34bfe1b74 100644
--- a/addons/pkg-maven/common/src/test/java/org/commonjava/indy/pkg/maven/content/MavenContentFilteringTransferDecoratorTest.java
+++ b/addons/pkg-maven/common/src/test/java/org/commonjava/indy/pkg/maven/content/MavenContentFilteringTransferDecoratorTest.java
@@ -156,7 +156,7 @@ private Transfer getTestHttpTransfer(final String path, final String content) th
         assertThat( transfer.exists(), equalTo( false ) );
 
         HttpDownload dl = new HttpDownload( url, location, transfer, new HashMap<>(), new EventMetadata(),
-                                            fixture.getHttp().getHttp(), new ObjectMapper(), true, metricRegistry, metricConfig, new ArrayList<>(), new NoOpProxySitesCache() );
+                                            fixture.getHttp().getHttp(), new ObjectMapper(), true, new ArrayList<>(), new NoOpProxySitesCache() );
 
         return dl.call().getTransfer();
     }
diff --git a/bindings/jaxrs/src/main/java/org/commonjava/indy/core/bind/jaxrs/admin/ContentAdminResource.java b/bindings/jaxrs/src/main/java/org/commonjava/indy/core/bind/jaxrs/admin/ContentAdminResource.java
index 1c79d9d36e..752f7a4b00 100644
--- a/bindings/jaxrs/src/main/java/org/commonjava/indy/core/bind/jaxrs/admin/ContentAdminResource.java
+++ b/bindings/jaxrs/src/main/java/org/commonjava/indy/core/bind/jaxrs/admin/ContentAdminResource.java
@@ -19,7 +19,7 @@
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.commonjava.indy.IndyWorkflowException;
 import org.commonjava.indy.bind.jaxrs.IndyResources;
 import org.commonjava.indy.bind.jaxrs.util.REST;
diff --git a/pom.xml b/pom.xml
index db45a567ef..188fc540f7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -108,7 +108,7 @@
     <indyModelVersion>1.5</indyModelVersion>
     <indyClientVersion>3.4.4</indyClientVersion>
     <atlasVersion>1.1.4</atlasVersion>
-    <galleyVersion>1.20</galleyVersion>
+    <galleyVersion>1.22-SNAPSHOT</galleyVersion>
     <weftVersion>1.24</weftVersion>
     <webdavVersion>3.2.1</webdavVersion>
     <!-- TODO: partyline is still needed for standalone mode, may be removed in future -->
@@ -1429,6 +1429,11 @@
         <artifactId>o11yphant-metrics-common</artifactId>
         <version>${o11yphantVersion}</version>
       </dependency>
+      <dependency>
+        <groupId>org.commonjava.util</groupId>
+        <artifactId>o11yphant-metrics-core</artifactId>
+        <version>${o11yphantVersion}</version>
+      </dependency>
 
       <!-- propulsor dependencies -->
       <dependency>
diff --git a/subsys/metrics/pom.xml b/subsys/metrics/pom.xml
index efe61cf433..ede9c31214 100644
--- a/subsys/metrics/pom.xml
+++ b/subsys/metrics/pom.xml
@@ -31,6 +31,10 @@
       <groupId>org.commonjava.util</groupId>
       <artifactId>o11yphant-metrics-common</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.commonjava.util</groupId>
+      <artifactId>o11yphant-metrics-core</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>