You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by th...@apache.org on 2020/11/21 22:10:38 UTC

[tapestry-5] 02/02: TAP5-2641: fixing automatic module names

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

thiagohp pushed a commit to branch java9modules
in repository https://gitbox.apache.org/repos/asf/tapestry-5.git

commit 63caee42442b7bc643eccb056640121c3c4cdde2
Author: Thiago H. de Paula Figueiredo <th...@arsmachina.com.br>
AuthorDate: Sat Nov 21 19:10:03 2020 -0300

    TAP5-2641: fixing automatic module names
---
 build.gradle | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index a785843..93ea122 100755
--- a/build.gradle
+++ b/build.gradle
@@ -225,7 +225,7 @@ subprojects {
     }
 
     jar {
-    	// println "JAR projectDir: " + projectDir.getName().replaceAll("5", "").replaceAll("tapestry-", "");
+    	// println "JAR projectDir: " + projectDir.getName().replaceAll("5", "").replaceAll("tapestry-", "").replaceAll("-", "");
         from(projectDir) {
             include "*.txt"
             into "META-INF"
@@ -233,7 +233,8 @@ subprojects {
         manifest {
         	attributes("Automatic-Module-Name": "org.apache.tapestry." + projectDir.getName()
         		.replaceAll("tapestry5", "tapestry")
-        		.replaceAll("tapestry-", ""))
+        		.replaceAll("tapestry-", "")
+        		.replaceAll("-", ""))        		
         	if (projectDir.getName().equals("tapestry-version-migrator")) {
         		attributes("Main-Class": "org.apache.tapestry5.versionmigrator.Main")
         	}