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:27 UTC
[maven-integration-testing] branch MNG-6522 updated (ab7910b ->
086ab55)
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 ab7910b [MNG-6522] Prepare to run ITs tests with Java 12-ea
add d3d6ea3 [MNG-5965] Parallel build multiplies work if multiple goals are given
add 7e1f5ed [MNG-6513] Migrate Plexus Javadoc Tags to Plexus Annotations
new 086ab55 [MNG-6522] Prepare to run ITs tests with Java 12-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 (ab7910b)
\
N -- N -- N refs/heads/MNG-6522 (086ab55)
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 1 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 | 79 ++++++++++++++++++++++
.../module-1/pom.xml | 12 ++--
.../module-2/pom.xml | 8 ++-
.../pom.xml | 2 +-
.../maven-it-plugin-configuration/pom.xml | 4 ++
.../plugin/coreit/CustomComponentConfigurator.java | 4 +-
.../maven-it-plugin-no-default-comp/pom.xml | 4 ++
.../maven/plugin/coreit/ConcreteComponent.java | 7 +-
.../maven-it-plugin-plexus-lifecycle/pom.xml | 4 ++
.../plexuslifecycle/DefaultFakeComponent.java | 5 +-
.../maven-it-plugin-singleton-component/pom.xml | 4 ++
.../maven/plugin/coreit/DefaultComponent.java | 7 +-
core-it-support/core-it-wagon/pom.xml | 4 ++
.../wagon/providers/coreit/CoreItHttpWagon.java | 4 +-
.../maven/wagon/providers/coreit/CoreItWagon.java | 4 +-
.../providers/ssh/external/ScpExternalWagon.java | 4 +-
17 files changed, 133 insertions(+), 24 deletions(-)
create mode 100644 core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5965ParallelBuildMultipliesWorkTest.java
copy core-it-suite/src/test/resources/{mng-6057-check-reactor-order => mng-5965-parallel-build-multiplies-work}/module-1/pom.xml (87%)
copy core-it-suite/src/test/resources/{mng-6173-get-all-projects-in-reactor => mng-5965-parallel-build-multiplies-work}/module-2/pom.xml (87%)
copy core-it-suite/src/test/resources/{mng-6173-get-projects-and-dependency-graph => mng-5965-parallel-build-multiplies-work}/pom.xml (95%)
[maven-integration-testing] 01/01: [MNG-6522] Prepare to run ITs
tests with Java 12-ea
Posted by sl...@apache.org.
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 )