You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2019/01/03 22:58:28 UTC
[maven-integration-testing] 01/01: [MNG-6522] Prepare to run ITs
tests with Java 12-ea
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MNG-6522
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git
commit 086ab55d094451f05a3c8ea4e0e57c5a0e414114
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Mon Nov 19 22:14:23 2018 +0100
[MNG-6522] Prepare to run ITs tests with Java 12-ea
---
core-it-suite/src/test/resources/mng-1957/pom.xml | 9 +++++++++
core-it-support/maven-it-helper/pom.xml | 2 +-
.../org/apache/maven/it/AbstractMavenIntegrationTestCase.java | 10 +++++++++-
3 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/core-it-suite/src/test/resources/mng-1957/pom.xml b/core-it-suite/src/test/resources/mng-1957/pom.xml
index 69f0387..6d69288 100644
--- a/core-it-suite/src/test/resources/mng-1957/pom.xml
+++ b/core-it-suite/src/test/resources/mng-1957/pom.xml
@@ -186,5 +186,14 @@ under the License.
<jdkProperty6>PASSED</jdkProperty6>
</properties>
</profile>
+ <profile>
+ <id>test-6i</id>
+ <activation>
+ <jdk>[12,)</jdk>
+ </activation>
+ <properties>
+ <jdkProperty6>PASSED</jdkProperty6>
+ </properties>
+ </profile>
</profiles>
</project>
diff --git a/core-it-support/maven-it-helper/pom.xml b/core-it-support/maven-it-helper/pom.xml
index 4bafebc..9019474 100644
--- a/core-it-support/maven-it-helper/pom.xml
+++ b/core-it-support/maven-it-helper/pom.xml
@@ -38,7 +38,7 @@ under the License.
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
- <version>2.0.5</version>
+ <version>3.0</version>
<exclusions>
<exclusion>
<artifactId>plexus-utils</artifactId>
diff --git a/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/AbstractMavenIntegrationTestCase.java b/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/AbstractMavenIntegrationTestCase.java
index 93d1357..203d3b7 100644
--- a/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/AbstractMavenIntegrationTestCase.java
+++ b/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/AbstractMavenIntegrationTestCase.java
@@ -556,10 +556,18 @@ public abstract class AbstractMavenIntegrationTestCase
{
// auto set source+target to lowest accepted value based on java version
// Java9 requires at least 1.6
- if ( VersionRange.createFromVersionSpec( "[1.9,)" ).containsVersion( getJavaVersion() ) )
+ if ( VersionRange.createFromVersionSpec( "[1.9,12)" ).containsVersion( getJavaVersion() ) )
{
verifier.getSystemProperties().put( "maven.compiler.source", "1.6" );
verifier.getSystemProperties().put( "maven.compiler.target", "1.6" );
+ verifier.getSystemProperties().put( "maven.compiler.release.", "6" );
+ }
+ // Java12 requires at least 7
+ if ( VersionRange.createFromVersionSpec( "[12,)" ).containsVersion( getJavaVersion() ) )
+ {
+ verifier.getSystemProperties().put( "maven.compiler.source", "7" );
+ verifier.getSystemProperties().put( "maven.compiler.target", "7" );
+ verifier.getSystemProperties().put( "maven.compiler.release.", "7" );
}
}
catch ( InvalidVersionSpecificationException e )