diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml index 375241d72..ff715b985 100644 --- a/.github/workflows/gradle-wrapper-validation.yml +++ b/.github/workflows/gradle-wrapper-validation.yml @@ -7,4 +7,4 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: gradle/wrapper-validation-action@v1 + - uses: gradle/wrapper-validation-action@v3 diff --git a/ribbon-archaius/build.gradle b/ribbon-archaius/build.gradle index 519148905..68c0a2114 100644 --- a/ribbon-archaius/build.gradle +++ b/ribbon-archaius/build.gradle @@ -3,7 +3,6 @@ dependencies { api 'com.google.code.findbugs:annotations:2.0.0' api "com.google.guava:guava:${guava_version}" api 'commons-configuration:commons-configuration:1.8' - api 'commons-lang:commons-lang:2.6' api "com.netflix.archaius:archaius-core:${archaius_version}" api project(':ribbon-core') diff --git a/ribbon-core/build.gradle b/ribbon-core/build.gradle index ab5b7c1af..95310e480 100644 --- a/ribbon-core/build.gradle +++ b/ribbon-core/build.gradle @@ -2,7 +2,7 @@ dependencies { api "org.slf4j:slf4j-api:${slf4j_version}" api 'com.google.code.findbugs:annotations:2.0.0' api "com.google.guava:guava:${guava_version}" - api 'commons-lang:commons-lang:2.6' + api 'org.apache.commons:commons-lang3:3.19.0' testImplementation 'junit:junit:4.11' testImplementation "org.slf4j:slf4j-log4j12:${slf4j_version}" diff --git a/ribbon-core/src/main/java/com/netflix/client/config/ReloadableClientConfig.java b/ribbon-core/src/main/java/com/netflix/client/config/ReloadableClientConfig.java index c712ad85e..6cea4cba7 100644 --- a/ribbon-core/src/main/java/com/netflix/client/config/ReloadableClientConfig.java +++ b/ribbon-core/src/main/java/com/netflix/client/config/ReloadableClientConfig.java @@ -1,7 +1,7 @@ package com.netflix.client.config; import com.google.common.base.Preconditions; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ribbon-core/src/main/java/com/netflix/client/ssl/URLSslContextFactory.java b/ribbon-core/src/main/java/com/netflix/client/ssl/URLSslContextFactory.java index f9ead162b..5e963fcea 100644 --- a/ribbon-core/src/main/java/com/netflix/client/ssl/URLSslContextFactory.java +++ b/ribbon-core/src/main/java/com/netflix/client/ssl/URLSslContextFactory.java @@ -25,7 +25,7 @@ import java.security.NoSuchAlgorithmException; import java.security.cert.CertificateException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ribbon-loadbalancer/src/main/java/com/netflix/loadbalancer/LoadBalancerContext.java b/ribbon-loadbalancer/src/main/java/com/netflix/loadbalancer/LoadBalancerContext.java index 8dd9eecc8..cd0347b5e 100644 --- a/ribbon-loadbalancer/src/main/java/com/netflix/loadbalancer/LoadBalancerContext.java +++ b/ribbon-loadbalancer/src/main/java/com/netflix/loadbalancer/LoadBalancerContext.java @@ -28,7 +28,7 @@ import com.netflix.servo.monitor.Monitors; import com.netflix.servo.monitor.Timer; import com.netflix.util.Pair; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory;