You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ti...@apache.org on 2018/12/12 18:06:04 UTC
[maven-surefire] 01/01: added JDK 12 (Ubuntu) on Jenkins CI
This is an automated email from the ASF dual-hosted git repository.
tibordigana pushed a commit to branch SUREFIRE-1017
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
commit f72a0e7ae8f6e6661377570754141103ac542ef0
Author: Tibor17 <ti...@apache.org>
AuthorDate: Wed Dec 12 02:40:14 2018 +0100
added JDK 12 (Ubuntu) on Jenkins CI
---
Jenkinsfile | 6 +++++-
.../java/org/apache/maven/surefire/its/Java9FullApiIT.java | 13 ++++---------
2 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index f2d937b..5166d0f 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, 8, 7]
+final def jdks = [12, 11, 8, 7]
final def options = ['-e', '-V', '-B', '-nsu', '-P', 'run-its']
final def goals = ['clean', 'install', 'jacoco:report']
@@ -62,6 +62,10 @@ oses.eachWithIndex { osMapping, indexOfOs ->
stages[stageKey] = {
node(label) {
+ if (os == 'windows' && jdk == 12) {
+ // https://issues.apache.org/jira/browse/INFRA-17384
+ return
+ }
timestamps {
def boolean makeReports = indexOfOs == 0 && indexOfMaven == 0 && indexOfJdk == 0
def failsafeItPort = 8000 + 100 * indexOfMaven + 10 * indexOfJdk
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/Java9FullApiIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/Java9FullApiIT.java
index ec9a688..1ceebb0 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/Java9FullApiIT.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/Java9FullApiIT.java
@@ -40,6 +40,7 @@ import static org.hamcrest.Matchers.is;
public class Java9FullApiIT
extends AbstractJigsawIT
{
+ private static final String JVM_SPEC_VERSION = System.getProperty( "java.specification.version" );
@Test
public void shouldLoadMultipleJavaModules_JavaHome() throws Exception
@@ -55,9 +56,7 @@ public class Java9FullApiIT
.verifyTextInLog( "loaded class javax.xml.bind.JAXBException" )
.verifyTextInLog( "loaded class javax.transaction.TransactionManager" )
.verifyTextInLog( "loaded class javax.transaction.InvalidTransactionException" )
- .assertThatLogLine( anyOf( is( "java.specification.version=9" ),
- is( "java.specification.version=10" ),
- is( "java.specification.version=11" ) ),
+ .assertThatLogLine( is( "java.specification.version=" + JVM_SPEC_VERSION ),
greaterThanOrEqualTo( 1 ) );
}
@@ -76,9 +75,7 @@ public class Java9FullApiIT
.verifyTextInLog( "loaded class javax.xml.bind.JAXBException" )
.verifyTextInLog( "loaded class javax.transaction.TransactionManager" )
.verifyTextInLog( "loaded class javax.transaction.InvalidTransactionException" )
- .assertThatLogLine( anyOf( is( "java.specification.version=9" ),
- is( "java.specification.version=10" ),
- is( "java.specification.version=11" ) ),
+ .assertThatLogLine( is( "java.specification.version=" + JVM_SPEC_VERSION ),
greaterThanOrEqualTo( 1 ) );
}
@@ -98,9 +95,7 @@ public class Java9FullApiIT
.verifyTextInLog( "loaded class javax.xml.bind.JAXBException" )
.verifyTextInLog( "loaded class javax.transaction.TransactionManager" )
.verifyTextInLog( "loaded class javax.transaction.InvalidTransactionException" )
- .assertThatLogLine( anyOf( is( "java.specification.version=9" ),
- is( "java.specification.version=10" ),
- is( "java.specification.version=11" ) ),
+ .assertThatLogLine( is( "java.specification.version=" + JVM_SPEC_VERSION ),
greaterThanOrEqualTo( 1 ) );
}