Merge pull request #323 from wttech/mvnw-improvement

Maven wrapper improvement

Author: krystian-panek-vmltech

pkg/project/app_classic/Taskfile.yml

@@ -8,8 +8,7 @@ env:
   AEM_ENV: '{{.AEM_ENV | default "local"}}'
   AEM_INSTANCE_PROCESSING_MODE: auto
   AEM_OUTPUT_VALUE: NONE
-  JAVA_HOME:
-    sh: sh aemw vendor list -V javaHome
+  AEM_JAVA_ENABLED: true
 
 dotenv:
   - '.env'              # VCS-ignored, user-specific
@@ -197,9 +196,7 @@ tasks:
 
   aem:build:version:
     desc: check build tool versions
-    cmds:
-      - echo "JAVA_HOME=${JAVA_HOME}"
-      - sh mvnw -version
+    cmd: sh mvnw --version
 
   aem:deploy:
     desc: deploy AEM application

pkg/project/app_cloud/Taskfile.yml

@@ -8,8 +8,7 @@ env:
   AEM_ENV: '{{.AEM_ENV | default "local"}}'
   AEM_INSTANCE_PROCESSING_MODE: auto
   AEM_OUTPUT_VALUE: NONE
-  JAVA_HOME:
-    sh: sh aemw vendor list -V javaHome
+  AEM_JAVA_ENABLED: true
 
 dotenv:
   - '.env'              # VCS-ignored, user-specific
@@ -192,9 +191,7 @@ tasks:
 
   aem:build:version:
     desc: check build tool versions
-    cmds:
-      - echo "JAVA_HOME=${JAVA_HOME}"
-      - sh mvnw -version
+    cmd: sh mvnw --version
 
   aem:deploy:
     desc: deploy AEM application

pkg/project/common/mvnw

@@ -18,6 +18,35 @@
 # under the License.
 # ----------------------------------------------------------------------------
 
+# ----------------------------------------------------------------------------
+# AEM Compose - Ensure Java is vendored and prepared
+# ----------------------------------------------------------------------------
+AEM_JAVA_ENABLED=${AEM_JAVA_ENABLED:-true}
+if [ "${AEM_JAVA_ENABLED}" = true ]; then
+  AEM_JAVA_HOME="$(sh aemw vendor list -V javaHome 2>/dev/null || true)"
+
+  if [ -z "$AEM_JAVA_HOME" ] || [ ! -d "$AEM_JAVA_HOME" ] || [ ! -x "$AEM_JAVA_HOME/bin/java" ]; then
+    echo "AEM Compose - Vendor tools not prepared (Java). Preparing now..."
+    if ! sh aemw vendor prepare; then
+      rc=$?
+      echo "AEM Compose - Vendor tools cannot be prepared (exit $rc). Cannot continue!"
+      echo "Run command 'sh aemw vendor prepare' and inspect the error."
+      exit $rc
+    fi
+
+    AEM_JAVA_HOME="$(sh aemw vendor list -V javaHome 2>/dev/null || true)"
+    if [ -z "$AEM_JAVA_HOME" ] || [ ! -d "$AEM_JAVA_HOME" ] || [ ! -x "$AEM_JAVA_HOME/bin/java" ]; then
+      echo "AEM Compose - Vendor tools cannot be prepared. Cannot continue!"
+      echo "Run command 'sh aemw vendor prepare' and inspect the error."
+      exit 1
+    fi
+
+    echo "AEM Compose - Vendor tools prepared. Java available at '${AEM_JAVA_HOME}'"
+  fi
+
+  JAVA_HOME="$AEM_JAVA_HOME"; export JAVA_HOME
+fi
+
 # ----------------------------------------------------------------------------
 # Apache Maven Wrapper startup batch script, version 3.2.0
 #

pkg/project/instance/Taskfile.yml

@@ -8,8 +8,7 @@ env:
   AEM_ENV: '{{.AEM_ENV | default "local"}}'
   AEM_INSTANCE_PROCESSING_MODE: auto
   AEM_OUTPUT_VALUE: NONE
-  JAVA_HOME:
-    sh: sh aemw vendor list -V javaHome
+  AEM_JAVA_ENABLED: true
 
 dotenv:
   - '.env'              # VCS-ignored, user-specific