From b39ded541d6d794db344ed9ad70f326ac7eb6ead Mon Sep 17 00:00:00 2001
From: Chris Hegarty <chegar@openjdk.org>
Date: Tue, 22 Dec 2015 12:17:05 +0000
Subject: [PATCH 1/5] 8145990: Move sun.misc math support classes to
 jdk.internal.math

Reviewed-by: bpb, darcy
---
 modules.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules.xml b/modules.xml
index e22f2141860..161181bf102 100644
--- a/modules.xml
+++ b/modules.xml
@@ -222,6 +222,10 @@
       <name>jdk.internal.jimage.decompressor</name>
       <to>jdk.dev</to>
     </export>
+    <export>
+      <name>jdk.internal.math</name>
+      <to>java.desktop</to>
+    </export>
     <export>
       <name>jdk.internal.misc</name>
       <to>java.corba</to>

From 9db7585276835bbb87199cf06b34dbc7d6f6a5bb Mon Sep 17 00:00:00 2001
From: Erik Joelsson <erikj@openjdk.org>
Date: Wed, 23 Dec 2015 10:00:37 +0100
Subject: [PATCH 2/5] 8146002: Need to support mirrors for bootstrapping Jib

Reviewed-by: ihse, tbell
---
 common/bin/jib.sh | 30 ++++++++++++++++++++++++++----
 1 file changed, 26 insertions(+), 4 deletions(-)

diff --git a/common/bin/jib.sh b/common/bin/jib.sh
index 0fc60e9e76f..454d78ce1d7 100644
--- a/common/bin/jib.sh
+++ b/common/bin/jib.sh
@@ -32,7 +32,7 @@ installed_jib_script=${mydir}/../../.jib/jib
 install_data=${mydir}/../../.jib/.data
 
 setup_url() {
-    if [ -f "~/.config/jib/jib.conf" ]; then
+    if [ -f ~/.config/jib/jib.conf ]; then
         source ~/.config/jib/jib.conf
     fi
 
@@ -50,6 +50,9 @@ setup_url() {
     if [ -n "${JIB_SERVER}" ]; then
         jib_server="${JIB_SERVER}"
     fi
+    if [ -n "${JIB_SERVER_MIRRORS}" ]; then
+        jib_server_mirrors="${JIB_SERVER_MIRRORS}"
+    fi
     if [ -n "${JIB_REPOSITORY}" ]; then
         jib_repository="${JIB_REPOSITORY}"
     fi
@@ -70,8 +73,9 @@ setup_url() {
         jib_url="${JIB_URL}"
         data_string="${jib_url}"
     else
-        data_string="${jib_repository}/${jib_organization}/${jib_module}/${jib_revision}/${jib_module}-${jib_revision}.${jib_ext}"
-        jib_url="${jib_server}/${data_string}"
+        jib_path="${jib_repository}/${jib_organization}/${jib_module}/${jib_revision}/${jib_module}-${jib_revision}.${jib_ext}"
+        data_string="${jib_path}"
+        jib_url="${jib_server}/${jib_path}"
     fi
 }
 
@@ -104,7 +108,25 @@ install_jib() {
     ${getcmd} ${jib_url} > "${installed_jib_script}.gz"
     if [ ! -s "${installed_jib_script}.gz" ]; then
         echo "Failed to download ${jib_url}"
-        exit 1
+        if [ -n "${jib_path}" -a -n "${jib_server_mirrors}" ]; then
+            OLD_IFS="${IFS}"
+            IFS=" ,"
+            for mirror in ${jib_server_mirrors}; do
+                echo "Trying mirror ${mirror}"
+                jib_url="${mirror}/${jib_path}"
+                ${getcmd} ${jib_url} > "${installed_jib_script}.gz"
+                if [ -s "${installed_jib_script}.gz" ]; then
+                    echo "Download from mirror successful"
+                    break
+                else
+                    echo "Failed to download ${jib_url}"
+                fi
+            done
+            IFS="${OLD_IFS}"
+        fi
+        if [ ! -s "${installed_jib_script}.gz" ]; then
+            exit 1
+        fi
     fi
     echo "Extracting JIB bootstrap script"
     rm -f "${installed_jib_script}"

From f0cea71572a495b841e4512ff3a2310942acff87 Mon Sep 17 00:00:00 2001
From: Lana Steuck <lana@openjdk.org>
Date: Wed, 23 Dec 2015 15:41:48 -0800
Subject: [PATCH 3/5] Added tag jdk-9+99 for changeset 08c65d3d2d85

---
 .hgtags-top-repo | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags-top-repo b/.hgtags-top-repo
index 32f36110423..d10b68389a6 100644
--- a/.hgtags-top-repo
+++ b/.hgtags-top-repo
@@ -341,3 +341,4 @@ cf1dc4c035fb84693d4ae5ad818785cb4d1465d1 jdk9-b90
 5582a79892596169ebddb3e2c2aa44939e4e3f40 jdk-9+96
 75c3897541ecb52ee16d001ea605b12971df7303 jdk-9+97
 48987460c7d49a29013963ee44d090194396bb61 jdk-9+98
+7c0577bea4c65d69c5bef67023a89d2efa4fb2f7 jdk-9+99

From f81d9a2a7b350ecf81ed3899b394bef7bbaf0f11 Mon Sep 17 00:00:00 2001
From: Lana Steuck <lana@openjdk.org>
Date: Wed, 23 Dec 2015 15:41:51 -0800
Subject: [PATCH 4/5] Added tag jdk-9+99 for changeset c71d1910fc22

---
 hotspot/.hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hotspot/.hgtags b/hotspot/.hgtags
index bd53ef2dfeb..ac6cea4d970 100644
--- a/hotspot/.hgtags
+++ b/hotspot/.hgtags
@@ -501,3 +501,4 @@ a22b7c80529f5f05c847e932e017456e83c46233 jdk9-b94
 a94bb7203596dd632486f1e3655fa5f70541dc08 jdk-9+96
 de592ea5f7ba0f8a8c5afc03bd169f7690c72b6f jdk-9+97
 e5b1a23be1e105417ba1c4c576ab373eb3fa2c2b jdk-9+98
+f008e8cc10d5b3212fb22d58c96fa01d38654f19 jdk-9+99

From 3739ad7a43ab7749d04503870ed0182f66a31a62 Mon Sep 17 00:00:00 2001
From: Steve Drach <sdrach@openjdk.org>
Date: Wed, 30 Dec 2015 16:15:01 +0000
Subject: [PATCH 5/5] 8144355: JDK 9 changes to ZipFileSystem to support
 multi-release jar files

JEP 238 Multi-Release JarFileSystem implementation

Reviewed-by: alanb, psandoz, sherman
---
 modules.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules.xml b/modules.xml
index 161181bf102..825f4acfa1c 100644
--- a/modules.xml
+++ b/modules.xml
@@ -299,6 +299,7 @@
       <to>jdk.security.jgss</to>
       <to>jdk.snmp</to>
       <to>jdk.vm.ci</to>
+      <to>jdk.zipfs</to>
       <to>java.instrument</to>
     </export>
     <export>