diff --git a/Jenkinsfile b/Jenkinsfile
index f944e22b29..2ef2b4a8b6 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -32,7 +32,7 @@ properties(
final def oses = ['linux':'ubuntu', 'windows':'windows-he']
final def mavens = env.BRANCH_NAME == 'master' ? ['3.6.x', '3.2.x'] : ['3.2.x']
// all non-EOL versions and the first EA
-final def jdks = [18, 17, 8, 7]
+final def jdks = [18, 17, 8]
final def options = ['-e', '-V', '-B', '-nsu', '-P', 'run-its']
final def goals = ['clean', 'install']
@@ -44,22 +44,19 @@ oses.eachWithIndex { osMapping, indexOfOs ->
jdks.eachWithIndex { jdk, indexOfJdk ->
def os = osMapping.key
def label = osMapping.value
- final String jdkTestName = jenkinsEnv.jdkFromVersion(os, jdk.toString())
- final String jdkName = jenkinsEnv.jdkFromVersion(os, '8')
+ final String jdkName = jenkinsEnv.jdkFromVersion(os, jdk.toString())
final String mvnName = jenkinsEnv.mvnFromVersion(os, maven)
final String stageKey = "${os}-jdk${jdk}-maven${maven}"
-// Referenses for TLS:
-// https://central.sonatype.org/articles/2018/May/04/discontinued-support-for-tlsv11-and-below/?__hstc=31049440.ab2fd229e7f8b6176196d9f78621e1f5.1534324377408.1534324377408.1534324377408.1&__hssc=31049440.1.1534324377409&__hsfp=2729160845
def mavenOpts = '-Xms64m -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
mavenOpts += (os == 'linux' ? ' -Xmx1g' : ' -Xmx256m')
- if (label == null || jdkTestName == null || mvnName == null) {
+ if (label == null || jdkName == null || mvnName == null) {
println "Skipping ${stageKey} as unsupported by Jenkins Environment."
return
}
- println "${stageKey} ==> Label: ${label}, JDK: ${jdkTestName}, Maven: ${mvnName}."
+ println "${stageKey} ==> Label: ${label}, JDK: ${jdkName}, Maven: ${mvnName}."
stages[stageKey] = {
node(label) {
@@ -67,14 +64,12 @@ oses.eachWithIndex { osMapping, indexOfOs ->
boolean first = indexOfOs == 0 && indexOfMaven == 0 && indexOfJdk == 0
def failsafeItPort = 8000 + 100 * indexOfMaven + 10 * indexOfJdk
def allOptions = options + ['-Djava.awt.headless=true', "-Dfailsafe-integration-test-port=${failsafeItPort}", "-Dfailsafe-integration-test-stop-port=${1 + failsafeItPort}"]
- if (jdk == 7) {
- allOptions += '-Dhttps.protocols=TLSv1.2'
- }
+
if (!maven.startsWith('3.2') && !maven.startsWith('3.3') && !maven.startsWith('3.5')) {
allOptions += '--no-transfer-progress'
}
ws(dir: "${os == 'windows' ? "${TEMP}\\${BUILD_TAG}" : pwd()}") {
- buildProcess(stageKey, jdkName, jdkTestName, mvnName, first ? goalsDepl : goals, allOptions, mavenOpts, first)
+ buildProcess(stageKey, jdkName, mvnName, first ? goalsDepl : goals, allOptions, mavenOpts, first)
}
}
}
@@ -118,7 +113,7 @@ timeout(time: 12, unit: 'HOURS') {
}
}
-def buildProcess(String stageKey, String jdkName, String jdkTestName, String mvnName, goals, options, mavenOpts, boolean makeReports) {
+def buildProcess(String stageKey, String jdkName, String mvnName, goals, options, mavenOpts, boolean makeReports) {
cleanWs()
def errorStatus = -99
try {
@@ -135,7 +130,6 @@ def buildProcess(String stageKey, String jdkName, String jdkTestName, String mvn
assert mvnLocalRepoDir != null : 'Local Maven Repository is undefined.'
def properties = ["-Djacoco.skip=${!makeReports}", "\"-Dmaven.repo.local=${mvnLocalRepoDir}\""]
- println "Setting JDK for testing ${jdkTestName}"
def cmd = ['mvn'] + goals + options + properties
stage("build ${stageKey}") {
@@ -146,25 +140,21 @@ def buildProcess(String stageKey, String jdkName, String jdkTestName, String mvn
if (isUnix()) {
withEnv(["JAVA_HOME=${tool(jdkName)}",
- "JAVA_HOME_IT=${tool(jdkTestName)}",
"MAVEN_OPTS=${mavenOpts}",
"PATH+MAVEN=${tool(mvnName)}/bin:${tool(jdkName)}/bin"
]) {
- sh '$JAVA_HOME_IT/bin/java -version'
- sh 'echo JAVA_HOME=$JAVA_HOME, JAVA_HOME_IT=$JAVA_HOME_IT, PATH=$PATH'
- def script = cmd + ['\"-DjdkHome=$JAVA_HOME_IT\"']
- errorStatus = sh(returnStatus: true, script: script.join(' '))
+ sh 'echo JAVA_HOME=$JAVA_HOME, PATH=$PATH'
+ sh '$JAVA_HOME/bin/java -version'
+ errorStatus = sh(returnStatus: true, script: cmd.join(' '))
}
} else {
withEnv(["JAVA_HOME=${tool(jdkName)}",
- "JAVA_HOME_IT=${tool(jdkTestName)}",
"MAVEN_OPTS=${mavenOpts}",
"PATH+MAVEN=${tool(mvnName)}\\bin;${tool(jdkName)}\\bin"
]) {
- bat '%JAVA_HOME_IT%\\bin\\java -version'
- bat 'echo JAVA_HOME=%JAVA_HOME%, JAVA_HOME_IT=%JAVA_HOME_IT%, PATH=%PATH%'
- def script = cmd + ['\"-DjdkHome=%JAVA_HOME_IT%\"']
- errorStatus = bat(returnStatus: true, script: script.join(' '))
+ bat 'echo JAVA_HOME=%JAVA_HOME%, PATH=%PATH%'
+ bat '%JAVA_HOME%\\bin\\java -version'
+ errorStatus = bat(returnStatus: true, script: cmd.join(' '))
}
}
diff --git a/README.md b/README.md
index 6de9b06da3..8586e6db32 100644
--- a/README.md
+++ b/README.md
@@ -46,7 +46,7 @@ Usage of [maven-surefire-plugin], [maven-failsafe-plugin], [maven-surefire-repor
# Development Information
-Build the Surefire project using **Maven 3.1.0+** and **JDK 1.8+**.
+Build the Surefire project using **Maven 3.2.5+** and **JDK 1.8+**.
* In order to run tests for a release check during the Vote, the following memory requirements are needed:
@@ -59,13 +59,9 @@ Build the Surefire project using **Maven 3.1.0+** and **JDK 1.8+**.
set MAVEN_OPTS="-server -Xmx256m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=384m -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -XX:SoftRefLRUPolicyMSPerMB=50 -Djava.awt.headless=true -Dhttps.protocols=TLSv1.2"
```
-* In order to run the tests with **JDK 1.7** (on Linux/Unix modify the system property **jdkHome**):
+* In order to build and run the tests:
```
- mvn install site site:stage -P reporting,run-its "-DjdkHome=e:\Program Files\Java\jdk1.7.0_80\"
- ```
-* In order to run the build and the tests with **JDK 1.8+**, e.g. JDK 11:
- ```
- mvn install site site:stage -P reporting,run-its "-DjdkHome=e:\Program Files\Java\jdk11\"
+ mvn install site site:stage -P reporting,run-its
```
diff --git a/maven-failsafe-plugin/pom.xml b/maven-failsafe-plugin/pom.xml
index 0e69eea1bb..7e6213d598 100644
--- a/maven-failsafe-plugin/pom.xml
+++ b/maven-failsafe-plugin/pom.xml
@@ -271,15 +271,10 @@
${failsafe-integration-test-port}
${failsafe-integration-test-stop-port}
- ${https.protocols}
- ${https.protocols}
-
- ${jdkHome}
-
diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoTest.java
index 007d24d31c..936666321a 100644
--- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoTest.java
+++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoTest.java
@@ -172,7 +172,7 @@ public void noModuleDescriptorFile() throws Exception
assertThat( wrapper.getResolvePathResult() )
.isNull();
- assertThat( invokeMethod( mojo, "existsModuleDescriptor", wrapper ) )
+ assertThat( (boolean) invokeMethod( mojo, "existsModuleDescriptor", wrapper ) )
.isEqualTo( false );
when( mojo.useModulePath() ).thenReturn( true );
@@ -180,7 +180,7 @@ public void noModuleDescriptorFile() throws Exception
File jvmExecutable = new File( jdkHome, IS_OS_WINDOWS ? "bin\\java.exe" : "bin/java" );
JdkAttributes jdkAttributes = new JdkAttributes( jvmExecutable, jdkHome, true );
Platform platform = new Platform().withJdkExecAttributesForTests( jdkAttributes );
- assertThat( invokeMethod( mojo, "canExecuteProviderWithModularPath", platform, wrapper ) )
+ assertThat( (boolean) invokeMethod( mojo, "canExecuteProviderWithModularPath", platform, wrapper ) )
.isEqualTo( false );
}
@@ -217,7 +217,7 @@ public void correctModuleDescriptor() throws Exception
assertThat( wrapper.getResolvePathResult().getModuleDescriptor() )
.isSameAs( descriptor );
- assertThat( invokeMethod( mojo, "existsModuleDescriptor", wrapper ) )
+ assertThat( (boolean) invokeMethod( mojo, "existsModuleDescriptor", wrapper ) )
.isEqualTo( true );
when( mojo.useModulePath() ).thenReturn( true );
@@ -225,19 +225,19 @@ public void correctModuleDescriptor() throws Exception
File jvmExecutable = new File( jdkHome, IS_OS_WINDOWS ? "bin\\java.exe" : "bin/java" );
JdkAttributes jdkAttributes = new JdkAttributes( jvmExecutable, jdkHome, true );
Platform platform = new Platform().withJdkExecAttributesForTests( jdkAttributes );
- assertThat( invokeMethod( mojo, "canExecuteProviderWithModularPath", platform, wrapper ) )
+ assertThat( (boolean) invokeMethod( mojo, "canExecuteProviderWithModularPath", platform, wrapper ) )
.isEqualTo( true );
jdkAttributes = new JdkAttributes( jvmExecutable, jdkHome, false );
platform = new Platform().withJdkExecAttributesForTests( jdkAttributes );
- assertThat( invokeMethod( mojo, "canExecuteProviderWithModularPath", platform, wrapper ) )
+ assertThat( (boolean) invokeMethod( mojo, "canExecuteProviderWithModularPath", platform, wrapper ) )
.isEqualTo( false );
when( mojo.useModulePath() ).thenReturn( false );
jdkAttributes = new JdkAttributes( jvmExecutable, jdkHome, true );
platform = new Platform().withJdkExecAttributesForTests( jdkAttributes );
- assertThat( invokeMethod( mojo, "canExecuteProviderWithModularPath", platform, wrapper ) )
+ assertThat( (boolean) invokeMethod( mojo, "canExecuteProviderWithModularPath", platform, wrapper ) )
.isEqualTo( false );
}
@@ -271,7 +271,7 @@ public void corruptedModuleDescriptor() throws Exception
assertThat( wrapper.getResolvePathResult() )
.isNull();
- assertThat( invokeMethod( mojo, "existsModuleDescriptor", wrapper ) )
+ assertThat( (boolean) invokeMethod( mojo, "existsModuleDescriptor", wrapper ) )
.isEqualTo( false );
}
diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/extensions/ConsoleOutputReporterTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/extensions/ConsoleOutputReporterTest.java
index 372c9a8656..fe92442abf 100644
--- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/extensions/ConsoleOutputReporterTest.java
+++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/extensions/ConsoleOutputReporterTest.java
@@ -19,16 +19,17 @@
* under the License.
*/
-import org.apache.maven.surefire.extensions.ConsoleOutputReportEventListener;
-import org.apache.maven.surefire.extensions.ConsoleOutputReporter;
+import java.io.File;
+import java.io.PrintStream;
+
import org.apache.maven.plugin.surefire.extensions.junit5.JUnit5ConsoleOutputReporter;
import org.apache.maven.plugin.surefire.report.ConsoleOutputFileReporter;
import org.apache.maven.plugin.surefire.report.DirectConsoleOutput;
+import org.apache.maven.surefire.extensions.ConsoleOutputReportEventListener;
+import org.apache.maven.surefire.extensions.ConsoleOutputReporter;
import org.fest.assertions.Assertions;
import org.junit.Test;
-import java.io.File;
-
import static org.fest.assertions.Assertions.assertThat;
import static org.powermock.reflect.Whitebox.getInternalState;
@@ -73,9 +74,9 @@ public void shouldCreateConsoleListener()
ConsoleOutputReportEventListener listener1 = extension.createListener( System.out, System.err );
assertThat( listener1 )
.isInstanceOf( DirectConsoleOutput.class );
- assertThat( getInternalState( listener1, "out" ) )
+ assertThat( (PrintStream) getInternalState( listener1, "out" ) )
.isSameAs( System.out );
- assertThat( getInternalState( listener1, "err" ) )
+ assertThat( (PrintStream) getInternalState( listener1, "err" ) )
.isSameAs( System.err );
File target = new File( System.getProperty( "user.dir" ), "target" );
@@ -89,17 +90,17 @@ public void shouldCreateConsoleListener()
extension.createListener( reportsDirectory, reportNameSuffix, forkNumber );
assertThat( listener2 )
.isInstanceOf( ConsoleOutputFileReporter.class );
- assertThat( getInternalState( listener2, "reportsDirectory" ) )
+ assertThat( (File) getInternalState( listener2, "reportsDirectory" ) )
.isSameAs( reportsDirectory );
- assertThat( getInternalState( listener2, "reportNameSuffix" ) )
+ assertThat( (String) getInternalState( listener2, "reportNameSuffix" ) )
.isSameAs( reportNameSuffix );
- assertThat( getInternalState( listener2, "usePhrasedFileName" ) )
+ assertThat( (boolean) getInternalState( listener2, "usePhrasedFileName" ) )
.isEqualTo( usePhrasedFileName );
- assertThat( getInternalState( listener2, "forkNumber" ) )
+ assertThat( (Integer) getInternalState( listener2, "forkNumber" ) )
.isSameAs( forkNumber );
- assertThat( getInternalState( listener2, "encoding" ) )
+ assertThat( (String) getInternalState( listener2, "encoding" ) )
.isSameAs( encoding );
- assertThat( getInternalState( listener2, "reportEntryName" ) )
+ assertThat( (String) getInternalState( listener2, "reportEntryName" ) )
.isNull();
}
@@ -142,9 +143,9 @@ public void shouldCreateJUnit5ConsoleListener()
ConsoleOutputReportEventListener listener1 = extension.createListener( System.out, System.err );
assertThat( listener1 )
.isInstanceOf( DirectConsoleOutput.class );
- assertThat( getInternalState( listener1, "out" ) )
+ assertThat( (PrintStream) getInternalState( listener1, "out" ) )
.isSameAs( System.out );
- assertThat( getInternalState( listener1, "err" ) )
+ assertThat( (PrintStream) getInternalState( listener1, "err" ) )
.isSameAs( System.err );
File target = new File( System.getProperty( "user.dir" ), "target" );
@@ -159,17 +160,17 @@ public void shouldCreateJUnit5ConsoleListener()
extension.createListener( reportsDirectory, reportNameSuffix, forkNumber );
assertThat( listener2 )
.isInstanceOf( ConsoleOutputFileReporter.class );
- assertThat( getInternalState( listener2, "reportsDirectory" ) )
+ assertThat( (File) getInternalState( listener2, "reportsDirectory" ) )
.isSameAs( reportsDirectory );
- assertThat( getInternalState( listener2, "reportNameSuffix" ) )
+ assertThat( (String) getInternalState( listener2, "reportNameSuffix" ) )
.isSameAs( reportNameSuffix );
- assertThat( getInternalState( listener2, "usePhrasedFileName" ) )
+ assertThat( (boolean) getInternalState( listener2, "usePhrasedFileName" ) )
.isEqualTo( usePhrasedFileName );
- assertThat( getInternalState( listener2, "forkNumber" ) )
+ assertThat( (Integer) getInternalState( listener2, "forkNumber" ) )
.isSameAs( forkNumber );
- assertThat( getInternalState( listener2, "encoding" ) )
+ assertThat( (String) getInternalState( listener2, "encoding" ) )
.isSameAs( encoding );
- assertThat( getInternalState( listener2, "reportEntryName" ) )
+ assertThat( (String) getInternalState( listener2, "reportEntryName" ) )
.isNull();
}
}
diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/extensions/StatelessReporterTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/extensions/StatelessReporterTest.java
index 4aa048cee5..253bbc213d 100644
--- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/extensions/StatelessReporterTest.java
+++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/extensions/StatelessReporterTest.java
@@ -96,27 +96,27 @@ public void shouldCreateConsoleListener()
StatelessReportEventListener listener = extension.createListener( config );
assertThat( listener )
.isInstanceOf( StatelessXmlReporter.class );
- assertThat( getInternalState( listener, "reportsDirectory" ) )
+ assertThat( (File) getInternalState( listener, "reportsDirectory" ) )
.isSameAs( reportsDirectory );
- assertThat( getInternalState( listener, "reportNameSuffix" ) )
+ assertThat( (String) getInternalState( listener, "reportNameSuffix" ) )
.isSameAs( reportNameSuffix );
- assertThat( getInternalState( listener, "trimStackTrace" ) )
+ assertThat( (boolean) getInternalState( listener, "trimStackTrace" ) )
.isEqualTo( true );
- assertThat( getInternalState( listener, "rerunFailingTestsCount" ) )
+ assertThat( (Integer) getInternalState( listener, "rerunFailingTestsCount" ) )
.isEqualTo( 5 );
- assertThat( getInternalState( listener, "xsdSchemaLocation" ) )
+ assertThat( (String) getInternalState( listener, "xsdSchemaLocation" ) )
.isSameAs( schema );
- assertThat( getInternalState( listener, "xsdVersion" ) )
+ assertThat( (String) getInternalState( listener, "xsdVersion" ) )
.isEqualTo( "V3" );
- assertThat( getInternalState( listener, "testClassMethodRunHistoryMap" ) )
+ assertThat( (Map, ?>) getInternalState( listener, "testClassMethodRunHistoryMap" ) )
.isSameAs( testClassMethodRunHistory );
- assertThat( getInternalState( listener, "phrasedFileName" ) )
+ assertThat( (boolean) getInternalState( listener, "phrasedFileName" ) )
.isEqualTo( false );
- assertThat( getInternalState( listener, "phrasedSuiteName" ) )
+ assertThat( (boolean) getInternalState( listener, "phrasedSuiteName" ) )
.isEqualTo( false );
- assertThat( getInternalState( listener, "phrasedClassName" ) )
+ assertThat( (boolean) getInternalState( listener, "phrasedClassName" ) )
.isEqualTo( false );
- assertThat( getInternalState( listener, "phrasedMethodName" ) )
+ assertThat( (boolean) getInternalState( listener, "phrasedMethodName" ) )
.isEqualTo( false );
}
@@ -217,27 +217,27 @@ public void shouldCreateJUnit5ConsoleListener()
StatelessReportEventListener listener = extension.createListener( config );
assertThat( listener )
.isInstanceOf( StatelessXmlReporter.class );
- assertThat( getInternalState( listener, "reportsDirectory" ) )
+ assertThat( (File) getInternalState( listener, "reportsDirectory" ) )
.isSameAs( reportsDirectory );
- assertThat( getInternalState( listener, "reportNameSuffix" ) )
+ assertThat( (String) getInternalState( listener, "reportNameSuffix" ) )
.isSameAs( reportNameSuffix );
- assertThat( getInternalState( listener, "trimStackTrace" ) )
+ assertThat( (boolean) getInternalState( listener, "trimStackTrace" ) )
.isEqualTo( true );
- assertThat( getInternalState( listener, "rerunFailingTestsCount" ) )
+ assertThat( (Integer) getInternalState( listener, "rerunFailingTestsCount" ) )
.isEqualTo( 5 );
- assertThat( getInternalState( listener, "xsdSchemaLocation" ) )
+ assertThat( (String) getInternalState( listener, "xsdSchemaLocation" ) )
.isSameAs( schema );
- assertThat( getInternalState( listener, "xsdVersion" ) )
+ assertThat( (String) getInternalState( listener, "xsdVersion" ) )
.isEqualTo( "V3" );
- assertThat( getInternalState( listener, "testClassMethodRunHistoryMap" ) )
+ assertThat( (Map, ?>) getInternalState( listener, "testClassMethodRunHistoryMap" ) )
.isSameAs( testClassMethodRunHistory );
- assertThat( getInternalState( listener, "phrasedFileName" ) )
+ assertThat( (boolean) getInternalState( listener, "phrasedFileName" ) )
.isEqualTo( true );
- assertThat( getInternalState( listener, "phrasedSuiteName" ) )
+ assertThat( (boolean) getInternalState( listener, "phrasedSuiteName" ) )
.isEqualTo( true );
- assertThat( getInternalState( listener, "phrasedClassName" ) )
+ assertThat( (boolean) getInternalState( listener, "phrasedClassName" ) )
.isEqualTo( true );
- assertThat( getInternalState( listener, "phrasedMethodName" ) )
+ assertThat( (boolean) getInternalState( listener, "phrasedMethodName" ) )
.isEqualTo( true );
}
}
diff --git a/maven-surefire-common/src/test/java/org/apache/maven/surefire/extensions/StatelessTestsetInfoReporterTest.java b/maven-surefire-common/src/test/java/org/apache/maven/surefire/extensions/StatelessTestsetInfoReporterTest.java
index 389acdfeb5..4576a081d8 100644
--- a/maven-surefire-common/src/test/java/org/apache/maven/surefire/extensions/StatelessTestsetInfoReporterTest.java
+++ b/maven-surefire-common/src/test/java/org/apache/maven/surefire/extensions/StatelessTestsetInfoReporterTest.java
@@ -118,11 +118,11 @@ public void shouldCreateFileReporterListener()
.isSameAs( reportNameSuffix );
assertThat( listener.getEncoding() )
.isSameAs( encoding );
- assertThat( getInternalState( listener, "usePhrasedFileName" ) )
+ assertThat( (boolean) getInternalState( listener, "usePhrasedFileName" ) )
.isEqualTo( false );
- assertThat( getInternalState( listener, "usePhrasedClassNameInRunning" ) )
+ assertThat( (boolean) getInternalState( listener, "usePhrasedClassNameInRunning" ) )
.isEqualTo( false );
- assertThat( getInternalState( listener, "usePhrasedClassNameInTestCaseSummary" ) )
+ assertThat( (boolean) getInternalState( listener, "usePhrasedClassNameInTestCaseSummary" ) )
.isEqualTo( false );
}
@@ -143,9 +143,9 @@ public void shouldCreateConsoleReporterListener()
.isInstanceOf( ConsoleReporter.class );
assertThat( listener.getConsoleLogger() )
.isSameAs( consoleLogger );
- assertThat( getInternalState( listener, "usePhrasedClassNameInRunning" ) )
+ assertThat( (boolean) getInternalState( listener, "usePhrasedClassNameInRunning" ) )
.isEqualTo( false );
- assertThat( getInternalState( listener, "usePhrasedClassNameInTestCaseSummary" ) )
+ assertThat( (boolean) getInternalState( listener, "usePhrasedClassNameInTestCaseSummary" ) )
.isEqualTo( false );
}
diff --git a/maven-surefire-plugin/src/site/apt/developing.apt.vm b/maven-surefire-plugin/src/site/apt/developing.apt.vm
index 7c8ccb22f4..c1f337b32b 100644
--- a/maven-surefire-plugin/src/site/apt/developing.apt.vm
+++ b/maven-surefire-plugin/src/site/apt/developing.apt.vm
@@ -114,12 +114,9 @@ ForkedBooter#main
* JDK Versions
- The surefire booter is capable of booting all the way back to jdk1.7. Specifically
+ The surefire booter is capable of booting all the way back to jdk1.8. Specifically
this means <<>>, <<>>, <<>>, <<>>
- and other modules are compiled with source/target 1.7. The plugin and several providers are 1.7.
- The provider <<>> is compiled with jdk1.8.
- The project requires using <<>> jdk1.8 but the tests run with jdk1.7+ which is
- configured by system property <<>>, see <<>>.
+ and other modules are compiled with source/target 1.8.
* Provider Isolation
diff --git a/pom.xml b/pom.xml
index 4692e25917..9440300b9c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -87,7 +87,7 @@
- 7
+ 8
3.2.5
3.8.1
@@ -105,6 +105,7 @@
surefire-archives/surefire-LATEST
1.${javaVersion}
1.${javaVersion}
+
${jvm9ArgsTests} -Xms32m -Xmx144m -XX:SoftRefLRUPolicyMSPerMB=50 -Djava.awt.headless=true -Djdk.net.URLClassPath.disableClassPathURLCheck=true
2020-06-10T18:16:37Z
@@ -413,11 +414,6 @@
maven-shade-plugin
3.2.3
-
- org.codehaus.mojo
- build-helper-maven-plugin
- 3.2.0
-
org.apache.maven.plugins
maven-compiler-plugin
@@ -477,13 +473,11 @@
maven-surefire-plugin
3.0.0-M4
- ${doSkipTests}
false
${jvm.args.tests}
false
false
- ${jdkHome}/bin/java
@@ -603,7 +597,6 @@
-
[1.8, )
@@ -644,62 +637,6 @@
true
-
- org.codehaus.mojo
- build-helper-maven-plugin
-
-
- bsh-property
-
- bsh-property
-
-
-
- jdkHome
- doSkipTests
- jvm9ArgsTests
-
-
-
-
-
-
org.codehaus.mojo
animal-sniffer-maven-plugin
@@ -712,7 +649,7 @@
org.codehaus.mojo.signature
- java17
+ java18
1.0
@@ -750,6 +687,17 @@
+
+
+ jdk9+
+
+ [9,)
+
+
+ --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.math=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.text=ALL-UNNAMED --add-opens java.base/java.util.regex=ALL-UNNAMED --add-opens java.base/java.nio.channels.spi=ALL-UNNAMED --add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.base/java.net=ALL-UNNAMED --add-opens java.base/java.util.concurrent=ALL-UNNAMED --add-opens java.base/sun.nio.fs=ALL-UNNAMED --add-opens java.base/sun.nio.cs=ALL-UNNAMED --add-opens java.base/java.nio.file=ALL-UNNAMED --add-opens java.base/java.nio.charset=ALL-UNNAMED
+
+
+
reporting
diff --git a/surefire-api/src/test/java/org/apache/maven/surefire/api/stream/AbstractStreamDecoderTest.java b/surefire-api/src/test/java/org/apache/maven/surefire/api/stream/AbstractStreamDecoderTest.java
index 748c467188..36ef828bc2 100644
--- a/surefire-api/src/test/java/org/apache/maven/surefire/api/stream/AbstractStreamDecoderTest.java
+++ b/surefire-api/src/test/java/org/apache/maven/surefire/api/stream/AbstractStreamDecoderTest.java
@@ -19,19 +19,8 @@
* under the License.
*/
-import org.apache.maven.plugin.surefire.log.api.ConsoleLogger;
-import org.apache.maven.surefire.api.booter.Constants;
-import org.apache.maven.surefire.api.booter.ForkedProcessEventType;
-import org.apache.maven.surefire.api.event.Event;
-import org.apache.maven.surefire.api.fork.ForkNodeArguments;
-import org.apache.maven.surefire.api.report.RunMode;
-import org.apache.maven.surefire.api.stream.AbstractStreamDecoder.MalformedFrameException;
-import org.apache.maven.surefire.api.stream.AbstractStreamDecoder.Memento;
-import org.apache.maven.surefire.api.stream.AbstractStreamDecoder.Segment;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
import javax.annotation.Nonnull;
+
import java.io.EOFException;
import java.io.File;
import java.math.BigInteger;
@@ -45,6 +34,18 @@
import java.util.Map;
import java.util.concurrent.TimeUnit;
+import org.apache.maven.plugin.surefire.log.api.ConsoleLogger;
+import org.apache.maven.surefire.api.booter.Constants;
+import org.apache.maven.surefire.api.booter.ForkedProcessEventType;
+import org.apache.maven.surefire.api.event.Event;
+import org.apache.maven.surefire.api.fork.ForkNodeArguments;
+import org.apache.maven.surefire.api.report.RunMode;
+import org.apache.maven.surefire.api.stream.AbstractStreamDecoder.MalformedFrameException;
+import org.apache.maven.surefire.api.stream.AbstractStreamDecoder.Memento;
+import org.apache.maven.surefire.api.stream.AbstractStreamDecoder.Segment;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
import static java.lang.Math.min;
import static java.lang.System.arraycopy;
import static java.nio.charset.CodingErrorAction.REPLACE;
@@ -275,7 +276,7 @@ public void shouldReadStringShiftedBuffer() throws Exception
Memento memento = thread.new Memento();
// whatever position will be compacted to 0
( (Buffer) ( (Buffer) memento.getByteBuffer() ).limit( 974 ) ).position( 974 );
- assertThat( invokeMethod( thread, "readString", memento, PATTERN1.length() + 3 ) )
+ assertThat( (String) invokeMethod( thread, "readString", memento, PATTERN1.length() + 3 ) )
.isEqualTo( PATTERN1 + "012" );
}
@@ -295,7 +296,7 @@ public void shouldReadStringShiftedInput() throws Exception
Collections.emptyMap() );
Memento memento = thread.new Memento();
- assertThat( invokeMethod( thread, "readString", memento, PATTERN1.length() ) )
+ assertThat( (String) invokeMethod( thread, "readString", memento, PATTERN1.length() ) )
.isEqualTo( "789" + PATTERN1.substring( 0, 97 ) );
}
@@ -325,7 +326,7 @@ public void shouldReadMultipleStringsAndShiftedInput() throws Exception
expected.append( PATTERN1 );
}
expected.setLength( 1100 );
- assertThat( invokeMethod( thread, "readString", memento, 1100 ) )
+ assertThat( (String) invokeMethod( thread, "readString", memento, 1100 ) )
.isEqualTo( expected.toString() );
}
diff --git a/surefire-its/pom.xml b/surefire-its/pom.xml
index 8275230f33..307d7de020 100644
--- a/surefire-its/pom.xml
+++ b/surefire-its/pom.xml
@@ -768,7 +768,6 @@
3.0.0-M4
${skipTests}
- ${jdkHome}/bin/java
alphabetical
1
false
diff --git a/surefire-its/src/test/resources/toolchains.xml b/surefire-its/src/test/resources/toolchains.xml
index 235c23aebd..857c82c687 100644
--- a/surefire-its/src/test/resources/toolchains.xml
+++ b/surefire-its/src/test/resources/toolchains.xml
@@ -29,7 +29,7 @@
oracle
- ${jdkHome}
+ ${java.home}
diff --git a/surefire-providers/surefire-junit-platform/pom.xml b/surefire-providers/surefire-junit-platform/pom.xml
index 54430dac1a..9883364aac 100644
--- a/surefire-providers/surefire-junit-platform/pom.xml
+++ b/surefire-providers/surefire-junit-platform/pom.xml
@@ -31,10 +31,6 @@
SureFire JUnit Platform Runner
SureFire JUnit Platform Runner
-
- 8
-
-
Konstantin Lutovich
@@ -134,31 +130,6 @@
jacoco.agent
-
- org.codehaus.mojo
- animal-sniffer-maven-plugin
-
-
- signature-check
-
- check
-
-
-
- org.codehaus.mojo.signature
- java18
- 1.0
-
-
- org.junit.platform:junit-platform-commons
-
-
- org.junit.platform.commons.*
-
-
-
-
-
maven-surefire-plugin
3.0.0-M4