This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/maven-project-info-reports-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new 4387113 [MPIR-369] Drop Commons Lang for System builtins
4387113 is described below
commit 43871130bff656b5afbfe3d90a558114df7ac9ed
Author: Michael Osipov <[email protected]>
AuthorDate: Tue May 1 00:18:17 2018 +0200
[MPIR-369] Drop Commons Lang for System builtins
---
pom.xml | 7 +------
.../apache/maven/report/projectinfo/ScmReport.java | 19 ++++++++++---------
2 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/pom.xml b/pom.xml
index 402864c..4a9e126 100644
--- a/pom.xml
+++ b/pom.xml
@@ -145,7 +145,7 @@ under the License.
<version>${mavenVersion}</version>
<scope>test</scope>
</dependency>
-
+
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
@@ -388,11 +388,6 @@ under the License.
<artifactId>commons-validator</artifactId>
<version>1.5.1</version>
</dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.6</version>
- </dependency>
</dependencies>
<build>
diff --git a/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java
b/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java
index 3508e55..1f8f196 100644
--- a/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java
+++ b/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java
@@ -19,7 +19,6 @@ package org.apache.maven.report.projectinfo;
* under the License.
*/
-import org.apache.commons.lang.SystemUtils;
import org.apache.maven.doxia.sink.Sink;
import org.apache.maven.model.Model;
import org.apache.maven.model.Scm;
@@ -160,6 +159,8 @@ public class ScmReport
private static class ScmRenderer
extends AbstractProjectInfoRenderer
{
+ private static final String LS = System.lineSeparator();
+
private Log log;
private Model model;
@@ -496,8 +497,8 @@ public class ScmReport
paragraph( getI18nString( "accessthroughtproxy.svn.intro2" ) );
paragraph( getI18nString( "accessthroughtproxy.svn.intro3" ) );
- verbatimText( "[global]" + SystemUtils.LINE_SEPARATOR +
"http-proxy-host = your.proxy.name"
- + SystemUtils.LINE_SEPARATOR + "http-proxy-port = 3128" +
SystemUtils.LINE_SEPARATOR );
+ verbatimText( "[global]" + LS + "http-proxy-host =
your.proxy.name"
+ + LS + "http-proxy-port = 3128" + LS );
endSection();
}
@@ -541,7 +542,7 @@ public class ScmReport
{
paragraph( getI18nString( "anonymousaccess.cvs.intro" ) );
- verbatimText( "$ cvs -d " + cvsRepo.getCvsRoot() + " login" +
SystemUtils.LINE_SEPARATOR + "$ cvs -z3 -d "
+ verbatimText( "$ cvs -d " + cvsRepo.getCvsRoot() + " login" + LS +
"$ cvs -z3 -d "
+ cvsRepo.getCvsRoot() + " co " + cvsRepo.getModule() );
}
@@ -622,7 +623,7 @@ public class ScmReport
// Safety: remove the username if present
String cvsRoot = StringUtils.replace( cvsRepo.getCvsRoot(),
cvsRepo.getUser(), "username" );
- verbatimText( "$ cvs -d " + cvsRoot + " login" +
SystemUtils.LINE_SEPARATOR + "$ cvs -z3 -d " + cvsRoot
+ verbatimText( "$ cvs -d " + cvsRoot + " login" + LS + "$ cvs -z3
-d " + cvsRoot
+ " co " + cvsRepo.getModule() );
}
@@ -704,7 +705,7 @@ public class ScmReport
command.append( " -P password" );
command.append( " " );
command.append( perforceRepo.getPath() );
- command.append( SystemUtils.LINE_SEPARATOR );
+ command.append( LS );
command.append( "$ p4 submit -c \"A comment\"" );
verbatimText( command.toString() );
@@ -737,7 +738,7 @@ public class ScmReport
command.append( "$ stcmd co -x -nologo -stop -p " );
command.append( fullUrl );
command.append( " -is" );
- command.append( SystemUtils.LINE_SEPARATOR );
+ command.append( LS );
command.append( "$ stcmd ci -x -nologo -stop -p " );
command.append( fullUrl );
command.append( " -f NCI -is" );
@@ -855,12 +856,12 @@ public class ScmReport
sb.append( "This SCM url '" );
sb.append( scmUrl );
sb.append( "' is invalid due to the following errors:"
);
- sb.append( SystemUtils.LINE_SEPARATOR );
+ sb.append( LS );
isIntroAdded = true;
}
sb.append( " * " );
sb.append( msg );
- sb.append( SystemUtils.LINE_SEPARATOR );
+ sb.append( LS );
}
if ( StringUtils.isNotEmpty( sb.toString() ) )
--
To stop receiving notification emails like this one, please contact
[email protected].
