diff --git a/README.md b/README.md index 36bbd83ce1..5d9964997a 100644 --- a/README.md +++ b/README.md @@ -52,11 +52,11 @@ Build the Surefire project using **Maven 3.2.5+** and **JDK 1.8+**. On Linux/Unix: ``` - export MAVEN_OPTS="-server -Xmx512m -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" + export MAVEN_OPTS="-server -Xmx512m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=384m -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -XX:SoftRefLRUPolicyMSPerMB=50 -Djava.awt.headless=true" ``` On Windows: ``` - 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" + 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" ``` * In order to build and run the tests: diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNg740ParallelIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNg740ParallelIT.java index 5ec2de3bff..70741ece0b 100644 --- a/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNg740ParallelIT.java +++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNg740ParallelIT.java @@ -20,23 +20,14 @@ */ import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase; -import org.junit.Before; import org.junit.Test; -import static org.apache.maven.surefire.its.fixture.HelperAssertions.assumeJavaVersion; - /** */ @SuppressWarnings( "checkstyle:magicnumber" ) public class CheckTestNg740ParallelIT extends SurefireJUnit4IntegrationTestCase { - @Before - public void assumeJava8Plus() - { - assumeJavaVersion( 1.8d ); - } - @Test public void withTestNG740AndParallelSet() { diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgListenerReporterIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgListenerReporterIT.java index 472543a45f..0d47fb26b5 100644 --- a/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgListenerReporterIT.java +++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgListenerReporterIT.java @@ -29,7 +29,6 @@ import org.junit.runners.Parameterized; import static org.apache.maven.surefire.its.fixture.HelperAssertions.assumeJavaMaxVersion; -import static org.apache.maven.surefire.its.fixture.HelperAssertions.assumeJavaVersion; import static org.junit.runners.Parameterized.Parameter; import static org.junit.runners.Parameterized.Parameters; @@ -49,10 +48,10 @@ public static Collection data() { return Arrays.asList( new Object[][] { - { "5.6", "jdk15", 1.5d }, // First TestNG version with reporter support - { "5.7", "jdk15", 1.5d }, // default version from pom of the test case - { "5.10", "jdk15", 1.5d }, - { "5.13", null, 1.5d }, // "reporterslist" param becomes String instead of List + { "5.6", "jdk15" }, // First TestNG version with reporter support + { "5.7", "jdk15" }, // default version from pom of the test case + { "5.10", "jdk15" }, + { "5.13", null }, // "reporterslist" param becomes String instead of List // "listener" param becomes String instead of List // configure(Map) in 5.14.1 and 5.14.2 is transforming List into a String with a space as separator. @@ -71,11 +70,11 @@ public static Collection data() //{ "5.14.4", null, "1.5" }, { "5.14.5", null, "1.5" }, // Fails: not able to test due to system dependency org.testng:guice missed the path and use to break CI // ClassNotFoundException: com.beust.jcommander.ParameterException - { "5.14.6", null, 1.5d }, // Usage of org.testng:guice removed - { "5.14.9", null, 1.5d }, // Latest 5.14.x TestNG version - { "6.0", null, 1.5d }, - { "6.14.3", null, 1.7d }, - { "7.0.0", null, 1.8d } // Currently latest TestNG version + { "5.14.6", null }, // Usage of org.testng:guice removed + { "5.14.9", null }, // Latest 5.14.x TestNG version + { "6.0", null }, + { "6.14.3", null }, + { "7.0.0", null } // Currently latest TestNG version } ); } @@ -87,15 +86,9 @@ public static Collection data() @SuppressWarnings( "checkstyle:visibilitymodifier" ) public String classifier; - @Parameter( 2 ) - @SuppressWarnings( "checkstyle:visibilitymodifier" ) - public double javaVersion; - @Test public void testNgListenerReporter() { - assumeJavaVersion( javaVersion ); - if ( version.equals( "5.13" ) ) { // only 5.13 uses Google Guice, reflection which breaks jdk 16+ diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit47RerunFailingTestWithCucumberIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit47RerunFailingTestWithCucumberIT.java index 9dd361b62f..c20ec1ec3e 100644 --- a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit47RerunFailingTestWithCucumberIT.java +++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit47RerunFailingTestWithCucumberIT.java @@ -23,14 +23,12 @@ import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase; import org.apache.maven.surefire.its.fixture.SurefireLauncher; -import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameter; import org.junit.runners.Parameterized.Parameters; -import static org.apache.maven.surefire.its.fixture.HelperAssertions.assumeJavaVersion; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; @@ -51,12 +49,6 @@ public class JUnit47RerunFailingTestWithCucumberIT extends SurefireJUnit4Integra private static final String SUREFIRE_FORK_NODE = "org.apache.maven.plugin.surefire.extensions.SurefireForkNodeFactory"; - @Before - public void assumeJava8Plus() - { - assumeJavaVersion( 1.8d ); - } - @Parameters public static Iterable data() { diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit47WithCucumberIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit47WithCucumberIT.java index bced25202c..ccb37df32a 100644 --- a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit47WithCucumberIT.java +++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit47WithCucumberIT.java @@ -20,11 +20,8 @@ */ import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase; -import org.junit.Before; import org.junit.Test; -import static org.apache.maven.surefire.its.fixture.HelperAssertions.assumeJavaVersion; - /** * Tests the JUnit 47 provider with the cucumber runner. At the moment, they don't play along that perfectly (minor * glitches in the reports with parallel=classes), but at least all tests are executed, the execution times are counted @@ -37,12 +34,6 @@ public class JUnit47WithCucumberIT extends SurefireJUnit4IntegrationTestCase { - @Before - public void assumeJava8Plus() - { - assumeJavaVersion( 1.8d ); - } - @Test public void testWithoutParallel() { diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnitPlatformEnginesIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnitPlatformEnginesIT.java index 02c2706382..cbb3b422b6 100644 --- a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnitPlatformEnginesIT.java +++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnitPlatformEnginesIT.java @@ -25,7 +25,6 @@ import org.apache.maven.it.VerificationException; import org.apache.maven.surefire.its.fixture.OutputValidator; import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase; -import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; @@ -33,7 +32,6 @@ import org.junit.runners.Parameterized.Parameters; import static java.nio.charset.StandardCharsets.UTF_8; -import static org.apache.maven.surefire.its.fixture.HelperAssertions.assumeJavaVersion; import static org.apache.maven.surefire.its.fixture.IsRegex.regex; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.util.Sets.set; @@ -87,12 +85,6 @@ public static Iterable artifactVersions() return args; } - @Before - public void setUp() - { - assumeJavaVersion( 1.8d ); - } - @Test public void testToRegex() { diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnitPlatformIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnitPlatformIT.java index 14c553702c..46699bb292 100644 --- a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnitPlatformIT.java +++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnitPlatformIT.java @@ -23,7 +23,6 @@ import org.apache.maven.surefire.its.fixture.OutputValidator; import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase; -import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; @@ -31,7 +30,6 @@ import org.junit.runners.Parameterized.Parameters; import static java.nio.charset.StandardCharsets.UTF_8; -import static org.apache.maven.surefire.its.fixture.HelperAssertions.assumeJavaVersion; /** * @@ -62,12 +60,6 @@ public static Iterable artifactVersions() return args; } - @Before - public void setUp() - { - assumeJavaVersion( 1.8d ); - } - @Test public void testVintageEngine() { diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnitPlatformRerunFailingTestsIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnitPlatformRerunFailingTestsIT.java index 146e3251a9..93a475942e 100644 --- a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnitPlatformRerunFailingTestsIT.java +++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnitPlatformRerunFailingTestsIT.java @@ -22,11 +22,8 @@ import org.apache.maven.surefire.its.fixture.OutputValidator; import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase; import org.apache.maven.surefire.its.fixture.SurefireLauncher; -import org.junit.Before; import org.junit.Test; -import static org.apache.maven.surefire.its.fixture.HelperAssertions.assumeJavaVersion; - /** * JUnit4 RunListener Integration Test. * @@ -43,12 +40,6 @@ private SurefireLauncher unpack() return unpack( "/junit-platform-rerun-failing-tests" ); } - @Before - public void setup() - { - assumeJavaVersion( 1.8 ); - } - @Test public void testRerunFailingErrorTestsWithOneRetry() { diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnitPlatformStreamCorruptionIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnitPlatformStreamCorruptionIT.java index de502b3bad..90810487f6 100644 --- a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnitPlatformStreamCorruptionIT.java +++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnitPlatformStreamCorruptionIT.java @@ -22,13 +22,11 @@ import org.apache.maven.it.VerificationException; import org.apache.maven.surefire.its.fixture.OutputValidator; import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase; -import org.junit.Before; import org.junit.Ignore; import org.junit.Test; import java.util.List; -import static org.apache.maven.surefire.its.fixture.HelperAssertions.assumeJavaVersion; import static org.assertj.core.api.Assertions.assertThat; import static org.hamcrest.CoreMatchers.startsWith; @@ -39,12 +37,6 @@ public class JUnitPlatformStreamCorruptionIT extends SurefireJUnit4IntegrationTestCase { - @Before - public void setUp() - { - assumeJavaVersion( 1.8d ); - } - @Test public void warningIsNotEmitted() throws VerificationException { diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/RunOrderIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/RunOrderIT.java index 0032e8de74..853ed1e7d5 100644 --- a/surefire-its/src/test/java/org/apache/maven/surefire/its/RunOrderIT.java +++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/RunOrderIT.java @@ -27,8 +27,6 @@ import org.apache.maven.surefire.its.fixture.SurefireLauncher; import org.junit.Test; -import static org.apache.maven.surefire.its.fixture.HelperAssertions.assumeJavaVersion; - /** * Verifies the runOrder setting and its effect * @@ -56,7 +54,6 @@ public void testAlphabeticalJUnit4() public void testAlphabeticalJUnit5() throws Exception { - assumeJavaVersion( 1.8d ); OutputValidator validator = executeWithRunOrder( "alphabetical", "junit5" ); assertTestnamesAppearInSpecificOrder( validator, TESTS_IN_ALPHABETICAL_ORDER ); } @@ -110,7 +107,6 @@ public void testReverseAlphabeticalJUnit4() public void testReverseAlphabeticalJUnit5() throws Exception { - assumeJavaVersion( 1.8d ); OutputValidator validator = executeWithRunOrder( "reversealphabetical", "junit5" ); assertTestnamesAppearInSpecificOrder( validator, TESTS_IN_REVERSE_ALPHABETICAL_ORDER ); } @@ -136,7 +132,6 @@ public void testHourlyJUnit4() public void testHourlyJUnit5() throws Exception { - assumeJavaVersion( 1.8d ); int startHour = Calendar.getInstance().get( Calendar.HOUR_OF_DAY ); OutputValidator validator = executeWithRunOrder( "hourly", "junit5" ); int endHour = Calendar.getInstance().get( Calendar.HOUR_OF_DAY ); @@ -166,7 +161,6 @@ public void testNonExistingRunOrderJUnit4() @Test public void testNonExistingRunOrderJUnit5() { - assumeJavaVersion( 1.8d ); unpack() .activateProfile( "junit5" ) .forkMode( getForkMode() ) diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/SurefireJUnit4IntegrationTestCase.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/SurefireJUnit4IntegrationTestCase.java index 8b1dbdec17..eb8350647b 100644 --- a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/SurefireJUnit4IntegrationTestCase.java +++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/SurefireJUnit4IntegrationTestCase.java @@ -19,9 +19,6 @@ * under the License. */ -import java.io.File; -import java.io.IOException; - import static java.lang.Double.parseDouble; /** @@ -38,8 +35,6 @@ public abstract class SurefireJUnit4IntegrationTestCase { private static final int JAVA9_VERSION = 9; - public static final File JAVA_HOME = javaHome(); - public static final double JAVA_VERSION = javaVersion(); public static final boolean IS_JAVA9_PLUS = isJDK9Plus(); @@ -72,7 +67,7 @@ public static SurefireLauncher unpack( Class testClass, String sourceName, St private static SurefireLauncher unpack( Class testClass, String sourceName, String suffix, String[] cli ) { MavenLauncher mavenLauncher = new MavenLauncher( testClass, sourceName, suffix, cli ); - return new SurefireLauncher( mavenLauncher, JAVA_HOME ); + return new SurefireLauncher( mavenLauncher ); } private static double javaVersion() @@ -84,32 +79,4 @@ private static boolean isJDK9Plus() { return javaVersion() >= JAVA9_VERSION; } - - private static File javaHome() - { - String javaHome = System.getProperty( "java.home" ); - if ( !isJDK9Plus() ) - { - File jre = new File( javaHome ); - if ( "jre".equals( jre.getName() ) ) - { - javaHome = jre.getParent(); - } - } - - try - { - File javaHomeAsDir = new File( javaHome ).getCanonicalFile(); - if ( !javaHomeAsDir.isDirectory() ) - { - throw new RuntimeException( javaHomeAsDir.getAbsolutePath() + " is not a JAVA_HOME directory." ); - } - System.out.println( "Using JAVA_HOME=" + javaHomeAsDir.getAbsolutePath() + " in forked launcher." ); - return javaHomeAsDir; - } - catch ( IOException e ) - { - throw new RuntimeException( e ); - } - } } diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java index 0394123587..09ee6ae5b0 100755 --- a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java +++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java @@ -39,13 +39,9 @@ public final class SurefireLauncher private final String surefireVersion = System.getProperty( "surefire.version" ); - private final File javaHome; - - public SurefireLauncher( MavenLauncher mavenLauncher, File javaHome ) + public SurefireLauncher( MavenLauncher mavenLauncher ) { this.mavenLauncher = mavenLauncher; - this.javaHome = javaHome; - mavenLauncher.addEnvVar( "JAVA_HOME", javaHome.getAbsolutePath() ); reset(); } @@ -70,7 +66,7 @@ public void reset() public SurefireLauncher getSubProjectLauncher( String subProject ) { - return new SurefireLauncher( mavenLauncher.getSubProjectLauncher( subProject ), javaHome ); + return new SurefireLauncher( mavenLauncher.getSubProjectLauncher( subProject ) ); } public OutputValidator getSubProjectValidator( String subProject ) @@ -98,9 +94,6 @@ private List getInitialGoals() String jacocoAgent = System.getProperty( "jacoco.agent", "" ); goals.add( "-Djacoco.agent=" + jacocoAgent ); - - goals.add( "-Dhttps.protocols=TLSv1,TLSv1.1,TLSv1.2" ); - goals.add( "-nsu" ); return goals; diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncherTest.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncherTest.java index 5b80c2ca3b..801ebec637 100644 --- a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncherTest.java +++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncherTest.java @@ -21,7 +21,6 @@ import org.junit.Test; -import static org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase.JAVA_HOME; import static org.junit.Assert.assertEquals; /** @@ -33,7 +32,7 @@ public class SurefireLauncherTest public void launcherGetsProperMethodName() { MavenLauncher mavenLauncher = new MavenLauncher( SurefireLauncherTest.class, "foo", "" ); - String method = new SurefireLauncher( mavenLauncher, JAVA_HOME ).getTestMethodName(); + String method = new SurefireLauncher( mavenLauncher ).getTestMethodName(); assertEquals( "launcherGetsProperMethodName", method ); } diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/SpockIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/SpockIT.java index 6e55f8f85d..f47963faca 100644 --- a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/SpockIT.java +++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/SpockIT.java @@ -23,7 +23,6 @@ import org.junit.Test; import static org.apache.maven.surefire.its.fixture.HelperAssertions.assumeJavaMaxVersion; -import static org.apache.maven.surefire.its.fixture.HelperAssertions.assumeJavaVersion; /** * @@ -34,7 +33,6 @@ public class SpockIT extends SurefireJUnit4IntegrationTestCase @Test public void test() { - assumeJavaVersion( 1.8d ); assumeJavaMaxVersion( 14d ); unpack( "junit5-spock" ) .executeTest() diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1585IT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1585IT.java index cad464cf3f..35baa0f4ac 100644 --- a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1585IT.java +++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1585IT.java @@ -20,11 +20,8 @@ */ import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase; -import org.junit.Before; import org.junit.Test; -import static org.apache.maven.surefire.its.fixture.HelperAssertions.assumeJavaVersion; - /** * */ @@ -32,12 +29,6 @@ public class Surefire1585IT extends SurefireJUnit4IntegrationTestCase { - @Before - public void setUp() - { - assumeJavaVersion( 1.8d ); - } - @Test public void shouldRunWithJupiterApi() { diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1914XmlReportingParameterizedTestIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1914XmlReportingParameterizedTestIT.java index 39951bc952..babc05ebbb 100644 --- a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1914XmlReportingParameterizedTestIT.java +++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1914XmlReportingParameterizedTestIT.java @@ -24,7 +24,6 @@ import org.apache.maven.surefire.its.fixture.OutputValidator; import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase; -import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; @@ -32,7 +31,6 @@ import org.junit.runners.Parameterized.Parameters; import static java.nio.charset.StandardCharsets.UTF_8; -import static org.apache.maven.surefire.its.fixture.HelperAssertions.assumeJavaVersion; /** * @@ -72,12 +70,6 @@ public static Iterable artifactVersions() return args; } - @Before - public void setUp() - { - assumeJavaVersion( 1.8d ); - } - @Test public void testXmlReport() { diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire260TestWithIdenticalNamesIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire260TestWithIdenticalNamesIT.java index 85bafc51d9..393a21e456 100644 --- a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire260TestWithIdenticalNamesIT.java +++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire260TestWithIdenticalNamesIT.java @@ -32,7 +32,6 @@ import com.gargoylesoftware.htmlunit.html.HtmlPage; import org.junit.Test; -import static org.apache.maven.surefire.its.fixture.HelperAssertions.assumeJavaVersion; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; @@ -51,7 +50,6 @@ public class Surefire260TestWithIdenticalNamesIT public void testWithIdenticalNames() throws IOException { - assumeJavaVersion( 1.8d ); OutputValidator validator = unpack( "surefire-260-testWithIdenticalNames" ) .failNever() .addGoal( "site" ) diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire673MockitoIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire673MockitoIT.java index 1b5d03f1b3..6782e5939c 100644 --- a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire673MockitoIT.java +++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire673MockitoIT.java @@ -20,11 +20,8 @@ */ import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase; -import org.junit.Before; import org.junit.Test; -import static org.apache.maven.surefire.its.fixture.HelperAssertions.assumeJavaVersion; - /** * SUREFIRE-673 Asserts that a given mockito build works as it should (classloader problem in 2.7) * @@ -34,12 +31,6 @@ public class Surefire673MockitoIT extends SurefireJUnit4IntegrationTestCase { - @Before - public void assumeJava8Plus() - { - assumeJavaVersion( 1.8d ); - } - @Test public void testBuildFailingWhenErrors() {