[maven-integration-testing] branch master updated (4894603 -> 09e395a)

classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|

[maven-integration-testing] branch master updated (4894603 -> 09e395a)

slachiewicz
This is an automated email from the ASF dual-hosted git repository.

slachiewicz pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git.


    from 4894603  [MNG-6522] Prepare to run ITs tests with Java 12-ea
     new 733a3cc  [MNG-6522] Fix typos
     new 09e395a  [MNG-6522] Prepare to run ITs tests with Java 13-ea

The 2 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:
 core-it-suite/src/test/resources/mng-1957/pom.xml             | 11 ++++++++++-
 .../org/apache/maven/it/AbstractMavenIntegrationTestCase.java |  6 +++---
 2 files changed, 13 insertions(+), 4 deletions(-)

Reply | Threaded
Open this post in threaded view
|

[maven-integration-testing] 01/02: [MNG-6522] Fix typos

slachiewicz
This is an automated email from the ASF dual-hosted git repository.

slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git

commit 733a3cc914ac93ef4f59c03e45646f9628aaa08c
Author: Sylwester Lachiewicz <[hidden email]>
AuthorDate: Fri Jan 11 22:49:42 2019 +0100

    [MNG-6522] Fix typos
---
 .../java/org/apache/maven/it/AbstractMavenIntegrationTestCase.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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 203d3b7..7e3c42a 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,18 +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,12)" ).containsVersion( getJavaVersion() ) )
+            if ( VersionRange.createFromVersionSpec( "[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" );
+                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" );
+                verifier.getSystemProperties().put( "maven.compiler.release", "7" );
             }
         }
         catch ( InvalidVersionSpecificationException e )

Reply | Threaded
Open this post in threaded view
|

[maven-integration-testing] 02/02: [MNG-6522] Prepare to run ITs tests with Java 13-ea

slachiewicz
In reply to this post by slachiewicz
This is an automated email from the ASF dual-hosted git repository.

slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git

commit 09e395a530d80b38e744006ccd23a1098d4a1ba5
Author: Sylwester Lachiewicz <[hidden email]>
AuthorDate: Fri Jan 11 19:26:47 2019 +0100

    [MNG-6522] Prepare to run ITs tests with Java 13-ea
---
 core-it-suite/src/test/resources/mng-1957/pom.xml | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

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 6d69288..aea53b5 100644
--- a/core-it-suite/src/test/resources/mng-1957/pom.xml
+++ b/core-it-suite/src/test/resources/mng-1957/pom.xml
@@ -189,7 +189,16 @@ under the License.
     <profile>
       <id>test-6i</id>
       <activation>
-        <jdk>[12,)</jdk>
+        <jdk>[12,13)</jdk>
+      </activation>
+      <properties>
+        <jdkProperty6>PASSED</jdkProperty6>
+      </properties>
+    </profile>
+    <profile>
+      <id>test-6j</id>
+      <activation>
+        <jdk>[13,)</jdk>
       </activation>
       <properties>
         <jdkProperty6>PASSED</jdkProperty6>