Repository: maven-integration-testing Updated Branches: refs/heads/MNG-6057 34f6f5692 -> befd7947c (forced update)
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/befd7947/core-it-suite/src/test/resources/bootstrap/group-6/pom.xml ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/bootstrap/group-6/pom.xml b/core-it-suite/src/test/resources/bootstrap/group-6/pom.xml index b48464e..4a26caa 100644 --- a/core-it-suite/src/test/resources/bootstrap/group-6/pom.xml +++ b/core-it-suite/src/test/resources/bootstrap/group-6/pom.xml @@ -88,5 +88,77 @@ under the License. <version>3.1</version> <scope>runtime</scope> </dependency> + <!-- IT MNG-6057 --> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-settings</artifactId> + <version>3.1.1</version> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-settings-builder</artifactId> + <version>3.1.1</version> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-repository-metadata</artifactId> + <version>3.1.1</version> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-aether-provider</artifactId> + <version>3.1.1</version> + </dependency> + <dependency> + <groupId>org.eclipse.aether</groupId> + <artifactId>aether-spi</artifactId> + <version>0.9.0.M2</version> + </dependency> + <dependency> + <groupId>org.eclipse.aether</groupId> + <artifactId>aether-impl</artifactId> + <version>0.9.0.M2</version> + </dependency> + <dependency> + <groupId>org.eclipse.sisu</groupId> + <artifactId>org.eclipse.sisu.plexus</artifactId> + <version>0.0.0.M5</version> + </dependency> + <dependency> + <groupId>org.eclipse.sisu</groupId> + <artifactId>org.eclipse.sisu.inject</artifactId> + <version>0.0.0.M5</version> + </dependency> + <dependency> + <groupId>org.sonatype.sisu</groupId> + <artifactId>sisu-guice</artifactId> + <version>3.1.0</version> + <classifier>no_aop</classifier> + </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>10.0.1</version> + </dependency> + <dependency> + <groupId>com.google.code.findbugs</groupId> + <artifactId>jsr205</artifactId> + <version>1.3.9</version> + </dependency> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-classworlds</artifactId> + <version>2.5.1</version> + </dependency> + <dependency> + <groupId>org.codehaus.mojo</groupId> + <artifactId>flatten-maven-plugin</artifactId> + <version>1.0.0</version> + </dependency> + <dependency> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.5.1</version> + </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/befd7947/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/module-3/pom.xml ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/module-3/pom.xml b/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/module-3/pom.xml index 6c77439..e51f0fb 100644 --- a/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/module-3/pom.xml +++ b/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/module-3/pom.xml @@ -31,20 +31,6 @@ </dependencies> <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <version>2.5.1</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <version>2.2</version> - </plugin> - </plugins> - </pluginManagement> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/befd7947/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/pom.xml ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/pom.xml b/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/pom.xml index ccf3aec..38a3358 100644 --- a/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/pom.xml +++ b/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/pom.xml @@ -31,6 +31,22 @@ under the License. <properties> <revision>1.3.0-SNAPSHOT</revision> </properties> + <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.5.1</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <version>2.2</version> + </plugin> + </plugins> + </pluginManagement> + </build> <modules> <module>module-3</module> <module>module-1</module> http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/befd7947/core-it-suite/src/test/resources/mng-6090-ci-friendly/pom.xml ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-6090-ci-friendly/pom.xml b/core-it-suite/src/test/resources/mng-6090-ci-friendly/pom.xml index c7ac56e..233c4cd 100644 --- a/core-it-suite/src/test/resources/mng-6090-ci-friendly/pom.xml +++ b/core-it-suite/src/test/resources/mng-6090-ci-friendly/pom.xml @@ -50,13 +50,17 @@ under the License. <artifactId>maven-jar-plugin</artifactId> <version>2.2</version> </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>flatten-maven-plugin</artifactId> + <version>1.0.0</version> + </plugin> </plugins> </pluginManagement> <plugins> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>flatten-maven-plugin</artifactId> - <version>1.0.0</version> <configuration> <updatePomFile>true</updatePomFile> </configuration>
