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 2021/02/27 23:47:50 UTC
[maven-surefire] branch jdk-16-17 updated (25e1333 -> bfbd8e3)
This is an automated email from the ASF dual-hosted git repository.
tibordigana pushed a change to branch jdk-16-17
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git.
from 25e1333 [travisci] openjdk15
new 5d6450b fix
new b57be76 removed jdkHome property, added preemptive dependencies
new bfbd8e3 added JUnit5 version 5.7.1
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
surefire-its/pom.xml | 49 +++++++++++++++++++++-
.../apache/maven/surefire/its/JUnitPlatformIT.java | 2 +-
.../apache/maven/surefire/its/Java9FullApiIT.java | 6 +--
.../fixture/SurefireJUnit4IntegrationTestCase.java | 6 +--
4 files changed, 55 insertions(+), 8 deletions(-)
[maven-surefire] 03/03: added JUnit5 version 5.7.1
Posted by ti...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tibordigana pushed a commit to branch jdk-16-17
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
commit bfbd8e3a9e19e7a7a9008c5bc250af3e481bd174
Author: tibordigana <ti...@gmail.com>
AuthorDate: Sun Feb 28 00:47:41 2021 +0100
added JUnit5 version 5.7.1
---
.../src/test/java/org/apache/maven/surefire/its/JUnitPlatformIT.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 b229ab7..44d7fe1 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
@@ -58,7 +58,7 @@ public class JUnitPlatformIT
args.add( new Object[] { "5.4.2", "1.0.0" } );
args.add( new Object[] { "5.5.2", "0.8.15" } );
args.add( new Object[] { "5.6.2", "1.2.7" } );
- //args.add( new Object[] { "5.7.0-SNAPSHOT", "1.2.7" } );
+ args.add( new Object[] { "5.7.1", "1.5.0" } );
return args;
}
[maven-surefire] 02/03: removed jdkHome property,
added preemptive dependencies
Posted by ti...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tibordigana pushed a commit to branch jdk-16-17
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
commit b57be76e8a5bac5223189a7598911bdf3deb81a8
Author: tibordigana <ti...@gmail.com>
AuthorDate: Sun Feb 28 00:47:07 2021 +0100
removed jdkHome property, added preemptive dependencies
---
surefire-its/pom.xml | 49 ++++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 48 insertions(+), 1 deletion(-)
diff --git a/surefire-its/pom.xml b/surefire-its/pom.xml
index 74a5867..8275230 100644
--- a/surefire-its/pom.xml
+++ b/surefire-its/pom.xml
@@ -543,6 +543,12 @@
<configuration><artifact>junit:junit:4.13</artifact></configuration>
</execution>
<execution>
+ <id>junit-4.13.1</id>
+ <phase>pre-integration-test</phase>
+ <goals><goal>get</goal></goals>
+ <configuration><artifact>junit:junit:4.13.1</artifact></configuration>
+ </execution>
+ <execution>
<id>junit-dep-4.4</id>
<phase>pre-integration-test</phase>
<goals><goal>get</goal></goals>
@@ -705,6 +711,48 @@
<configuration><artifact>org.junit.jupiter:junit-jupiter-engine:5.6.2</artifact></configuration>
</execution>
<execution>
+ <id>jupiter-5.7.1</id>
+ <phase>pre-integration-test</phase>
+ <goals><goal>get</goal></goals>
+ <configuration><artifact>org.junit.jupiter:junit-jupiter-engine:5.7.1</artifact></configuration>
+ </execution>
+ <execution>
+ <id>jqwik-0.8.0</id>
+ <phase>pre-integration-test</phase>
+ <goals><goal>get</goal></goals>
+ <configuration><artifact>net.jqwik:jqwik:0.8.0</artifact></configuration>
+ </execution>
+ <execution>
+ <id>jqwik-0.9.0</id>
+ <phase>pre-integration-test</phase>
+ <goals><goal>get</goal></goals>
+ <configuration><artifact>net.jqwik:jqwik:0.9.0</artifact></configuration>
+ </execution>
+ <execution>
+ <id>jqwik-1.0.0</id>
+ <phase>pre-integration-test</phase>
+ <goals><goal>get</goal></goals>
+ <configuration><artifact>net.jqwik:jqwik:1.0.0</artifact></configuration>
+ </execution>
+ <execution>
+ <id>jqwik-0.8.15</id>
+ <phase>pre-integration-test</phase>
+ <goals><goal>get</goal></goals>
+ <configuration><artifact>net.jqwik:jqwik:0.8.15</artifact></configuration>
+ </execution>
+ <execution>
+ <id>jqwik-1.2.7</id>
+ <phase>pre-integration-test</phase>
+ <goals><goal>get</goal></goals>
+ <configuration><artifact>net.jqwik:jqwik:1.2.7</artifact></configuration>
+ </execution>
+ <execution>
+ <id>jqwik-1.5.0</id>
+ <phase>pre-integration-test</phase>
+ <goals><goal>get</goal></goals>
+ <configuration><artifact>net.jqwik:jqwik:1.5.0</artifact></configuration>
+ </execution>
+ <execution>
<id>crashjvm</id>
<phase>pre-integration-test</phase>
<goals><goal>get</goal></goals>
@@ -738,7 +786,6 @@
<maven.toolchains.file>${project.build.directory}/private/toolchains.xml</maven.toolchains.file>
<maven.test.tmpdir>${project.build.directory}</maven.test.tmpdir>
<verifier.forkMode>forked</verifier.forkMode>
- <jdkHome>${jdkHome}</jdkHome>
<jacoco.agent>${jacoco-it.agent}</jacoco.agent>
<!-- see the f/w com.googlecode.junit-toolbox:junit-toolbox -->
[maven-surefire] 01/03: fix
Posted by ti...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tibordigana pushed a commit to branch jdk-16-17
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
commit 5d6450b0072402990dcf5ab630eb97f21a3743fb
Author: tibordigana <ti...@gmail.com>
AuthorDate: Fri Feb 26 23:53:05 2021 +0100
fix
---
.../src/test/java/org/apache/maven/surefire/its/Java9FullApiIT.java | 6 +++---
.../surefire/its/fixture/SurefireJUnit4IntegrationTestCase.java | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
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 88008f0..f326e1d 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
@@ -51,7 +51,7 @@ public class Java9FullApiIT
.verifyTextInLog( "loaded class javax.xml.bind.JAXBException" )
.verifyTextInLog( "loaded class javax.transaction.TransactionManager" )
.verifyTextInLog( "loaded class javax.transaction.InvalidTransactionException" )
- .assertThatLogLine( is( "java.specification.version=" + JAVA_VERSION ),
+ .assertThatLogLine( is( "java.specification.version=" + (int) JAVA_VERSION ),
greaterThanOrEqualTo( 1 ) );
}
@@ -70,7 +70,7 @@ public class Java9FullApiIT
.verifyTextInLog( "loaded class javax.xml.bind.JAXBException" )
.verifyTextInLog( "loaded class javax.transaction.TransactionManager" )
.verifyTextInLog( "loaded class javax.transaction.InvalidTransactionException" )
- .assertThatLogLine( is( "java.specification.version=" + JAVA_VERSION ),
+ .assertThatLogLine( is( "java.specification.version=" + (int) JAVA_VERSION ),
greaterThanOrEqualTo( 1 ) );
}
@@ -91,7 +91,7 @@ public class Java9FullApiIT
.verifyTextInLog( "loaded class javax.xml.bind.JAXBException" )
.verifyTextInLog( "loaded class javax.transaction.TransactionManager" )
.verifyTextInLog( "loaded class javax.transaction.InvalidTransactionException" )
- .assertThatLogLine( is( "java.specification.version=" + JAVA_VERSION ),
+ .assertThatLogLine( is( "java.specification.version=" + (int) JAVA_VERSION ),
greaterThanOrEqualTo( 1 ) );
}
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 8e73cc2..631a93d 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
@@ -40,7 +40,7 @@ public abstract class SurefireJUnit4IntegrationTestCase
public static final File JAVA_HOME = javaHome();
- public static final int JAVA_VERSION = javaVersion();
+ public static final double JAVA_VERSION = javaVersion();
public static final boolean IS_JAVA9_PLUS = isJDK9Plus();
@@ -77,9 +77,9 @@ public abstract class SurefireJUnit4IntegrationTestCase
return new SurefireLauncher( mavenLauncher, JAVA_HOME );
}
- private static int javaVersion()
+ private static double javaVersion()
{
- return (int) parseDouble( System.getProperty( "java.specification.version" ) );
+ return parseDouble( System.getProperty( "java.specification.version" ) );
}
private static boolean isJDK9Plus()