Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -100,7 +101,7 @@
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>junit</groupId>
Expand All @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/commonjava/util/partyline/Partyline.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down