Skip to content

Fixing JavaScript support for Java 17 builds #4611

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shai-almog merged 1 commit into from
Mar 13, 2026
+29 −1
Merged

Fixing JavaScript support for Java 17 builds #4611

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions scripts/hellocodenameone/javascript/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,17 @@
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.4.1</version>
<executions>
<execution>
<id>default-jar</id>
<phase>none</phase>
</execution>
</executions>
</plugin>
<plugin>
<groupId>com.codenameone</groupId>
<artifactId>codenameone-maven-plugin</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion scripts/initializr/common/src/main/java/com/codename1/initializr/model/GeneratorModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand Down
6 changes: 6 additions & 0 deletions ...tializr/common/src/test/java/com/codename1/initializr/model/GeneratorModelMatrixTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,12 @@ private void validateExperimentalJava17RegressionFixes() throws Exception {
assertContains(iosPom, "<version>3.4.1</version>", "iOS module should pin maven-jar-plugin version");
assertContains(iosPom, "<id>default-jar</id>", "iOS module should target default-jar execution");
assertContains(iosPom, "<phase>none</phase>", "iOS module should disable default-jar execution to avoid duplicate attach in cn1:build");

String javascriptPom = getText(entries, "javascript/pom.xml");
assertContains(javascriptPom, "<artifactId>maven-jar-plugin</artifactId>", "JavaScript module should configure maven-jar-plugin explicitly");
assertContains(javascriptPom, "<version>3.4.1</version>", "JavaScript module should pin maven-jar-plugin version");
assertContains(javascriptPom, "<id>default-jar</id>", "JavaScript module should target default-jar execution");
assertContains(javascriptPom, "<phase>none</phase>", "JavaScript module should disable default-jar execution to avoid duplicate attach in cn1:build");
}

private void validateCombination(Template template, IDE ide) throws Exception {
Expand Down
11 changes: 11 additions & 0 deletions scripts/initializr/javascript/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,17 @@
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.4.1</version>
<executions>
<execution>
<id>default-jar</id>
<phase>none</phase>
</execution>
</executions>
</plugin>
<plugin>
<groupId>com.codenameone</groupId>
<artifactId>codenameone-maven-plugin</artifactId>
Expand Down
Loading