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/12/23 12:57:13 UTC
[maven-scm] 01/01: replace deprecated methods
This is an automated email from the ASF dual-hosted git repository.
elharo pushed a commit to branch depre
in repository https://gitbox.apache.org/repos/asf/maven-scm.git
commit c908e1e79a2bb27ea0b84083939d16f4925b990c
Author: Elliotte Rusty Harold <el...@ibiblio.org>
AuthorDate: Wed Dec 23 07:56:58 2020 -0500
replace deprecated methods
---
.../java/org/apache/maven/scm/plugin/AbstractScmMojo.java | 3 ++-
.../accurev/command/changelog/AccuRevChangeLogCommand.java | 3 ++-
.../accurev/AccuRevScmProviderRepositoryMatcher.java | 13 +++++++------
.../cvslib/command/changelog/CvsChangeLogConsumerTest.java | 1 -
.../svn/svnexe/command/changelog/SvnChangeLogCommand.java | 3 ++-
5 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java
index b0a3aea..54bf40a 100644
--- a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java
+++ b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java
@@ -26,6 +26,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
+import java.util.Objects;
import java.util.Properties;
import org.apache.maven.plugin.AbstractMojo;
@@ -445,7 +446,7 @@ public abstract class AbstractScmMojo
getLog().error( result.getCommandOutput() == null ? "" : result.getCommandOutput() );
throw new MojoExecutionException(
- "Command failed." + StringUtils.defaultString( result.getProviderMessage() ) );
+ "Command failed." + Objects.toString( result.getProviderMessage() ) );
}
}
diff --git a/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/command/changelog/AccuRevChangeLogCommand.java b/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/command/changelog/AccuRevChangeLogCommand.java
index b0b02d4..db149cc 100644
--- a/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/command/changelog/AccuRevChangeLogCommand.java
+++ b/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/command/changelog/AccuRevChangeLogCommand.java
@@ -26,6 +26,7 @@ import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import org.apache.maven.scm.ChangeFile;
import org.apache.maven.scm.ChangeSet;
@@ -96,7 +97,7 @@ public class AccuRevChangeLogCommand
endVersion == null ? new AccuRevVersion( fromVersion.getBasisStream(), "now" )
: repository.getAccuRevVersion( endVersion );
- if ( !StringUtils.equals( fromVersion.getBasisStream(), toVersion.getBasisStream() ) )
+ if ( !Objects.equals( fromVersion.getBasisStream(), toVersion.getBasisStream() ) )
{
throw new AccuRevException( "Not able to provide change log between different streams " + fromVersion
+ "," + toVersion );
diff --git a/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/AccuRevScmProviderRepositoryMatcher.java b/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/AccuRevScmProviderRepositoryMatcher.java
index bdfc37e..b959879 100644
--- a/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/AccuRevScmProviderRepositoryMatcher.java
+++ b/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/AccuRevScmProviderRepositoryMatcher.java
@@ -1,5 +1,7 @@
package org.apache.maven.scm.provider.accurev;
+import java.util.Objects;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -20,7 +22,6 @@ package org.apache.maven.scm.provider.accurev;
*/
import org.apache.maven.scm.provider.ScmProviderRepository;
-import org.codehaus.plexus.util.StringUtils;
import org.hamcrest.Description;
import org.hamcrest.Matcher;
import org.hamcrest.TypeSafeMatcher;
@@ -86,11 +87,11 @@ public class AccuRevScmProviderRepositoryMatcher
return false;
}
AccuRevScmProviderRepository accuRevRepo = (AccuRevScmProviderRepository) repo;
- return StringUtils.equals( user, accuRevRepo.getUser() )
- && StringUtils.equals( pass, accuRevRepo.getPassword() )
- && StringUtils.equals( host, accuRevRepo.getHost() ) && port == accuRevRepo.getPort()
- && StringUtils.equals( stream, accuRevRepo.getStreamName() )
- && StringUtils.equals( projectPath, accuRevRepo.getProjectPath() );
+ return Objects.equals( user, accuRevRepo.getUser() )
+ && Objects.equals( pass, accuRevRepo.getPassword() )
+ && Objects.equals( host, accuRevRepo.getHost() ) && port == accuRevRepo.getPort()
+ && Objects.equals( stream, accuRevRepo.getStreamName() )
+ && Objects.equals( projectPath, accuRevRepo.getProjectPath() );
}
}
diff --git a/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/test/java/org/apache/maven/scm/provider/cvslib/command/changelog/CvsChangeLogConsumerTest.java b/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/test/java/org/apache/maven/scm/provider/cvslib/command/changelog/CvsChangeLogConsumerTest.java
index 379801f..6290219 100644
--- a/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/test/java/org/apache/maven/scm/provider/cvslib/command/changelog/CvsChangeLogConsumerTest.java
+++ b/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/test/java/org/apache/maven/scm/provider/cvslib/command/changelog/CvsChangeLogConsumerTest.java
@@ -22,7 +22,6 @@ package org.apache.maven.scm.provider.cvslib.command.changelog;
import org.apache.maven.scm.ChangeSet;
import org.apache.maven.scm.ScmTestCase;
import org.apache.maven.scm.log.DefaultLog;
-import org.apache.maven.scm.provider.cvslib.AbstractCvsScmTest;
import org.apache.maven.scm.util.ConsumerUtils;
import java.io.File;
diff --git a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogCommand.java b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogCommand.java
index 65b90df..7f50bb7 100644
--- a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogCommand.java
+++ b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogCommand.java
@@ -42,6 +42,7 @@ import org.codehaus.plexus.util.cli.Commandline;
import java.io.File;
import java.text.SimpleDateFormat;
import java.util.Date;
+import java.util.Objects;
import java.util.TimeZone;
/**
@@ -219,7 +220,7 @@ public class SvnChangeLogCommand
}
}
- if ( endVersion == null || !StringUtils.equals( "BASE", endVersion.getName() ) )
+ if ( endVersion == null || !Objects.equals( "BASE", endVersion.getName() ) )
{
cl.createArg().setValue( repository.getUrl() + "@" );
}