You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2017/05/13 19:34:14 UTC
maven-integration-testing git commit: [MNG-6169] Lifecycle/binding
plugin version updates [Forced Update!]
Repository: maven-integration-testing
Updated Branches:
refs/heads/MNG-6169 5c01864e4 -> 0d0dc91a5 (forced update)
[MNG-6169] Lifecycle/binding plugin version updates
MNG-5895 and MNG-6090 with ArtifactResolutionException. Add dependencies
Maven Resources Plugin 3.0.2, Maven Surefire 2.20, and JUnit 4.12 to
bootstrap's group 7.
Project: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/commit/0d0dc91a
Tree: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/0d0dc91a
Diff: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/0d0dc91a
Branch: refs/heads/MNG-6169
Commit: 0d0dc91a5dfa429fa3502f539632edb316d59276
Parents: 4aeb411
Author: Michael Osipov <mi...@apache.org>
Authored: Fri May 12 23:31:45 2017 +0200
Committer: Michael Osipov <19...@gmx.net>
Committed: Sat May 13 21:32:43 2017 +0200
----------------------------------------------------------------------
.../apache/maven/it/MavenITBootstrapTest.java | 1 +
.../test/resources-filtered/settings-remote.xml | 2 +-
.../src/test/resources/bootstrap/group-7/pom.xml | 19 +++++++++++++++++++
3 files changed, 21 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/0d0dc91a/core-it-suite/src/test/java/org/apache/maven/it/MavenITBootstrapTest.java
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITBootstrapTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITBootstrapTest.java
index 9b4c627..d32eecb 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITBootstrapTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITBootstrapTest.java
@@ -51,6 +51,7 @@ public class MavenITBootstrapTest
verifier.setAutoclean( false );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
+ verifier.addCliOption( "-X" );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/0d0dc91a/core-it-suite/src/test/resources-filtered/settings-remote.xml
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/resources-filtered/settings-remote.xml b/core-it-suite/src/test/resources-filtered/settings-remote.xml
index d0d696e..33809d2 100644
--- a/core-it-suite/src/test/resources-filtered/settings-remote.xml
+++ b/core-it-suite/src/test/resources-filtered/settings-remote.xml
@@ -71,4 +71,4 @@ plugins/artifacts from test repos so use of these settings should be the excepti
<activeProfiles>
<activeProfile>it-defaults</activeProfile>
</activeProfiles>
-</settings>
+</settings>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/0d0dc91a/core-it-suite/src/test/resources/bootstrap/group-7/pom.xml
----------------------------------------------------------------------
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 6538a73..08e7657 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
@@ -60,5 +60,24 @@ under the License.
<version>2.0</version>
<scope>runtime</scope>
</dependency>
+ <!-- MNG-6169 => MNG-5895, MNG-6090 -->
+ <dependency>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>3.0.2</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.20</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.12</version>
+ <scope>runtime</scope>
+ </dependency>
</dependencies>
</project>