From 024ceb19d549fe6213a1e59e721ce1b3f9958eef Mon Sep 17 00:00:00 2001 From: Nick Cross Date: Fri, 24 Oct 2025 08:13:59 +0100 Subject: [PATCH 1/2] Update versions. Remove commons-lang:2.6. --- pom.xml | 22 +++++++++---------- .../com/redhat/red/build/koji/KojiClient.java | 4 ++-- .../converter/KojiBuildSourceConverter.java | 2 +- .../model/converter/StringListConverter.java | 2 +- .../json/util/BuildSourceDeserializer.java | 2 +- .../model/json/util/MavenGAVDeserializer.java | 2 +- .../koji/model/json/util/Verifications.java | 2 +- .../koji/model/xmlrpc/KojiArchiveQuery.java | 2 +- .../koji/model/xmlrpc/KojiBuildInfo.java | 2 +- .../redhat/red/build/koji/it/AbstractIT.java | 2 +- .../build/koji/it/AbstractWithSetupIT.java | 2 +- .../build/koji/it/GetAllPermissionsIT.java | 2 +- 12 files changed, 23 insertions(+), 23 deletions(-) diff --git a/pom.xml b/pom.xml index 9f2f6ed..ef2ac21 100644 --- a/pom.xml +++ b/pom.xml @@ -42,13 +42,13 @@ true 1.8 - 1.6 - 2.4 + 1.16 + 2.5 4.4 - 1.0.0 + 1.1.8 2.22.0 2.1.0 - 1.0 + 1.9.2 postgres:9.4 docker.io/buildchimp/koji-dojo-hub:dev @@ -77,7 +77,7 @@ org.commonjava.boms web-commons-bom - 27 + 31 pom import @@ -136,10 +136,6 @@ com.fasterxml.jackson.core jackson-annotations - - commons-lang - commons-lang - commons-codec commons-codec @@ -160,6 +156,10 @@ org.apache.httpcomponents httpcore + + org.apache.commons + commons-lang3 + commons-io commons-io @@ -211,13 +211,13 @@ org.apache.maven maven-model - 3.1.1 + 3.6.3 test org.apache.maven maven-model-builder - 3.1.1 + 3.6.3 test diff --git a/src/main/java/com/redhat/red/build/koji/KojiClient.java b/src/main/java/com/redhat/red/build/koji/KojiClient.java index 587a2dc..64fcec3 100644 --- a/src/main/java/com/redhat/red/build/koji/KojiClient.java +++ b/src/main/java/com/redhat/red/build/koji/KojiClient.java @@ -82,8 +82,8 @@ import static com.redhat.red.build.koji.model.xmlrpc.messages.Constants.GET_BUILD; import static com.redhat.red.build.koji.model.xmlrpc.messages.MultiCallRequest.getBuilder; -import static org.apache.commons.lang.StringUtils.isEmpty; -import static org.apache.commons.lang.StringUtils.isNotEmpty; +import static org.apache.commons.lang3.StringUtils.isEmpty; +import static org.apache.commons.lang3.StringUtils.isNotEmpty; import static org.apache.http.client.utils.HttpClientUtils.closeQuietly; /** diff --git a/src/main/java/com/redhat/red/build/koji/model/converter/KojiBuildSourceConverter.java b/src/main/java/com/redhat/red/build/koji/model/converter/KojiBuildSourceConverter.java index d43b03d..4d9b43e 100644 --- a/src/main/java/com/redhat/red/build/koji/model/converter/KojiBuildSourceConverter.java +++ b/src/main/java/com/redhat/red/build/koji/model/converter/KojiBuildSourceConverter.java @@ -20,7 +20,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.apache.commons.lang.StringUtils.isEmpty; +import static org.apache.commons.lang3.StringUtils.isEmpty; /** * Created by ruhan on 8/11/17. diff --git a/src/main/java/com/redhat/red/build/koji/model/converter/StringListConverter.java b/src/main/java/com/redhat/red/build/koji/model/converter/StringListConverter.java index 3642c33..091f463 100644 --- a/src/main/java/com/redhat/red/build/koji/model/converter/StringListConverter.java +++ b/src/main/java/com/redhat/red/build/koji/model/converter/StringListConverter.java @@ -15,7 +15,7 @@ */ package com.redhat.red.build.koji.model.converter; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.commonjava.rwx.core.Converter; import java.util.Arrays; diff --git a/src/main/java/com/redhat/red/build/koji/model/json/util/BuildSourceDeserializer.java b/src/main/java/com/redhat/red/build/koji/model/json/util/BuildSourceDeserializer.java index 1efa3f4..8aadcfa 100644 --- a/src/main/java/com/redhat/red/build/koji/model/json/util/BuildSourceDeserializer.java +++ b/src/main/java/com/redhat/red/build/koji/model/json/util/BuildSourceDeserializer.java @@ -23,7 +23,7 @@ import java.io.IOException; -import static org.apache.commons.lang.StringUtils.isEmpty; +import static org.apache.commons.lang3.StringUtils.isEmpty; /** * Created by jdcasey on 2/10/16. diff --git a/src/main/java/com/redhat/red/build/koji/model/json/util/MavenGAVDeserializer.java b/src/main/java/com/redhat/red/build/koji/model/json/util/MavenGAVDeserializer.java index 2eb3cb5..b30b733 100644 --- a/src/main/java/com/redhat/red/build/koji/model/json/util/MavenGAVDeserializer.java +++ b/src/main/java/com/redhat/red/build/koji/model/json/util/MavenGAVDeserializer.java @@ -29,7 +29,7 @@ import static com.redhat.red.build.koji.model.json.KojiJsonConstants.ARTIFACT_ID; import static com.redhat.red.build.koji.model.json.KojiJsonConstants.GROUP_ID; import static com.redhat.red.build.koji.model.json.KojiJsonConstants.VERSION; -import static org.apache.commons.lang.StringUtils.isEmpty; +import static org.apache.commons.lang3.StringUtils.isEmpty; /** * Created by jdcasey on 2/10/16. diff --git a/src/main/java/com/redhat/red/build/koji/model/json/util/Verifications.java b/src/main/java/com/redhat/red/build/koji/model/json/util/Verifications.java index 868d3ad..50a0bfb 100644 --- a/src/main/java/com/redhat/red/build/koji/model/json/util/Verifications.java +++ b/src/main/java/com/redhat/red/build/koji/model/json/util/Verifications.java @@ -17,7 +17,7 @@ import java.util.Set; -import static org.apache.commons.lang.StringUtils.isEmpty; +import static org.apache.commons.lang3.StringUtils.isEmpty; /** * Created by jdcasey on 2/16/16. diff --git a/src/main/java/com/redhat/red/build/koji/model/xmlrpc/KojiArchiveQuery.java b/src/main/java/com/redhat/red/build/koji/model/xmlrpc/KojiArchiveQuery.java index 3309604..1c92b66 100644 --- a/src/main/java/com/redhat/red/build/koji/model/xmlrpc/KojiArchiveQuery.java +++ b/src/main/java/com/redhat/red/build/koji/model/xmlrpc/KojiArchiveQuery.java @@ -21,7 +21,7 @@ import org.commonjava.rwx.anno.DataKey; import org.commonjava.rwx.anno.StructPart; -import static org.apache.commons.lang.StringUtils.isNotEmpty; +import static org.apache.commons.lang3.StringUtils.isNotEmpty; /** * Created by jdcasey on 5/6/16. diff --git a/src/main/java/com/redhat/red/build/koji/model/xmlrpc/KojiBuildInfo.java b/src/main/java/com/redhat/red/build/koji/model/xmlrpc/KojiBuildInfo.java index 2801b27..c6a5053 100644 --- a/src/main/java/com/redhat/red/build/koji/model/xmlrpc/KojiBuildInfo.java +++ b/src/main/java/com/redhat/red/build/koji/model/xmlrpc/KojiBuildInfo.java @@ -21,7 +21,7 @@ import com.redhat.red.build.koji.model.converter.TimestampConverter; import com.redhat.red.build.koji.model.util.ExternalizableUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.commonjava.atlas.maven.ident.ref.ProjectVersionRef; import org.commonjava.atlas.maven.ident.ref.SimpleProjectVersionRef; import org.commonjava.rwx.anno.Converter; diff --git a/src/test/java/com/redhat/red/build/koji/it/AbstractIT.java b/src/test/java/com/redhat/red/build/koji/it/AbstractIT.java index 121d341..1d90326 100644 --- a/src/test/java/com/redhat/red/build/koji/it/AbstractIT.java +++ b/src/test/java/com/redhat/red/build/koji/it/AbstractIT.java @@ -21,7 +21,7 @@ import com.redhat.red.build.koji.config.SimpleKojiConfigBuilder; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpGet; import org.apache.http.client.methods.HttpPost; diff --git a/src/test/java/com/redhat/red/build/koji/it/AbstractWithSetupIT.java b/src/test/java/com/redhat/red/build/koji/it/AbstractWithSetupIT.java index 5f46ec0..7d70ddc 100644 --- a/src/test/java/com/redhat/red/build/koji/it/AbstractWithSetupIT.java +++ b/src/test/java/com/redhat/red/build/koji/it/AbstractWithSetupIT.java @@ -29,7 +29,7 @@ import java.util.Properties; import static org.apache.commons.io.IOUtils.closeQuietly; -import static org.apache.commons.lang.StringUtils.isEmpty; +import static org.apache.commons.lang3.StringUtils.isEmpty; import static org.junit.Assert.fail; /** diff --git a/src/test/java/com/redhat/red/build/koji/it/GetAllPermissionsIT.java b/src/test/java/com/redhat/red/build/koji/it/GetAllPermissionsIT.java index 581012b..a832ebd 100644 --- a/src/test/java/com/redhat/red/build/koji/it/GetAllPermissionsIT.java +++ b/src/test/java/com/redhat/red/build/koji/it/GetAllPermissionsIT.java @@ -18,7 +18,7 @@ import com.redhat.red.build.koji.KojiClient; import com.redhat.red.build.koji.model.xmlrpc.KojiPermission; import com.redhat.red.build.koji.model.xmlrpc.KojiSessionInfo; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.junit.Test; import java.util.List; From 58f254a7eca161f42eb1a39f1e21e716bb6a2e58 Mon Sep 17 00:00:00 2001 From: Nick Cross Date: Fri, 24 Oct 2025 15:56:17 +0100 Subject: [PATCH 2/2] Update JDK to 11 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ef2ac21..0ca47e8 100644 --- a/pom.xml +++ b/pom.xml @@ -41,7 +41,7 @@ true - 1.8 + 11 1.16 2.5 4.4