Browse Source

Change JDK distribution source (#41626)

We had been obtaining JDK distributions from download.java.net. This
site is now presenting a certificate that does not list
download.java.net as a SAN. Therefore with host verification, the build
can not use this site. This commit switches to using download.oracle.com
which appears to be an alternative name for the same CNAME
download.oracle.com.edgekey.net. This allows our builds to resume.
Jason Tedor 6 years ago
parent
commit
5fa17aaf8a
2 changed files with 3 additions and 3 deletions
  1. 2 2
      Vagrantfile
  2. 1 1
      distribution/build.gradle

+ 2 - 2
Vagrantfile

@@ -244,7 +244,7 @@ def linux_common(config,
   SHELL
   SHELL
 
 
   config.vm.provision 'jdk-11', type: 'shell', inline: <<-SHELL
   config.vm.provision 'jdk-11', type: 'shell', inline: <<-SHELL
-    curl -sSL https://download.java.net/java/GA/jdk11/9/GPL/openjdk-11.0.2_linux-x64_bin.tar.gz | tar xz -C /opt/
+    curl -sSL https://download.oracle.com/java/GA/jdk11/9/GPL/openjdk-11.0.2_linux-x64_bin.tar.gz | tar xz -C /opt/
   SHELL
   SHELL
 
 
   # This prevents leftovers from previous tests using the
   # This prevents leftovers from previous tests using the
@@ -405,7 +405,7 @@ def windows_common(config, name)
 
 
   config.vm.provision 'windows-jdk-11', type: 'shell', inline: <<-SHELL
   config.vm.provision 'windows-jdk-11', type: 'shell', inline: <<-SHELL
     New-Item -ItemType Directory -Force -Path "C:/java"
     New-Item -ItemType Directory -Force -Path "C:/java"
-    Invoke-WebRequest "https://download.java.net/java/GA/jdk11/9/GPL/openjdk-11.0.2_windows-x64_bin.zip" -OutFile "C:/java/jdk-11.zip"
+    Invoke-WebRequest "https://download.oracle.com/java/GA/jdk11/9/GPL/openjdk-11.0.2_windows-x64_bin.zip" -OutFile "C:/java/jdk-11.zip"
     Expand-Archive -Path "C:/java/jdk-11.zip" -DestinationPath "C:/java/"
     Expand-Archive -Path "C:/java/jdk-11.zip" -DestinationPath "C:/java/"
   SHELL
   SHELL
 
 

+ 1 - 1
distribution/build.gradle

@@ -235,7 +235,7 @@ String jdkBuild = jdkVersionMatcher.group(3)
 
 
 repositories {
 repositories {
   ivy {
   ivy {
-    url "https://download.java.net"
+    url "https://download.oracle.com"
     patternLayout {
     patternLayout {
       artifact "java/GA/jdk${jdkMajor}/${jdkBuild}/GPL/openjdk-[revision]_[module]-x64_bin.[ext]"
       artifact "java/GA/jdk${jdkMajor}/${jdkBuild}/GPL/openjdk-[revision]_[module]-x64_bin.[ext]"
     }
     }