This is an automated email from the ASF dual-hosted git repository. tibordigana pushed a commit to branch jdk12 in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
commit c8d3fb3964226e838beda2d0a900cbfec9607a0d Author: Tibor17 <tibordig...@apache.org> AuthorDate: Mon Dec 10 00:08:41 2018 +0100 [SUREFIRE-1613] maven-surefire-report-plugin fails on JDK 11 --- Jenkinsfile | 5 ++++- maven-surefire-report-plugin/pom.xml | 38 ++++++++++++++++++++++++++++++++++++ pom.xml | 33 +++++++++++++++++++++++++++++++ 3 files changed, 75 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index cac1321..f2d937b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -32,7 +32,7 @@ properties( final def oses = ['linux':'ubuntu && !H24', 'windows':'Windows'] final def mavens = env.BRANCH_NAME == 'master' ? ['3.5.x', '3.3.x', '3.2.x'] : ['3.5.x'] -final def jdks = [11] +final def jdks = [11, 8, 7] final def options = ['-e', '-V', '-B', '-nsu', '-P', 'run-its'] final def goals = ['clean', 'install', 'jacoco:report'] @@ -66,6 +66,9 @@ oses.eachWithIndex { osMapping, indexOfOs -> def boolean makeReports = indexOfOs == 0 && indexOfMaven == 0 && indexOfJdk == 0 def failsafeItPort = 8000 + 100 * indexOfMaven + 10 * indexOfJdk def allOptions = options + ["-Dfailsafe-integration-test-port=${failsafeItPort}", "-Dfailsafe-integration-test-stop-port=${1 + failsafeItPort}"] + if (jdk > 7) { + allOptions += ['-DpowermockVersion=2.0.0-RC.4', '-Denforcer.skip=true'] + } ws(dir: "${os == 'windows' ? "${TEMP}\\${BUILD_TAG}" : pwd()}") { buildProcess(stageKey, jdkName, jdkTestName, mvnName, goals, allOptions, mavenOpts, makeReports) } diff --git a/maven-surefire-report-plugin/pom.xml b/maven-surefire-report-plugin/pom.xml index f633908..ea20260 100644 --- a/maven-surefire-report-plugin/pom.xml +++ b/maven-surefire-report-plugin/pom.xml @@ -75,6 +75,44 @@ <dependency> <groupId>org.apache.maven.reporting</groupId> <artifactId>maven-reporting-impl</artifactId> + <exclusions> + <exclusion> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-sink-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-decoration-model</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-core</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-site-renderer</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-sink-api</artifactId> + </dependency> + <dependency> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-decoration-model</artifactId> + </dependency> + <dependency> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-core</artifactId> + </dependency> + <dependency> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-site-renderer</artifactId> + </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> </dependency> <dependency> <groupId>org.fusesource.jansi</groupId> diff --git a/pom.xml b/pom.xml index 61e99a6..a0fbada 100644 --- a/pom.xml +++ b/pom.xml @@ -89,6 +89,8 @@ <!-- <shadedVersion>3.0.0-M2</shadedVersion> commented out due to https://issues.apache.org/jira/browse/MRELEASE-799 --> <commonsLang3Version>3.8.1</commonsLang3Version> <commonsIoVersion>2.6</commonsIoVersion> + <doxiaVersion>1.8</doxiaVersion> + <doxiaSitetoolsVersion>1.8.1</doxiaSitetoolsVersion> <!-- maven-shared-utils:3.2.0+ another behavior - broke Surefire performance - end of subprocess notification not arrived in ForkStarter --> <mavenSharedUtilsVersion>3.1.0</mavenSharedUtilsVersion> <powermockVersion>2.0.0-RC.1</powermockVersion> @@ -202,6 +204,37 @@ </exclusions> </dependency> <dependency> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-sink-api</artifactId> + <version>${doxiaVersion}</version> + </dependency> + <dependency> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-decoration-model</artifactId> + <version>${doxiaSitetoolsVersion}</version> + </dependency> + <dependency> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-core</artifactId> + <version>${doxiaVersion}</version> + </dependency> + <dependency> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-site-renderer</artifactId> + <version>${doxiaSitetoolsVersion}</version> + <exclusions> + <exclusion> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.6</version> + </dependency> + <dependency> <groupId>org.apache.maven.plugin-testing</groupId> <artifactId>maven-plugin-testing-harness</artifactId> <version>2.1</version>