mirror of https://github.com/apache/maven.git
o fixing ITs with subprojects with the wrong groupId
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@466859 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
825e768681
commit
9147b32fcc
|
@ -1,8 +1,8 @@
|
|||
<model>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<groupId>org.apache.maven.it</groupId>
|
||||
<artifactId>maven-core-it0029</artifactId>
|
||||
<groupId>org.apache.maven.its.it0029</groupId>
|
||||
<artifactId>maven-it-it0029</artifactId>
|
||||
<version>1.0-SNAPSHOT</version>
|
||||
</parent>
|
||||
<groupId>org.apache.maven.it</groupId>
|
||||
|
|
|
@ -1,16 +1,13 @@
|
|||
<model>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<groupId>org.apache.maven.it</groupId>
|
||||
<artifactId>maven-core-it0030</artifactId>
|
||||
<groupId>org.apache.maven.its.it0030</groupId>
|
||||
<artifactId>maven-it-it0030</artifactId>
|
||||
<version>1.0-SNAPSHOT</version>
|
||||
</parent>
|
||||
<groupId>org.apache.maven.it</groupId>
|
||||
<artifactId>maven-core-it0030-child-hierarchy</artifactId>
|
||||
<artifactId>child-hierarchy</artifactId>
|
||||
<packaging>pom</packaging>
|
||||
|
||||
<version>1.0-SNAPSHOT</version>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>junit</groupId>
|
||||
|
@ -18,7 +15,6 @@
|
|||
<scope>test</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<modules>
|
||||
<module>project1</module>
|
||||
<module>project2</module>
|
||||
|
|
|
@ -1,13 +1,10 @@
|
|||
<model>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<groupId>org.apache.maven.it</groupId>
|
||||
<artifactId>maven-core-it0030-child-hierarchy</artifactId>
|
||||
<groupId>org.apache.maven.its.it0030</groupId>
|
||||
<artifactId>child-hierarchy</artifactId>
|
||||
<version>1.0-SNAPSHOT</version>
|
||||
</parent>
|
||||
<groupId>org.apache.maven.it</groupId>
|
||||
<artifactId>maven-core-it0030-child-project1</artifactId>
|
||||
|
||||
<artifactId>project1</artifactId>
|
||||
<version>1.0-SNAPSHOT</version>
|
||||
|
||||
</model>
|
||||
|
|
|
@ -1,20 +1,16 @@
|
|||
<model>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<groupId>org.apache.maven.it</groupId>
|
||||
<artifactId>maven-core-it0030-child-hierarchy</artifactId>
|
||||
<groupId>org.apache.maven.its.it0030</groupId>
|
||||
<artifactId>child-hierarchy</artifactId>
|
||||
<version>1.0-SNAPSHOT</version>
|
||||
</parent>
|
||||
<groupId>org.apache.maven.it</groupId>
|
||||
<artifactId>maven-core-it0030-child-project2</artifactId>
|
||||
|
||||
<artifactId>project2</artifactId>
|
||||
<version>1.0-SNAPSHOT</version>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.apache.maven.it</groupId>
|
||||
<artifactId>maven-core-it0030-child-project1</artifactId>
|
||||
<groupId>org.apache.maven.its.it0030</groupId>
|
||||
<artifactId>project1</artifactId>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
</model>
|
||||
|
|
|
@ -6,12 +6,9 @@
|
|||
dependency poms.</description>
|
||||
<version>1.0-SNAPSHOT</version>
|
||||
<packaging>pom</packaging>
|
||||
|
||||
|
||||
<modules>
|
||||
<module>child-hierarchy</module>
|
||||
</modules>
|
||||
|
||||
<dependencyManagement>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
|
@ -20,11 +17,10 @@
|
|||
<version>3.8.1</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.maven.it</groupId>
|
||||
<artifactId>maven-core-it0030-child-project1</artifactId>
|
||||
<groupId>org.apache.maven.its.it0030</groupId>
|
||||
<artifactId>project1</artifactId>
|
||||
<version>1.0-SNAPSHOT</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</dependencyManagement>
|
||||
|
||||
</project>
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
<model>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<groupId>org.apache.maven.its</groupId>
|
||||
<groupId>org.apache.maven.its.it0045</groupId>
|
||||
<artifactId>maven-it-it0045</artifactId>
|
||||
<version>1.0</version>
|
||||
</parent>
|
||||
<artifactId>maven-it-it0045-subproject</artifactId>
|
||||
<artifactId>subproject</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
</model>
|
||||
|
|
|
@ -1,13 +1,12 @@
|
|||
<model>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<groupId>org.apache.maven.its</groupId>
|
||||
<groupId>org.apache.maven.its.it0046</groupId>
|
||||
<artifactId>maven-it-it0046</artifactId>
|
||||
<version>1.0</version>
|
||||
</parent>
|
||||
<artifactId>maven-it-it0046-subproject</artifactId>
|
||||
<artifactId>subproject</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
<model>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<groupId>org.apache.maven.its</groupId>
|
||||
<groupId>org.apache.maven.its.it0046</groupId>
|
||||
<artifactId>maven-it-it0046</artifactId>
|
||||
<version>1.0</version>
|
||||
</parent>
|
||||
<artifactId>maven-it-it0046-subproject2</artifactId>
|
||||
<artifactId>subproject2</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
</model>
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
<model>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<groupId>org.apache.maven.its</groupId>
|
||||
<groupId>org.apache.maven.its.it0058</groupId>
|
||||
<artifactId>maven-it-it0058</artifactId>
|
||||
<version>1.0</version>
|
||||
</parent>
|
||||
<artifactId>maven-it-it0058-subproject</artifactId>
|
||||
<artifactId>subproject</artifactId>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>junit</groupId>
|
||||
|
|
|
@ -1,14 +1,13 @@
|
|||
<model>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<groupId>org.apache.maven.its</groupId>
|
||||
<groupId>org.apache.maven.its.it0060</groupId>
|
||||
<artifactId>maven-it-it0060</artifactId>
|
||||
<version>1.0</version>
|
||||
</parent>
|
||||
<artifactId>maven-it-it0060-subproject</artifactId>
|
||||
<artifactId>subproject</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
<version>1.0</version>
|
||||
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
<project>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<groupId>org.apache.maven.it</groupId>
|
||||
<artifactId>maven-core-it0065</artifactId>
|
||||
<groupId>org.apache.maven.its.it0065</groupId>
|
||||
<artifactId>maven-it-it0065</artifactId>
|
||||
<version>1.0</version>
|
||||
</parent>
|
||||
<artifactId>maven-it0065-plugin</artifactId>
|
||||
<artifactId>plugin</artifactId>
|
||||
<packaging>maven-plugin</packaging>
|
||||
<version>1.0-SNAPSHOT</version>
|
||||
<dependencies>
|
||||
|
|
|
@ -1,19 +1,18 @@
|
|||
<model>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<groupId>org.apache.maven.it</groupId>
|
||||
<artifactId>maven-core-it0065</artifactId>
|
||||
<groupId>org.apache.maven.its.it0065</groupId>
|
||||
<artifactId>maven-it-it0065</artifactId>
|
||||
<version>1.0</version>
|
||||
</parent>
|
||||
<artifactId>maven-core-it0065-subproject</artifactId>
|
||||
<artifactId>subproject</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
<version>1.0</version>
|
||||
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.it</groupId>
|
||||
<artifactId>maven-it0065-plugin</artifactId>
|
||||
<groupId>org.apache.maven.its.it0065</groupId>
|
||||
<artifactId>plugin</artifactId>
|
||||
<version>1.0-SNAPSHOT</version>
|
||||
<executions>
|
||||
<execution>
|
||||
|
|
|
@ -1,11 +1,9 @@
|
|||
<project>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<groupId>org.apache.maven.its</groupId>
|
||||
<groupId>org.apache.maven.its.it0075</groupId>
|
||||
<artifactId>maven-it-it0075</artifactId>
|
||||
<version>1.0</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>maven-it-it0075-sub1</artifactId>
|
||||
|
||||
<artifactId>sub1</artifactId>
|
||||
</project>
|
||||
|
|
|
@ -1,11 +1,9 @@
|
|||
<project>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<groupId>org.apache.maven.its</groupId>
|
||||
<groupId>org.apache.maven.its.it0075</groupId>
|
||||
<artifactId>maven-it-it0075</artifactId>
|
||||
<version>1.0</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>maven-it-it0075-sub2</artifactId>
|
||||
|
||||
<artifactId>sub2</artifactId>
|
||||
</project>
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
<project>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<groupId>org.apache.maven.it</groupId>
|
||||
<artifactId>maven-core-it0077</artifactId>
|
||||
<groupId>org.apache.maven.its.it0077</groupId>
|
||||
<artifactId>maven-it-it0077</artifactId>
|
||||
<version>1.0</version>
|
||||
</parent>
|
||||
<artifactId>maven-it0077-sub1</artifactId>
|
||||
<artifactId>sub1</artifactId>
|
||||
<version>1.0</version>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
|
|
|
@ -1,13 +1,12 @@
|
|||
<model>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<groupId>org.apache.maven.it</groupId>
|
||||
<artifactId>maven-core-it0077</artifactId>
|
||||
<groupId>org.apache.maven.its.it0077</groupId>
|
||||
<artifactId>maven-it-it0077</artifactId>
|
||||
<version>1.0</version>
|
||||
</parent>
|
||||
<artifactId>maven-it0077-sub2</artifactId>
|
||||
<artifactId>sub2</artifactId>
|
||||
<version>1.0</version>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.apache.maven.it</groupId>
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
<project>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<groupId>org.apache.maven.its</groupId>
|
||||
<groupId>org.apache.maven.its.it0085</groupId>
|
||||
<artifactId>maven-it-it0085</artifactId>
|
||||
<version>1.0</version>
|
||||
</parent>
|
||||
<artifactId>it0085-dep</artifactId>
|
||||
<artifactId>dep</artifactId>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.apache.maven.it</groupId>
|
||||
<groupId>org.apache.maven.its.it0085</groupId>
|
||||
<artifactId>pom-dep</artifactId>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
<dependencyManagement>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.apache.maven.it</groupId>
|
||||
<groupId>org.apache.maven.its.it0085</groupId>
|
||||
<artifactId>pom-dep</artifactId>
|
||||
<version>1.4.2</version>
|
||||
<scope>system</scope>
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
<project>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<groupId>org.apache.maven.its</groupId>
|
||||
<groupId>org.apache.maven.its.it0085</groupId>
|
||||
<artifactId>maven-it-it0085</artifactId>
|
||||
<version>1.0</version>
|
||||
</parent>
|
||||
<artifactId>it0085-war</artifactId>
|
||||
<artifactId>war</artifactId>
|
||||
<packaging>war</packaging>
|
||||
|
||||
<dependencies>
|
||||
|
@ -15,8 +15,8 @@
|
|||
<version>3.8.1</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.maven.its</groupId>
|
||||
<artifactId>it0085-dep</artifactId>
|
||||
<groupId>org.apache.maven.its.it0085</groupId>
|
||||
<artifactId>dep</artifactId>
|
||||
<version>1.0</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
|
|
|
@ -1,16 +1,14 @@
|
|||
<project>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<groupId>org.apache.maven.it</groupId>
|
||||
<groupId>org.apache.maven.its.it0089</groupId>
|
||||
<version>1.0</version>
|
||||
<artifactId>it0089-root</artifactId>
|
||||
<artifactId>maven-it-it0089</artifactId>
|
||||
</parent>
|
||||
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-it0089-plugin</artifactId>
|
||||
<version>1.0-SNAPSHOT</version>
|
||||
<packaging>maven-plugin</packaging>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>checkstyle</groupId>
|
||||
|
|
|
@ -1,24 +1,19 @@
|
|||
<project>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<groupId>org.apache.maven.it</groupId>
|
||||
<groupId>org.apache.maven.its.it0089</groupId>
|
||||
<version>1.0</version>
|
||||
<artifactId>it0089-root</artifactId>
|
||||
<artifactId>maven-it-it0089</artifactId>
|
||||
</parent>
|
||||
|
||||
<artifactId>it0089</artifactId>
|
||||
|
||||
<artifactId>project</artifactId>
|
||||
<name>Plugin Transitive Dependency Classloading Test</name>
|
||||
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<artifactId>maven-it0089-plugin</artifactId>
|
||||
|
||||
<executions>
|
||||
<execution>
|
||||
<phase>validate</phase>
|
||||
|
||||
<goals>
|
||||
<goal>test</goal>
|
||||
</goals>
|
||||
|
|
|
@ -1,17 +1,10 @@
|
|||
<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>
|
||||
<parent>
|
||||
<groupId>org.codehaus.mojo</groupId>
|
||||
<artifactId>mojo</artifactId>
|
||||
<version>5</version>
|
||||
</parent>
|
||||
<groupId>org.apache.maven.it</groupId>
|
||||
<artifactId>maven-core-it0094-mojo</artifactId>
|
||||
<groupId>org.apache.maven.its.it0094</groupId>
|
||||
<artifactId>maven-it0094-plugin</artifactId>
|
||||
<packaging>maven-plugin</packaging>
|
||||
<version>1.0-SNAPSHOT</version>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.apache.maven</groupId>
|
||||
|
|
|
@ -3,20 +3,18 @@
|
|||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<groupId>org.apache.maven.it</groupId>
|
||||
<artifactId>maven-core-it0094</artifactId>
|
||||
<groupId>org.apache.maven.its.it0094</groupId>
|
||||
<artifactId>maven-it-it0094</artifactId>
|
||||
<version>1.0-SNAPSHOT</version>
|
||||
</parent>
|
||||
<artifactId>maven-core-it0094-test</artifactId>
|
||||
|
||||
<artifactId>test</artifactId>
|
||||
<dependencies>
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.it</groupId>
|
||||
<artifactId>maven-core-it0094-mojo</artifactId>
|
||||
<groupId>org.apache.maven.its.it0094</groupId>
|
||||
<artifactId>maven-it0094-plugin</artifactId>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>process-classes</id>
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
<project>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<groupId>org.apache.maven.its</groupId>
|
||||
<groupId>org.apache.maven.its.it0099</groupId>
|
||||
<artifactId>maven-it-it0099</artifactId>
|
||||
<version>1</version>
|
||||
</parent>
|
||||
<artifactId>maven-it0099-child</artifactId>
|
||||
<artifactId>child</artifactId>
|
||||
</project>
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
<project>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<groupId>org.apache.maven.its</groupId>
|
||||
<groupId>org.apache.maven.its.it0103</groupId>
|
||||
<artifactId>level1</artifactId>
|
||||
<version>1</version>
|
||||
</parent>
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
<project>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<groupId>org.apache.maven.its</groupId>
|
||||
<groupId>org.apache.maven.its.it0103</groupId>
|
||||
<artifactId>level1</artifactId>
|
||||
<version>1</version>
|
||||
</parent>
|
||||
|
|
|
@ -1,13 +1,12 @@
|
|||
<project>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<groupId>org.apache.maven.its</groupId>
|
||||
<groupId>org.apache.maven.its.it0103</groupId>
|
||||
<artifactId>maven-it-it0103</artifactId>
|
||||
<version>1</version>
|
||||
</parent>
|
||||
<artifactId>level1</artifactId>
|
||||
<packaging>pom</packaging>
|
||||
|
||||
<modules>
|
||||
<module>level2</module>
|
||||
</modules>
|
||||
|
|
|
@ -19,7 +19,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.test.it0106</groupId>
|
||||
<groupId>org.apache.maven.its.it0106</groupId>
|
||||
<artifactId>A</artifactId>
|
||||
<version>1</version>
|
||||
<packaging>pom</packaging>
|
||||
|
|
|
@ -21,13 +21,11 @@
|
|||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<parent>
|
||||
<groupId>org.apache.maven.test.it0106</groupId>
|
||||
<groupId>org.apache.maven.its.it0106</groupId>
|
||||
<artifactId>B</artifactId>
|
||||
<version>1</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>C</artifactId>
|
||||
<packaging>pom</packaging>
|
||||
<name>C</name>
|
||||
</project>
|
||||
|
||||
|
|
Loading…
Reference in New Issue