diff --git a/java/form/build.xml b/java/form/build.xml index d043dc465170..141c5d198473 100644 --- a/java/form/build.xml +++ b/java/form/build.xml @@ -25,7 +25,7 @@ - + diff --git a/java/form/nbproject/project.properties b/java/form/nbproject/project.properties index e75c574bac4d..49cb7925b28b 100644 --- a/java/form/nbproject/project.properties +++ b/java/form/nbproject/project.properties @@ -15,8 +15,17 @@ # specific language governing permissions and limitations # under the License. + +# 'error: exporting a package from system module java.desktop is not allowed with --release' +javac.source=17 +javac.target=17 + +absolutelayout.javac.release=8 extra.module.files=modules/ext/AbsoluteLayout.jar -javac.source=1.8 + +# see o.n.m.form.fakepeer package +javac.compilerargs=--add-exports=java.desktop/java.awt.peer=ALL-UNNAMED + javadoc.arch=${basedir}/arch.xml spec.version.base=1.88.0 test-unit-sys-prop.org.netbeans.modules.form.layoutdesign.test=0 diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/CustomJavac.java b/nbbuild/antsrc/org/netbeans/nbbuild/CustomJavac.java index e4215b753d6d..1a025149fbad 100644 --- a/nbbuild/antsrc/org/netbeans/nbbuild/CustomJavac.java +++ b/nbbuild/antsrc/org/netbeans/nbbuild/CustomJavac.java @@ -78,7 +78,7 @@ public void execute() throws BuildException { if (tgr.matches("\\d+")) { tgr = "1." + tgr; } - if (!isBootclasspathOptionUsed()) { + if (canUseRelease()) { setRelease(tgr.substring(2)); } String src = getSource(); @@ -135,13 +135,14 @@ protected void compile() { super.compile(); } - private boolean isBootclasspathOptionUsed() { + private boolean canUseRelease() { + // 'error: exporting a package from system module java.desktop is not allowed with --release' for (String arg : getCurrentCompilerArgs()) { - if (arg.contains("-Xbootclasspath")) { - return true; + if (arg.contains("-Xbootclasspath") || arg.contains("--add-exports=java.")) { + return false; } } - return false; + return true; } /**