Add Automatic Module Name, fixes #530

jline · May 11, 2020 · a6176bc · a6176bc
1 parent 80265b4
commit a6176bc
Show file tree

Hide file tree

Showing 12 changed files with 56 additions and 7 deletions.
diff --git a/builtins/pom.xml b/builtins/pom.xml
@@ -22,6 +22,10 @@
     <artifactId>jline-builtins</artifactId>
     <name>JLine Builtins</name>
 
+    <properties>
+        <automatic.module.name>org.jline.builtins</automatic.module.name>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>org.jline</groupId>

diff --git a/demo/pom.xml b/demo/pom.xml
@@ -22,6 +22,10 @@
     <artifactId>jline-demo</artifactId>
     <name>JLine Demo</name>
 
+    <properties>
+        <automatic.module.name>org.jline.demo</automatic.module.name>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>org.jline</groupId>

diff --git a/groovy/pom.xml b/groovy/pom.xml
@@ -19,6 +19,11 @@
     <artifactId>jline-groovy</artifactId>
     <name>JLine Groovy</name>
     <url>http://maven.apache.org</url>
+
+    <properties>
+        <automatic.module.name>org.jline.groovy</automatic.module.name>
+    </properties>
+
     <dependencies>
          <dependency>
             <groupId>org.jline</groupId>

diff --git a/jline/pom.xml b/jline/pom.xml
@@ -22,6 +22,10 @@
     <artifactId>jline</artifactId>
     <name>JLine Bundle</name>
 
+    <properties>
+        <automatic.module.name>org.jline</automatic.module.name>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>org.fusesource.jansi</groupId>

diff --git a/pom.xml b/pom.xml
@@ -79,6 +79,7 @@
         <maven.compiler.target>1.8</maven.compiler.target>
 
         <native.image.skip>true</native.image.skip>
+        <automatic.module.name></automatic.module.name>
 
         <jna.version>5.3.1</jna.version>
         <jansi.version>1.18</jansi.version>
@@ -455,6 +456,9 @@
                 <configuration>
                     <archive>
                         <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+                        <manifestEntries>
+                            <Automatic-Module-Name>${automatic.module.name}</Automatic-Module-Name>
+                        </manifestEntries>
                     </archive>
                 </configuration>
             </plugin>

diff --git a/reader/pom.xml b/reader/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2002-2016, the original author or authors.
+    Copyright (c) 2002-2020, the original author or authors.
 
     This software is distributable under the BSD license. See the terms of the
     BSD license in the documentation provided with this software.
@@ -22,6 +22,10 @@
     <artifactId>jline-reader</artifactId>
     <name>JLine Reader</name>
 
+    <properties>
+        <automatic.module.name>org.jline.reader</automatic.module.name>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>org.jline</groupId>

diff --git a/remote-ssh/pom.xml b/remote-ssh/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2002-2017, the original author or authors.
+    Copyright (c) 2002-2020, the original author or authors.
 
     This software is distributable under the BSD license. See the terms of the
     BSD license in the documentation provided with this software.
@@ -22,6 +22,10 @@
     <artifactId>jline-remote-ssh</artifactId>
     <name>JLine Remote SSH</name>
 
+    <properties>
+        <automatic.module.name>org.jline.remote.ssh</automatic.module.name>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>org.jline</groupId>

diff --git a/remote-telnet/pom.xml b/remote-telnet/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2002-2017, the original author or authors.
+    Copyright (c) 2002-2020, the original author or authors.
 
     This software is distributable under the BSD license. See the terms of the
     BSD license in the documentation provided with this software.
@@ -22,6 +22,10 @@
     <artifactId>jline-remote-telnet</artifactId>
     <name>JLine Remote Telnet</name>
 
+    <properties>
+        <automatic.module.name>org.jline.remote.telnet</automatic.module.name>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>org.jline</groupId>

diff --git a/style/pom.xml b/style/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2002-2016, the original author or authors.
+    Copyright (c) 2002-2020, the original author or authors.
 
     This software is distributable under the BSD license. See the terms of the
     BSD license in the documentation provided with this software.
@@ -22,6 +22,10 @@
     <artifactId>jline-style</artifactId>
     <name>JLine Style</name>
 
+    <properties>
+        <automatic.module.name>org.jline.style</automatic.module.name>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>org.jline</groupId>

diff --git a/terminal-jansi/pom.xml b/terminal-jansi/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2002-2017, the original author or authors.
+    Copyright (c) 2002-2020, the original author or authors.
 
     This software is distributable under the BSD license. See the terms of the
     BSD license in the documentation provided with this software.
@@ -22,6 +22,10 @@
     <artifactId>jline-terminal-jansi</artifactId>
     <name>JLine JANSI Terminal</name>
 
+    <properties>
+        <automatic.module.name>org.jline.terminal.jansi</automatic.module.name>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>org.fusesource.jansi</groupId>

diff --git a/terminal-jna/pom.xml b/terminal-jna/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2002-2016, the original author or authors.
+    Copyright (c) 2002-2020, the original author or authors.
 
     This software is distributable under the BSD license. See the terms of the
     BSD license in the documentation provided with this software.
@@ -22,6 +22,10 @@
     <artifactId>jline-terminal-jna</artifactId>
     <name>JLine JNA Terminal</name>
 
+    <properties>
+        <automatic.module.name>org.jline.terminal.jna</automatic.module.name>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>net.java.dev.jna</groupId>

diff --git a/terminal/pom.xml b/terminal/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2002-2016, the original author or authors.
+    Copyright (c) 2002-2020, the original author or authors.
 
     This software is distributable under the BSD license. See the terms of the
     BSD license in the documentation provided with this software.
@@ -22,6 +22,10 @@
     <artifactId>jline-terminal</artifactId>
     <name>JLine Terminal</name>
 
+    <properties>
+        <automatic.module.name>org.jline.terminal</automatic.module.name>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>org.easymock</groupId>