From 6fbbc79ebb939efa13e032481029dca99e1fd517 Mon Sep 17 00:00:00 2001
From: Krystian Panek <krystian.panek@vml.com>
Date: Fri, 23 Oct 2026 15:04:37 +0200
Subject: [PATCH] Export jdk.compiler packages in mvnw on Java 9+

---
 mvnw                    | 7 +++++++
 pkg/project/common/mvnw | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/mvnw b/mvnw
index 34a21de1..6bc5c782 100755
--- a/mvnw
+++ b/mvnw
@@ -60,6 +60,13 @@ if [ "${AEM_JAVA_ENABLED}" = true ]; then
   JAVA_HOME="$AEM_JAVA_HOME"; export JAVA_HOME
 fi
 
+if [ -n "$JAVA_HOME" ] && [ -x "$JAVA_HOME/bin/java" ]; then
+  if "$JAVA_HOME/bin/java" --add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED -version >/dev/null 2>&1; then
+    MAVEN_OPTS="${MAVEN_OPTS} --add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED --add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED --add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED --add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED --add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"
+    export MAVEN_OPTS
+  fi
+fi
+
 # ----------------------------------------------------------------------------
 # Apache Maven Wrapper startup batch script, version 3.2.0
 #
diff --git a/pkg/project/common/mvnw b/pkg/project/common/mvnw
index 88a9d238..05820d27 100644
--- a/pkg/project/common/mvnw
+++ b/pkg/project/common/mvnw
@@ -60,6 +60,13 @@ if [ "${AEM_JAVA_ENABLED}" = true ]; then
   JAVA_HOME="$AEM_JAVA_HOME"; export JAVA_HOME
 fi
 
+if [ -n "$JAVA_HOME" ] && [ -x "$JAVA_HOME/bin/java" ]; then
+  if "$JAVA_HOME/bin/java" --add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED -version >/dev/null 2>&1; then
+    MAVEN_OPTS="${MAVEN_OPTS} --add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED --add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED --add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED --add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED --add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"
+    export MAVEN_OPTS
+  fi
+fi
+
 # ----------------------------------------------------------------------------
 # Apache Maven Wrapper startup batch script, version 3.2.0
 #