From 32c5a2aadcbc837f942e9d70dfdf546e6576d3ad Mon Sep 17 00:00:00 2001
From: Nick Cross <ncross@redhat.com>
Date: Wed, 22 Oct 2025 13:04:24 +0100
Subject: [PATCH] Update versions. Remove commons-lang:2.6.

---
 pom.xml                                       | 30 +++++++++----------
 .../commonjava/util/partyline/Partyline.java  |  2 +-
 .../partyline/lock/local/LocalLockOwner.java  |  2 --
 .../util/partyline/fixture/ThreadDumper.java  |  2 +-
 4 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8a83689..244fd30 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,11 +17,11 @@
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  
+
   <parent>
     <groupId>org.commonjava</groupId>
     <artifactId>commonjava</artifactId>
-    <version>13</version>
+    <version>21</version>
   </parent>
 
   <groupId>org.commonjava.util</groupId>
@@ -30,21 +30,22 @@
 
   <name>partyline</name>
   <inceptionYear>2015</inceptionYear>
-  
+
   <scm>
     <connection>scm:git:https://github.com/Commonjava/partyline.git</connection>
     <developerConnection>scm:git:git@github.com:Commonjava/partyline.git</developerConnection>
     <url>https://github.com/Commonjava/partyline</url>
     <tag>HEAD</tag>
   </scm>
-  
+
   <properties>
-    <weftVersion>1.14</weftVersion>
-    <infinispanVersion>9.4.7.Final</infinispanVersion>
+    <weftVersion>1.25</weftVersion>
+    <!-- Match the version currently being used by Indy -->
+    <infinispanVersion>9.4.24.Final</infinispanVersion>
     <projectOwner>Red Hat, Inc.</projectOwner>
     <projectEmail>nos-devel@redhat.com</projectEmail>
     <javaVersion>1.8</javaVersion>
-    <byteman.version>3.0.6</byteman.version>
+    <byteman.version>4.0.26</byteman.version>
     <test-forkCount>1</test-forkCount>
 
     <plugin.jacoco.skip>false</plugin.jacoco.skip>
@@ -55,7 +56,7 @@
       <dependency>
         <groupId>org.commonjava.boms</groupId>
         <artifactId>web-commons-bom</artifactId>
-        <version>21</version>
+        <version>31</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -100,7 +101,7 @@
       </dependency>
     </dependencies>
   </dependencyManagement>
-  
+
   <dependencies>
     <dependency>
       <groupId>junit</groupId>
@@ -118,10 +119,6 @@
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-classic</artifactId>
     </dependency>
-    <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.jboss.byteman</groupId>
       <artifactId>byteman</artifactId>
@@ -138,6 +135,10 @@
       <groupId>org.jboss.byteman</groupId>
       <artifactId>byteman-bmunit</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.commonjava.cdi.util</groupId>
       <artifactId>weft</artifactId>
@@ -153,10 +154,9 @@
     <dependency>
       <groupId>org.jboss.logging</groupId>
       <artifactId>jboss-logging</artifactId>
-      <version>3.3.0.Final</version>
     </dependency>
   </dependencies>
-  
+
   <build>
     <pluginManagement>
       <plugins>
diff --git a/src/main/java/org/commonjava/util/partyline/Partyline.java b/src/main/java/org/commonjava/util/partyline/Partyline.java
index 27a8237..6b8ce6b 100644
--- a/src/main/java/org/commonjava/util/partyline/Partyline.java
+++ b/src/main/java/org/commonjava/util/partyline/Partyline.java
@@ -40,7 +40,7 @@
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Consumer;
 
-import static org.apache.commons.lang.StringUtils.join;
+import static org.apache.commons.lang3.StringUtils.join;
 
 import static org.commonjava.util.partyline.lock.LockLevel.read;
 import static org.commonjava.util.partyline.lock.local.LocalLockOwner.getLockReservationName;
diff --git a/src/main/java/org/commonjava/util/partyline/lock/local/LocalLockOwner.java b/src/main/java/org/commonjava/util/partyline/lock/local/LocalLockOwner.java
index e8657ac..602dedd 100644
--- a/src/main/java/org/commonjava/util/partyline/lock/local/LocalLockOwner.java
+++ b/src/main/java/org/commonjava/util/partyline/lock/local/LocalLockOwner.java
@@ -28,8 +28,6 @@
 import java.util.Map;
 import java.util.Optional;
 
-import static org.apache.commons.lang.StringUtils.join;
-
 /**
  * Maintain information about threads with active locks on a file, along the current lock-level of the file (which
  * determines what additional operations can be added, once the initial operation is started). This class counts
diff --git a/src/test/java/org/commonjava/util/partyline/fixture/ThreadDumper.java b/src/test/java/org/commonjava/util/partyline/fixture/ThreadDumper.java
index 8de59a8..83a870e 100644
--- a/src/test/java/org/commonjava/util/partyline/fixture/ThreadDumper.java
+++ b/src/test/java/org/commonjava/util/partyline/fixture/ThreadDumper.java
@@ -31,7 +31,7 @@
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Stream;
 
-import static org.apache.commons.lang.StringUtils.join;
+import static org.apache.commons.lang3.StringUtils.join;
 
 /**
  * Created by jdcasey on 11/28/16.