Fix Windows version numbers for OpenJDK 11

Author: tianon

11/jdk/windows/windowsservercore-1709/Dockerfile

@@ -10,7 +10,7 @@ RUN $newPath = ('{0}\bin;{1}' -f $env:JAVA_HOME, $env:PATH); \
 	setx /M PATH $newPath
 
 # http://jdk.java.net/
-ENV JAVA_VERSION 11+28
+ENV JAVA_VERSION 11-ea+28
 ENV JAVA_URL https://download.java.net/java/early_access/jdk11/28/GPL/openjdk-11+28_windows-x64_bin.zip
 ENV JAVA_SHA256 fde3b28ca31b86a889c37528f17411cd0b9651beb6fa76cac89a223417910f4b
 

11/jdk/windows/windowsservercore-1803/Dockerfile

@@ -10,7 +10,7 @@ RUN $newPath = ('{0}\bin;{1}' -f $env:JAVA_HOME, $env:PATH); \
 	setx /M PATH $newPath
 
 # http://jdk.java.net/
-ENV JAVA_VERSION 11+28
+ENV JAVA_VERSION 11-ea+28
 ENV JAVA_URL https://download.java.net/java/early_access/jdk11/28/GPL/openjdk-11+28_windows-x64_bin.zip
 ENV JAVA_SHA256 fde3b28ca31b86a889c37528f17411cd0b9651beb6fa76cac89a223417910f4b
 

11/jdk/windows/windowsservercore-ltsc2016/Dockerfile

@@ -10,7 +10,7 @@ RUN $newPath = ('{0}\bin;{1}' -f $env:JAVA_HOME, $env:PATH); \
 	setx /M PATH $newPath
 
 # http://jdk.java.net/
-ENV JAVA_VERSION 11+28
+ENV JAVA_VERSION 11-ea+28
 ENV JAVA_URL https://download.java.net/java/early_access/jdk11/28/GPL/openjdk-11+28_windows-x64_bin.zip
 ENV JAVA_SHA256 fde3b28ca31b86a889c37528f17411cd0b9651beb6fa76cac89a223417910f4b
 

update.sh

@@ -440,6 +440,11 @@ EOD
 					downloadVersion="$(grep -Eom1 "openjdk-$javaVersion[^_]+" <<<"$downloadUrl")"
 					downloadVersion="${downloadVersion#openjdk-}"
 
+					if [ "$javaVersion" = '11' ]; then
+						# convert "11+28" into "11-ea+28" for consistency
+						downloadVersion="${downloadVersion//+/-ea+}"
+					fi
+
 					echo "$javaVersion-$javaType: $downloadVersion (windows)"
 
 					sed -ri \