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 2019/03/24 09:37:58 UTC

[maven-jlink-plugin] branch MJLINK-29 updated (9b52c95 -> c00339b)

This is an automated email from the ASF dual-hosted git repository.

khmarbaise pushed a change to branch MJLINK-29
in repository https://gitbox.apache.org/repos/asf/maven-jlink-plugin.git.


 discard 9b52c95  Added fixed version of maven-invoker-plugin 3.2.0
     new c00339b  Added fixed version of maven-invoker-plugin 3.2.0

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   (9b52c95)
            \
             N -- N -- N   refs/heads/MJLINK-29 (c00339b)

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:
 src/main/java/org/apache/maven/plugins/jlink/JLinkMojo.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


[maven-jlink-plugin] 01/01: Added fixed version of maven-invoker-plugin 3.2.0

Posted by kh...@apache.org.
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 c00339bb9a6f8609c086f485503cf1756710c352
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Sat Mar 23 21:19:24 2019 +0100

    Added fixed version of maven-invoker-plugin 3.2.0
---
 pom.xml                                                     | 1 +
 src/main/java/org/apache/maven/plugins/jlink/JLinkMojo.java | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6856ba7..54cef77 100644
--- a/pom.xml
+++ b/pom.xml
@@ -203,6 +203,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-invoker-plugin</artifactId>
+            <version>3.2.0</version>
             <configuration>
               <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
               <environmentVariables>
diff --git a/src/main/java/org/apache/maven/plugins/jlink/JLinkMojo.java b/src/main/java/org/apache/maven/plugins/jlink/JLinkMojo.java
index 137c6b8..de9c003 100644
--- a/src/main/java/org/apache/maven/plugins/jlink/JLinkMojo.java
+++ b/src/main/java/org/apache/maven/plugins/jlink/JLinkMojo.java
@@ -269,7 +269,7 @@ public class JLinkMojo
         File jmodsFolder;
         if ( sourceJdkModules != null && sourceJdkModules.isDirectory() )
         {
-            jmodsFolder = new File ( sourceJdkModules, JMODS );
+            jmodsFolder = new File( sourceJdkModules, JMODS );
         }
         else
         {
@@ -412,7 +412,7 @@ public class JLinkMojo
                 }
             }
 
-        }   
+        }
         catch ( IOException e )
         {
             getLog().error( e.getMessage() );