[1/2] maven-surefire git commit: [SUREFIRE-1495] Encoding of TXT report file should be configured by ${project.reporting.outputEncoding} and MOJO parameter encoding [Forced Update!]
Repository: maven-surefire
Updated Branches:
refs/heads/SUREFIRE-1490 6174be76f -> be4e4c0c7 (forced update)
[SUREFIRE-1495] Encoding of TXT report file should be configured by
${project.reporting.outputEncoding} and MOJO parameter encoding
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/bcd27b7f
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/bcd27b7f
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/bcd27b7f
Branch: refs/heads/SUREFIRE-1490
Commit: bcd27b7f2b560fe6fa0b2927913c3c4a15e5c41e
Parents: c10e717
Author: Tibor17
Authored: Thu Mar 8 08:19:02 2018 +0100
Committer: Tibor17
Committed: Sat Mar 17 11:19:54 2018 +0100
--
.gitattributes | 6 ++-
Jenkinsfile | 4 +-
.../plugin/failsafe/IntegrationTestMojo.java| 19 +++--
.../plugin/surefire/AbstractSurefireMojo.java | 3 +-
.../maven/plugin/surefire/CommonReflector.java | 5 ++-
.../surefire/StartupReportConfiguration.java| 41 +++-
.../surefire/SurefireExecutionParameters.java | 4 ++
.../surefire/report/DefaultReporterFactory.java | 11 --
.../plugin/surefire/report/FileReporter.java| 14 +--
.../surefire/report/NullFileReporter.java | 2 +-
.../AbstractSurefireMojoJava7PlusTest.java | 12 ++
.../surefire/AbstractSurefireMojoTest.java | 12 ++
.../TestSetMockReporterFactory.java | 17 +++-
.../report/DefaultReporterFactoryTest.java | 2 +-
.../report/ConsoleOutputFileReporterTest.java | 34 +++-
.../maven/surefire/report/FileReporterTest.java | 8 ++--
.../maven/plugin/surefire/SurefirePlugin.java | 22 +++
.../maven/surefire/its/UnicodeTestNamesIT.java | 14 +--
.../surefire/its/fixture/HelperAssertions.java | 6 +++
.../surefire/its/fixture/OutputValidator.java | 9 -
.../maven/surefire/its/fixture/TestFile.java| 2 +-
.../jiras/Surefire141PluggableProvidersIT.java | 16 +---
.../jiras/Surefire975DefaultVMEncodingIT.java | 5 ++-
.../test/resources/unicode-testnames/pom.xml| 1 +
.../junitcore/ConcurrentRunListenerTest.java| 2 +-
.../surefire/junitcore/JUnitCoreTester.java | 27 -
.../surefire/junitcore/Surefire746Test.java | 3 +-
27 files changed, 206 insertions(+), 95 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/bcd27b7f/.gitattributes
--
diff --git a/.gitattributes b/.gitattributes
index 3bb3b5e..4f942c9 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,8 +1,12 @@
# Auto detect text files and perform LF normalization
-*text=auto
+* text eol=lf
+*.xmltext diff=xml
*.java text diff=java
*.html text diff=html
+*.vm text
+*.fmltext
+*.md text
*.csstext
*.js text
*.sqltext
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/bcd27b7f/Jenkinsfile
--
diff --git a/Jenkinsfile b/Jenkinsfile
index 5733847..c33159c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -27,8 +27,8 @@ properties(
)
final def oses = ['linux', 'windows']
-final def mavens = ['3.2.x', '3.3.x', '3.5.x']//env.BRANCH_NAME == 'master' ?
['3.2.x', '3.3.x', '3.5.x'] : ['3.5.x']
-final def jdks = [7, 8, 9, 10]//env.BRANCH_NAME == 'master' ? [7, 8, 9, 10] :
[9, 10]
+final def mavens = ['3.2.x', '3.3.x', '3.5.x'] // env.BRANCH_NAME == 'master'
? ['3.2.x', '3.3.x', '3.5.x'] : ['3.2.x', '3.5.x']
+final def jdks = [7, 8, 9, 10] // env.BRANCH_NAME == 'master' ? [7, 8, 9, 10]
: [7, 10]
final def options = ['-e', '-V', '-B', '-nsu', '-P', 'run-its']
final def goals = ['clean', 'install', 'jacoco:report']
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/bcd27b7f/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
--
diff --git
a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
b/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
index 3474b16..51414cf 100644
---
a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
+++
b/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
@@ -256,10 +256,11 @@ public class IntegrationTestMojo
private boolean useManifestOnlyJar;
/**
- * The character encoding scheme to be applied.
- * Deprecated since 2.20.1 and used encoding UTF-8 in
failsafe-summary.xml.
+ *
maven-surefire git commit: [SUREFIRE-1495] Encoding of TXT report file should be configured by ${project.reporting.outputEncoding} and MOJO parameter encoding [Forced Update!]
Repository: maven-surefire
Updated Branches:
refs/heads/SUREFIRE-1495 b21a534c7 -> bcd27b7f2 (forced update)
[SUREFIRE-1495] Encoding of TXT report file should be configured by
${project.reporting.outputEncoding} and MOJO parameter encoding
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/bcd27b7f
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/bcd27b7f
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/bcd27b7f
Branch: refs/heads/SUREFIRE-1495
Commit: bcd27b7f2b560fe6fa0b2927913c3c4a15e5c41e
Parents: c10e717
Author: Tibor17
Authored: Thu Mar 8 08:19:02 2018 +0100
Committer: Tibor17
Committed: Sat Mar 17 11:19:54 2018 +0100
--
.gitattributes | 6 ++-
Jenkinsfile | 4 +-
.../plugin/failsafe/IntegrationTestMojo.java| 19 +++--
.../plugin/surefire/AbstractSurefireMojo.java | 3 +-
.../maven/plugin/surefire/CommonReflector.java | 5 ++-
.../surefire/StartupReportConfiguration.java| 41 +++-
.../surefire/SurefireExecutionParameters.java | 4 ++
.../surefire/report/DefaultReporterFactory.java | 11 --
.../plugin/surefire/report/FileReporter.java| 14 +--
.../surefire/report/NullFileReporter.java | 2 +-
.../AbstractSurefireMojoJava7PlusTest.java | 12 ++
.../surefire/AbstractSurefireMojoTest.java | 12 ++
.../TestSetMockReporterFactory.java | 17 +++-
.../report/DefaultReporterFactoryTest.java | 2 +-
.../report/ConsoleOutputFileReporterTest.java | 34 +++-
.../maven/surefire/report/FileReporterTest.java | 8 ++--
.../maven/plugin/surefire/SurefirePlugin.java | 22 +++
.../maven/surefire/its/UnicodeTestNamesIT.java | 14 +--
.../surefire/its/fixture/HelperAssertions.java | 6 +++
.../surefire/its/fixture/OutputValidator.java | 9 -
.../maven/surefire/its/fixture/TestFile.java| 2 +-
.../jiras/Surefire141PluggableProvidersIT.java | 16 +---
.../jiras/Surefire975DefaultVMEncodingIT.java | 5 ++-
.../test/resources/unicode-testnames/pom.xml| 1 +
.../junitcore/ConcurrentRunListenerTest.java| 2 +-
.../surefire/junitcore/JUnitCoreTester.java | 27 -
.../surefire/junitcore/Surefire746Test.java | 3 +-
27 files changed, 206 insertions(+), 95 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/bcd27b7f/.gitattributes
--
diff --git a/.gitattributes b/.gitattributes
index 3bb3b5e..4f942c9 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,8 +1,12 @@
# Auto detect text files and perform LF normalization
-*text=auto
+* text eol=lf
+*.xmltext diff=xml
*.java text diff=java
*.html text diff=html
+*.vm text
+*.fmltext
+*.md text
*.csstext
*.js text
*.sqltext
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/bcd27b7f/Jenkinsfile
--
diff --git a/Jenkinsfile b/Jenkinsfile
index 5733847..c33159c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -27,8 +27,8 @@ properties(
)
final def oses = ['linux', 'windows']
-final def mavens = ['3.2.x', '3.3.x', '3.5.x']//env.BRANCH_NAME == 'master' ?
['3.2.x', '3.3.x', '3.5.x'] : ['3.5.x']
-final def jdks = [7, 8, 9, 10]//env.BRANCH_NAME == 'master' ? [7, 8, 9, 10] :
[9, 10]
+final def mavens = ['3.2.x', '3.3.x', '3.5.x'] // env.BRANCH_NAME == 'master'
? ['3.2.x', '3.3.x', '3.5.x'] : ['3.2.x', '3.5.x']
+final def jdks = [7, 8, 9, 10] // env.BRANCH_NAME == 'master' ? [7, 8, 9, 10]
: [7, 10]
final def options = ['-e', '-V', '-B', '-nsu', '-P', 'run-its']
final def goals = ['clean', 'install', 'jacoco:report']
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/bcd27b7f/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
--
diff --git
a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
b/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
index 3474b16..51414cf 100644
---
a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
+++
b/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
@@ -256,10 +256,11 @@ public class IntegrationTestMojo
private boolean useManifestOnlyJar;
/**
- * The character encoding scheme to be applied.
- * Deprecated since 2.20.1 and used encoding UTF-8 in
failsafe-summary.xml.
+ *
maven-surefire git commit: [SUREFIRE-1495] Encoding of TXT report file should be configured by ${project.reporting.outputEncoding} and MOJO parameter encoding [Forced Update!]
Repository: maven-surefire
Updated Branches:
refs/heads/SUREFIRE-1495 0b5323cd9 -> b21a534c7 (forced update)
[SUREFIRE-1495] Encoding of TXT report file should be configured by
${project.reporting.outputEncoding} and MOJO parameter encoding
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/b21a534c
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/b21a534c
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/b21a534c
Branch: refs/heads/SUREFIRE-1495
Commit: b21a534c752978ebbed85269e71960e2d5ebf11d
Parents: c10e717
Author: Tibor17
Authored: Thu Mar 8 08:19:02 2018 +0100
Committer: Tibor17
Committed: Fri Mar 16 13:45:01 2018 +0100
--
.gitattributes | 6 ++-
Jenkinsfile | 4 +-
.../plugin/failsafe/IntegrationTestMojo.java| 19 +++--
.../plugin/surefire/AbstractSurefireMojo.java | 3 +-
.../maven/plugin/surefire/CommonReflector.java | 5 ++-
.../surefire/StartupReportConfiguration.java| 41 +++-
.../surefire/SurefireExecutionParameters.java | 4 ++
.../surefire/report/DefaultReporterFactory.java | 11 --
.../plugin/surefire/report/FileReporter.java| 14 +--
.../surefire/report/NullFileReporter.java | 2 +-
.../AbstractSurefireMojoJava7PlusTest.java | 12 ++
.../surefire/AbstractSurefireMojoTest.java | 12 ++
.../TestSetMockReporterFactory.java | 17 +++-
.../report/DefaultReporterFactoryTest.java | 2 +-
.../report/ConsoleOutputFileReporterTest.java | 34 +++-
.../maven/surefire/report/FileReporterTest.java | 8 ++--
.../maven/plugin/surefire/SurefirePlugin.java | 22 +++
.../maven/surefire/its/UnicodeTestNamesIT.java | 14 +--
.../surefire/its/fixture/HelperAssertions.java | 6 +++
.../surefire/its/fixture/OutputValidator.java | 9 -
.../maven/surefire/its/fixture/TestFile.java| 2 +-
.../jiras/Surefire141PluggableProvidersIT.java | 16 +---
.../jiras/Surefire975DefaultVMEncodingIT.java | 5 ++-
.../test/resources/unicode-testnames/pom.xml| 1 +
.../junitcore/ConcurrentRunListenerTest.java| 2 +-
.../surefire/junitcore/JUnitCoreTester.java | 27 -
.../surefire/junitcore/Surefire746Test.java | 3 +-
27 files changed, 206 insertions(+), 95 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b21a534c/.gitattributes
--
diff --git a/.gitattributes b/.gitattributes
index 3bb3b5e..4f942c9 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,8 +1,12 @@
# Auto detect text files and perform LF normalization
-*text=auto
+* text eol=lf
+*.xmltext diff=xml
*.java text diff=java
*.html text diff=html
+*.vm text
+*.fmltext
+*.md text
*.csstext
*.js text
*.sqltext
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b21a534c/Jenkinsfile
--
diff --git a/Jenkinsfile b/Jenkinsfile
index 5733847..7e02ac7 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -27,8 +27,8 @@ properties(
)
final def oses = ['linux', 'windows']
-final def mavens = ['3.2.x', '3.3.x', '3.5.x']//env.BRANCH_NAME == 'master' ?
['3.2.x', '3.3.x', '3.5.x'] : ['3.5.x']
-final def jdks = [7, 8, 9, 10]//env.BRANCH_NAME == 'master' ? [7, 8, 9, 10] :
[9, 10]
+final def mavens = env.BRANCH_NAME == 'master' ? ['3.2.x', '3.3.x', '3.5.x'] :
['3.2.x', '3.5.x']
+final def jdks = env.BRANCH_NAME == 'master' ? [7, 8, 9, 10] : [7, 10]
final def options = ['-e', '-V', '-B', '-nsu', '-P', 'run-its']
final def goals = ['clean', 'install', 'jacoco:report']
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b21a534c/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
--
diff --git
a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
b/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
index 3474b16..51414cf 100644
---
a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
+++
b/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
@@ -256,10 +256,11 @@ public class IntegrationTestMojo
private boolean useManifestOnlyJar;
/**
- * The character encoding scheme to be applied.
- * Deprecated since 2.20.1 and used encoding UTF-8 in
failsafe-summary.xml.
+ * The character encoding scheme to be applied while
maven-surefire git commit: [SUREFIRE-1495] Encoding of TXT report file should be configured by ${project.reporting.outputEncoding} and MOJO parameter encoding [Forced Update!]
Repository: maven-surefire
Updated Branches:
refs/heads/SUREFIRE-1495 71a70e460 -> 28d120bbe (forced update)
[SUREFIRE-1495] Encoding of TXT report file should be configured by
${project.reporting.outputEncoding} and MOJO parameter encoding
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/28d120bb
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/28d120bb
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/28d120bb
Branch: refs/heads/SUREFIRE-1495
Commit: 28d120bbef17b765cc7391a8889db5c17e439d12
Parents: aee2bb4
Author: Tibor17
Authored: Thu Mar 8 08:19:02 2018 +0100
Committer: Tibor17
Committed: Sun Mar 11 16:39:45 2018 +0100
--
.gitattributes | 6 ++-
.../plugin/failsafe/IntegrationTestMojo.java| 19 +++--
.../plugin/surefire/AbstractSurefireMojo.java | 3 +-
.../maven/plugin/surefire/CommonReflector.java | 5 ++-
.../surefire/StartupReportConfiguration.java| 41 +++-
.../surefire/SurefireExecutionParameters.java | 4 ++
.../surefire/report/DefaultReporterFactory.java | 11 --
.../plugin/surefire/report/FileReporter.java| 14 +--
.../surefire/report/NullFileReporter.java | 2 +-
.../AbstractSurefireMojoJava7PlusTest.java | 12 ++
.../surefire/AbstractSurefireMojoTest.java | 12 ++
.../TestSetMockReporterFactory.java | 17 +++-
.../report/DefaultReporterFactoryTest.java | 2 +-
.../report/ConsoleOutputFileReporterTest.java | 34 +++-
.../maven/surefire/report/FileReporterTest.java | 8 ++--
.../maven/plugin/surefire/SurefirePlugin.java | 22 +++
.../maven/surefire/its/UnicodeTestNamesIT.java | 14 +--
.../surefire/its/fixture/HelperAssertions.java | 6 +++
.../surefire/its/fixture/OutputValidator.java | 9 -
.../maven/surefire/its/fixture/TestFile.java| 2 +-
.../jiras/Surefire141PluggableProvidersIT.java | 16 +---
.../jiras/Surefire975DefaultVMEncodingIT.java | 5 ++-
.../test/resources/unicode-testnames/pom.xml| 1 +
.../junitcore/ConcurrentRunListenerTest.java| 2 +-
.../surefire/junitcore/JUnitCoreTester.java | 27 -
.../surefire/junitcore/Surefire746Test.java | 3 +-
26 files changed, 204 insertions(+), 93 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/28d120bb/.gitattributes
--
diff --git a/.gitattributes b/.gitattributes
index 3bb3b5e..4f942c9 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,8 +1,12 @@
# Auto detect text files and perform LF normalization
-*text=auto
+* text eol=lf
+*.xmltext diff=xml
*.java text diff=java
*.html text diff=html
+*.vm text
+*.fmltext
+*.md text
*.csstext
*.js text
*.sqltext
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/28d120bb/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
--
diff --git
a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
b/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
index 3474b16..51414cf 100644
---
a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
+++
b/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
@@ -256,10 +256,11 @@ public class IntegrationTestMojo
private boolean useManifestOnlyJar;
/**
- * The character encoding scheme to be applied.
- * Deprecated since 2.20.1 and used encoding UTF-8 in
failsafe-summary.xml.
+ * The character encoding scheme to be applied while generating test report
+ * files (see target/surefire-reports/yourTestName.txt).
+ * The report output files (*-out.txt) are still encoded with JVM's
encoding used in standard out/err pipes.
*
- * @deprecated since of 2.20.1
+ * @since 3.0.0-M1
*/
@Parameter( property = "encoding", defaultValue =
"${project.reporting.outputEncoding}" )
private String encoding;
@@ -703,6 +704,18 @@ public class IntegrationTestMojo
this.useManifestOnlyJar = useManifestOnlyJar;
}
+@Override
+public String getEncoding()
+{
+return encoding;
+}
+
+@Override
+public void setEncoding( String encoding )
+{
+this.encoding = encoding;
+}
+
// the following will be refactored out once the common code is all in one
place
public boolean isTestFailureIgnore()
maven-surefire git commit: [SUREFIRE-1495] Encoding of TXT report file should be configured by ${project.reporting.outputEncoding} and MOJO parameter encoding [Forced Update!]
Repository: maven-surefire
Updated Branches:
refs/heads/SUREFIRE-1495 c496ebf3b -> 71a70e460 (forced update)
[SUREFIRE-1495] Encoding of TXT report file should be configured by
${project.reporting.outputEncoding} and MOJO parameter encoding
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/71a70e46
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/71a70e46
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/71a70e46
Branch: refs/heads/SUREFIRE-1495
Commit: 71a70e4602198a3d11c2dc9f65fa646227571825
Parents: aee2bb4
Author: Tibor17
Authored: Thu Mar 8 08:19:02 2018 +0100
Committer: Tibor17
Committed: Sun Mar 11 15:06:41 2018 +0100
--
.gitattributes | 6 ++-
.../plugin/failsafe/IntegrationTestMojo.java| 19 +++--
.../plugin/surefire/AbstractSurefireMojo.java | 3 +-
.../maven/plugin/surefire/CommonReflector.java | 6 ++-
.../surefire/StartupReportConfiguration.java| 41 +++-
.../surefire/SurefireExecutionParameters.java | 4 ++
.../surefire/report/DefaultReporterFactory.java | 11 --
.../plugin/surefire/report/FileReporter.java| 14 +--
.../surefire/report/NullFileReporter.java | 2 +-
.../AbstractSurefireMojoJava7PlusTest.java | 12 ++
.../surefire/AbstractSurefireMojoTest.java | 12 ++
.../TestSetMockReporterFactory.java | 17 +++-
.../report/DefaultReporterFactoryTest.java | 2 +-
.../report/ConsoleOutputFileReporterTest.java | 34 +++-
.../maven/surefire/report/FileReporterTest.java | 8 ++--
.../maven/plugin/surefire/SurefirePlugin.java | 22 +++
.../maven/surefire/its/UnicodeTestNamesIT.java | 14 +--
.../surefire/its/fixture/HelperAssertions.java | 6 +++
.../surefire/its/fixture/OutputValidator.java | 9 -
.../maven/surefire/its/fixture/TestFile.java| 2 +-
.../jiras/Surefire141PluggableProvidersIT.java | 16 +---
.../jiras/Surefire975DefaultVMEncodingIT.java | 5 ++-
.../test/resources/unicode-testnames/pom.xml| 1 +
.../junitcore/ConcurrentRunListenerTest.java| 2 +-
.../surefire/junitcore/JUnitCoreTester.java | 27 -
.../surefire/junitcore/Surefire746Test.java | 3 +-
26 files changed, 205 insertions(+), 93 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/71a70e46/.gitattributes
--
diff --git a/.gitattributes b/.gitattributes
index 3bb3b5e..4f942c9 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,8 +1,12 @@
# Auto detect text files and perform LF normalization
-*text=auto
+* text eol=lf
+*.xmltext diff=xml
*.java text diff=java
*.html text diff=html
+*.vm text
+*.fmltext
+*.md text
*.csstext
*.js text
*.sqltext
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/71a70e46/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
--
diff --git
a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
b/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
index 3474b16..51414cf 100644
---
a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
+++
b/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
@@ -256,10 +256,11 @@ public class IntegrationTestMojo
private boolean useManifestOnlyJar;
/**
- * The character encoding scheme to be applied.
- * Deprecated since 2.20.1 and used encoding UTF-8 in
failsafe-summary.xml.
+ * The character encoding scheme to be applied while generating test report
+ * files (see target/surefire-reports/yourTestName.txt).
+ * The report output files (*-out.txt) are still encoded with JVM's
encoding used in standard out/err pipes.
*
- * @deprecated since of 2.20.1
+ * @since 3.0.0-M1
*/
@Parameter( property = "encoding", defaultValue =
"${project.reporting.outputEncoding}" )
private String encoding;
@@ -703,6 +704,18 @@ public class IntegrationTestMojo
this.useManifestOnlyJar = useManifestOnlyJar;
}
+@Override
+public String getEncoding()
+{
+return encoding;
+}
+
+@Override
+public void setEncoding( String encoding )
+{
+this.encoding = encoding;
+}
+
// the following will be refactored out once the common code is all in one
place
public boolean isTestFailureIgnore()
maven-surefire git commit: [SUREFIRE-1495] Encoding of TXT report file should be configured by ${project.reporting.outputEncoding} and MOJO parameter encoding [Forced Update!]
Repository: maven-surefire
Updated Branches:
refs/heads/SUREFIRE-1495 e22d44d19 -> c496ebf3b (forced update)
[SUREFIRE-1495] Encoding of TXT report file should be configured by
${project.reporting.outputEncoding} and MOJO parameter encoding
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/c496ebf3
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/c496ebf3
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/c496ebf3
Branch: refs/heads/SUREFIRE-1495
Commit: c496ebf3b4518c25787d5eac9f54b2a220a59447
Parents: aee2bb4
Author: Tibor17
Authored: Thu Mar 8 08:19:02 2018 +0100
Committer: Tibor17
Committed: Thu Mar 8 23:33:48 2018 +0100
--
.../plugin/failsafe/IntegrationTestMojo.java| 18 --
.../plugin/surefire/AbstractSurefireMojo.java | 3 +-
.../maven/plugin/surefire/CommonReflector.java | 5 +--
.../surefire/StartupReportConfiguration.java| 38 ++--
.../surefire/SurefireExecutionParameters.java | 4 +++
.../report/ConsoleOutputFileReporter.java | 2 +-
.../surefire/report/DefaultReporterFactory.java | 11 --
.../plugin/surefire/report/FileReporter.java| 14 +---
.../surefire/report/NullFileReporter.java | 2 +-
.../AbstractSurefireMojoJava7PlusTest.java | 12 +++
.../surefire/AbstractSurefireMojoTest.java | 12 +++
.../TestSetMockReporterFactory.java | 17 -
.../report/DefaultReporterFactoryTest.java | 2 +-
.../maven/surefire/report/FileReporterTest.java | 4 +--
.../maven/plugin/surefire/SurefirePlugin.java | 21 +++
.../maven/surefire/its/UnicodeTestNamesIT.java | 10 +++---
.../surefire/its/fixture/HelperAssertions.java | 6
.../surefire/its/fixture/OutputValidator.java | 9 +++--
.../maven/surefire/its/fixture/TestFile.java| 2 +-
.../jiras/Surefire141PluggableProvidersIT.java | 16 +
.../jiras/Surefire975DefaultVMEncodingIT.java | 4 ++-
.../test/resources/unicode-testnames/pom.xml| 1 +
.../junitcore/ConcurrentRunListenerTest.java| 2 +-
.../surefire/junitcore/JUnitCoreTester.java | 27 --
.../surefire/junitcore/Surefire746Test.java | 3 +-
25 files changed, 162 insertions(+), 83 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/c496ebf3/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
--
diff --git
a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
b/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
index 3474b16..781a9f8 100644
---
a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
+++
b/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
@@ -256,10 +256,10 @@ public class IntegrationTestMojo
private boolean useManifestOnlyJar;
/**
- * The character encoding scheme to be applied.
- * Deprecated since 2.20.1 and used encoding UTF-8 in
failsafe-summary.xml.
+ * The character encoding scheme to be applied while generating test report
+ * output files (see target/surefire-reports/yourTestName.txt).
*
- * @deprecated since of 2.20.1
+ * @since 3.0.0-M1
*/
@Parameter( property = "encoding", defaultValue =
"${project.reporting.outputEncoding}" )
private String encoding;
@@ -703,6 +703,18 @@ public class IntegrationTestMojo
this.useManifestOnlyJar = useManifestOnlyJar;
}
+@Override
+public String getEncoding()
+{
+return encoding;
+}
+
+@Override
+public void setEncoding( String encoding )
+{
+this.encoding = encoding;
+}
+
// the following will be refactored out once the common code is all in one
place
public boolean isTestFailureIgnore()
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/c496ebf3/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
--
diff --git
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
index 38d18db..34f805a 100644
---
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
+++
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
@@ -1807,7 +1807,7 @@ public abstract class AbstractSurefireMojo
maven-surefire git commit: [SUREFIRE-1495] Encoding of TXT report file should be configured by ${project.reporting.outputEncoding} and MOJO parameter encoding [Forced Update!]
Repository: maven-surefire
Updated Branches:
refs/heads/SUREFIRE-1495 dc2bc4555 -> e22d44d19 (forced update)
[SUREFIRE-1495] Encoding of TXT report file should be configured by
${project.reporting.outputEncoding} and MOJO parameter encoding
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/e22d44d1
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/e22d44d1
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/e22d44d1
Branch: refs/heads/SUREFIRE-1495
Commit: e22d44d199eb33f8e298506fcb03c3d21a8ec7be
Parents: aee2bb4
Author: Tibor17
Authored: Thu Mar 8 08:19:02 2018 +0100
Committer: Tibor17
Committed: Thu Mar 8 17:14:22 2018 +0100
--
.../plugin/failsafe/IntegrationTestMojo.java| 18 --
.../plugin/surefire/AbstractSurefireMojo.java | 3 +-
.../maven/plugin/surefire/CommonReflector.java | 5 +--
.../surefire/StartupReportConfiguration.java| 38 ++--
.../surefire/SurefireExecutionParameters.java | 4 +++
.../report/ConsoleOutputFileReporter.java | 2 +-
.../surefire/report/DefaultReporterFactory.java | 11 --
.../plugin/surefire/report/FileReporter.java| 14 +---
.../surefire/report/NullFileReporter.java | 2 +-
.../AbstractSurefireMojoJava7PlusTest.java | 12 +++
.../surefire/AbstractSurefireMojoTest.java | 12 +++
.../TestSetMockReporterFactory.java | 17 -
.../report/DefaultReporterFactoryTest.java | 2 +-
.../maven/surefire/report/FileReporterTest.java | 4 +--
.../maven/plugin/surefire/SurefirePlugin.java | 21 +++
.../maven/surefire/its/UnicodeTestNamesIT.java | 12 +--
.../surefire/its/fixture/OutputValidator.java | 9 +++--
.../maven/surefire/its/fixture/TestFile.java| 2 +-
.../test/resources/unicode-testnames/pom.xml| 1 +
.../junitcore/ConcurrentRunListenerTest.java| 2 +-
.../surefire/junitcore/JUnitCoreTester.java | 27 --
.../surefire/junitcore/Surefire746Test.java | 3 +-
22 files changed, 155 insertions(+), 66 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e22d44d1/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
--
diff --git
a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
b/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
index 3474b16..781a9f8 100644
---
a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
+++
b/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
@@ -256,10 +256,10 @@ public class IntegrationTestMojo
private boolean useManifestOnlyJar;
/**
- * The character encoding scheme to be applied.
- * Deprecated since 2.20.1 and used encoding UTF-8 in
failsafe-summary.xml.
+ * The character encoding scheme to be applied while generating test report
+ * output files (see target/surefire-reports/yourTestName.txt).
*
- * @deprecated since of 2.20.1
+ * @since 3.0.0-M1
*/
@Parameter( property = "encoding", defaultValue =
"${project.reporting.outputEncoding}" )
private String encoding;
@@ -703,6 +703,18 @@ public class IntegrationTestMojo
this.useManifestOnlyJar = useManifestOnlyJar;
}
+@Override
+public String getEncoding()
+{
+return encoding;
+}
+
+@Override
+public void setEncoding( String encoding )
+{
+this.encoding = encoding;
+}
+
// the following will be refactored out once the common code is all in one
place
public boolean isTestFailureIgnore()
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e22d44d1/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
--
diff --git
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
index 38d18db..34f805a 100644
---
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
+++
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
@@ -1807,7 +1807,7 @@ public abstract class AbstractSurefireMojo
isRedirectTestOutputToFile(),
isDisableXmlReport(),
getReportsDirectory(),
isTrimStackTrace(),
maven-surefire git commit: [SUREFIRE-1495] Encoding of TXT report file should be configured by ${project.reporting.outputEncoding} and MOJO parameter encoding [Forced Update!]
Repository: maven-surefire
Updated Branches:
refs/heads/SUREFIRE-1495 ae497d580 -> dc2bc4555 (forced update)
[SUREFIRE-1495] Encoding of TXT report file should be configured by
${project.reporting.outputEncoding} and MOJO parameter encoding
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/dc2bc455
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/dc2bc455
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/dc2bc455
Branch: refs/heads/SUREFIRE-1495
Commit: dc2bc45552c7a0769fb178816dccb5926017c1f5
Parents: aee2bb4
Author: Tibor17
Authored: Thu Mar 8 08:19:02 2018 +0100
Committer: Tibor17
Committed: Thu Mar 8 10:03:47 2018 +0100
--
.../plugin/failsafe/IntegrationTestMojo.java| 18 --
.../plugin/surefire/AbstractSurefireMojo.java | 3 +-
.../maven/plugin/surefire/CommonReflector.java | 5 +--
.../surefire/StartupReportConfiguration.java| 38 ++--
.../surefire/SurefireExecutionParameters.java | 4 +++
.../report/ConsoleOutputFileReporter.java | 2 +-
.../surefire/report/DefaultReporterFactory.java | 11 --
.../plugin/surefire/report/FileReporter.java| 14 +---
.../surefire/report/NullFileReporter.java | 2 +-
.../AbstractSurefireMojoJava7PlusTest.java | 12 +++
.../surefire/AbstractSurefireMojoTest.java | 12 +++
.../TestSetMockReporterFactory.java | 17 -
.../report/DefaultReporterFactoryTest.java | 2 +-
.../maven/surefire/report/FileReporterTest.java | 4 +--
.../maven/plugin/surefire/SurefirePlugin.java | 21 +++
.../maven/surefire/its/UnicodeTestNamesIT.java | 2 +-
.../test/resources/unicode-testnames/pom.xml| 1 +
.../junitcore/ConcurrentRunListenerTest.java| 2 +-
.../surefire/junitcore/JUnitCoreTester.java | 27 --
.../surefire/junitcore/Surefire746Test.java | 3 +-
20 files changed, 139 insertions(+), 61 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/dc2bc455/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
--
diff --git
a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
b/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
index 3474b16..781a9f8 100644
---
a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
+++
b/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
@@ -256,10 +256,10 @@ public class IntegrationTestMojo
private boolean useManifestOnlyJar;
/**
- * The character encoding scheme to be applied.
- * Deprecated since 2.20.1 and used encoding UTF-8 in
failsafe-summary.xml.
+ * The character encoding scheme to be applied while generating test report
+ * output files (see target/surefire-reports/yourTestName.txt).
*
- * @deprecated since of 2.20.1
+ * @since 3.0.0-M1
*/
@Parameter( property = "encoding", defaultValue =
"${project.reporting.outputEncoding}" )
private String encoding;
@@ -703,6 +703,18 @@ public class IntegrationTestMojo
this.useManifestOnlyJar = useManifestOnlyJar;
}
+@Override
+public String getEncoding()
+{
+return encoding;
+}
+
+@Override
+public void setEncoding( String encoding )
+{
+this.encoding = encoding;
+}
+
// the following will be refactored out once the common code is all in one
place
public boolean isTestFailureIgnore()
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/dc2bc455/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
--
diff --git
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
index 38d18db..34f805a 100644
---
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
+++
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
@@ -1807,7 +1807,7 @@ public abstract class AbstractSurefireMojo
isRedirectTestOutputToFile(),
isDisableXmlReport(),
getReportsDirectory(),
isTrimStackTrace(), getReportNameSuffix(),
getStatisticsFile(
configChecksum ),
