Skip to content

Commit 32c5a2a

Browse files
committed
Update versions. Remove commons-lang:2.6.
1 parent bb7e88b commit 32c5a2a

File tree

4 files changed

+17
-19
lines changed

4 files changed

+17
-19
lines changed

pom.xml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
-->
1818
<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">
1919
<modelVersion>4.0.0</modelVersion>
20-
20+
2121
<parent>
2222
<groupId>org.commonjava</groupId>
2323
<artifactId>commonjava</artifactId>
24-
<version>13</version>
24+
<version>21</version>
2525
</parent>
2626

2727
<groupId>org.commonjava.util</groupId>
@@ -30,21 +30,22 @@
3030

3131
<name>partyline</name>
3232
<inceptionYear>2015</inceptionYear>
33-
33+
3434
<scm>
3535
<connection>scm:git:https://github.com/Commonjava/partyline.git</connection>
3636
<developerConnection>scm:git:[email protected]:Commonjava/partyline.git</developerConnection>
3737
<url>https://github.com/Commonjava/partyline</url>
3838
<tag>HEAD</tag>
3939
</scm>
40-
40+
4141
<properties>
42-
<weftVersion>1.14</weftVersion>
43-
<infinispanVersion>9.4.7.Final</infinispanVersion>
42+
<weftVersion>1.25</weftVersion>
43+
<!-- Match the version currently being used by Indy -->
44+
<infinispanVersion>9.4.24.Final</infinispanVersion>
4445
<projectOwner>Red Hat, Inc.</projectOwner>
4546
<projectEmail>[email protected]</projectEmail>
4647
<javaVersion>1.8</javaVersion>
47-
<byteman.version>3.0.6</byteman.version>
48+
<byteman.version>4.0.26</byteman.version>
4849
<test-forkCount>1</test-forkCount>
4950

5051
<plugin.jacoco.skip>false</plugin.jacoco.skip>
@@ -55,7 +56,7 @@
5556
<dependency>
5657
<groupId>org.commonjava.boms</groupId>
5758
<artifactId>web-commons-bom</artifactId>
58-
<version>21</version>
59+
<version>31</version>
5960
<type>pom</type>
6061
<scope>import</scope>
6162
</dependency>
@@ -100,7 +101,7 @@
100101
</dependency>
101102
</dependencies>
102103
</dependencyManagement>
103-
104+
104105
<dependencies>
105106
<dependency>
106107
<groupId>junit</groupId>
@@ -118,10 +119,6 @@
118119
<groupId>ch.qos.logback</groupId>
119120
<artifactId>logback-classic</artifactId>
120121
</dependency>
121-
<dependency>
122-
<groupId>commons-lang</groupId>
123-
<artifactId>commons-lang</artifactId>
124-
</dependency>
125122
<dependency>
126123
<groupId>org.jboss.byteman</groupId>
127124
<artifactId>byteman</artifactId>
@@ -138,6 +135,10 @@
138135
<groupId>org.jboss.byteman</groupId>
139136
<artifactId>byteman-bmunit</artifactId>
140137
</dependency>
138+
<dependency>
139+
<groupId>org.apache.commons</groupId>
140+
<artifactId>commons-lang3</artifactId>
141+
</dependency>
141142
<dependency>
142143
<groupId>org.commonjava.cdi.util</groupId>
143144
<artifactId>weft</artifactId>
@@ -153,10 +154,9 @@
153154
<dependency>
154155
<groupId>org.jboss.logging</groupId>
155156
<artifactId>jboss-logging</artifactId>
156-
<version>3.3.0.Final</version>
157157
</dependency>
158158
</dependencies>
159-
159+
160160
<build>
161161
<pluginManagement>
162162
<plugins>

src/main/java/org/commonjava/util/partyline/Partyline.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
import java.util.concurrent.atomic.AtomicReference;
4141
import java.util.function.Consumer;
4242

43-
import static org.apache.commons.lang.StringUtils.join;
43+
import static org.apache.commons.lang3.StringUtils.join;
4444

4545
import static org.commonjava.util.partyline.lock.LockLevel.read;
4646
import static org.commonjava.util.partyline.lock.local.LocalLockOwner.getLockReservationName;

src/main/java/org/commonjava/util/partyline/lock/local/LocalLockOwner.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@
2828
import java.util.Map;
2929
import java.util.Optional;
3030

31-
import static org.apache.commons.lang.StringUtils.join;
32-
3331
/**
3432
* Maintain information about threads with active locks on a file, along the current lock-level of the file (which
3533
* determines what additional operations can be added, once the initial operation is started). This class counts

src/test/java/org/commonjava/util/partyline/fixture/ThreadDumper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import java.util.concurrent.atomic.AtomicReference;
3232
import java.util.stream.Stream;
3333

34-
import static org.apache.commons.lang.StringUtils.join;
34+
import static org.apache.commons.lang3.StringUtils.join;
3535

3636
/**
3737
* Created by jdcasey on 11/28/16.

0 commit comments

Comments
 (0)