updated all the the latest java12.0.2.x

made sure that we copy the libjli.dylib on osx to MacOS/lib instead of having a 0 bytes file there.
Servoy · Aug 8, 2019 · e17262d · e17262d
1 parent 81ef755
commit e17262d
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 17 deletions.
diff --git a/com.servoy.jre.linux.x86_64/feature.xml b/com.servoy.jre.linux.x86_64/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="com.servoy.jre.linux.x86_64.feature"
       label="OpenJDK with OpenJ9 Runtime (Linux x86_64)"
-      version="12"
+      version="12.0.2"
       provider-name="Eclipse Packaging Project"
       os="linux"
       arch="x86_64">

diff --git a/com.servoy.jre.linux.x86_64/pom.xml b/com.servoy.jre.linux.x86_64/pom.xml
@@ -12,7 +12,11 @@
 
 	<artifactId>com.servoy.jre.linux.x86_64.feature</artifactId>
 	<packaging>eclipse-feature</packaging>
-	<version>12</version>
+	<version>12.0.2</version>
+
+	<properties>
+		<jre.version>jdk-12.0.2+10-jre</jre.version>
+	</properties>
 
 	<build>
 		<plugins>
@@ -59,15 +63,15 @@
 			<plugin>
 				<groupId>com.googlecode.maven-download-plugin</groupId>
 				<artifactId>download-maven-plugin</artifactId>
-				<version>1.4.0</version>
+				<version>1.4.2</version>
 				<executions>
 					<execution>
 						<goals>
 							<goal>wget</goal>
 						</goals>
 						<phase>generate-resources</phase>
 						<configuration>
-							<url>https://api.adoptopenjdk.net/v2/binary/releases/openjdk12?openjdk_impl=openj9&amp;os=linux&amp;arch=x64&amp;release=latest&amp;type=jre&amp;heap_size=normal</url>
+							<url>https://github.com/AdoptOpenJDK/openjdk12-binaries/releases/download/jdk-12.0.2%2B10_openj9-0.15.1/OpenJDK12U-jre_x64_linux_openj9_12.0.2_10_openj9-0.15.1.tar.gz</url>
 							<outputFileName>jre12.tar.gz</outputFileName>
 							<!-- sha256 4a90944fbe96cb6452391e952cc7c9b5136fb042a445eb205e31a029fd72fd7c -->
 						</configuration>
@@ -107,7 +111,7 @@
 							<outputDirectory>${basedir}/jre</outputDirectory>
 							<resources>
 								<resource>
-									<directory>${project.build.directory}/jdk-12.0.1+12-jre/</directory>
+									<directory>${project.build.directory}/${jre.version}/</directory>
 									<!-- Workaround https://github.com/eclipse/openj9/issues/2239 -->
 									<exclude>lib/libfreetype.so.6</exclude>
 								</resource>

diff --git a/com.servoy.jre.macosx.x86_64/feature.xml b/com.servoy.jre.macosx.x86_64/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="com.servoy.jre.macosx.x86_64.feature"
       label="OpenJDK with OpenJ9 Runtime (macOS)"
-      version="12"
+      version="12.0.2"
       provider-name="Eclipse Packaging Project"
       os="macosx"
       arch="x86_64">

diff --git a/com.servoy.jre.macosx.x86_64/pom.xml b/com.servoy.jre.macosx.x86_64/pom.xml
@@ -12,7 +12,11 @@
 
 	<artifactId>com.servoy.jre.macosx.x86_64.feature</artifactId>
 	<packaging>eclipse-feature</packaging>
-	<version>12</version>
+	<version>12.0.2</version>
+
+	<properties>
+		<jre.version>jdk-12.0.2+10-jre</jre.version>
+	</properties>
 
 	<build>
 		<plugins>
@@ -59,17 +63,16 @@
 			<plugin>
 				<groupId>com.googlecode.maven-download-plugin</groupId>
 				<artifactId>download-maven-plugin</artifactId>
-				<version>1.4.0</version>
+				<version>1.4.2</version>
 				<executions>
 					<execution>
 						<goals>
 							<goal>wget</goal>
 						</goals>
 						<phase>generate-resources</phase>
 						<configuration>
