From commits-return-69770-archive-asf-public=cust-asf.ponee.io@maven.apache.org Sat Jan 27 18:56:33 2018 Return-Path: X-Original-To: archive-asf-public@eu.ponee.io Delivered-To: archive-asf-public@eu.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by mx-eu-01.ponee.io (Postfix) with ESMTP id 7C54118076D for ; Sat, 27 Jan 2018 18:56:33 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 6B921160C13; Sat, 27 Jan 2018 17:56:33 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id EDA1D160C30 for ; Sat, 27 Jan 2018 18:56:30 +0100 (CET) Received: (qmail 31309 invoked by uid 500); 27 Jan 2018 17:56:30 -0000 Mailing-List: contact commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@maven.apache.org Delivered-To: mailing list commits@maven.apache.org Received: (qmail 31291 invoked by uid 99); 27 Jan 2018 17:56:30 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 27 Jan 2018 17:56:30 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A6C3BDFB31; Sat, 27 Jan 2018 17:56:27 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: tibordigana@apache.org To: commits@maven.apache.org Date: Sat, 27 Jan 2018 17:56:29 -0000 Message-Id: In-Reply-To: <94f309da920b41a58b1cb14d54e9d100@git.apache.org> References: <94f309da920b41a58b1cb14d54e9d100@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] maven-surefire git commit: [SUREFIRE-1463] integration tests should run on the top of JDK 9 [SUREFIRE-1463] integration tests should run on the top of JDK 9 Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/e3df1b56 Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/e3df1b56 Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/e3df1b56 Branch: refs/heads/SUREFIRE-1463 Commit: e3df1b56a05263bf6027feb6ec2096e4027fd915 Parents: 27a5e6a Author: Tibor17 Authored: Sat Jan 13 23:22:07 2018 +0100 Committer: Tibor17 Committed: Sat Jan 27 18:56:11 2018 +0100 ---------------------------------------------------------------------- Jenkinsfile | 209 +++++++++++++++++-- README.md | 4 +- maven-failsafe-plugin/pom.xml | 1 + .../src/it/jetty-war-test-failing/pom.xml | 10 +- .../src/it/jetty-war-test-passing/pom.xml | 10 +- .../src/it/multiple-summaries-failing/pom.xml | 6 + .../src/it/multiple-summaries/pom.xml | 6 + .../src/it/working-directory/pom.xml | 6 + pom.xml | 1 + surefire-integration-tests/pom.xml | 50 +---- .../maven/surefire/its/AbstractJigsawIT.java | 23 +- .../maven/surefire/its/Java9FullApiIT.java | 5 +- .../apache/maven/surefire/its/RunOrderIT.java | 1 - .../surefire/its/fixture/SurefireLauncher.java | 45 ++-- ...urefire1295AttributeJvmCrashesToTestsIT.java | 19 +- .../resources/environment-variables/pom.xml | 14 +- .../src/test/resources/fail-fast-junit/pom.xml | 8 - .../src/test/resources/fail-fast-testng/pom.xml | 8 - .../src/test/resources/failingBuilds/pom.xml | 10 +- .../src/test/resources/failsafe-notests/pom.xml | 7 + .../resources/failure-result-counting/pom.xml | 10 +- .../src/test/resources/failureOutput/pom.xml | 10 +- .../test/resources/fork-consoleOutput/pom.xml | 10 +- .../fork-consoleOutputWithErrors/pom.xml | 10 +- .../src/test/resources/fork-fail/pom.xml | 14 +- .../resources/fork-mode-multimodule/pom.xml | 13 +- .../fork-mode-resource-loading/pom.xml | 12 +- .../src/test/resources/fork-mode-testng/pom.xml | 12 +- .../src/test/resources/fork-mode/pom.xml | 12 +- .../src/test/resources/fork-timeout/pom.xml | 7 +- .../includes-excludes-from-file/pom.xml | 2 + .../test/resources/includes-excludes/pom.xml | 4 +- .../test/resources/isolated-classloader/pom.xml | 4 + .../src/test/resources/java9-full-api/pom.xml | 5 - .../resources/junit-fork-mode-always/pom.xml | 15 +- .../src/test/resources/junit-ignore/pom.xml | 10 +- .../src/test/resources/junit-innerClass/pom.xml | 5 + .../junit-notExtendingTestCase/pom.xml | 5 + .../test/resources/junit-pathWithUmlaut/pom.xml | 5 + .../resources/junit-twoTestCaseSuite/pom.xml | 5 + .../test/resources/junit-twoTestCases/pom.xml | 5 + .../junit4-forkAlways-staticInit/pom.xml | 13 +- .../junit4-rerun-failing-tests/pom.xml | 13 +- .../test/resources/junit4-runlistener/pom.xml | 10 +- .../resources/junit4-twoTestCaseSuite/pom.xml | 10 +- .../src/test/resources/junit4/pom.xml | 12 +- .../src/test/resources/junit44-dep/pom.xml | 14 +- .../test/resources/junit44-environment/pom.xml | 13 +- .../src/test/resources/junit44-hamcrest/pom.xml | 14 +- .../resources/junit44-method-pattern/pom.xml | 10 +- .../resources/junit44-multiple-methods/pom.xml | 8 - .../resources/junit44-single-method/pom.xml | 10 +- .../test/resources/junit47-parallel-nts/pom.xml | 7 - .../junit47-parallel-with-suite/pom.xml | 10 +- .../src/test/resources/junit47-parallel/pom.xml | 7 - .../resources/junit47-redirect-output/pom.xml | 10 +- .../junit47-static-inner-class-tests/pom.xml | 12 +- .../test/resources/junit48-categories/pom.xml | 10 +- .../resources/junit48-method-pattern/pom.xml | 8 - .../junit48-multiple-method-patterns/pom.xml | 8 - .../resources/junit48-multiple-methods/pom.xml | 8 - .../resources/junit48-single-method/pom.xml | 8 - .../resources/junit48-smartStackTrace/pom.xml | 10 +- .../src/test/resources/norunnableTests/pom.xml | 5 + .../src/test/resources/parallel-runtime/pom.xml | 12 +- .../resources/plain-old-java-classpath/pom.xml | 5 + .../src/test/resources/plexus-conflict/pom.xml | 5 + .../src/test/resources/pojo-simple/pom.xml | 13 +- .../src/test/resources/pom.xml | 10 +- .../src/test/resources/reporters/pom.xml | 10 +- .../src/test/resources/result-counting/pom.xml | 10 +- .../src/test/resources/runOrder/pom.xml | 5 + .../test/resources/runorder-parallel/pom.xml | 13 +- .../sibling-aggregator/aggregator/pom.xml | 6 + .../resources/sibling-aggregator/child1/pom.xml | 5 + .../resources/sibling-aggregator/child2/pom.xml | 5 + .../resources/small-result-counting/pom.xml | 10 +- .../jiras-surefire-1024-testjar/pom.xml | 17 +- .../pom.xml | 14 -- .../pom.xml | 7 - .../surefire-1053-system-properties/pom.xml | 7 - .../surefire-1055-parallelTestCount/pom.xml | 8 - .../pom.xml | 13 +- .../pom.xml | 13 +- .../surefire-1095-npe-in-runlistener/pom.xml | 7 - .../surefire-1098-balanced-runorder/pom.xml | 7 - .../pom.xml | 13 +- .../pom.xml | 13 +- .../pom.xml | 8 - .../resources/surefire-1144-xml-runtime/pom.xml | 13 -- .../pom.xml | 7 - .../pom.xml | 8 - .../pom.xml | 7 - .../surefire-1158-remove-info-lines/pom.xml | 8 - .../pom.xml | 8 - .../src/test/resources/surefire-1185/pom.xml | 7 - .../surefire-1202-rerun-and-failfast/pom.xml | 15 +- .../surefire-1209-rerun-and-forkcount/pom.xml | 15 +- .../src/test/resources/surefire-1211/pom.xml | 8 - .../surefire-1278-group-name-ending/pom.xml | 13 +- .../src/test/resources/surefire-1364/pom.xml | 3 +- .../src/test/resources/surefire-1367/pom.xml | 2 - .../pom.xml | 5 + .../pom.xml | 5 + .../pom.xml | 16 +- .../surefire-141-pluggableproviders/pom.xml | 12 +- .../surefire-146-forkPerTestNoSetup/pom.xml | 5 + .../surefire-162-charsetProvider/pom.xml | 11 +- .../surefire-224-wellFormedXmlFailures/pom.xml | 5 + .../surefire-257-rerunningTests/pom.xml | 5 + .../surefire-260-testWithIdenticalNames/pom.xml | 5 + .../surefire-34-securityManager-success/pom.xml | 11 +- .../surefire-34-securityManager/pom.xml | 11 +- .../pom.xml | 5 + .../surefire-500-puzzling-error/pom.xml | 15 +- .../surefire-510-testClassPath/pom.xml | 12 +- .../pom.xml | 5 + .../surefire-613-testCount-in-parallel/pom.xml | 12 +- .../pom.xml | 12 +- .../pom.xml | 10 +- .../pom.xml | 11 +- .../surefire-649-systemProperties/pom.xml | 7 - .../pom.xml | 7 - .../test/resources/surefire-673-mockito/pom.xml | 13 +- .../surefire-674-buildFailingWhenErrors/pom.xml | 10 +- .../surefire-685-commaseparatedIncludes/pom.xml | 5 + .../resources/surefire-697-niceSummary/pom.xml | 5 + .../surefire-733-allOverridesCaptured/pom.xml | 2 + .../pom.xml | 7 +- .../pom.xml | 7 +- .../surefire-806-specifiedTests-multi/pom.xml | 5 + .../surefire-806-specifiedTests-single/pom.xml | 5 + .../surefire-809-groupExpr-junit48/pom.xml | 10 +- .../surefire-809-groupExpr-testng/pom.xml | 11 +- .../surefire-812-log4j-classloader/pom.xml | 13 +- .../resources/surefire-817-system-exit/pom.xml | 7 - .../surefire-818-ignored-tests-on-npe/pom.xml | 10 +- .../surefire-828-emptyGroupExpr-junit48/pom.xml | 10 +- .../surefire-828-emptyGroupExpr-testng/pom.xml | 15 +- .../surefire-832-provider-selection/pom.xml | 10 +- .../resources/surefire-847-testngfail/pom.xml | 11 +- .../surefire-855-failsafe-use-bundle/pom.xml | 10 +- .../surefire-855-failsafe-use-jar/pom.xml | 10 +- .../surefire-855-failsafe-use-war/pom.xml | 10 +- .../surefire-930-failsafe-runtests/pom.xml | 7 +- .../surefire-931-provider-failure/pom.xml | 11 +- .../surefire-943-report-content/pom.xml | 7 +- .../pom.xml | 13 +- .../surefire-946-self-destruct-plugin/pom.xml | 7 +- .../surefire-972-bizarre-noclassdef/pom.xml | 4 + .../surefire-975-wrong-encoding/pom.xml | 7 +- .../module1/pom.xml | 10 +- .../module2/pom.xml | 10 +- .../pom.xml | 10 +- .../pom.xml | 8 - .../surefire-995-categoryInheritance/pom.xml | 7 - .../test/resources/system-properties/pom.xml | 2 + .../test-helper-dump-pid-plugin/pom.xml | 7 +- .../resources/testng-afterSuiteFailure/pom.xml | 15 +- .../test/resources/testng-beforeMethod/pom.xml | 16 +- .../testng-beforeMethodFailure/pom.xml | 15 +- .../test/resources/testng-execute-error/pom.xml | 12 +- .../testng-group-thread-parallel/pom.xml | 8 - .../src/test/resources/testng-groups/pom.xml | 13 +- .../src/test/resources/testng-jdk14/pom.xml | 5 + .../resources/testng-junit-together/pom.xml | 14 +- .../resources/testng-junit4-together/pom.xml | 13 -- .../resources/testng-listener-reporter/pom.xml | 14 +- .../testng-method-pattern-after/pom.xml | 17 +- .../testng-method-pattern-before/pom.xml | 17 +- .../resources/testng-method-pattern/pom.xml | 14 +- .../testng-multiple-method-patterns/pom.xml | 8 - .../test/resources/testng-objectFactory/pom.xml | 8 - .../resources/testng-parallel-suites/pom.xml | 8 - .../testng-parallel-with-annotations/pom.xml | 12 +- .../resources/testng-path with spaces/pom.xml | 16 +- .../src/test/resources/testng-simple/pom.xml | 13 +- .../testng-single-method-5-14-9/pom.xml | 14 +- .../test/resources/testng-single-method/pom.xml | 14 +- .../src/test/resources/testng-suite-xml/pom.xml | 13 +- .../resources/testng-testRunnerFactory/pom.xml | 8 - .../resources/testng-twoTestCaseSuite/pom.xml | 14 +- .../src/test/resources/timeout-forked/pom.xml | 5 + .../test/resources/unicode-testnames/pom.xml | 7 +- .../pom.xml | 7 + .../resources/working-directory-missing/pom.xml | 4 + .../test/resources/working-directory/pom.xml | 6 + 187 files changed, 803 insertions(+), 1208 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e3df1b56/Jenkinsfile ---------------------------------------------------------------------- diff --git a/Jenkinsfile b/Jenkinsfile index 9863659..acec9fc 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,31 +1,198 @@ -pipeline { - agent none - stages { - stage('Parallel Unix and Windows Build') { - steps { - parallel unix: { - node("${env.NIX_LABEL}") { - checkout scm - withEnv(["JAVA_HOME=${tool('JDK 1.8.0_144')}", "PATH+MAVEN=${tool('Maven 3.5.0')}/bin:${env.JAVA_HOME}/bin"]) { - sh "mvn clean install jacoco:report -B -U -e -fae -V -P run-its,jenkins -Dsurefire.useFile=false -Dfailsafe.useFile=false -Dintegration-test-port=8084 \\\"-Djdk.home=${tool('JDK 9 b181')}\\\"" +#!/usr/bin/env groovy + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +properties([buildDiscarder(logRotator(artifactDaysToKeepStr: '', artifactNumToKeepStr: '0', daysToKeepStr: env.BRANCH_NAME == 'master' ? '30' : '7', numToKeepStr: '5'))]) + +def oses = ['linux', 'windows'] +def mavens = env.BRANCH_NAME == 'master' ? ['3.2.x', '3.3.x', '3.5.x'] : ['3.5.x'] +def jdks = env.BRANCH_NAME == 'master' ? ['7', '8', '9', '10'] : ['9'] + +def cmd = ['mvn'] +def options = ['-B', '-U', '-e', '-V', '-P', 'run-its'] +def goals = ['clean', 'install', 'jacoco:report'] +def properties = ["-Dintegration-test-port=8084"] + +Map stages = [:] + +oses.eachWithIndex { os, indexOfOs -> + + mavens.eachWithIndex { maven, indexOfMaven -> + + jdks.eachWithIndex { jdk, indexOfJdk -> + + String label = jenkinsEnv.labelForOS(os); + String jdkName = jenkinsEnv.jdkFromVersion(os, jdk) + String mvnName = jenkinsEnv.mvnFromVersion(os, maven) + + def stageKey = "${os}-jdk${jdk}-maven${maven}" + + if (label == null || jdkName == null || mvnName == null) { + println "Skipping ${stageKey} as unsupported by Jenkins Environment." + continue; + } + + println "${stageKey} ==> Label: ${label}, JDK: ${jdkName}, Maven: ${mvnName}." + + stages[stageKey] = { + if (os == 'windows') { + node("${env.WIN_LABEL}") { + try { + println "Basedir = ${pwd()}." + + def mvnLocalRepoDir + + dir('.repository') { + mvnLocalRepoDir = "${pwd()}" + } + + println "Maven Local Repository = ${mvnLocalRepoDir}." + + dir('build') { + try { + stage("checkout ${stageKey}") { + checkout scm + } + + stage("build ${stageKey}") { + def jdkHome = resolveToolNameToJavaPath(jdkName, mvnName) + println("Setting JDK for testing -Djdk.home=${jdkHome}") + withMaven(jdk: 'JDK 1.8 (latest)', maven: mvnName, mavenLocalRepo: mvnLocalRepoDir, + options: [invokerPublisher()]) { + def jdkForTests = [" \"-Djdk.home=${jdkHome}\""] + def command = cmd + options + goals + properties + jdkForTests + bat command.join(' ') + } + } + } finally { + stage('cleanup ${stageKey}') { + deleteDir() // clean up after ourselves to reduce disk space + } + } + } + } finally { + cleanWs() } - jacoco changeBuildStatus: false, execPattern: '**/*.exec', sourcePattern: '**/src/main/java', exclusionPattern: 'pkg/*.class,plexusConflict/*.class,**/surefire570/**/*.class,siblingAggregator/*.class,surefire257/*.class,surefire979/*.class,org/apache/maven/surefire/crb/*.class,org/apache/maven/plugins/surefire/selfdestruct/*.class,org/apache/maven/plugins/surefire/dumppid/*.class,org/apache/maven/plugin/surefire/*.class,org/apache/maven/plugin/failsafe/*.class,jiras/**/*.class,org/apache/maven/surefire/testng/*.class,org/apache/maven/surefire/testprovider/*.class,**/test/*.class,**/org/apache/maven/surefire/group/parse/*.class' - junit healthScaleFactor: 0.0, allowEmptyResults: true, keepLongStdio: true, testResults: '**/surefire-integration-tests/target/failsafe-reports/**/*.xml,**/surefire-integration-tests/target/surefire-reports/**/*.xml,**/maven-*/target/surefire-reports/**/*.xml,**/surefire-*/target/surefire-reports/**/*.xml,**/common-*/target/surefire-reports/**/*.xml' } - }, - windows: { - node("${env.WIN_LABEL}") { - checkout scm - withEnv(["JAVA_HOME=${tool('JDK 1.8_121 (Windows Only)')}", "PATH+MAVEN=${tool('Maven 3.5.0 (Windows)')}\\bin;${env.JAVA_HOME}\\bin"]) { - bat "mvn clean install jacoco:report -B -U -e -fae -V -P run-its,jenkins -Dsurefire.useFile=false -Dfailsafe.useFile=false -Dintegration-test-port=8084" + } else { + node("${env.NIX_LABEL}") { + try { + println "Basedir = ${pwd()}." + + def mvnLocalRepoDir + + dir('.repository') { + mvnLocalRepoDir = "${pwd()}" + } + + println "Maven Local Repository = ${mvnLocalRepoDir}." + + dir('build') { + try { + stage("checkout ${stageKey}") { + checkout scm + } + + stage("build ${stageKey}") { + def jdkHome = resolveToolNameToJavaPath(jdkName, mvnName) + println("Setting JDK for testing -Djdk.home=${jdkHome}") + withMaven(jdk: 'JDK 1.8 (latest)', maven: mvnName, mavenLocalRepo: mvnLocalRepoDir, + options: [invokerPublisher()]) { + def jdkForTests = [" \"-Djdk.home=${jdkHome}\""] + def command = cmd + options + goals + properties + jdkForTests + sh command.join(' ') + } + } + } finally { + stage('cleanup ${stageKey}') { + deleteDir() // clean up after ourselves to reduce disk space + } + } + } + } finally { + if (indexOfMaven == mavens.size() - 1 && indexOfJdk == jdks.size() - 1) { + jacoco changeBuildStatus: false, execPattern: '**/*.exec', sourcePattern: '**/src/main/java', exclusionPattern: 'pkg/*.class,plexusConflict/*.class,**/surefire570/**/*.class,siblingAggregator/*.class,surefire257/*.class,surefire979/*.class,org/apache/maven/surefire/crb/*.class,org/apache/maven/plugins/surefire/selfdestruct/*.class,org/apache/maven/plugins/surefire/dumppid/*.class,org/apache/maven/plugin/surefire/*.class,org/apache/maven/plugin/failsafe/*.class,jiras/**/*.class,org/apache/maven/surefire/testng/*.class,org/apache/maven/surefire/testprovider/*.class,**/test/*.class,**/org/apache/maven/surefire/group/parse/*.class' + junit healthScaleFactor: 0.0, allowEmptyResults: true, keepLongStdio: true, testResults: '**/surefire-integration-tests/target/failsafe-reports/**/*.xml,**/surefire-integration-tests/target/surefire-reports/**/*.xml,**/maven-*/target/surefire-reports/**/*.xml,**/surefire-*/target/surefire-reports/**/*.xml,**/common-*/target/surefire-reports/**/*.xml' + } + cleanWs() } } } } } } - options { - buildDiscarder(logRotator(numToKeepStr:'10')) - timeout(time: 10, unit: 'HOURS') +} + +timeout(time: 18, unit: 'HOURS') { + try { + parallel(stages) + // JENKINS-34376 seems to make it hard to detect the aborted builds + } catch (org.jenkinsci.plugins.workflow.steps.FlowInterruptedException e) { + // this ambiguous condition means a user probably aborted + if (e.causes.size() == 0) { + currentBuild.result = "ABORTED" + } else { + currentBuild.result = "FAILURE" + } + throw e + } catch (hudson.AbortException e) { + // this ambiguous condition means during a shell step, user probably aborted + if (e.getMessage().contains('script returned exit code 143')) { + currentBuild.result = "ABORTED" + } else { + currentBuild.result = "FAILURE" + } + throw e + } catch (InterruptedException e) { + currentBuild.result = "ABORTED" + throw e + } catch (Throwable e) { + currentBuild.result = "FAILURE" + throw e + } finally { + stage("notifications") { + //jenkinsNotify() + } + } +} + +/** + * It is used instead of tool(${jdkName}). + */ +def resolveToolNameToJavaPath(jdkToolName, mvnName) { + def javaHome = null + try { + withMaven(jdk: jdkToolName, maven: mvnName) { + javaHome = isUnix() ? sh(script: 'echo -e $JAVA_HOME', returnStdout: true) : bat(script: '@echo %JAVA_HOME%', returnStdout: true) + } + + if (javaHome != null) { + File exec = new File(javaHome + (isUnix() ? '/bin/java' : '/bin/java.exe')) + if (!exec.exists()) { + println "The ${exec} does not exist in jdkToolName=${jdkToolName}." + } + } + } catch(e) { + println "Caught an exception while resolving 'jdkToolName' ${jdkToolName} via 'mvnName' ${mvnName}: ${e}" + javaHome = null; } + assert javaHome != null : "Could not resolve ${jdkToolName} to JAVA_HOME." + return javaHome } http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e3df1b56/README.md ---------------------------------------------------------------------- diff --git a/README.md b/README.md index 2361f5d..c3dd2d2 100644 --- a/README.md +++ b/README.md @@ -31,8 +31,8 @@ In order to build Surefire project use **Maven 3.1.0+** and **JDK 1.8**. But in order to run IT tests, you can do: * In order to run tests for a release check during the vote the following memory requirements are needed: - **(on Linux/Unix)** *export MAVEN_OPTS="-Xmx768m -XX:MaxMetaspaceSize=864m -XX:SoftRefLRUPolicyMSPerMB=50 -Djava.awt.headless=true"* - **(on Windows)** *set MAVEN_OPTS="-Xmx768m -XX:MaxMetaspaceSize=864m -XX:SoftRefLRUPolicyMSPerMB=50 -Djava.awt.headless=true"* + **(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"* + **(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"* * In order to run the build with **JDK 9** **on Windows** (**on Linux/Unix modify system property jdk.home**): *mvn install site site:stage -P reporting,run-its "-Djdk.home=e:\Program Files\Java\jdk9\"* http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e3df1b56/maven-failsafe-plugin/pom.xml ---------------------------------------------------------------------- diff --git a/maven-failsafe-plugin/pom.xml b/maven-failsafe-plugin/pom.xml index ace3231..9e3d87b 100644 --- a/maven-failsafe-plugin/pom.xml +++ b/maven-failsafe-plugin/pom.xml @@ -300,6 +300,7 @@ + ${jdk.home} ${project.build.directory}/local-repo http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e3df1b56/maven-failsafe-plugin/src/it/jetty-war-test-failing/pom.xml ---------------------------------------------------------------------- diff --git a/maven-failsafe-plugin/src/it/jetty-war-test-failing/pom.xml b/maven-failsafe-plugin/src/it/jetty-war-test-failing/pom.xml index cc65b18..193791d 100644 --- a/maven-failsafe-plugin/src/it/jetty-war-test-failing/pom.xml +++ b/maven-failsafe-plugin/src/it/jetty-war-test-failing/pom.xml @@ -118,14 +118,6 @@ - - maven-compiler-plugin - 2.0.2 - - 1.5 - 1.5 - - @@ -135,6 +127,8 @@ 8083 18009 9.2.2.v20140723 + 1.7 + 1.7 http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e3df1b56/maven-failsafe-plugin/src/it/jetty-war-test-passing/pom.xml ---------------------------------------------------------------------- diff --git a/maven-failsafe-plugin/src/it/jetty-war-test-passing/pom.xml b/maven-failsafe-plugin/src/it/jetty-war-test-passing/pom.xml index b90d3d8..31dc8ec 100644 --- a/maven-failsafe-plugin/src/it/jetty-war-test-passing/pom.xml +++ b/maven-failsafe-plugin/src/it/jetty-war-test-passing/pom.xml @@ -118,14 +118,6 @@ - - maven-compiler-plugin - 2.0.2 - - 1.5 - 1.5 - - @@ -135,6 +127,8 @@ 8083 18009 9.2.2.v20140723 + 1.7 + 1.7 http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e3df1b56/maven-failsafe-plugin/src/it/multiple-summaries-failing/pom.xml ---------------------------------------------------------------------- diff --git a/maven-failsafe-plugin/src/it/multiple-summaries-failing/pom.xml b/maven-failsafe-plugin/src/it/multiple-summaries-failing/pom.xml index 41e36d5..aedbdde 100644 --- a/maven-failsafe-plugin/src/it/multiple-summaries-failing/pom.xml +++ b/maven-failsafe-plugin/src/it/multiple-summaries-failing/pom.xml @@ -25,6 +25,12 @@ working-directory-test 1.0 Run tests multiple times + + + 1.6 + 1.6 + + junit http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e3df1b56/maven-failsafe-plugin/src/it/multiple-summaries/pom.xml ---------------------------------------------------------------------- diff --git a/maven-failsafe-plugin/src/it/multiple-summaries/pom.xml b/maven-failsafe-plugin/src/it/multiple-summaries/pom.xml index 921af08..d87409f 100644 --- a/maven-failsafe-plugin/src/it/multiple-summaries/pom.xml +++ b/maven-failsafe-plugin/src/it/multiple-summaries/pom.xml @@ -25,6 +25,12 @@ working-directory-test 1.0 Run tests multiple times + + + 1.6 + 1.6 + + junit http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e3df1b56/maven-failsafe-plugin/src/it/working-directory/pom.xml ---------------------------------------------------------------------- diff --git a/maven-failsafe-plugin/src/it/working-directory/pom.xml b/maven-failsafe-plugin/src/it/working-directory/pom.xml index c250b69..6cf2bc5 100644 --- a/maven-failsafe-plugin/src/it/working-directory/pom.xml +++ b/maven-failsafe-plugin/src/it/working-directory/pom.xml @@ -25,6 +25,12 @@ working-directory-test 1.0 Run tests in a nonexistent working directory + + + 1.6 + 1.6 + + junit http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e3df1b56/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 3592b31..8637b1c 100644 --- a/pom.xml +++ b/pom.xml @@ -434,6 +434,7 @@ false -Xms128m -Xmx144m ${jacoco.agent} + false http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e3df1b56/surefire-integration-tests/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/pom.xml b/surefire-integration-tests/pom.xml index c1a6c4a..a3d8940 100644 --- a/surefire-integration-tests/pom.xml +++ b/surefire-integration-tests/pom.xml @@ -34,9 +34,6 @@ UTF-8 - false - 5 - false 1.7 1.7 @@ -76,8 +73,10 @@ commons-io + org.apache.commons commons-lang3 + 3.7 @@ -93,13 +92,14 @@ maven-failsafe-plugin 2.12.4 + ${jdk.home}/bin/java alphabetical 1 false - never - ${argLine} + once + -server -Xmx64m -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -Djava.awt.headless=true - org/apache/**/*IT*.java + org/apache/**/AbstractTestCaseIT.java @@ -113,13 +113,14 @@ ${project.basedir}/../surefire-setup-integration-tests/target/it-repo ${project.build.directory} ${settings.localRepository} - ${useInterpolatedSettings} + false ${project.build.testOutputDirectory} - ${verifier.forkMode} + forked ${jdk.home} ${jacoco-it.agent} false + false @@ -198,37 +199,4 @@ - - - - parallel - - false - - - - - maven-failsafe-plugin - - classes - ${surefire.threadcount} - ${argLine} -Xmx512m -XX:MaxPermSize=356m - - - - - - - embedded - - - - ${basedir} - - - - auto - - - http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e3df1b56/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractJigsawIT.java ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractJigsawIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractJigsawIT.java index 5063a2d..7f73d48 100644 --- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractJigsawIT.java +++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractJigsawIT.java @@ -29,6 +29,8 @@ import java.io.InputStream; import java.util.Properties; import java.util.StringTokenizer; +import static org.apache.maven.surefire.its.fixture.SurefireLauncher.EXT_JDK_HOME; +import static org.apache.maven.surefire.its.fixture.SurefireLauncher.EXT_JDK_HOME_KEY; import static org.junit.Assert.fail; import static org.junit.Assume.assumeTrue; @@ -41,8 +43,6 @@ import static org.junit.Assume.assumeTrue; public abstract class AbstractJigsawIT extends SurefireJUnit4IntegrationTestCase { - protected static final String JDK_HOME_KEY = "jdk.home"; - protected static final String JDK_HOME = System.getProperty( JDK_HOME_KEY ); private static final double JIGSAW_JAVA_VERSION = 9.0d; protected abstract String getProjectDirectoryName(); @@ -50,22 +50,17 @@ public abstract class AbstractJigsawIT protected SurefireLauncher assumeJigsaw() throws IOException { assumeTrue( "There's no JDK 9 provided.", - isJavaVersion9AtLeast() || JDK_HOME != null && isExtJavaVerion9AtLeast() ); - // fail( JDK_HOME_KEY + " was provided with value " + JDK_HOME + " but it is not Jigsaw Java 9." ); + isJavaVersion9AtLeast() || EXT_JDK_HOME != null && isExtJavaVerion9AtLeast() ); + // fail( EXT_JDK_HOME_KEY + " was provided with value " + EXT_JDK_HOME + " but it is not Jigsaw Java 9." ); SurefireLauncher launcher = unpack(); - if ( JDK_HOME != null ) - { - launcher.setLauncherJavaHome( JDK_HOME ); - } - - return launcher; + return EXT_JDK_HOME == null ? launcher : launcher.setLauncherJavaHome( EXT_JDK_HOME ); } protected SurefireLauncher assumeJava9Property() throws IOException { - assumeTrue( "There's no JDK 9 provided.", JDK_HOME != null && isExtJavaVerion9AtLeast() ); + assumeTrue( "There's no JDK 9 provided.", EXT_JDK_HOME != null && isExtJavaVerion9AtLeast() ); return unpack(); } @@ -81,12 +76,12 @@ public abstract class AbstractJigsawIT private static boolean isExtJavaVerion9AtLeast() throws IOException { - File release = new File( JDK_HOME, "release" ); + File release = new File( EXT_JDK_HOME, "release" ); if ( !release.isFile() ) { - fail( JDK_HOME_KEY + " was provided with value " + JDK_HOME + " but file does not exist " - + JDK_HOME + File.separator + "release" + fail( EXT_JDK_HOME_KEY + " was provided with value " + EXT_JDK_HOME + " but file does not exist " + + EXT_JDK_HOME + File.separator + "release" ); } http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e3df1b56/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Java9FullApiIT.java ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Java9FullApiIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Java9FullApiIT.java index 22841ae..5d9b7fe 100644 --- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Java9FullApiIT.java +++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Java9FullApiIT.java @@ -25,6 +25,9 @@ import org.junit.Test; import java.io.File; import java.io.IOException; +import static org.apache.maven.surefire.its.fixture.SurefireLauncher.EXT_JDK_HOME; +import static org.apache.maven.surefire.its.fixture.SurefireLauncher.EXT_JDK_HOME_KEY; + /** * Running Surefire on the top of JDK 9 and should be able to load * classes of multiple different Jigsaw modules without error. @@ -59,7 +62,7 @@ public class Java9FullApiIT OutputValidator validator = assumeJava9Property() .setForkJvm() .debugLogging() - .sysProp( JDK_HOME_KEY, new File( JDK_HOME ).getCanonicalPath() ) + .sysProp( EXT_JDK_HOME_KEY, new File( EXT_JDK_HOME ).getCanonicalPath() ) .execute( "verify" ) .verifyErrorFree( 1 ); http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e3df1b56/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/RunOrderIT.java ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/RunOrderIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/RunOrderIT.java index c71e5d6..099aa07 100644 --- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/RunOrderIT.java +++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/RunOrderIT.java @@ -83,7 +83,6 @@ public class RunOrderIT } private OutputValidator executeWithRunOrder( String runOrder ) - throws IOException, VerificationException { return unpack().forkMode( getForkMode() ).runOrder( runOrder ).executeTest().verifyErrorFree( 3 ); } http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e3df1b56/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java index 1c6c971..a9fc346 100755 --- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java +++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java @@ -26,6 +26,8 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; +import static org.apache.commons.lang3.StringUtils.isBlank; + /** * Encapsulate all needed features to start a surefire run *
@@ -36,6 +38,12 @@ import java.util.List; */ public final class SurefireLauncher { + public static final String EXT_JDK_HOME_KEY = "jdk.home"; + + public static final String EXT_JDK_HOME = System.getProperty( EXT_JDK_HOME_KEY ); + + private static final File JAVA_HOME = javaHome(); + private final MavenLauncher mavenLauncher; private final String surefireVersion = System.getProperty( "surefire.version" ); @@ -66,25 +74,38 @@ public final class SurefireLauncher setInProcessJavaHome(); } - public SurefireLauncher setInProcessJavaHome() + private static File javaHome() { - String javaHome = System.getenv( "JAVA_HOME" ); - if ( javaHome != null && !javaHome.isEmpty() ) + String javaHome = isBlank( EXT_JDK_HOME ) ? System.getenv( "JAVA_HOME" ) : EXT_JDK_HOME; + if ( isBlank( javaHome ) ) { - try + javaHome = System.getProperty( "java.home" ); + File jre = new File( javaHome ); + if ( "jre".equals( jre.getName() ) ) { - File javaHomeAsDir = new File( javaHome ).getCanonicalFile(); - if ( javaHomeAsDir.isDirectory() ) - { - setLauncherJavaHome( javaHomeAsDir.getPath() ); - } + javaHome = jre.getParent(); } - catch ( IOException e ) + } + + try + { + File javaHomeAsDir = new File( javaHome ).getCanonicalFile(); + if ( !javaHomeAsDir.isDirectory() ) { - throw new RuntimeException( e ); + throw new RuntimeException( javaHomeAsDir.getAbsolutePath() + " is not a JAVA_HOME directory." ); } + System.out.println( "Using JAVA_HOME=" + javaHomeAsDir.getAbsolutePath() + " in forked launcher." ); + return javaHomeAsDir; } - return this; + catch ( IOException e ) + { + throw new RuntimeException( e ); + } + } + + private void setInProcessJavaHome() + { + setLauncherJavaHome( JAVA_HOME.getPath() ); } public SurefireLauncher setLauncherJavaHome( String javaHome ) http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e3df1b56/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1295AttributeJvmCrashesToTestsIT.java ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1295AttributeJvmCrashesToTestsIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1295AttributeJvmCrashesToTestsIT.java index f051c1c..3ca758a 100644 --- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1295AttributeJvmCrashesToTestsIT.java +++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1295AttributeJvmCrashesToTestsIT.java @@ -27,9 +27,10 @@ import org.junit.Before; import org.junit.Test; import java.util.Iterator; +import java.util.concurrent.TimeUnit; -import static org.apache.commons.lang.SystemUtils.IS_OS_LINUX; -import static org.apache.commons.lang.SystemUtils.IS_OS_MAC_OSX; +import static org.apache.commons.lang3.SystemUtils.IS_OS_LINUX; +import static org.apache.commons.lang3.SystemUtils.IS_OS_MAC_OSX; import static org.fest.assertions.Assertions.assertThat; import static org.junit.Assert.fail; import static org.junit.Assume.assumeTrue; @@ -51,7 +52,7 @@ public class Surefire1295AttributeJvmCrashesToTestsIT } @Test - public void crashInFork() throws VerificationException + public void crashInFork() throws VerificationException, InterruptedException { SurefireLauncher launcher = unpack( "crash-during-test" ); @@ -59,7 +60,7 @@ public class Surefire1295AttributeJvmCrashesToTestsIT } @Test - public void crashInSingleUseFork() throws VerificationException + public void crashInSingleUseFork() throws VerificationException, InterruptedException { SurefireLauncher launcher = unpack( "crash-during-test" ) .forkCount( 1 ) @@ -69,7 +70,7 @@ public class Surefire1295AttributeJvmCrashesToTestsIT } @Test - public void crashInReusableFork() throws VerificationException + public void crashInReusableFork() throws VerificationException, InterruptedException { SurefireLauncher launcher = unpack( "crash-during-test" ) .forkPerThread() @@ -80,14 +81,14 @@ public class Surefire1295AttributeJvmCrashesToTestsIT } private static void checkCrashTypes( SurefireLauncher launcher ) - throws VerificationException + throws VerificationException, InterruptedException { checkCrash( launcher.addGoal( "-DcrashType=exit" ) ); checkCrash( launcher.addGoal( "-DcrashType=abort" ) ); checkCrash( launcher.addGoal( "-DcrashType=segfault" ) ); } - private static void checkCrash( SurefireLauncher launcher ) throws VerificationException + private static void checkCrash( SurefireLauncher launcher ) throws VerificationException, InterruptedException { OutputValidator validator = launcher.maven() .withFailure() @@ -97,6 +98,10 @@ public class Surefire1295AttributeJvmCrashesToTestsIT ) .verifyTextInLog( "Crashed tests:" ); + // Cannot flush log.txt stream because it is consumed internally by Verifier. + // Waiting for the stream to become flushed on disk. + TimeUnit.SECONDS.sleep( 1L ); + for ( Iterator it = validator.loadLogLines().iterator(); it.hasNext(); ) { String line = it.next(); http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e3df1b56/surefire-integration-tests/src/test/resources/environment-variables/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/environment-variables/pom.xml b/surefire-integration-tests/src/test/resources/environment-variables/pom.xml index 79f4eda..902e97e 100644 --- a/surefire-integration-tests/src/test/resources/environment-variables/pom.xml +++ b/surefire-integration-tests/src/test/resources/environment-variables/pom.xml @@ -29,8 +29,10 @@ Test for checking environment variables into forks - always - false + always + false + 1.7 + 1.7 @@ -56,14 +58,6 @@ - - org.apache.maven.plugins - maven-compiler-plugin - - 1.5 - 1.5 - - http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e3df1b56/surefire-integration-tests/src/test/resources/fail-fast-junit/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/fail-fast-junit/pom.xml b/surefire-integration-tests/src/test/resources/fail-fast-junit/pom.xml index 6d6aca2..b82448e 100644 --- a/surefire-integration-tests/src/test/resources/fail-fast-junit/pom.xml +++ b/surefire-integration-tests/src/test/resources/fail-fast-junit/pom.xml @@ -50,14 +50,6 @@ org.apache.maven.plugins - maven-compiler-plugin - - 1.5 - 1.5 - - - - org.apache.maven.plugins maven-surefire-plugin alphabetical http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e3df1b56/surefire-integration-tests/src/test/resources/fail-fast-testng/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/fail-fast-testng/pom.xml b/surefire-integration-tests/src/test/resources/fail-fast-testng/pom.xml index 47e5e24..d52ad12 100644 --- a/surefire-integration-tests/src/test/resources/fail-fast-testng/pom.xml +++ b/surefire-integration-tests/src/test/resources/fail-fast-testng/pom.xml @@ -47,14 +47,6 @@ org.apache.maven.plugins - maven-compiler-plugin - - 1.5 - 1.5 - - - - org.apache.maven.plugins maven-surefire-plugin alphabetical http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e3df1b56/surefire-integration-tests/src/test/resources/failingBuilds/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/failingBuilds/pom.xml b/surefire-integration-tests/src/test/resources/failingBuilds/pom.xml index 46da1bf..8e988ad 100644 --- a/surefire-integration-tests/src/test/resources/failingBuilds/pom.xml +++ b/surefire-integration-tests/src/test/resources/failingBuilds/pom.xml @@ -18,14 +18,6 @@ org.apache.maven.plugins - maven-compiler-plugin - - 1.5 - 1.5 - - - - org.apache.maven.plugins maven-surefire-plugin ${surefire.version} @@ -42,5 +34,7 @@ 4.8.1 once + 1.7 + 1.7 http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e3df1b56/surefire-integration-tests/src/test/resources/failsafe-notests/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/failsafe-notests/pom.xml b/surefire-integration-tests/src/test/resources/failsafe-notests/pom.xml index bc414e4..24d1dec 100644 --- a/surefire-integration-tests/src/test/resources/failsafe-notests/pom.xml +++ b/surefire-integration-tests/src/test/resources/failsafe-notests/pom.xml @@ -21,10 +21,17 @@ 4.0.0 + localhost failsafe-notests 1.0 failsafe-notests + + + 1.7 + 1.7 + + junit http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e3df1b56/surefire-integration-tests/src/test/resources/failure-result-counting/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/failure-result-counting/pom.xml b/surefire-integration-tests/src/test/resources/failure-result-counting/pom.xml index 59f60cd..7d79f29 100644 --- a/surefire-integration-tests/src/test/resources/failure-result-counting/pom.xml +++ b/surefire-integration-tests/src/test/resources/failure-result-counting/pom.xml @@ -18,14 +18,6 @@ org.apache.maven.plugins - maven-compiler-plugin - - 1.5 - 1.5 - - - - org.apache.maven.plugins maven-surefire-plugin ${surefire.version} @@ -40,5 +32,7 @@ 4.10 once + 1.7 + 1.7 http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e3df1b56/surefire-integration-tests/src/test/resources/failureOutput/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/failureOutput/pom.xml b/surefire-integration-tests/src/test/resources/failureOutput/pom.xml index 71ff2c4..85c10ee 100644 --- a/surefire-integration-tests/src/test/resources/failureOutput/pom.xml +++ b/surefire-integration-tests/src/test/resources/failureOutput/pom.xml @@ -19,14 +19,6 @@ org.apache.maven.plugins - maven-compiler-plugin - - 1.5 - 1.5 - - - - org.apache.maven.plugins maven-surefire-plugin ${surefire.version} @@ -51,6 +43,8 @@ true true brief + 1.7 + 1.7 http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e3df1b56/surefire-integration-tests/src/test/resources/fork-consoleOutput/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/fork-consoleOutput/pom.xml b/surefire-integration-tests/src/test/resources/fork-consoleOutput/pom.xml index 29610f9..407d86b 100644 --- a/surefire-integration-tests/src/test/resources/fork-consoleOutput/pom.xml +++ b/surefire-integration-tests/src/test/resources/fork-consoleOutput/pom.xml @@ -19,14 +19,6 @@ org.apache.maven.plugins - maven-compiler-plugin - - 1.5 - 1.5 - - - - org.apache.maven.plugins maven-surefire-plugin ${surefire.version} @@ -48,6 +40,8 @@ once true brief + 1.7 + 1.7 http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e3df1b56/surefire-integration-tests/src/test/resources/fork-consoleOutputWithErrors/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/fork-consoleOutputWithErrors/pom.xml b/surefire-integration-tests/src/test/resources/fork-consoleOutputWithErrors/pom.xml index fd92dde..9aa5e1b 100644 --- a/surefire-integration-tests/src/test/resources/fork-consoleOutputWithErrors/pom.xml +++ b/surefire-integration-tests/src/test/resources/fork-consoleOutputWithErrors/pom.xml @@ -19,14 +19,6 @@ org.apache.maven.plugins - maven-compiler-plugin - - 1.5 - 1.5 - - - - org.apache.maven.plugins maven-surefire-plugin ${surefire.version} @@ -51,6 +43,8 @@ true true brief + 1.7 + 1.7 http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e3df1b56/surefire-integration-tests/src/test/resources/fork-fail/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/fork-fail/pom.xml b/surefire-integration-tests/src/test/resources/fork-fail/pom.xml index e0de5b0..9db6d72 100644 --- a/surefire-integration-tests/src/test/resources/fork-fail/pom.xml +++ b/surefire-integration-tests/src/test/resources/fork-fail/pom.xml @@ -28,17 +28,15 @@ 1.0-SNAPSHOT Test for failing fork - -Xmxxxx712743m + + -Xmxxxx712743m + 1.7 + 1.7 + + - maven-compiler-plugin - - 1.5 - 1.5 - - - maven-surefire-plugin ${surefire.version} http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e3df1b56/surefire-integration-tests/src/test/resources/fork-mode-multimodule/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/fork-mode-multimodule/pom.xml b/surefire-integration-tests/src/test/resources/fork-mode-multimodule/pom.xml index 7535569..e0786b1 100644 --- a/surefire-integration-tests/src/test/resources/fork-mode-multimodule/pom.xml +++ b/surefire-integration-tests/src/test/resources/fork-mode-multimodule/pom.xml @@ -30,6 +30,11 @@ pom + + 1.7 + 1.7 + + module-a module-b @@ -38,14 +43,6 @@ - maven-compiler-plugin - 2.3.2 - - 1.5 - 1.5 - - - maven-surefire-plugin ${surefire.version} http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e3df1b56/surefire-integration-tests/src/test/resources/fork-mode-resource-loading/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/fork-mode-resource-loading/pom.xml b/surefire-integration-tests/src/test/resources/fork-mode-resource-loading/pom.xml index 1c00ea6..e40033c 100644 --- a/surefire-integration-tests/src/test/resources/fork-mode-resource-loading/pom.xml +++ b/surefire-integration-tests/src/test/resources/fork-mode-resource-loading/pom.xml @@ -28,16 +28,14 @@ 1.0-SNAPSHOT Test for forkMode + + 1.7 + 1.7 + + - maven-compiler-plugin - - 1.5 - 1.5 - - - maven-surefire-plugin ${surefire.version} http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e3df1b56/surefire-integration-tests/src/test/resources/fork-mode-testng/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/fork-mode-testng/pom.xml b/surefire-integration-tests/src/test/resources/fork-mode-testng/pom.xml index a622fa5..8e25749 100644 --- a/surefire-integration-tests/src/test/resources/fork-mode-testng/pom.xml +++ b/surefire-integration-tests/src/test/resources/fork-mode-testng/pom.xml @@ -12,16 +12,14 @@ 1.0-SNAPSHOT Test for forkMode + + 1.7 + 1.7 + + - maven-compiler-plugin - - 1.5 - 1.5 - - - maven-surefire-plugin ${surefire.version} http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e3df1b56/surefire-integration-tests/src/test/resources/fork-mode/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/fork-mode/pom.xml b/surefire-integration-tests/src/test/resources/fork-mode/pom.xml index cf77bb0..28bfb4d 100644 --- a/surefire-integration-tests/src/test/resources/fork-mode/pom.xml +++ b/surefire-integration-tests/src/test/resources/fork-mode/pom.xml @@ -28,16 +28,14 @@ 1.0-SNAPSHOT Test for forkMode + + 1.7 + 1.7 + + - maven-compiler-plugin - - 1.5 - 1.5 - - - maven-surefire-plugin ${surefire.version} http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e3df1b56/surefire-integration-tests/src/test/resources/fork-timeout/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/fork-timeout/pom.xml b/surefire-integration-tests/src/test/resources/fork-timeout/pom.xml index c0d03c5..25365a2 100644 --- a/surefire-integration-tests/src/test/resources/fork-timeout/pom.xml +++ b/surefire-integration-tests/src/test/resources/fork-timeout/pom.xml @@ -12,6 +12,8 @@ classes once 1 + 1.7 + 1.7 @@ -24,11 +26,6 @@ org.apache.maven.plugins - maven-compiler-plugin - 2.3.2 - - - org.apache.maven.plugins maven-surefire-plugin ${surefire.version} http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e3df1b56/surefire-integration-tests/src/test/resources/includes-excludes-from-file/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/includes-excludes-from-file/pom.xml b/surefire-integration-tests/src/test/resources/includes-excludes-from-file/pom.xml index 025f182..39313db 100644 --- a/surefire-integration-tests/src/test/resources/includes-excludes-from-file/pom.xml +++ b/surefire-integration-tests/src/test/resources/includes-excludes-from-file/pom.xml @@ -31,6 +31,8 @@ under the License. 3.8.2 + 1.7 + 1.7 http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e3df1b56/surefire-integration-tests/src/test/resources/includes-excludes/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/includes-excludes/pom.xml b/surefire-integration-tests/src/test/resources/includes-excludes/pom.xml index 504171e..77711f7 100644 --- a/surefire-integration-tests/src/test/resources/includes-excludes/pom.xml +++ b/surefire-integration-tests/src/test/resources/includes-excludes/pom.xml @@ -31,10 +31,10 @@ under the License. 3.8.2 + 1.7 + 1.7 - - junit http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e3df1b56/surefire-integration-tests/src/test/resources/isolated-classloader/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/isolated-classloader/pom.xml b/surefire-integration-tests/src/test/resources/isolated-classloader/pom.xml index dbed07b..a853063 100644 --- a/surefire-integration-tests/src/test/resources/isolated-classloader/pom.xml +++ b/surefire-integration-tests/src/test/resources/isolated-classloader/pom.xml @@ -28,6 +28,10 @@ 1.0-SNAPSHOT Test for useSystemClassLoader=false + + 1.7 + 1.7 + http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e3df1b56/surefire-integration-tests/src/test/resources/java9-full-api/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/java9-full-api/pom.xml b/surefire-integration-tests/src/test/resources/java9-full-api/pom.xml index dc44fb7..2e4d4f3 100644 --- a/surefire-integration-tests/src/test/resources/java9-full-api/pom.xml +++ b/surefire-integration-tests/src/test/resources/java9-full-api/pom.xml @@ -32,11 +32,6 @@ java9-full-api - - 1.6 - 1.6 - - http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e3df1b56/surefire-integration-tests/src/test/resources/junit-fork-mode-always/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/junit-fork-mode-always/pom.xml b/surefire-integration-tests/src/test/resources/junit-fork-mode-always/pom.xml index ed2d930..9b86c75 100644 --- a/surefire-integration-tests/src/test/resources/junit-fork-mode-always/pom.xml +++ b/surefire-integration-tests/src/test/resources/junit-fork-mode-always/pom.xml @@ -28,21 +28,18 @@ 1.0-SNAPSHOT Test for forkMode + + 1.7 + 1.7 + + - maven-compiler-plugin - - 1.5 - 1.5 - - - maven-surefire-plugin - ${surefire.version} + ${surefire.version} ${forkMode} - http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e3df1b56/surefire-integration-tests/src/test/resources/junit-ignore/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/junit-ignore/pom.xml b/surefire-integration-tests/src/test/resources/junit-ignore/pom.xml index a73c362..d9c3817 100644 --- a/surefire-integration-tests/src/test/resources/junit-ignore/pom.xml +++ b/surefire-integration-tests/src/test/resources/junit-ignore/pom.xml @@ -32,6 +32,8 @@ 4.4 3 + 1.7 + 1.7 @@ -46,14 +48,6 @@ - org.apache.maven.plugins - maven-compiler-plugin - - 1.5 - 1.5 - - - maven-surefire-plugin ${surefire.version} http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e3df1b56/surefire-integration-tests/src/test/resources/junit-innerClass/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/junit-innerClass/pom.xml b/surefire-integration-tests/src/test/resources/junit-innerClass/pom.xml index 40b5060..fb1ffd6 100644 --- a/surefire-integration-tests/src/test/resources/junit-innerClass/pom.xml +++ b/surefire-integration-tests/src/test/resources/junit-innerClass/pom.xml @@ -28,6 +28,11 @@ 1.0-SNAPSHOT Test JUnit classes with inner classes + + 1.7 + 1.7 + + junit http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e3df1b56/surefire-integration-tests/src/test/resources/junit-notExtendingTestCase/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/junit-notExtendingTestCase/pom.xml b/surefire-integration-tests/src/test/resources/junit-notExtendingTestCase/pom.xml index e459f45..8a95201 100644 --- a/surefire-integration-tests/src/test/resources/junit-notExtendingTestCase/pom.xml +++ b/surefire-integration-tests/src/test/resources/junit-notExtendingTestCase/pom.xml @@ -28,6 +28,11 @@ 1.0-SNAPSHOT Test for JUnit tests that don't extend TestCase + + 1.7 + 1.7 + + junit http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e3df1b56/surefire-integration-tests/src/test/resources/junit-pathWithUmlaut/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/junit-pathWithUmlaut/pom.xml b/surefire-integration-tests/src/test/resources/junit-pathWithUmlaut/pom.xml index 321aba7..890839e 100644 --- a/surefire-integration-tests/src/test/resources/junit-pathWithUmlaut/pom.xml +++ b/surefire-integration-tests/src/test/resources/junit-pathWithUmlaut/pom.xml @@ -28,6 +28,11 @@ 1.0-SNAPSHOT Test path with Ümlaut + + 1.7 + 1.7 + + junit http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e3df1b56/surefire-integration-tests/src/test/resources/junit-twoTestCaseSuite/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/junit-twoTestCaseSuite/pom.xml b/surefire-integration-tests/src/test/resources/junit-twoTestCaseSuite/pom.xml index 0e2a12c..f2075ae 100644 --- a/surefire-integration-tests/src/test/resources/junit-twoTestCaseSuite/pom.xml +++ b/surefire-integration-tests/src/test/resources/junit-twoTestCaseSuite/pom.xml @@ -28,6 +28,11 @@ 1.0-SNAPSHOT Test for single suite with two test cases + + 1.7 + 1.7 + + http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e3df1b56/surefire-integration-tests/src/test/resources/junit-twoTestCases/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/junit-twoTestCases/pom.xml b/surefire-integration-tests/src/test/resources/junit-twoTestCases/pom.xml index e74f485..89684ad 100644 --- a/surefire-integration-tests/src/test/resources/junit-twoTestCases/pom.xml +++ b/surefire-integration-tests/src/test/resources/junit-twoTestCases/pom.xml @@ -23,6 +23,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 + + 1.7 + 1.7 + + org.apache.maven.plugins.surefire junit-twoTestCases 1.0-SNAPSHOT http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e3df1b56/surefire-integration-tests/src/test/resources/junit4-forkAlways-staticInit/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/junit4-forkAlways-staticInit/pom.xml b/surefire-integration-tests/src/test/resources/junit4-forkAlways-staticInit/pom.xml index 57765e0..4bfc081 100644 --- a/surefire-integration-tests/src/test/resources/junit4-forkAlways-staticInit/pom.xml +++ b/surefire-integration-tests/src/test/resources/junit4-forkAlways-staticInit/pom.xml @@ -10,6 +10,11 @@ Test that static initializers on classes other than the one being executed in the current test-set will not be run, and cannot pollute the environment. + + 1.7 + 1.7 + + junit @@ -28,14 +33,6 @@ always - - maven-compiler-plugin - 2.0.2 - - 1.5 - 1.5 - - http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e3df1b56/surefire-integration-tests/src/test/resources/junit4-rerun-failing-tests/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/junit4-rerun-failing-tests/pom.xml b/surefire-integration-tests/src/test/resources/junit4-rerun-failing-tests/pom.xml index 95e8471..9456a29 100644 --- a/surefire-integration-tests/src/test/resources/junit4-rerun-failing-tests/pom.xml +++ b/surefire-integration-tests/src/test/resources/junit4-rerun-failing-tests/pom.xml @@ -28,6 +28,11 @@ 1.0-SNAPSHOT Test for rerun failing tests in JUnit 4 + + 1.7 + 1.7 + + junit @@ -41,14 +46,6 @@ org.apache.maven.plugins - maven-compiler-plugin - - 1.5 - 1.5 - - - - org.apache.maven.plugins maven-surefire-plugin ${surefire.version} http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e3df1b56/surefire-integration-tests/src/test/resources/junit4-runlistener/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/junit4-runlistener/pom.xml b/surefire-integration-tests/src/test/resources/junit4-runlistener/pom.xml index 1487d3a..d776533 100644 --- a/surefire-integration-tests/src/test/resources/junit4-runlistener/pom.xml +++ b/surefire-integration-tests/src/test/resources/junit4-runlistener/pom.xml @@ -31,6 +31,8 @@ 4.4 surefire-junit4 + 1.7 + 1.7 @@ -46,14 +48,6 @@ org.apache.maven.plugins - maven-compiler-plugin - - 1.5 - 1.5 - - - - org.apache.maven.plugins maven-surefire-plugin ${surefire.version} http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e3df1b56/surefire-integration-tests/src/test/resources/junit4-twoTestCaseSuite/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/junit4-twoTestCaseSuite/pom.xml b/surefire-integration-tests/src/test/resources/junit4-twoTestCaseSuite/pom.xml index 6c83538..867cd09 100644 --- a/surefire-integration-tests/src/test/resources/junit4-twoTestCaseSuite/pom.xml +++ b/surefire-integration-tests/src/test/resources/junit4-twoTestCaseSuite/pom.xml @@ -31,6 +31,8 @@ 4.4 + 1.7 + 1.7 @@ -46,14 +48,6 @@ org.apache.maven.plugins - maven-compiler-plugin - - 1.5 - 1.5 - - - - org.apache.maven.plugins maven-surefire-plugin ${surefire.version} http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e3df1b56/surefire-integration-tests/src/test/resources/junit4/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/junit4/pom.xml b/surefire-integration-tests/src/test/resources/junit4/pom.xml index 894b608..bba9b00 100644 --- a/surefire-integration-tests/src/test/resources/junit4/pom.xml +++ b/surefire-integration-tests/src/test/resources/junit4/pom.xml @@ -17,7 +17,6 @@ ~ specific language governing permissions and limitations ~ under the License. --> - @@ -28,9 +27,10 @@ 1.0-SNAPSHOT Test for JUnit 4 - 4.4 + 1.7 + 1.7 @@ -46,14 +46,6 @@ org.apache.maven.plugins - maven-compiler-plugin - - 1.5 - 1.5 - - - - org.apache.maven.plugins maven-surefire-plugin ${surefire.version} http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e3df1b56/surefire-integration-tests/src/test/resources/junit44-dep/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/junit44-dep/pom.xml b/surefire-integration-tests/src/test/resources/junit44-dep/pom.xml index b19f5f7..d26c024 100644 --- a/surefire-integration-tests/src/test/resources/junit44-dep/pom.xml +++ b/surefire-integration-tests/src/test/resources/junit44-dep/pom.xml @@ -28,6 +28,11 @@ 1.0-SNAPSHOT Test for junit-dep + + 1.7 + 1.7 + + junit @@ -53,15 +58,6 @@ - org.apache.maven.plugins - maven-compiler-plugin - - 1.5 - 1.5 - - - - maven-surefire-plugin ${surefire.version} http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e3df1b56/surefire-integration-tests/src/test/resources/junit44-environment/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/junit44-environment/pom.xml b/surefire-integration-tests/src/test/resources/junit44-environment/pom.xml index b7904d2..eb04443 100644 --- a/surefire-integration-tests/src/test/resources/junit44-environment/pom.xml +++ b/surefire-integration-tests/src/test/resources/junit44-environment/pom.xml @@ -28,6 +28,11 @@ 1.0-SNAPSHOT Test for setting environment variables + + 1.7 + 1.7 + + junit @@ -48,14 +53,6 @@ - - org.apache.maven.plugins - maven-compiler-plugin - - 1.5 - 1.5 - - http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e3df1b56/surefire-integration-tests/src/test/resources/junit44-hamcrest/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/junit44-hamcrest/pom.xml b/surefire-integration-tests/src/test/resources/junit44-hamcrest/pom.xml index 8bc0e93..4140b41 100644 --- a/surefire-integration-tests/src/test/resources/junit44-hamcrest/pom.xml +++ b/surefire-integration-tests/src/test/resources/junit44-hamcrest/pom.xml @@ -28,6 +28,11 @@ 1.0-SNAPSHOT Test for JUnit44 with Hamcrest extensions + + 1.7 + 1.7 + + junit @@ -40,18 +45,9 @@ - org.apache.maven.plugins - maven-compiler-plugin - - 1.5 - 1.5 - - - maven-surefire-plugin ${surefire.version} - http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e3df1b56/surefire-integration-tests/src/test/resources/junit44-method-pattern/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/junit44-method-pattern/pom.xml b/surefire-integration-tests/src/test/resources/junit44-method-pattern/pom.xml index 2ef4471..e9ac59e 100644 --- a/surefire-integration-tests/src/test/resources/junit44-method-pattern/pom.xml +++ b/surefire-integration-tests/src/test/resources/junit44-method-pattern/pom.xml @@ -31,6 +31,8 @@ 4.4 + 1.7 + 1.7 @@ -46,14 +48,6 @@ org.apache.maven.plugins - maven-compiler-plugin - - 1.5 - 1.5 - - - - org.apache.maven.plugins maven-surefire-plugin ${surefire.version}