Skip to content

Commit 024ceb1

Browse files
committed
Update versions. Remove commons-lang:2.6.
1 parent 070cb12 commit 024ceb1

12 files changed

Lines changed: 23 additions & 23 deletions

File tree

pom.xml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,13 @@
4242
<properties>
4343
<enforcer.skip>true</enforcer.skip>
4444
<javaVersion>1.8</javaVersion>
45-
<jhttpcVersion>1.6</jhttpcVersion>
46-
<rwxVersion>2.4</rwxVersion>
45+
<jhttpcVersion>1.16</jhttpcVersion>
46+
<rwxVersion>2.5</rwxVersion>
4747
<httpcVersion>4.4</httpcVersion>
48-
<atlasVersion>1.0.0</atlasVersion>
48+
<atlasVersion>1.1.8</atlasVersion>
4949
<mockitoVersion>2.22.0</mockitoVersion>
5050
<kerbyVersion>2.1.0</kerbyVersion>
51-
<o11yphantVersion>1.0</o11yphantVersion>
51+
<o11yphantVersion>1.9.2</o11yphantVersion>
5252

5353
<dbImage>postgres:9.4</dbImage>
5454
<hubImage>docker.io/buildchimp/koji-dojo-hub:dev</hubImage>
@@ -77,7 +77,7 @@
7777
<dependency>
7878
<groupId>org.commonjava.boms</groupId>
7979
<artifactId>web-commons-bom</artifactId>
80-
<version>27</version>
80+
<version>31</version>
8181
<type>pom</type>
8282
<scope>import</scope>
8383
</dependency>
@@ -136,10 +136,6 @@
136136
<groupId>com.fasterxml.jackson.core</groupId>
137137
<artifactId>jackson-annotations</artifactId>
138138
</dependency>
139-
<dependency>
140-
<groupId>commons-lang</groupId>
141-
<artifactId>commons-lang</artifactId>
142-
</dependency>
143139
<dependency>
144140
<groupId>commons-codec</groupId>
145141
<artifactId>commons-codec</artifactId>
@@ -160,6 +156,10 @@
160156
<groupId>org.apache.httpcomponents</groupId>
161157
<artifactId>httpcore</artifactId>
162158
</dependency>
159+
<dependency>
160+
<groupId>org.apache.commons</groupId>
161+
<artifactId>commons-lang3</artifactId>
162+
</dependency>
163163
<dependency>
164164
<groupId>commons-io</groupId>
165165
<artifactId>commons-io</artifactId>
@@ -211,13 +211,13 @@
211211
<dependency>
212212
<groupId>org.apache.maven</groupId>
213213
<artifactId>maven-model</artifactId>
214-
<version>3.1.1</version>
214+
<version>3.6.3</version>
215215
<scope>test</scope>
216216
</dependency>
217217
<dependency>
218218
<groupId>org.apache.maven</groupId>
219219
<artifactId>maven-model-builder</artifactId>
220-
<version>3.1.1</version>
220+
<version>3.6.3</version>
221221
<scope>test</scope>
222222
</dependency>
223223

src/main/java/com/redhat/red/build/koji/KojiClient.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@
8282

8383
import static com.redhat.red.build.koji.model.xmlrpc.messages.Constants.GET_BUILD;
8484
import static com.redhat.red.build.koji.model.xmlrpc.messages.MultiCallRequest.getBuilder;
85-
import static org.apache.commons.lang.StringUtils.isEmpty;
86-
import static org.apache.commons.lang.StringUtils.isNotEmpty;
85+
import static org.apache.commons.lang3.StringUtils.isEmpty;
86+
import static org.apache.commons.lang3.StringUtils.isNotEmpty;
8787
import static org.apache.http.client.utils.HttpClientUtils.closeQuietly;
8888

8989
/**

src/main/java/com/redhat/red/build/koji/model/converter/KojiBuildSourceConverter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import org.slf4j.Logger;
2121
import org.slf4j.LoggerFactory;
2222

23-
import static org.apache.commons.lang.StringUtils.isEmpty;
23+
import static org.apache.commons.lang3.StringUtils.isEmpty;
2424

2525
/**
2626
* Created by ruhan on 8/11/17.

src/main/java/com/redhat/red/build/koji/model/converter/StringListConverter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
package com.redhat.red.build.koji.model.converter;
1717

18-
import org.apache.commons.lang.StringUtils;
18+
import org.apache.commons.lang3.StringUtils;
1919
import org.commonjava.rwx.core.Converter;
2020

2121
import java.util.Arrays;

src/main/java/com/redhat/red/build/koji/model/json/util/BuildSourceDeserializer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
import java.io.IOException;
2525

26-
import static org.apache.commons.lang.StringUtils.isEmpty;
26+
import static org.apache.commons.lang3.StringUtils.isEmpty;
2727

2828
/**
2929
* Created by jdcasey on 2/10/16.

src/main/java/com/redhat/red/build/koji/model/json/util/MavenGAVDeserializer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import static com.redhat.red.build.koji.model.json.KojiJsonConstants.ARTIFACT_ID;
3030
import static com.redhat.red.build.koji.model.json.KojiJsonConstants.GROUP_ID;
3131
import static com.redhat.red.build.koji.model.json.KojiJsonConstants.VERSION;
32-
import static org.apache.commons.lang.StringUtils.isEmpty;
32+
import static org.apache.commons.lang3.StringUtils.isEmpty;
3333

3434
/**
3535
* Created by jdcasey on 2/10/16.

src/main/java/com/redhat/red/build/koji/model/json/util/Verifications.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
import java.util.Set;
1919

20-
import static org.apache.commons.lang.StringUtils.isEmpty;
20+
import static org.apache.commons.lang3.StringUtils.isEmpty;
2121

2222
/**
2323
* Created by jdcasey on 2/16/16.

src/main/java/com/redhat/red/build/koji/model/xmlrpc/KojiArchiveQuery.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import org.commonjava.rwx.anno.DataKey;
2222
import org.commonjava.rwx.anno.StructPart;
2323

24-
import static org.apache.commons.lang.StringUtils.isNotEmpty;
24+
import static org.apache.commons.lang3.StringUtils.isNotEmpty;
2525

2626
/**
2727
* Created by jdcasey on 5/6/16.

src/main/java/com/redhat/red/build/koji/model/xmlrpc/KojiBuildInfo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import com.redhat.red.build.koji.model.converter.TimestampConverter;
2222
import com.redhat.red.build.koji.model.util.ExternalizableUtils;
2323

24-
import org.apache.commons.lang.StringUtils;
24+
import org.apache.commons.lang3.StringUtils;
2525
import org.commonjava.atlas.maven.ident.ref.ProjectVersionRef;
2626
import org.commonjava.atlas.maven.ident.ref.SimpleProjectVersionRef;
2727
import org.commonjava.rwx.anno.Converter;

src/test/java/com/redhat/red/build/koji/it/AbstractIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import com.redhat.red.build.koji.config.SimpleKojiConfigBuilder;
2222
import org.apache.commons.io.FileUtils;
2323
import org.apache.commons.io.IOUtils;
24-
import org.apache.commons.lang.StringUtils;
24+
import org.apache.commons.lang3.StringUtils;
2525
import org.apache.http.client.methods.CloseableHttpResponse;
2626
import org.apache.http.client.methods.HttpGet;
2727
import org.apache.http.client.methods.HttpPost;

0 commit comments

Comments
 (0)