You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2020/11/11 20:38:52 UTC
[maven-jlink-plugin] 01/01: [MJLINK-9] - Add support for multi
module projects
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a commit to branch JLINK-9
in repository https://gitbox.apache.org/repos/asf/maven-jlink-plugin.git
commit 00ce056051fae984b8b2db824f1746e2edb5c33c
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Wed Nov 11 21:38:21 2020 +0100
[MJLINK-9] - Add support for multi module projects
---
src/it/projects/MJLINK-9_reactor/app/pom.xml | 28 -------------------
.../MJLINK-9_reactor/{app => dist}/pom.xml | 32 ++++++----------------
.../src/main/java/module-info.java} | 18 ++----------
src/it/projects/MJLINK-9_reactor/pom.xml | 3 +-
src/it/projects/MJLINK-9_reactor/verify.groovy | 9 ++++--
5 files changed, 19 insertions(+), 71 deletions(-)
diff --git a/src/it/projects/MJLINK-9_reactor/app/pom.xml b/src/it/projects/MJLINK-9_reactor/app/pom.xml
index fedba21..5e76ef2 100644
--- a/src/it/projects/MJLINK-9_reactor/app/pom.xml
+++ b/src/it/projects/MJLINK-9_reactor/app/pom.xml
@@ -45,32 +45,4 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <classifier>orig</classifier>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jlink-plugin</artifactId>
- <executions>
- <execution>
- <id>create-bundle</id>
- <goals>
- <goal>jlink</goal>
- </goals>
- <phase>package</phase>
- <configuration>
- <launcher>reactorapp=com.reactor.project.app/com.reactor.project.app.App</launcher>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
</project>
diff --git a/src/it/projects/MJLINK-9_reactor/app/pom.xml b/src/it/projects/MJLINK-9_reactor/dist/pom.xml
similarity index 68%
copy from src/it/projects/MJLINK-9_reactor/app/pom.xml
copy to src/it/projects/MJLINK-9_reactor/dist/pom.xml
index fedba21..726b4dc 100644
--- a/src/it/projects/MJLINK-9_reactor/app/pom.xml
+++ b/src/it/projects/MJLINK-9_reactor/dist/pom.xml
@@ -30,17 +30,17 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>maven-jlink-plugin-mjlink-9-app</artifactId>
- <packaging>jar</packaging>
- <name>mjlink-9-app</name>
+ <artifactId>maven-jlink-plugin-mjlink-9-dist</artifactId>
+ <packaging>jlink</packaging>
+ <name>mjlink-9-jlink</name>
<url>https://maven.apache.org</url>
- <description>mjlink-9-app</description>
+ <description>mjlink-9-jlink</description>
<dependencies>
<dependency>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jlink-plugin-mjlink-9-api</artifactId>
+ <artifactId>maven-jlink-plugin-mjlink-9-app</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
@@ -49,28 +49,12 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
+ <artifactId>maven-jlink-plugin</artifactId>
+ <extensions>true</extensions>
<configuration>
- <classifier>orig</classifier>
+ <launcher>reactorapp=com.reactor.project.app/com.reactor.project.app.App</launcher>
</configuration>
</plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jlink-plugin</artifactId>
- <executions>
- <execution>
- <id>create-bundle</id>
- <goals>
- <goal>jlink</goal>
- </goals>
- <phase>package</phase>
- <configuration>
- <launcher>reactorapp=com.reactor.project.app/com.reactor.project.app.App</launcher>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</project>
diff --git a/src/it/projects/MJLINK-9_reactor/verify.groovy b/src/it/projects/MJLINK-9_reactor/dist/src/main/java/module-info.java
similarity index 64%
copy from src/it/projects/MJLINK-9_reactor/verify.groovy
copy to src/it/projects/MJLINK-9_reactor/dist/src/main/java/module-info.java
index a2e0c8e..536d5be 100644
--- a/src/it/projects/MJLINK-9_reactor/verify.groovy
+++ b/src/it/projects/MJLINK-9_reactor/dist/src/main/java/module-info.java
@@ -1,4 +1,3 @@
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,18 +17,7 @@
* under the License.
*/
-import java.io.*
-import java.util.*
-import java.util.jar.*
-import org.codehaus.plexus.util.*
-
-File target = new File( basedir, "app/target" );
-assert target.isDirectory()
-
-File jarArtifact = new File( target, "maven-jlink-plugin-mjlink-9-app-96.0-orig.jar" );
-assert jarArtifact.isFile()
-
-File artifact = new File( target, "maven-jlink-plugin-mjlink-9-app-96.0.zip" );
-assert artifact.isFile()
+module com.reactor.project.dist {
+ requires com.reactor.project.app;
-// optional: check if it contains a launcher script
+}
diff --git a/src/it/projects/MJLINK-9_reactor/pom.xml b/src/it/projects/MJLINK-9_reactor/pom.xml
index 97e2921..604174a 100644
--- a/src/it/projects/MJLINK-9_reactor/pom.xml
+++ b/src/it/projects/MJLINK-9_reactor/pom.xml
@@ -39,6 +39,7 @@
<modules>
<module>api</module>
<module>app</module>
+ <module>dist</module>
</modules>
<build>
@@ -47,7 +48,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.8.0</version>
+ <version>3.8.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/src/it/projects/MJLINK-9_reactor/verify.groovy b/src/it/projects/MJLINK-9_reactor/verify.groovy
index a2e0c8e..f2f1267 100644
--- a/src/it/projects/MJLINK-9_reactor/verify.groovy
+++ b/src/it/projects/MJLINK-9_reactor/verify.groovy
@@ -23,13 +23,16 @@ import java.util.*
import java.util.jar.*
import org.codehaus.plexus.util.*
-File target = new File( basedir, "app/target" );
+File target = new File( basedir, "app/target" )
assert target.isDirectory()
-File jarArtifact = new File( target, "maven-jlink-plugin-mjlink-9-app-96.0-orig.jar" );
+File jarArtifact = new File( target, "maven-jlink-plugin-mjlink-9-app-96.0.jar" )
assert jarArtifact.isFile()
-File artifact = new File( target, "maven-jlink-plugin-mjlink-9-app-96.0.zip" );
+File distTarget = new File( basedir, "dist/target" )
+assert distTarget.isDirectory()
+
+File artifact = new File( distTarget, "maven-jlink-plugin-mjlink-9-dist-96.0.zip" )
assert artifact.isFile()
// optional: check if it contains a launcher script