This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a commit to branch MJLINK-29 in repository https://gitbox.apache.org/repos/asf/maven-jlink-plugin.git
commit 9069211089aa9114e4a68fec7b568d9a5256820d Author: Karl Heinz Marbaise <[email protected]> AuthorDate: Sat Nov 3 15:09:41 2018 +0100 Manually define order of execution. --- pom.xml | 4 +-- src/it/projects/{setup-02-jar => setup}/pom.xml | 38 ++++++---------------- .../{ => setup}/setup-01/invoker.properties | 0 src/it/projects/{ => setup}/setup-01/pom.xml | 0 .../setup-02-jar}/invoker.properties | 0 src/it/projects/{ => setup}/setup-02-jar/pom.xml | 0 .../src/main/java/myproject/HelloWorld.java | 0 .../setup-03-jar-module-info}/invoker.properties | 0 .../{ => setup}/setup-03-jar-module-info/pom.xml | 0 .../src/main/java/module-info.java | 0 .../src/main/java/myproject/HelloWorld.java | 0 11 files changed, 11 insertions(+), 31 deletions(-) diff --git a/pom.xml b/pom.xml index 704e6dc..6856ba7 100644 --- a/pom.xml +++ b/pom.xml @@ -215,9 +215,7 @@ <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath> <projectsDirectory>src/it/projects</projectsDirectory> <setupIncludes> - <setupInclude>setup-01/pom.xml</setupInclude> - <setupInclude>setup-02-jar/pom.xml</setupInclude> - <setupInclude>setup-03-jar-module-info/pom.xml</setupInclude> + <setupInclude>setup/pom.xml</setupInclude> </setupIncludes> <pomIncludes> <pomInclude>**/pom.xml</pomInclude> diff --git a/src/it/projects/setup-02-jar/pom.xml b/src/it/projects/setup/pom.xml similarity index 58% copy from src/it/projects/setup-02-jar/pom.xml copy to src/it/projects/setup/pom.xml index 8988fc2..aec949c 100644 --- a/src/it/projects/setup-02-jar/pom.xml +++ b/src/it/projects/setup/pom.xml @@ -24,38 +24,20 @@ 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.apache.maven.plugins.jlink.its</groupId> - <artifactId>mjlink-parent</artifactId> - <version>1.0.0</version> - </parent> + <groupId>org.apache.maven.plugins.jlink.its</groupId> + <artifactId>setup</artifactId> + <version>1.0.0</version> + <packaging>pom</packaging> - <groupId>localhost</groupId> - <artifactId>first-jar</artifactId> - <version>99.0</version> - <name>Maven</name> <description> - Test Project to prepare a jar file which does not contain - module-info.class file. + Defined aggregator to define order of execution. </description> <properties> - <maven.compiler.source>1.9</maven.compiler.source> - <maven.compiler.target>1.9</maven.compiler.target> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> </properties> - <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>3.8.0</version> - <configuration> - <source>1.9</source> - <target>1.9</target> - </configuration> - </plugin> - </plugins> - </pluginManagement> - </build> + <modules> + <module>setup-01</module> + <module>setup-02-jar</module> + <module>setup-02-jar-module-info</module> + </modules> </project> diff --git a/src/it/projects/setup-01/invoker.properties b/src/it/projects/setup/setup-01/invoker.properties similarity index 100% rename from src/it/projects/setup-01/invoker.properties rename to src/it/projects/setup/setup-01/invoker.properties diff --git a/src/it/projects/setup-01/pom.xml b/src/it/projects/setup/setup-01/pom.xml similarity index 100% rename from src/it/projects/setup-01/pom.xml rename to src/it/projects/setup/setup-01/pom.xml diff --git a/src/it/projects/setup-03-jar-module-info/invoker.properties b/src/it/projects/setup/setup-02-jar/invoker.properties similarity index 100% rename from src/it/projects/setup-03-jar-module-info/invoker.properties rename to src/it/projects/setup/setup-02-jar/invoker.properties diff --git a/src/it/projects/setup-02-jar/pom.xml b/src/it/projects/setup/setup-02-jar/pom.xml similarity index 100% rename from src/it/projects/setup-02-jar/pom.xml rename to src/it/projects/setup/setup-02-jar/pom.xml diff --git a/src/it/projects/setup-03-jar-module-info/src/main/java/myproject/HelloWorld.java b/src/it/projects/setup/setup-02-jar/src/main/java/myproject/HelloWorld.java similarity index 100% rename from src/it/projects/setup-03-jar-module-info/src/main/java/myproject/HelloWorld.java rename to src/it/projects/setup/setup-02-jar/src/main/java/myproject/HelloWorld.java diff --git a/src/it/projects/setup-02-jar/invoker.properties b/src/it/projects/setup/setup-03-jar-module-info/invoker.properties similarity index 100% rename from src/it/projects/setup-02-jar/invoker.properties rename to src/it/projects/setup/setup-03-jar-module-info/invoker.properties diff --git a/src/it/projects/setup-03-jar-module-info/pom.xml b/src/it/projects/setup/setup-03-jar-module-info/pom.xml similarity index 100% rename from src/it/projects/setup-03-jar-module-info/pom.xml rename to src/it/projects/setup/setup-03-jar-module-info/pom.xml diff --git a/src/it/projects/setup-03-jar-module-info/src/main/java/module-info.java b/src/it/projects/setup/setup-03-jar-module-info/src/main/java/module-info.java similarity index 100% rename from src/it/projects/setup-03-jar-module-info/src/main/java/module-info.java rename to src/it/projects/setup/setup-03-jar-module-info/src/main/java/module-info.java diff --git a/src/it/projects/setup-02-jar/src/main/java/myproject/HelloWorld.java b/src/it/projects/setup/setup-03-jar-module-info/src/main/java/myproject/HelloWorld.java similarity index 100% rename from src/it/projects/setup-02-jar/src/main/java/myproject/HelloWorld.java rename to src/it/projects/setup/setup-03-jar-module-info/src/main/java/myproject/HelloWorld.java
