diff --git a/scripts/hellocodenameone/javascript/pom.xml b/scripts/hellocodenameone/javascript/pom.xml index 13f64ecfb7..1ebdd765cf 100644 --- a/scripts/hellocodenameone/javascript/pom.xml +++ b/scripts/hellocodenameone/javascript/pom.xml @@ -30,6 +30,17 @@ + + org.apache.maven.plugins + maven-jar-plugin + 3.4.1 + + + default-jar + none + + + com.codenameone codenameone-maven-plugin diff --git a/scripts/initializr/common/src/main/java/com/codename1/initializr/model/GeneratorModel.java b/scripts/initializr/common/src/main/java/com/codename1/initializr/model/GeneratorModel.java index f5fb02aba1..06df9adc38 100644 --- a/scripts/initializr/common/src/main/java/com/codename1/initializr/model/GeneratorModel.java +++ b/scripts/initializr/common/src/main/java/com/codename1/initializr/model/GeneratorModel.java @@ -216,7 +216,7 @@ private byte[] applyDataReplacements(String targetPath, byte[] sourceData) throw content = replaceTagValue(content, "cn1.plugin.version", CN1_PLUGIN_VERSION); content = replaceTagValue(content, "cn1.version", CN1_PLUGIN_VERSION); } - if ("android/pom.xml".equals(targetPath) || "ios/pom.xml".equals(targetPath)) { + if ("android/pom.xml".equals(targetPath) || "ios/pom.xml".equals(targetPath) || "javascript/pom.xml".equals(targetPath)) { content = hardenPlatformModulePomAgainstDoubleJarAttach(content); } if ("javase/pom.xml".equals(targetPath)) { diff --git a/scripts/initializr/common/src/test/java/com/codename1/initializr/model/GeneratorModelMatrixTest.java b/scripts/initializr/common/src/test/java/com/codename1/initializr/model/GeneratorModelMatrixTest.java index bab4df80b4..024a820cee 100644 --- a/scripts/initializr/common/src/test/java/com/codename1/initializr/model/GeneratorModelMatrixTest.java +++ b/scripts/initializr/common/src/test/java/com/codename1/initializr/model/GeneratorModelMatrixTest.java @@ -171,6 +171,12 @@ private void validateExperimentalJava17RegressionFixes() throws Exception { assertContains(iosPom, "3.4.1", "iOS module should pin maven-jar-plugin version"); assertContains(iosPom, "default-jar", "iOS module should target default-jar execution"); assertContains(iosPom, "none", "iOS module should disable default-jar execution to avoid duplicate attach in cn1:build"); + + String javascriptPom = getText(entries, "javascript/pom.xml"); + assertContains(javascriptPom, "maven-jar-plugin", "JavaScript module should configure maven-jar-plugin explicitly"); + assertContains(javascriptPom, "3.4.1", "JavaScript module should pin maven-jar-plugin version"); + assertContains(javascriptPom, "default-jar", "JavaScript module should target default-jar execution"); + assertContains(javascriptPom, "none", "JavaScript module should disable default-jar execution to avoid duplicate attach in cn1:build"); } private void validateCombination(Template template, IDE ide) throws Exception { diff --git a/scripts/initializr/javascript/pom.xml b/scripts/initializr/javascript/pom.xml index df0b26023c..a68c0251d5 100644 --- a/scripts/initializr/javascript/pom.xml +++ b/scripts/initializr/javascript/pom.xml @@ -30,6 +30,17 @@ + + org.apache.maven.plugins + maven-jar-plugin + 3.4.1 + + + default-jar + none + + + com.codenameone codenameone-maven-plugin