[MNG-6957] versionless reactor dependencies/parent should work even if modules are aggregated in reverse order
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java b/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
index 465179c..027587f 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
@@ -107,6 +107,7 @@
// -------------------------------------------------------------------------------------------------------------
// suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); -- MNG-3137
suite.addTestSuite( MavenITmng6957BuildConsumer.class );
+ suite.addTestSuite( MavenITmng7045DropUselessAndOutdatedCdiApiTest.class );
suite.addTestSuite( MavenITmng6566ExecuteAnnotationShouldNotReExecuteGoalsTest.class );
suite.addTestSuite( MavenITmng6754TimestampInMultimoduleProject.class );
suite.addTestSuite( MavenITmng6981ProjectListShouldIncludeChildrenTest.class );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4148DepPomInterpWithSettingsProfilesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4148DepPomInterpWithSettingsProfilesTest.java
index e75c952..30854b4 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4148DepPomInterpWithSettingsProfilesTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4148DepPomInterpWithSettingsProfilesTest.java
@@ -51,7 +51,7 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.deleteDirectory( "target" );
- verifier.deleteArtifacts( "org.apache.maven.it.mng4148" );
+ verifier.deleteArtifacts( "org.apache.maven.its.mng4148" );
verifier.setAutoclean( false );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4238ArtifactHandlerExtensionUsageTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4238ArtifactHandlerExtensionUsageTest.java
index 1f1badd..19d5684 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4238ArtifactHandlerExtensionUsageTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4238ArtifactHandlerExtensionUsageTest.java
@@ -34,7 +34,7 @@
extends AbstractMavenIntegrationTestCase
{
- private static final String GID = "org.apache.maven.it.mng4238";
+ private static final String GID = "org.apache.maven.its.mng4238";
private static final String AID = "mng-4238";
private static final String VERSION = "1";
private static final String TYPE = "jar";
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4347ImportScopeWithSettingsProfilesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4347ImportScopeWithSettingsProfilesTest.java
index fe7d09c..8677556 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4347ImportScopeWithSettingsProfilesTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4347ImportScopeWithSettingsProfilesTest.java
@@ -51,7 +51,7 @@
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.deleteDirectory( "target" );
- verifier.deleteArtifacts( "org.apache.maven.it.mng4347" );
+ verifier.deleteArtifacts( "org.apache.maven.its.mng4347" );
verifier.setAutoclean( false );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7045DropUselessAndOutdatedCdiApiTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7045DropUselessAndOutdatedCdiApiTest.java
new file mode 100644
index 0000000..b36f25c
--- /dev/null
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7045DropUselessAndOutdatedCdiApiTest.java
@@ -0,0 +1,31 @@
+package org.apache.maven.it;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Arrays;
+
+import org.apache.maven.it.util.ResourceExtractor;
+import org.junit.Test;
+
+public class MavenITmng7045DropUselessAndOutdatedCdiApiTest
+ extends AbstractMavenIntegrationTestCase
+{
+
+ public MavenITmng7045DropUselessAndOutdatedCdiApiTest()
+ {
+ super( "[4.0.0-alpha-1,)" );
+ }
+
+ @Test
+ public void testit()
+ throws IOException, VerificationException
+ {
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng7045" );
+ Verifier verifier = newVerifier( testDir.getAbsolutePath()) ;
+
+ verifier.executeGoal( "process-classes") ;
+ verifier.resetStreams();
+ verifier.verifyErrorFreeLog();
+ }
+
+}
diff --git a/core-it-suite/src/test/resources/bootstrap/group-11/pom.xml b/core-it-suite/src/test/resources/bootstrap/group-11/pom.xml
index 30be7ce..3442b61 100644
--- a/core-it-suite/src/test/resources/bootstrap/group-11/pom.xml
+++ b/core-it-suite/src/test/resources/bootstrap/group-11/pom.xml
@@ -44,5 +44,20 @@
<artifactId>plexus-utils</artifactId>
<version>1.5.6</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jcdi_2.0_spec</artifactId>
+ <version>1.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy</artifactId>
+ <version>3.0.7</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.gmavenplus</groupId>
+ <artifactId>gmavenplus-plugin</artifactId>
+ <version>1.11.0</version>
+ </dependency>
</dependencies>
</project>
diff --git a/core-it-suite/src/test/resources/mng-3203/pom.xml b/core-it-suite/src/test/resources/mng-3203/pom.xml
index 0f83199..f09fbc3 100644
--- a/core-it-suite/src/test/resources/mng-3203/pom.xml
+++ b/core-it-suite/src/test/resources/mng-3203/pom.xml
@@ -1,7 +1,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.it.mng3203</groupId>
+ <groupId>org.apache.maven.its.mng3203</groupId>
<artifactId>mng-3203</artifactId>
<packaging>jar</packaging>
<version>1</version>
diff --git a/core-it-suite/src/test/resources/mng-3259/parent/pom.xml b/core-it-suite/src/test/resources/mng-3259/parent/pom.xml
index 2ad6c39..4005796 100644
--- a/core-it-suite/src/test/resources/mng-3259/parent/pom.xml
+++ b/core-it-suite/src/test/resources/mng-3259/parent/pom.xml
@@ -82,7 +82,7 @@
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
- <version>1.2.2</version>
+ <version>1.4.15</version>
</dependency>
<dependency>
<groupId>jmock</groupId>
diff --git a/core-it-suite/src/test/resources/mng-4148/pom.xml b/core-it-suite/src/test/resources/mng-4148/pom.xml
index e9be8b4..4d17599 100644
--- a/core-it-suite/src/test/resources/mng-4148/pom.xml
+++ b/core-it-suite/src/test/resources/mng-4148/pom.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.it.mng4148</groupId>
- <artifactId>mng-4148</artifactId>
- <version>1.0.0-SNAPSHOT</version>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.it.mng4148</groupId>
- <artifactId>module</artifactId>
- <version>1.0.0</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.its.plugins</groupId>
- <artifactId>maven-it-plugin-dependency-resolution</artifactId>
- <version>2.1-SNAPSHOT</version>
- <executions>
- <execution>
- <id>test</id>
- <phase>validate</phase>
- <goals>
- <goal>test</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
\ No newline at end of file
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.its.mng4148</groupId>
+ <artifactId>mng-4148</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.its.mng4148</groupId>
+ <artifactId>module</artifactId>
+ <version>1.0.0</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.its.plugins</groupId>
+ <artifactId>maven-it-plugin-dependency-resolution</artifactId>
+ <version>2.1-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <id>test</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/it/mng4148/dep/1.0.0/dep-1.0.0.jar b/core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/its/mng4148/dep/1.0.0/dep-1.0.0.jar
similarity index 100%
rename from core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/it/mng4148/dep/1.0.0/dep-1.0.0.jar
rename to core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/its/mng4148/dep/1.0.0/dep-1.0.0.jar
Binary files differ
diff --git a/core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/it/mng4148/dep/1.0.0/dep-1.0.0.pom b/core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/its/mng4148/dep/1.0.0/dep-1.0.0.pom
similarity index 87%
rename from core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/it/mng4148/dep/1.0.0/dep-1.0.0.pom
rename to core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/its/mng4148/dep/1.0.0/dep-1.0.0.pom
index 0d71231..030717d 100644
--- a/core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/it/mng4148/dep/1.0.0/dep-1.0.0.pom
+++ b/core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/its/mng4148/dep/1.0.0/dep-1.0.0.pom
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.it.mng4148</groupId>
- <artifactId>dep</artifactId>
- <version>1.0.0</version>
-</project>
\ No newline at end of file
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.its.mng4148</groupId>
+ <artifactId>dep</artifactId>
+ <version>1.0.0</version>
+</project>
diff --git a/core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/it/mng4148/module/1.0.0/module-1.0.0.jar b/core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/its/mng4148/module/1.0.0/module-1.0.0.jar
similarity index 100%
rename from core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/it/mng4148/module/1.0.0/module-1.0.0.jar
rename to core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/its/mng4148/module/1.0.0/module-1.0.0.jar
Binary files differ
diff --git a/core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/it/mng4148/module/1.0.0/module-1.0.0.pom b/core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/its/mng4148/module/1.0.0/module-1.0.0.pom
similarity index 79%
rename from core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/it/mng4148/module/1.0.0/module-1.0.0.pom
rename to core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/its/mng4148/module/1.0.0/module-1.0.0.pom
index b0b9575..a03fc9a 100644
--- a/core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/it/mng4148/module/1.0.0/module-1.0.0.pom
+++ b/core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/its/mng4148/module/1.0.0/module-1.0.0.pom
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.it.mng4148</groupId>
- <artifactId>module</artifactId>
- <version>1.0.0</version>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.it.mng4148</groupId>
- <artifactId>dep</artifactId>
- <version>${depVersion}</version>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.its.mng4148</groupId>
+ <artifactId>module</artifactId>
+ <version>1.0.0</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.its.mng4148</groupId>
+ <artifactId>dep</artifactId>
+ <version>${depVersion}</version>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/it/mng4148/parent/1.0.0/parent-1.0.0.pom b/core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/its/mng4148/parent/1.0.0/parent-1.0.0.pom
similarity index 88%
rename from core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/it/mng4148/parent/1.0.0/parent-1.0.0.pom
rename to core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/its/mng4148/parent/1.0.0/parent-1.0.0.pom
index 549b9b2..564ed1b 100644
--- a/core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/it/mng4148/parent/1.0.0/parent-1.0.0.pom
+++ b/core-it-suite/src/test/resources/mng-4148/remote-repository/org/apache/maven/its/mng4148/parent/1.0.0/parent-1.0.0.pom
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.it.mng4148</groupId>
- <artifactId>parent</artifactId>
- <version>1.0.0</version>
- <packaging>pom</packaging>
-</project>
\ No newline at end of file
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.its.mng4148</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0.0</version>
+ <packaging>pom</packaging>
+</project>
diff --git a/core-it-suite/src/test/resources/mng-4238/pom.xml b/core-it-suite/src/test/resources/mng-4238/pom.xml
index 240f74e..e7818fa 100644
--- a/core-it-suite/src/test/resources/mng-4238/pom.xml
+++ b/core-it-suite/src/test/resources/mng-4238/pom.xml
@@ -1,7 +1,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.it.mng4238</groupId>
+ <groupId>org.apache.maven.its.mng4238</groupId>
<artifactId>mng-4238</artifactId>
<version>1</version>
diff --git a/core-it-suite/src/test/resources/mng-4347/pom.xml b/core-it-suite/src/test/resources/mng-4347/pom.xml
index c1b04e7..0fcb49e 100644
--- a/core-it-suite/src/test/resources/mng-4347/pom.xml
+++ b/core-it-suite/src/test/resources/mng-4347/pom.xml
@@ -22,14 +22,14 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.it.mng4347</groupId>
+ <groupId>org.apache.maven.its.mng4347</groupId>
<artifactId>consumer</artifactId>
<packaging>jar</packaging>
<version>1</version>
<dependencies>
<dependency>
- <groupId>org.apache.maven.it.mng4347</groupId>
+ <groupId>org.apache.maven.its.mng4347</groupId>
<artifactId>dep-with-import</artifactId>
<version>1</version>
</dependency>
diff --git a/core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/it/mng4347/dep-with-import/1/dep-with-import-1.jar b/core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/its/mng4347/dep-with-import/1/dep-with-import-1.jar
similarity index 100%
rename from core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/it/mng4347/dep-with-import/1/dep-with-import-1.jar
rename to core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/its/mng4347/dep-with-import/1/dep-with-import-1.jar
Binary files differ
diff --git a/core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/it/mng4347/dep-with-import/1/dep-with-import-1.pom b/core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/its/mng4347/dep-with-import/1/dep-with-import-1.pom
similarity index 90%
rename from core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/it/mng4347/dep-with-import/1/dep-with-import-1.pom
rename to core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/its/mng4347/dep-with-import/1/dep-with-import-1.pom
index 130e0cc..6036cf6 100644
--- a/core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/it/mng4347/dep-with-import/1/dep-with-import-1.pom
+++ b/core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/its/mng4347/dep-with-import/1/dep-with-import-1.pom
@@ -22,7 +22,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.it.mng4347</groupId>
+ <groupId>org.apache.maven.its.mng4347</groupId>
<artifactId>dep-with-import</artifactId>
<packaging>jar</packaging>
<version>1</version>
@@ -30,7 +30,7 @@
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.apache.maven.it.mng4347</groupId>
+ <groupId>org.apache.maven.its.mng4347</groupId>
<artifactId>import-dep</artifactId>
<version>1-SNAPSHOT</version>
<type>pom</type>
@@ -41,7 +41,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.maven.it.mng4347</groupId>
+ <groupId>org.apache.maven.its.mng4347</groupId>
<artifactId>managed-dep</artifactId>
</dependency>
</dependencies>
diff --git a/core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/it/mng4347/dep-with-import/maven-metadata.xml b/core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/its/mng4347/dep-with-import/maven-metadata.xml
similarity index 95%
rename from core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/it/mng4347/dep-with-import/maven-metadata.xml
rename to core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/its/mng4347/dep-with-import/maven-metadata.xml
index add76c2..b0b3c24 100644
--- a/core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/it/mng4347/dep-with-import/maven-metadata.xml
+++ b/core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/its/mng4347/dep-with-import/maven-metadata.xml
@@ -20,7 +20,7 @@
-->
<metadata>
- <groupId>org.apache.maven.it.mng4347</groupId>
+ <groupId>org.apache.maven.its.mng4347</groupId>
<artifactId>dep-with-import</artifactId>
<version>1</version>
<versioning>
diff --git a/core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/it/mng4347/import-dep/1-SNAPSHOT/import-dep-1-20090909.201000-1.pom b/core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/its/mng4347/import-dep/1-SNAPSHOT/import-dep-1-20090909.201000-1.pom
similarity index 88%
rename from core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/it/mng4347/import-dep/1-SNAPSHOT/import-dep-1-20090909.201000-1.pom
rename to core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/its/mng4347/import-dep/1-SNAPSHOT/import-dep-1-20090909.201000-1.pom
index 107ca04..0b2f82c 100644
--- a/core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/it/mng4347/import-dep/1-SNAPSHOT/import-dep-1-20090909.201000-1.pom
+++ b/core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/its/mng4347/import-dep/1-SNAPSHOT/import-dep-1-20090909.201000-1.pom
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.it.mng4347</groupId>
+ <groupId>org.apache.maven.its.mng4347</groupId>
<artifactId>import-dep</artifactId>
<version>1-SNAPSHOT</version>
<packaging>pom</packaging>
@@ -16,7 +16,7 @@
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.apache.maven.it.mng4347</groupId>
+ <groupId>org.apache.maven.its.mng4347</groupId>
<artifactId>managed-dep</artifactId>
<version>2</version>
</dependency>
diff --git a/core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/it/mng4347/import-dep/1-SNAPSHOT/maven-metadata.xml b/core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/its/mng4347/import-dep/1-SNAPSHOT/maven-metadata.xml
similarity index 86%
rename from core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/it/mng4347/import-dep/1-SNAPSHOT/maven-metadata.xml
rename to core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/its/mng4347/import-dep/1-SNAPSHOT/maven-metadata.xml
index 2110850..c1f0a9b 100644
--- a/core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/it/mng4347/import-dep/1-SNAPSHOT/maven-metadata.xml
+++ b/core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/its/mng4347/import-dep/1-SNAPSHOT/maven-metadata.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<metadata>
- <groupId>org.apache.maven.it.mng4347</groupId>
+ <groupId>org.apache.maven.its.mng4347</groupId>
<artifactId>import-dep</artifactId>
<version>1-SNAPSHOT</version>
<versioning>
diff --git a/core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/it/mng4347/managed-dep/2/managed-dep-2.jar b/core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/its/mng4347/managed-dep/2/managed-dep-2.jar
similarity index 100%
rename from core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/it/mng4347/managed-dep/2/managed-dep-2.jar
rename to core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/its/mng4347/managed-dep/2/managed-dep-2.jar
Binary files differ
diff --git a/core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/it/mng4347/managed-dep/2/managed-dep-2.pom b/core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/its/mng4347/managed-dep/2/managed-dep-2.pom
similarity index 95%
rename from core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/it/mng4347/managed-dep/2/managed-dep-2.pom
rename to core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/its/mng4347/managed-dep/2/managed-dep-2.pom
index f6f8c31..2b75ce5 100644
--- a/core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/it/mng4347/managed-dep/2/managed-dep-2.pom
+++ b/core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/its/mng4347/managed-dep/2/managed-dep-2.pom
@@ -22,7 +22,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.it.mng4347</groupId>
+ <groupId>org.apache.maven.its.mng4347</groupId>
<artifactId>managed-dep</artifactId>
<packaging>jar</packaging>
<version>2</version>
diff --git a/core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/it/mng4347/managed-dep/maven-metadata.xml b/core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/its/mng4347/managed-dep/maven-metadata.xml
similarity index 95%
rename from core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/it/mng4347/managed-dep/maven-metadata.xml
rename to core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/its/mng4347/managed-dep/maven-metadata.xml
index 693091f..9ebc1a0 100644
--- a/core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/it/mng4347/managed-dep/maven-metadata.xml
+++ b/core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/its/mng4347/managed-dep/maven-metadata.xml
@@ -20,7 +20,7 @@
-->
<metadata>
- <groupId>org.apache.maven.it.mng4347</groupId>
+ <groupId>org.apache.maven.its.mng4347</groupId>
<artifactId>managed-dep</artifactId>
<version>2</version>
<versioning>
diff --git a/core-it-suite/src/test/resources/mng7045/pom.xml b/core-it-suite/src/test/resources/mng7045/pom.xml
new file mode 100644
index 0000000..e983c1f
--- /dev/null
+++ b/core-it-suite/src/test/resources/mng7045/pom.xml
@@ -0,0 +1,66 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.its.mng7045</groupId>
+ <artifactId>test</artifactId>
+ <version>1.0</version>
+
+ <name>Maven Integration Test :: MNG-7045</name>
+ <description>
+ Do a Maven exec-java which executes some CDI 2.0 code which would fail if maven leaks CDI API 1.0.
+ </description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jcdi_2.0_spec</artifactId>
+ <version>1.3</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.8.1</version>
+ <configuration>
+ <source>8</source>
+ <target>8</target>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.gmavenplus</groupId>
+ <artifactId>gmavenplus-plugin</artifactId>
+ <version>1.11.0</version>
+ <executions>
+ <execution>
+ <id>run</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>execute</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <scripts>
+ <script><![CDATA[
+println("InstanceSource=" + javax.enterprise.inject.Instance.class.getProtectionDomain().getCodeSource())
+javax.enterprise.inject.Instance.class.getDeclaredMethod("stream")
+ ]]></script>
+ </scripts>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy</artifactId>
+ <version>3.0.7</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+</project>
+
