From e90613791b341c16663ccb0dd6f431623aa0e8cd Mon Sep 17 00:00:00 2001 From: yermak Date: Sat, 14 Aug 2021 08:01:42 +0100 Subject: [PATCH 01/10] java 16 build --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 8f3898a5..c3e30173 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -17,7 +17,7 @@ steps: displayName: 'Cache Maven local repo' - script: | - choco install openjdk --version 16.0.2 --no-progress + choco install openjdk --no-progress call refreshenv call mvn clean package -Dexec.skip=true --no-transfer-progress $(MAVEN_OPTS) displayName: 'Build app without installer' From 712beb65886680f720a34d2c9a98ff4430f00942 Mon Sep 17 00:00:00 2001 From: yermak Date: Sat, 14 Aug 2021 08:04:48 +0100 Subject: [PATCH 02/10] java 16 build --- build_binaries.yml | 2 +- release-all.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build_binaries.yml b/build_binaries.yml index 6c506fde..16bc390a 100644 --- a/build_binaries.yml +++ b/build_binaries.yml @@ -85,7 +85,7 @@ jobs: - script: | ECHO ON - choco install openjdk --version 16.0.2 --no-progress + choco install openjdk --no-progress choco install 7zip --no-progress choco install wget --no-progress call refreshenv diff --git a/release-all.yml b/release-all.yml index 2ed08a38..b3dffc58 100644 --- a/release-all.yml +++ b/release-all.yml @@ -88,7 +88,7 @@ jobs: - script: | ECHO ON - choco install openjdk --version 16.0.2 --no-progress + choco install openjdk --no-progress choco install 7zip --no-progress choco install wget --no-progress call refreshenv From 6dc91c2d8b7c2112a9cfc2cfb09c4eaeea5491a9 Mon Sep 17 00:00:00 2001 From: yermak Date: Sun, 15 Aug 2021 10:14:00 +0100 Subject: [PATCH 03/10] java 16 build --- azure-pipelines.yml | 2 +- build_binaries.yml | 2 +- release-all.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index c3e30173..8f3898a5 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -17,7 +17,7 @@ steps: displayName: 'Cache Maven local repo' - script: | - choco install openjdk --no-progress + choco install openjdk --version 16.0.2 --no-progress call refreshenv call mvn 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 index 16bc390a..6c506fde 100644 --- a/build_binaries.yml +++ b/build_binaries.yml @@ -85,7 +85,7 @@ jobs: - script: | ECHO ON - choco install openjdk --no-progress + choco install openjdk --version 16.0.2 --no-progress choco install 7zip --no-progress choco install wget --no-progress call refreshenv diff --git a/release-all.yml b/release-all.yml index b3dffc58..2ed08a38 100644 --- a/release-all.yml +++ b/release-all.yml @@ -88,7 +88,7 @@ jobs: - script: | ECHO ON - choco install openjdk --no-progress + choco install openjdk --version 16.0.2 --no-progress choco install 7zip --no-progress choco install wget --no-progress call refreshenv From 3bc8bf07096507960e32390c41a63586d381e553 Mon Sep 17 00:00:00 2001 From: yermak Date: Sun, 15 Aug 2021 12:00:46 +0100 Subject: [PATCH 04/10] java 16 build --- azure-pipelines.yml | 2 +- build_binaries.yml | 2 +- release-all.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 8f3898a5..fcf856af 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -19,5 +19,5 @@ steps: - script: | choco install openjdk --version 16.0.2 --no-progress 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 index 6c506fde..82356536 100644 --- a/build_binaries.yml +++ b/build_binaries.yml @@ -93,7 +93,7 @@ jobs: unzip 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 index 2ed08a38..a980dfd4 100644 --- a/release-all.yml +++ b/release-all.yml @@ -96,7 +96,7 @@ jobs: unzip 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) From 1caf0a4d1e9caa7e8ef32a73e9a90932b1b63720 Mon Sep 17 00:00:00 2001 From: yermak Date: Sun, 15 Aug 2021 16:26:51 +0100 Subject: [PATCH 05/10] java 16 build --- azure-pipelines.yml | 7 ++++++- build_binaries.yml | 5 ++++- release-all.yml | 5 ++++- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index fcf856af..61e74049 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -17,7 +17,12 @@ 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 + SET JAVA_HOME=jdk-16.0.2 + echo %JAVA_HOME% call refreshenv + echo %JAVA_HOME% 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 index 82356536..87efeab1 100644 --- a/build_binaries.yml +++ b/build_binaries.yml @@ -85,9 +85,12 @@ jobs: - script: | ECHO ON - choco install openjdk --version 16.0.2 --no-progress +# 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 + SET 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 diff --git a/release-all.yml b/release-all.yml index a980dfd4..be02f73c 100644 --- a/release-all.yml +++ b/release-all.yml @@ -88,9 +88,12 @@ jobs: - script: | ECHO ON - choco install openjdk --version 16.0.2 --no-progress +# 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 + SET 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 From 0cf9da4046a122d50c5ab43f689c840ab1235064 Mon Sep 17 00:00:00 2001 From: yermak Date: Sun, 15 Aug 2021 16:31:50 +0100 Subject: [PATCH 06/10] java 16 build --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 61e74049..fcf7ce9d 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -20,7 +20,7 @@ steps: 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 - SET JAVA_HOME=jdk-16.0.2 + setx JAVA_HOME=jdk-16.0.2 echo %JAVA_HOME% call refreshenv echo %JAVA_HOME% From 90ab34ec8a4af4e412dbfc103bdf2f0e3fdcd7a1 Mon Sep 17 00:00:00 2001 From: yermak Date: Sun, 15 Aug 2021 16:36:23 +0100 Subject: [PATCH 07/10] java 16 build --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index fcf7ce9d..27702fb8 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -20,7 +20,7 @@ steps: 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 + setx JAVA_HOME jdk-16.0.2 echo %JAVA_HOME% call refreshenv echo %JAVA_HOME% From cb86aa1b560e8b932a255fe7dff3d790932e5e2a Mon Sep 17 00:00:00 2001 From: yermak Date: Sun, 15 Aug 2021 16:40:23 +0100 Subject: [PATCH 08/10] java 16 build --- azure-pipelines.yml | 2 -- build_binaries.yml | 2 +- release-all.yml | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 27702fb8..749e13d5 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -21,8 +21,6 @@ steps: 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 - echo %JAVA_HOME% call refreshenv - echo %JAVA_HOME% 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 index 87efeab1..3650cb27 100644 --- a/build_binaries.yml +++ b/build_binaries.yml @@ -90,7 +90,7 @@ jobs: 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 - SET JAVA_HOME=jdk-16.0.2 + 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 diff --git a/release-all.yml b/release-all.yml index be02f73c..4bf7dd00 100644 --- a/release-all.yml +++ b/release-all.yml @@ -93,7 +93,7 @@ jobs: 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 - SET JAVA_HOME=jdk-16.0.2 + 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 From 06b543b1b6edde13dc162015d08e9388fc6d56e4 Mon Sep 17 00:00:00 2001 From: yermak Date: Sun, 15 Aug 2021 16:46:14 +0100 Subject: [PATCH 09/10] java 16 build --- build_binaries.yml | 1 - release-all.yml | 1 - 2 files changed, 2 deletions(-) diff --git a/build_binaries.yml b/build_binaries.yml index 3650cb27..cd4cefda 100644 --- a/build_binaries.yml +++ b/build_binaries.yml @@ -85,7 +85,6 @@ 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 diff --git a/release-all.yml b/release-all.yml index 4bf7dd00..62a659dc 100644 --- a/release-all.yml +++ b/release-all.yml @@ -88,7 +88,6 @@ 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 From 24a85aa1697fe8791fcf498da454a8f0c8169f73 Mon Sep 17 00:00:00 2001 From: yermak Date: Sun, 15 Aug 2021 17:22:55 +0100 Subject: [PATCH 10/10] java 16 build --- build_binaries.yml | 2 +- release-all.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build_binaries.yml b/build_binaries.yml index cd4cefda..11084397 100644 --- a/build_binaries.yml +++ b/build_binaries.yml @@ -92,7 +92,7 @@ jobs: 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 -X clean package --no-transfer-progress diff --git a/release-all.yml b/release-all.yml index 62a659dc..a62a2f2a 100644 --- a/release-all.yml +++ b/release-all.yml @@ -95,7 +95,7 @@ jobs: 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 -X clean package --no-transfer-progress