DSS-2672 : update java and javafx builds to version 17

esig · Jan 28, 2022 · 79938d9 · 79938d9
1 parent c3dccd6
commit 79938d9
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 16 deletions.
diff --git a/dss-demo-bundle/pom.xml b/dss-demo-bundle/pom.xml
@@ -104,19 +104,10 @@
 
 	<profiles>
 		<profile>
-			<id>java16</id>
-			<properties>
-				<jre.download.link>https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jre_x86-32_windows_hotspot_16.0.1_9.zip</jre.download.link>
-				<jre.root.folder>jdk-16.0.1+9-jre</jre.root.folder>
-				<tomcat.version>9.0.58</tomcat.version>
-			</properties>
-		</profile>
-		<profile>
-			<!-- NOTE: experimental / Nightly build (pre-release) -->
 			<id>java17</id>
 			<properties>
-				<jre.download.link>https://github.com/AdoptOpenJDK/openjdk17-binaries/releases/download/jdk-2021-05-07-13-31/OpenJDK-jre_x86-32_windows_hotspot_2021-05-06-23-30.zip</jre.download.link>
-				<jre.root.folder>jdk-17+20-jre</jre.root.folder>
+				<jre.download.link>https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.1%2B12/OpenJDK17U-jre_x86-32_windows_hotspot_17.0.1_12.zip</jre.download.link>
+				<jre.root.folder>jdk-17.0.1+12-jre</jre.root.folder>
 				<tomcat.version>9.0.58</tomcat.version>
 			</properties>
 		</profile>

diff --git a/dss-demo-bundle/src/main/assembly/assembly.xml b/dss-demo-bundle/src/main/assembly/assembly.xml
@@ -7,8 +7,8 @@
 	<id>ootb-webapp</id>
 
 	<formats>
-		<format>tar.gz</format>
 		<format>zip</format>
+		<format>tar.gz</format>
 	</formats>
 
 	<fileSets>

diff --git a/dss-standalone-app-package/pom.xml b/dss-standalone-app-package/pom.xml
@@ -9,11 +9,11 @@
 	<name>DSS standalone application packager</name>
 
 	<properties>
-		<jre.download.link>https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jre_x64_windows_hotspot_16.0.1_9.zip</jre.download.link>
-		<jre.root.folder>jdk-16.0.1+9-jre</jre.root.folder>
+		<jre.download.link>https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2%2B8/OpenJDK17U-jre_x64_windows_hotspot_17.0.2_8.zip</jre.download.link>
+		<jre.root.folder>jdk-17.0.2+8-jre</jre.root.folder>
 
-		<fx.sdk.download.link>https://download2.gluonhq.com/openjfx/16/openjfx-16_windows-x64_bin-sdk.zip</fx.sdk.download.link>
-		<fx.root.folder>javafx-sdk-16</fx.root.folder>
+		<fx.sdk.download.link>https://download2.gluonhq.com/openjfx/17.0.2/openjfx-17.0.2_windows-x64_bin-sdk.zip</fx.sdk.download.link>
+		<fx.root.folder>javafx-sdk-17.0.2</fx.root.folder>
 	</properties>
 
 	<dependencies>