[maven-integration-testing] branch MNG-6522 updated (086ab55 -> edfadf1)

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

[maven-integration-testing] branch MNG-6522 updated (086ab55 -> edfadf1)

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

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


 discard 086ab55  [MNG-6522] Prepare to run ITs tests with Java 12-ea
     add 3e2b601  [MNG-6265] Add integration test
     add c7d8684  Fix Maven version range for MNG-5965
     add e8302f3  Add missing depenencies for MNG-3372 + MNG-6555
     new 4894603  [MNG-6522] Prepare to run ITs tests with Java 12-ea
     new edfadf1  [MNG-6522] Prepare to run ITs tests with Java 13-ea

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (086ab55)
            \
             N -- N -- N   refs/heads/MNG-6522 (edfadf1)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

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:
 .../org/apache/maven/it/IntegrationTestSuite.java  |  1 +
 ...enITmng5965ParallelBuildMultipliesWorkTest.java |  2 +-
 ...nITmng6256SpecialCharsAlternatePOMLocation.java | 92 ++++++++++++++++++++++
 .../src/test/resources/bootstrap/group-7/pom.xml   | 25 ++++++
 core-it-suite/src/test/resources/mng-1957/pom.xml  | 11 ++-
 .../folder-with- -space}/pom.xml                   | 12 +--
 .../folder-with-)-closing-bracket}/pom.xml         | 12 +--
 7 files changed, 131 insertions(+), 24 deletions(-)
 create mode 100644 core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6256SpecialCharsAlternatePOMLocation.java
 copy core-it-suite/src/test/resources/{mng-5452-maven-build-timestamp-utc => mng-6256-special-chars-alternate-pom-location/folder-with- -space}/pom.xml (52%)
 copy core-it-suite/src/test/resources/{mng-5452-maven-build-timestamp-utc => mng-6256-special-chars-alternate-pom-location/folder-with-)-closing-bracket}/pom.xml (52%)

Reply | Threaded
Open this post in threaded view
|

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

slachiewicz
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 4894603943414e03787c90a258403273646bc0a4
Author: Sylwester Lachiewicz <[hidden email]>
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 )

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 MNG-6522
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git

commit edfadf1672af30df8c60d946898e8802456b2e6f
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>