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 2020/04/17 18:26:26 UTC
[maven-integration-testing] branch maven-antrun-plugin-3 updated
(a6514c7 -> 60aaba4)
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch maven-antrun-plugin-3
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git.
discard a6514c7 Test with maven-antrun-plugin 3.0.0
add 9181532 [MNG-5640] AbstractMavenLifecycleParticipant#afterSessionEnd is not invoked in some cases
add 8c109b3 [MNG-4660] Use of --resume-from in multi-module project fails with missing inter-module dependencies
new 60aaba4 Test with maven-antrun-plugin 3.0.0
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 (a6514c7)
\
N -- N -- N refs/heads/maven-antrun-plugin-3 (60aaba4)
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:
core-it-suite/pom.xml | 6 +
.../org/apache/maven/it/IntegrationTestSuite.java | 2 +
.../it/MavenITmng4660OutdatedPackagedArtifact.java | 122 +++++++++++++++++++++
.../maven/it/MavenITmng4660ResumeFromTest.java | 112 +++++++++++++++++++
core-it-suite/src/test/resources/bootstrap/pom.xml | 3 +-
.../module-a}/pom.xml | 23 ++--
.../main/java/org/apache/maven/it/Example.java} | 7 +-
.../module-b}/pom.xml | 45 ++++----
.../java/org/apache/maven/it/AnotherExample.java | 14 +--
.../test/java/org/apache/maven/it/TestCase.java | 17 +--
.../pom.xml | 47 +++++---
.../module-a}/pom.xml | 23 ++--
.../main/java/org/apache/maven/it/Example.java} | 7 +-
.../module-b}/pom.xml | 45 ++++----
.../java/org/apache/maven/it/AnotherExample.java | 14 +--
.../test/java/org/apache/maven/it/TestCase.java | 24 ++--
.../plugin => mng-4660-resume-from}/pom.xml | 47 +++++---
.../buildfailure-utfail/pom.xml | 7 ++
pom.xml | 5 +-
19 files changed, 438 insertions(+), 132 deletions(-)
create mode 100644 core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660OutdatedPackagedArtifact.java
create mode 100644 core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660ResumeFromTest.java
copy core-it-suite/src/test/resources/{mng-6090-ci-friendly/module-1 => mng-4660-outdated-packaged-artifact/module-a}/pom.xml (69%)
copy core-it-suite/src/test/resources/{mng-6506-package-annotation/plugin/src/main/java/testmojo/package-info.java => mng-4660-outdated-packaged-artifact/module-a/src/main/java/org/apache/maven/it/Example.java} (93%)
copy core-it-suite/src/test/resources/{mng-2562/reactor/child-2 => mng-4660-outdated-packaged-artifact/module-b}/pom.xml (60%)
copy core-it-support/core-it-plugins/mng5805-plugin-dep/src/main/java/org/apache/maven/its/mng5805/TestClass1.java => core-it-suite/src/test/resources/mng-4660-outdated-packaged-artifact/module-b/src/main/java/org/apache/maven/it/AnotherExample.java (87%)
copy core-it-support/core-it-plugins/mng5805-plugin-dep/src/main/java/org/apache/maven/its/mng5805/TestClass1.java => core-it-suite/src/test/resources/mng-4660-outdated-packaged-artifact/module-b/src/test/java/org/apache/maven/it/TestCase.java (82%)
copy core-it-suite/src/test/resources/{mng-3536/plugin => mng-4660-outdated-packaged-artifact}/pom.xml (53%)
copy core-it-suite/src/test/resources/{mng-6090-ci-friendly/module-1 => mng-4660-resume-from/module-a}/pom.xml (69%)
copy core-it-suite/src/test/resources/{mng-6506-package-annotation/plugin/src/main/java/testmojo/package-info.java => mng-4660-resume-from/module-a/src/main/java/org/apache/maven/it/Example.java} (93%)
copy core-it-suite/src/test/resources/{mng-2562/reactor/child-2 => mng-4660-resume-from/module-b}/pom.xml (60%)
copy core-it-support/core-it-plugins/mng5805-plugin-dep/src/main/java/org/apache/maven/its/mng5805/TestClass1.java => core-it-suite/src/test/resources/mng-4660-resume-from/module-b/src/main/java/org/apache/maven/it/AnotherExample.java (87%)
copy core-it-support/core-it-plugins/maven-it-plugin-class-loader/dep-b/src/main/java/org/apache/maven/plugin/coreit/ClassB.java => core-it-suite/src/test/resources/mng-4660-resume-from/module-b/src/test/java/org/apache/maven/it/TestCase.java (77%)
copy core-it-suite/src/test/resources/{mng-3536/plugin => mng-4660-resume-from}/pom.xml (54%)
[maven-integration-testing] 01/01: Test with maven-antrun-plugin
3.0.0
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch maven-antrun-plugin-3
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git
commit 60aaba41dba83169d8bfe11169aba0b69905c4ee
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Sun Apr 12 18:31:21 2020 +0200
Test with maven-antrun-plugin 3.0.0
---
core-it-suite/pom.xml | 18 +++++++--------
.../src/test/resources/bootstrap/group-7/pom.xml | 2 +-
core-it-suite/src/test/resources/bootstrap/pom.xml | 15 ++++++++++++-
.../test/resources/mng-0624/simple/child/pom.xml | 4 ++--
pom.xml | 26 ++++++++++++++++++++++
5 files changed, 52 insertions(+), 13 deletions(-)
diff --git a/core-it-suite/pom.xml b/core-it-suite/pom.xml
index 2850f66..774602f 100644
--- a/core-it-suite/pom.xml
+++ b/core-it-suite/pom.xml
@@ -380,7 +380,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.3</version>
+ <version>3.0.0</version>
<executions>
<execution>
<id>unpack-maven-distro</id>
@@ -389,7 +389,7 @@ under the License.
<goal>run</goal>
</goals>
<configuration>
- <tasks>
+ <target>
<delete dir="${mavenHome}" />
<unzip src="${project.build.directory}/maven-bin.zip"
dest="${mavenHome}">
@@ -398,7 +398,7 @@ under the License.
</unzip>
<chmod dir="${mavenHome}/bin" perm="ugo+rx"
includes="mvn,mvnDebug" />
- </tasks>
+ </target>
</configuration>
</execution>
</executions>
@@ -427,7 +427,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.6</version>
+ <version>3.0.0</version>
<executions>
<execution>
<id>unpack-maven-distro</id>
@@ -436,7 +436,7 @@ under the License.
<goal>run</goal>
</goals>
<configuration>
- <tasks>
+ <target>
<delete dir="${mavenHome}" />
<unzip src="${mavenDistro}" dest="${mavenHome}">
<regexpmapper from="^([^/]+)/(.*)$"
@@ -444,7 +444,7 @@ under the License.
</unzip>
<chmod dir="${mavenHome}/bin" perm="ugo+rx"
includes="mvn,mvnDebug" />
- </tasks>
+ </target>
</configuration>
</execution>
</executions>
@@ -469,7 +469,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.3</version>
+ <version>3.0.0</version>
<executions>
<execution>
<id>copy-maven-distro</id>
@@ -478,14 +478,14 @@ under the License.
<goal>run</goal>
</goals>
<configuration>
- <tasks>
+ <target>
<delete dir="${preparedMavenHome}" />
<copy todir="${preparedMavenHome}" overwrite="true">
<fileset dir="${mavenHome}" />
</copy>
<chmod dir="${preparedMavenHome}/bin" perm="ugo+rx"
includes="mvn,mvnDebug" />
- </tasks>
+ </target>
</configuration>
</execution>
</executions>
diff --git a/core-it-suite/src/test/resources/bootstrap/group-7/pom.xml b/core-it-suite/src/test/resources/bootstrap/group-7/pom.xml
index 821f9e7..acb2afe 100644
--- a/core-it-suite/src/test/resources/bootstrap/group-7/pom.xml
+++ b/core-it-suite/src/test/resources/bootstrap/group-7/pom.xml
@@ -70,7 +70,7 @@ under the License.
<dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.3</version>
+ <version>3.0.0</version>
<scope>runtime</scope>
</dependency>
<dependency>
diff --git a/core-it-suite/src/test/resources/bootstrap/pom.xml b/core-it-suite/src/test/resources/bootstrap/pom.xml
index 9f65a77..b5b5128 100644
--- a/core-it-suite/src/test/resources/bootstrap/pom.xml
+++ b/core-it-suite/src/test/resources/bootstrap/pom.xml
@@ -52,7 +52,20 @@ under the License.
<properties>
<maven.test.skip>true</maven.test.skip>
</properties>
-
+<!--
+ <repositories>
+ <repository>
+ <id>apache.staging.1562</id>
+ <url>https://repository.apache.org/content/repositories/maven-1562/</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ </repositories>
+-->
<build>
<!-- This merely locks the plugin versions to disable auto-update -->
<plugins>
diff --git a/core-it-suite/src/test/resources/mng-0624/simple/child/pom.xml b/core-it-suite/src/test/resources/mng-0624/simple/child/pom.xml
index 0fa2443..c578ab7 100644
--- a/core-it-suite/src/test/resources/mng-0624/simple/child/pom.xml
+++ b/core-it-suite/src/test/resources/mng-0624/simple/child/pom.xml
@@ -20,9 +20,9 @@
<phase>install</phase>
<goals><goal>run</goal></goals>
<configuration>
- <tasks>
+ <target>
<echo>hello world</echo>
- </tasks>
+ </target>
</configuration>
</execution>
</executions>
diff --git a/pom.xml b/pom.xml
index 9ceb300..86af373 100644
--- a/pom.xml
+++ b/pom.xml
@@ -95,7 +95,33 @@ under the License.
<enabled>false</enabled>
</releases>
</repository>
+<!--
+ <repository>
+ <id>apache.staging.1562</id>
+ <url>https://repository.apache.org/content/repositories/maven-1562/</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+-->
</repositories>
+<!--
+ <pluginRepositories>
+ <pluginRepository>
+ <id>apache.staging.1562</id>
+ <url>https://repository.apache.org/content/repositories/maven-1562/</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </pluginRepository>
+ </pluginRepositories>
+-->
<profiles>
<profile>