You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2018/08/18 22:06:56 UTC
[maven-scm] branch SCM-834 created (now 3ba078e)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch SCM-834
in repository https://gitbox.apache.org/repos/asf/maven-scm.git.
at 3ba078e [SCM-834] Commit encoding is platform-dependent instead of UTF-8
This branch includes the following new commits:
new 3ba078e [SCM-834] Commit encoding is platform-dependent instead of UTF-8
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[maven-scm] 01/01: [SCM-834] Commit encoding is platform-dependent
instead of UTF-8
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch SCM-834
in repository https://gitbox.apache.org/repos/asf/maven-scm.git
commit 3ba078e70a0c1bf344d5c76664f3ae92e5b70162
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sun Aug 19 00:06:36 2018 +0200
[SCM-834] Commit encoding is platform-dependent instead of UTF-8
---
.../provider/git/gitexe/command/checkin/GitCheckInCommand.java | 2 +-
.../scm/provider/git/gitexe/command/tag/GitTagCommand.java | 2 +-
.../provider/svn/svnexe/command/branch/SvnBranchCommand.java | 8 ++++++--
.../provider/svn/svnexe/command/checkin/SvnCheckInCommand.java | 6 +++++-
.../scm/provider/svn/svnexe/command/mkdir/SvnMkdirCommand.java | 7 +++++--
.../scm/provider/svn/svnexe/command/tag/SvnTagCommand.java | 6 +++++-
.../provider/svn/svnexe/command/mkdir/SvnMkdirCommandTest.java | 10 +++++-----
7 files changed, 28 insertions(+), 13 deletions(-)
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/checkin/GitCheckInCommand.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/checkin/GitCheckInCommand.java
index 30d6c70..26cdb66 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/checkin/GitCheckInCommand.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/checkin/GitCheckInCommand.java
@@ -73,7 +73,7 @@ public class GitCheckInCommand
File messageFile = FileUtils.createTempFile( "maven-scm-", ".commit", null );
try
{
- FileUtils.fileWrite( messageFile.getAbsolutePath(), message );
+ FileUtils.fileWrite( messageFile.getAbsolutePath(), "UTF-8", message );
}
catch ( IOException ex )
{
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/tag/GitTagCommand.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/tag/GitTagCommand.java
index 068ec3e..9609124 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/tag/GitTagCommand.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/tag/GitTagCommand.java
@@ -77,7 +77,7 @@ public class GitTagCommand
try
{
- FileUtils.fileWrite( messageFile.getAbsolutePath(), scmTagParameters.getMessage() );
+ FileUtils.fileWrite( messageFile.getAbsolutePath(), "UTF-8", scmTagParameters.getMessage() );
}
catch ( IOException ex )
{
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/branch/SvnBranchCommand.java b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/branch/SvnBranchCommand.java
index 59f52d3..b5c78a4 100644
--- a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/branch/SvnBranchCommand.java
+++ b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/branch/SvnBranchCommand.java
@@ -77,7 +77,7 @@ public class SvnBranchCommand
try
{
- FileUtils.fileWrite( messageFile.getAbsolutePath(), scmBranchParameters.getMessage() );
+ FileUtils.fileWrite( messageFile.getAbsolutePath(), "UTF-8", scmBranchParameters.getMessage() );
}
catch ( IOException ex )
{
@@ -187,6 +187,10 @@ public class SvnBranchCommand
cl.createArg().setValue( messageFile.getAbsolutePath() );
+ cl.createArg().setValue( "--encoding" );
+
+ cl.createArg().setValue( "UTF-8" );
+
if ( scmBranchParameters != null && scmBranchParameters.isPinExternals() )
{
cl.createArg().setValue( "--pin-externals" );
@@ -210,5 +214,5 @@ public class SvnBranchCommand
cl.createArg().setValue( SvnCommandUtils.fixUrl( branchUrl, repository.getUser() ) );
return cl;
- }
+ }
}
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/checkin/SvnCheckInCommand.java b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/checkin/SvnCheckInCommand.java
index 38ff8c2..3a0adce 100644
--- a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/checkin/SvnCheckInCommand.java
+++ b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/checkin/SvnCheckInCommand.java
@@ -61,7 +61,7 @@ public class SvnCheckInCommand
try
{
- FileUtils.fileWrite( messageFile.getAbsolutePath(), message );
+ FileUtils.fileWrite( messageFile.getAbsolutePath(), "UTF-8", message );
}
catch ( IOException ex )
{
@@ -132,6 +132,10 @@ public class SvnCheckInCommand
cl.createArg().setValue( messageFile.getAbsolutePath() );
+ cl.createArg().setValue( "--encoding" );
+
+ cl.createArg().setValue( "UTF-8" );
+
try
{
SvnCommandLineUtils.addTarget( cl, fileSet.getFileList() );
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/mkdir/SvnMkdirCommand.java b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/mkdir/SvnMkdirCommand.java
index 6e6e313..0f10d26 100644
--- a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/mkdir/SvnMkdirCommand.java
+++ b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/mkdir/SvnMkdirCommand.java
@@ -57,7 +57,7 @@ public class SvnMkdirCommand
try
{
- FileUtils.fileWrite( messageFile.getAbsolutePath(), message );
+ FileUtils.fileWrite( messageFile.getAbsolutePath(), "UTF-8", message );
}
catch ( IOException ex )
{
@@ -138,7 +138,7 @@ public class SvnMkdirCommand
Iterator<File> it = fileSet.getFileList().iterator();
String dirPath = it.next().getPath();
// replacing \ with / for windauze
- if ( dirPath != null && Os.isFamily( Os.FAMILY_DOS ) )
+ if ( dirPath != null && Os.isFamily( Os.FAMILY_WINDOWS ) )
{
dirPath = StringUtils.replace( dirPath, "\\", "/" );
}
@@ -151,6 +151,9 @@ public class SvnMkdirCommand
{
cl.createArg().setValue( "--file" );
cl.createArg().setValue( messageFile.getAbsolutePath() );
+
+ cl.createArg().setValue( "--encoding" );
+ cl.createArg().setValue( "UTF-8" );
}
}
else
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/tag/SvnTagCommand.java b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnTagCommand.java
index b3f6005..0e96e97 100644
--- a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnTagCommand.java
+++ b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnTagCommand.java
@@ -103,7 +103,7 @@ public class SvnTagCommand
try
{
- FileUtils.fileWrite( messageFile.getAbsolutePath(), scmTagParameters.getMessage() );
+ FileUtils.fileWrite( messageFile.getAbsolutePath(), "UTF-8", scmTagParameters.getMessage() );
}
catch ( IOException ex )
{
@@ -240,6 +240,10 @@ public class SvnTagCommand
cl.createArg().setValue( messageFile.getAbsolutePath() );
+ cl.createArg().setValue( "--encoding" );
+
+ cl.createArg().setValue( "UTF-8" );
+
cl.createArg().setValue( "--parents" );
if ( scmTagParameters != null && scmTagParameters.getScmRevision() != null )
diff --git a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/mkdir/SvnMkdirCommandTest.java b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/mkdir/SvnMkdirCommandTest.java
index 85828c8..dd124ec 100644
--- a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/mkdir/SvnMkdirCommandTest.java
+++ b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/mkdir/SvnMkdirCommandTest.java
@@ -46,21 +46,21 @@ public class SvnMkdirCommandTest
messageFile = new File( "mkdir-message" );
- String path = messageFile.getAbsolutePath();
+ String path = messageFile.getAbsolutePath();
FileUtils.fileWrite( path, "create missing directory" );
-
+
if ( path.indexOf( ' ' ) >= 0 )
{
path = "\"" + path + "\"";
}
- messageFileString = "--file " + path;
+ messageFileString = "--file " + path + " --encoding UTF-8";
}
-
+
protected void tearDown()
throws Exception
{
assertTrue( messageFile.delete() );
-
+
super.tearDown();
}