Mvnw optional on java

scottkurz · Sep 11, 2019 · c29bda5 · c29bda5
1 parent 9dc9c18
commit c29bda5
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/incubator/java-microprofile/image/project/.appsody-init.bat b/incubator/java-microprofile/image/project/.appsody-init.bat
@@ -1 +1,6 @@
-mvnw install -Denforcer.skip=true
+setlocal
+set JAVA_FOUND=0
+where java >nul 2>nul
+if %ERRORLEVEL% EQU 0 set JAVA_FOUND=1
+if defined JAVA_HOME set JAVA_FOUND=1
+if "%JAVA_FOUND%"==1 mvnw install -Denforcer.skip=true
diff --git a/incubator/java-microprofile/image/project/.appsody-init.sh b/incubator/java-microprofile/image/project/.appsody-init.sh
@@ -1,2 +1,5 @@
 #!/bin/bash
-./mvnw install -Denforcer.skip=true
+which java 2>&1 >/dev/null ; JAVA_KNOWN=$?
+if [ ! -z "$JAVA_HOME" ] || [ $JAVA_KNOWN = "0" ]; then
+  ./mvnw install -Denforcer.skip=true
+fi
diff --git a/incubator/java-microprofile/image/project/pom.xml b/incubator/java-microprofile/image/project/pom.xml
@@ -14,7 +14,7 @@
 
     <groupId>dev.appsody</groupId>
     <artifactId>java-microprofile</artifactId>
-    <version>0.2.13</version>
+    <version>0.2.14</version>
     <packaging>pom</packaging>
 
     <properties>

diff --git a/incubator/java-microprofile/stack.yaml b/incubator/java-microprofile/stack.yaml
@@ -1,5 +1,5 @@
 name: Eclipse MicroProfile®
-version: 0.2.13
+version: 0.2.14
 description: Eclipse MicroProfile on Open Liberty & OpenJ9 using Maven
 license: Apache-2.0
 language: java