This is an automated email from the ASF dual-hosted git repository. lburgazzoli pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
commit c726ce5ef11e6ff509a33799075098bc9c032d2d Author: Luca Burgazzoli <[email protected]> AuthorDate: Fri Oct 22 19:07:38 2021 +0200 chore: fix deprecation warnings --- .../apache/camel/k/tooling/maven/GenerateDependencyListMojo.java | 6 +++--- .../main/java/org/apache/camel/k/tooling/maven/GenerateSupport.java | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/support/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateDependencyListMojo.java b/support/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateDependencyListMojo.java index 09ba7f7..5cac698 100644 --- a/support/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateDependencyListMojo.java +++ b/support/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateDependencyListMojo.java @@ -28,6 +28,7 @@ import java.util.Collections; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.stream.Collectors; import org.apache.maven.artifact.Artifact; @@ -40,7 +41,6 @@ import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.plugins.annotations.Parameter; import org.apache.maven.plugins.annotations.ResolutionScope; import org.apache.maven.project.MavenProject; -import org.apache.maven.shared.utils.StringUtils; import org.yaml.snakeyaml.DumperOptions; import org.yaml.snakeyaml.Yaml; @@ -93,8 +93,8 @@ public class GenerateDependencyListMojo extends AbstractMojo { } private boolean isCompileOrRuntime(Artifact artifact) { - return StringUtils.equals(artifact.getScope(), DefaultArtifact.SCOPE_COMPILE) - || StringUtils.equals(artifact.getScope(), DefaultArtifact.SCOPE_RUNTIME); + return Objects.equals(artifact.getScope(), DefaultArtifact.SCOPE_COMPILE) + || Objects.equals(artifact.getScope(), DefaultArtifact.SCOPE_RUNTIME); } private Map<String, String> artifactToMap(Artifact artifact) { diff --git a/support/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateSupport.java b/support/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateSupport.java index e8369d0..2f17bdf 100644 --- a/support/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateSupport.java +++ b/support/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateSupport.java @@ -20,7 +20,7 @@ import java.io.IOException; import java.io.InputStream; import java.nio.charset.StandardCharsets; -import org.apache.maven.shared.utils.io.IOUtil; +import org.apache.commons.io.IOUtils; public final class GenerateSupport { private GenerateSupport() { @@ -32,7 +32,7 @@ public final class GenerateSupport { throw new IllegalStateException("Unable to find catalog-license.txt"); } - return IOUtil.toString(is, StandardCharsets.UTF_8.name()); + return IOUtils.toString(is, StandardCharsets.UTF_8.name()); } } }
