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:49:39 UTC
[maven-jlink-plugin] branch JLINK-9 updated (00ce056 -> a330205)
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a change to branch JLINK-9
in repository https://gitbox.apache.org/repos/asf/maven-jlink-plugin.git.
discard 00ce056 [MJLINK-9] - Add support for multi module projects
new a330205 [MJLINK-9] - Add support for multi module projects
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (00ce056)
\
N -- N -- N refs/heads/JLINK-9 (a330205)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
[maven-jlink-plugin] 01/01: [MJLINK-9] - Add support for multi
module projects
Posted by kh...@apache.org.
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 a330205dbe1d95b475fceeea05d3a125bbf1d315
Author: Benjamin Marwell <bm...@apache.org>
AuthorDate: Wed Nov 11 21:48:17 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