You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by el...@apache.org on 2020/06/15 14:07:46 UTC

[maven-resolver] branch master updated: deprecate yet another StringUtils class (#57)

This is an automated email from the ASF dual-hosted git repository.

elharo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-resolver.git


The following commit(s) were added to refs/heads/master by this push:
     new 86c1cb2  deprecate yet another StringUtils class (#57)
86c1cb2 is described below

commit 86c1cb28042d2e751ddd657a7490c997cff4cd26
Author: Elliotte Rusty Harold <el...@users.noreply.github.com>
AuthorDate: Mon Jun 15 10:07:36 2020 -0400

    deprecate yet another StringUtils class (#57)
---
 maven-resolver-impl/pom.xml                                          | 5 +++++
 .../eclipse/aether/internal/impl/DefaultRemoteRepositoryManager.java | 2 +-
 .../eclipse/aether/internal/impl/StubRemoteRepositoryManager.java    | 2 +-
 .../src/main/java/org/eclipse/aether/util/StringUtils.java           | 2 ++
 .../src/test/java/org/eclipse/aether/util/StringUtilsTest.java       | 3 +--
 5 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/maven-resolver-impl/pom.xml b/maven-resolver-impl/pom.xml
index f6a57c4..186c17b 100644
--- a/maven-resolver-impl/pom.xml
+++ b/maven-resolver-impl/pom.xml
@@ -54,6 +54,11 @@
       <artifactId>maven-resolver-util</artifactId>
     </dependency>
     <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+      <version>3.8.1</version>
+    </dependency>
+    <dependency>
       <groupId>javax.inject</groupId>
       <artifactId>javax.inject</artifactId>
       <scope>provided</scope>
diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRemoteRepositoryManager.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRemoteRepositoryManager.java
index 5156896..90b1e38 100644
--- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRemoteRepositoryManager.java
+++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRemoteRepositoryManager.java
@@ -28,6 +28,7 @@ import static java.util.Objects.requireNonNull;
 import javax.inject.Inject;
 import javax.inject.Named;
 
+import org.apache.commons.lang3.StringUtils;
 import org.eclipse.aether.RepositoryCache;
 import org.eclipse.aether.RepositorySystemSession;
 import org.eclipse.aether.impl.RemoteRepositoryManager;
@@ -42,7 +43,6 @@ import org.eclipse.aether.repository.RepositoryPolicy;
 import org.eclipse.aether.spi.connector.checksum.ChecksumPolicyProvider;
 import org.eclipse.aether.spi.locator.Service;
 import org.eclipse.aether.spi.locator.ServiceLocator;
-import org.eclipse.aether.util.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/StubRemoteRepositoryManager.java b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/StubRemoteRepositoryManager.java
index ef3d062..5471069 100644
--- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/StubRemoteRepositoryManager.java
+++ b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/StubRemoteRepositoryManager.java
@@ -21,11 +21,11 @@ package org.eclipse.aether.internal.impl;
 
 import java.util.List;
 
+import org.apache.commons.lang3.StringUtils;
 import org.eclipse.aether.RepositorySystemSession;
 import org.eclipse.aether.impl.RemoteRepositoryManager;
 import org.eclipse.aether.repository.RemoteRepository;
 import org.eclipse.aether.repository.RepositoryPolicy;
-import org.eclipse.aether.util.StringUtils;
 
 public class StubRemoteRepositoryManager
     implements RemoteRepositoryManager
diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/StringUtils.java b/maven-resolver-util/src/main/java/org/eclipse/aether/util/StringUtils.java
index e0ed12a..b857d2e 100644
--- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/StringUtils.java
+++ b/maven-resolver-util/src/main/java/org/eclipse/aether/util/StringUtils.java
@@ -22,6 +22,7 @@ package org.eclipse.aether.util;
 /**
  * A utility class to ease string processing.
  */
+@Deprecated
 public final class StringUtils
 {
 
@@ -35,6 +36,7 @@ public final class StringUtils
      * 
      * @param string The string to check, may be {@code null}.
      * @return {@code true} if the string is {@code null} or of zero length, {@code false} otherwise.
+     * @deprecated use {@code org.apache.commons.lang3.StringUtils.isEmpty()} instead
      */
     public static boolean isEmpty( String string )
     {
diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/StringUtilsTest.java b/maven-resolver-util/src/test/java/org/eclipse/aether/util/StringUtilsTest.java
index 4ac2f7e..d0a373b 100644
--- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/StringUtilsTest.java
+++ b/maven-resolver-util/src/test/java/org/eclipse/aether/util/StringUtilsTest.java
@@ -24,8 +24,7 @@ import static org.junit.Assert.*;
 import org.eclipse.aether.util.StringUtils;
 import org.junit.Test;
 
-/**
- */
+@SuppressWarnings( "deprecation" )
 public class StringUtilsTest
 {