-							<url>https://api.adoptopenjdk.net/v2/binary/releases/openjdk12?openjdk_impl=openj9&amp;os=mac&amp;arch=x64&amp;release=latest&amp;type=jre&amp;heap_size=normal</url>
+							<url>https://github.com/AdoptOpenJDK/openjdk12-binaries/releases/download/jdk-12.0.2%2B10.2_openj9-0.15.1/OpenJDK12U-jre_x64_mac_openj9_12.0.2_10_openj9-0.15.1.tar.gz</url>
 							<outputFileName>jre12.tar.gz</outputFileName>
-							<!-- sha256 4a90944fbe96cb6452391e952cc7c9b5136fb042a445eb205e31a029fd72fd7c -->
 						</configuration>
 					</execution>
 				</executions>
@@ -84,7 +87,8 @@
             <phase>generate-resources</phase>  
             <configuration>  
                 <tasks>  
-		    <untar src="${project.build.directory}/jre12.tar.gz" compression="gzip" dest="${project.build.directory}"/>
+		    		<untar src="${project.build.directory}/jre12.tar.gz" compression="gzip" dest="${project.build.directory}"/>
+		    		<copy file="${project.build.directory}/${jre.version}/Contents/Home/lib/libjli.dylib" tofile="${project.build.directory}/${jre.version}/Contents/MacOS/libjli.dylib"/>
                 </tasks>  
             </configuration>  
             <goals>  
@@ -107,7 +111,7 @@
 							<outputDirectory>${basedir}/jre</outputDirectory>
 							<resources>
 								<resource>
-									<directory>${project.build.directory}/jdk-12.0.1+12-jre/</directory>
+									<directory>${project.build.directory}/${jre.version}/</directory>
 								</resource>
 							</resources>
 						</configuration>

diff --git a/com.servoy.jre.win32.x86_64/feature.xml b/com.servoy.jre.win32.x86_64/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="com.servoy.jre.win32.x86_64.feature"
       label="OpenJDK with OpenJ9 Runtime (windows x86_64)"
-      version="12"
+      version="12.0.2"
       provider-name="Eclipse Packaging Project"
       os="win32"
       arch="x86_64">

diff --git a/com.servoy.jre.win32.x86_64/pom.xml b/com.servoy.jre.win32.x86_64/pom.xml
@@ -12,7 +12,11 @@
 
 	<artifactId>com.servoy.jre.win32.x86_64.feature</artifactId>
 	<packaging>eclipse-feature</packaging>
-	<version>12</version>
+	<version>12.0.2</version>
+
+	<properties>
+		<jre.version>jdk-12.0.2+10-jre</jre.version>
+	</properties>
 
 	<build>
 		<plugins>
@@ -59,15 +63,15 @@
 			<plugin>
 				<groupId>com.googlecode.maven-download-plugin</groupId>
 				<artifactId>download-maven-plugin</artifactId>
-				<version>1.4.0</version>
+				<version>1.4.2</version>
 				<executions>
 					<execution>
 						<goals>
 							<goal>wget</goal>
 						</goals>
 						<phase>generate-resources</phase>
 						<configuration>
-							<url>https://api.adoptopenjdk.net/v2/binary/releases/openjdk12?openjdk_impl=openj9&amp;os=windows&amp;arch=x64&amp;release=latest&amp;type=jre</url>
+							<url>https://github.com/AdoptOpenJDK/openjdk12-binaries/releases/download/jdk-12.0.2%2B10_openj9-0.15.1/OpenJDK12U-jre_x64_windows_openj9_12.0.2_10_openj9-0.15.1.zip</url>
 							<outputFileName>jre12.zip</outputFileName>
 							<!-- sha256 4a90944fbe96cb6452391e952cc7c9b5136fb042a445eb205e31a029fd72fd7c -->
 							<unpack>true</unpack>
@@ -89,7 +93,7 @@
 							<outputDirectory>${basedir}/jre</outputDirectory>
 							<resources>
 								<resource>
-									<directory>${project.build.directory}/jdk-12.0.1+12-jre/</directory>
+									<directory>${project.build.directory}/${jre.version}/</directory>
 								</resource>
 							</resources>
 						</configuration>