Merge pull request #286 from yermak/development

Increment from 5.5.18
yermak · Aug 15, 2021 · 9a07a7b · 9a07a7b
2 parents 4d5fbf3 + 1128ba4
commit 9a07a7b
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -17,7 +17,10 @@ steps:
     displayName: 'Cache Maven local repo'
 
   - script: |
-      choco install openjdk --version 16.0.2 --no-progress
+      choco install wget --no-progress
+      wget -q https://download.java.net/java/GA/jdk16.0.2/d4a915d82b4c4fbb9bde534da945d746/7/GPL/openjdk-16.0.2_windows-x64_bin.zip -O openjdk-16.0.2_windows-x64_bin.zip
+      unzip openjdk-16.0.2_windows-x64_bin.zip
+      setx JAVA_HOME jdk-16.0.2
       call refreshenv
-      call mvn clean package -Dexec.skip=true --no-transfer-progress $(MAVEN_OPTS)
+      call mvn -X clean package -Dexec.skip=true --no-transfer-progress $(MAVEN_OPTS)
     displayName: 'Build app without installer'
diff --git a/build_binaries.yml b/build_binaries.yml
@@ -85,15 +85,17 @@ jobs:
 
     - script: |
         ECHO ON
-        choco install openjdk --version 16.0.2 --no-progress
         choco install 7zip --no-progress
         choco install wget --no-progress
+        wget -q https://download.java.net/java/GA/jdk16.0.2/d4a915d82b4c4fbb9bde534da945d746/7/GPL/openjdk-16.0.2_windows-x64_bin.zip -O openjdk-16.0.2_windows-x64_bin.zip
+        unzip openjdk-16.0.2_windows-x64_bin.zip
+        setx JAVA_HOME jdk-16.0.2
         call refreshenv
         wget -q https://gluonhq.com/download/javafx-16-jmods-windows/ -O openjfx-16_windows-x64_bin-jmods.zip
-        unzip openjfx-16_windows-x64_bin-jmods.zip
+        7z.exe x openjfx-16_windows-x64_bin-jmods.zip
         SET JAVAFX_JMODS=javafx-jmods-16
 
-        call mvn clean package --no-transfer-progress
+        call mvn -X clean package --no-transfer-progress
 
         call build/windows/package.bat "%JAVA_HOME%" %JAVAFX_JMODS% $(APP_VERSION)
 

diff --git a/release-all.yml b/release-all.yml
@@ -88,15 +88,17 @@ jobs:
 
     - script: |
         ECHO ON
-        choco install openjdk --version 16.0.2 --no-progress
         choco install 7zip --no-progress
         choco install wget --no-progress
+        wget -q https://download.java.net/java/GA/jdk16.0.2/d4a915d82b4c4fbb9bde534da945d746/7/GPL/openjdk-16.0.2_windows-x64_bin.zip -O openjdk-16.0.2_windows-x64_bin.zip
+        unzip openjdk-16.0.2_windows-x64_bin.zip
+        setx JAVA_HOME jdk-16.0.2
         call refreshenv
         wget -q https://gluonhq.com/download/javafx-16-jmods-windows/ -O openjfx-16_windows-x64_bin-jmods.zip
-        unzip openjfx-16_windows-x64_bin-jmods.zip
+        7z.exe x openjfx-16_windows-x64_bin-jmods.zip
         SET JAVAFX_JMODS=javafx-jmods-16
 
-        call mvn clean package --no-transfer-progress
+        call mvn -X clean package --no-transfer-progress
 
         call build/windows/package.bat "%JAVA_HOME%" %JAVAFX_JMODS% $(APP_VERSION)