JBR-2148: sign Frameworks & Helpers

JBR-2150 add LW JBR executables

.gitignore

@@ -2,4 +2,25 @@ JTwork
 JTreport
 *.class
 .idea/workspace.xml
+.idea/misc.xml
+.idea/modules.xml
+.idea/shelf/
+JetBrainsRuntime.iml
 build/
+# Project exclude paths
+/jb/project/java-gradle/.gradle/
+/build/
+/dist/
+/.idea/
+nbproject/private/
+/webrev
+/.src-rev
+/.jib/
+.DS_Store
+.metadata/
+.recommenders/
+test/nashorn/script/external
+test/nashorn/lib
+NashornProfile.txt
+**/JTreport/**
+**/JTwork/**

.hgtags

@@ -533,3 +533,46 @@ fe85e2f43a1c893cb410308106b0f31b814aebb8 jdk-11.0.2+8
 a01e0cc0105972acc3b5e213dbe2b84acaee5be3 jdk-11.0.2-ga
 0000000000000000000000000000000000000000 jdk-11.0.2-ga
 144d476b6efe527c5e9ebf19af93398913c5450f jdk-11.0.2-ga
+98e7354165d3a2443a8b845a5a526cc55d1b0dd7 jdk-11.0.3+0
+cd1c042181e934a1a91f9ee59a0066f64c8bad7a jdk-11.0.3+1
+9de3f198995c6c384fd6431c97089c311ec6a7ff jdk-11.0.3+2
+d17a1764a0f318ab72beadb589c998d40951493a jdk-11.0.3+3
+43d6759c3b2e36c1118e9753a080372294e1f17a jdk-11.0.3+4
+c9865fee1a6d39a7bd2a5313f54c812d9a0852f5 jdk-11.0.3+5
+8e139b8b4f62c0a1c4b13fa216f6fd975df81c1c jdk-11.0.3+6
+175eb80c253addb5b49a91c53daa7e204f124581 jdk-11.0.3+7
+175eb80c253addb5b49a91c53daa7e204f124581 jdk-11.0.3-ga
+b3f7a4c524f2e37a8068ca797859df86d9865aad jdk-11.0.4+1
+3b9194001c2eebea3109777c2b308cd784a5dcc7 jdk-11.0.4+2
+3b6fc7cd594608b7125eb0b75bdc05132e7b5f39 jdk-11.0.4+3
+e442b78d7687744475676724bd27b1d52f096d38 jdk-11.0.4+4
+371ce104ac19a12012dfe3749240b0309bfc86ee jdk-11.0.4+5
+9ab8738bf30663e01924f40e04d6d04751271b77 jdk-11.0.4+6
+640251cdca0577fd8aa4a51ddb7c71c3b874033c jdk-11.0.4+7
+ce601e800f56af59edfda40e19a92a8d3121a1cd jdk-11.0.4+8
+26958299a5f8012736b99782c835ec685e18dd43 jdk-11.0.4+9
+3f5829d9d7629ba3893456e20731949a570cc277 jdk-11.0.4+10
+6a4d57474e1c971cccf4165b3d9d023928510010 jdk-11.0.4+11
+6a4d57474e1c971cccf4165b3d9d023928510010 jdk-11.0.4-ga
+3ba9c532128b1feccf59ab8ce812b1fce2b6f681 jdk-11.0.5+1
+b249a2a2034e3392c647c61d401a41ac7237d635 jdk-11.0.5+2
+d84dae4fba034adc749e3f28fc444b3d95b8f670 jdk-11.0.5+3
+315e873712092d48fbfa23885bdf2c6fd654c1ab jdk-11.0.5+4
+d43c5ab1a337b94fffee1cab871543da06f8113c jdk-11.0.5+5
+deaef57bf366fdab908b97a9760d0fa6e273abcd jdk-11.0.5+6
+046604d257d7bc698ee213d70af09793f5008ff1 jdk-11.0.5+7
+2c29e9b3a2856350d55a188635c36c5b23c1c9e3 jdk-11.0.5+8
+ee7128cf507a670ae84841b202a7a06711608359 jdk-11.0.5+9
+6385eb06af947d8ec5fd51a4733bc8187efb88b5 jdk-11.0.5+10
+6385eb06af947d8ec5fd51a4733bc8187efb88b5 jdk-11.0.5-ga
+6eb89e59a06a2f83f7fe0399da4bf4ca638d46f3 jdk-11.0.6+1
+8d3e0c2c009815cae59ad3c9bf9e4b1f090efc8b jdk-11.0.6+2
+f8b2e95a1d41585a757729ed28ce35d43aba1b3f jdk-11.0.6+3
+577a1fc440666e3c0724e07f6a8d736b2c7905cf jdk-11.0.6+4
+bfce7426e091127450a70b7d07941c0f9e02d347 jdk-11.0.6+5
+aa260c24480a2bd7d21ad1c863e6fe9a3973011e jdk-11.0.6+6
+42500af9232ed5b2990ff618a1e92ef6ccc0b9af jdk-11.0.6+7
+0c54fb645a7388cb7e3d587b4df75a2edd7826e2 jdk-11.0.6+8
+1859de77ee6cd7e10ac0b9e71027d9f974a6e481 jdk-11.0.6+9
+837b7afec083aaddeef0a6c3e6501b2200eaf1d4 jdk-11.0.6+10
+837b7afec083aaddeef0a6c3e6501b2200eaf1d4 jdk-11.0.6-ga

README.md

@@ -4,7 +4,7 @@
 
 |Windows-x64  |macOS        |Linux-x64    |
 |-------------|-------------|-------------|
-|<a href="https://bintray.com/jetbrains/intellij-jdk/openjdk9-windows-x64/_latestVersion"> <img src="https://api.bintray.com/packages/jetbrains/intellij-jdk/openjdk9-windows-x64/images/download.svg"/></a>|<a href="https://bintray.com/jetbrains/intellij-jdk/openjdk9-osx-x64/_latestVersion"> <img src="https://api.bintray.com/packages/jetbrains/intellij-jdk/openjdk9-osx-x64/images/download.svg"/></a>|<a href="https://bintray.com/jetbrains/intellij-jdk/openjdk9-linux-x64/_latestVersion"><img src="https://api.bintray.com/packages/jetbrains/intellij-jdk/openjdk9-linux-x64/images/download.svg"/></a>|
+|[ ![Download](https://api.bintray.com/packages/jetbrains/intellij-jdk/openjdk11-windows-x64/images/download.svg) ](https://bintray.com/jetbrains/intellij-jdk/openjdk11-windows-x64/_latestVersion)|[ ![Download](https://api.bintray.com/packages/jetbrains/intellij-jdk/openjdk11-osx-x64/images/download.svg) ](https://bintray.com/jetbrains/intellij-jdk/openjdk11-osx-x64/_latestVersion)|[ ![Download](https://api.bintray.com/packages/jetbrains/intellij-jdk/openjdk11-linux-x64/images/download.svg) ](https://bintray.com/jetbrains/intellij-jdk/openjdk11-linux-x64/_latestVersion)|
 
 
 # How JetBrains Runtime is organised
@@ -26,6 +26,10 @@ git clone git@github.com:JetBrains/JetBrainsRuntime.git
 ```
 
 # Configure Local Build Environment
+[OpenJDK build docs](http://hg.openjdk.java.net/jdk/jdk11/raw-file/tip/doc/building.html)  
+Tip for all platforms: run ./configure and check output.  
+Usually, it has meaningful advice how to solve your problem.
+
 ## Linux (docker)
 ```
 $ cd jb/project/docker
@@ -43,7 +47,7 @@ $ docker run -v `pwd`../../../../:/JetBrainsRuntime -it 942ea9900054
 
 ## Linux (Ubuntu 18.10 desktop)
 ```
-$ sudo apt-get install autoconf make build-essential libx11-dev libxext-dev libxrender-dev libxtst-dev libxt-dev install libcups2-dev libfontconfig1-dev libasound2-dev 
+$ sudo apt-get install autoconf make build-essential libx11-dev libxext-dev libxrender-dev libxtst-dev libxt-dev libxrandr-dev libcups2-dev libfontconfig1-dev libasound2-dev 
 
 $ cd JetBrainsRuntime
 $ sh ./configure --disable-warnings-as-errors
@@ -51,10 +55,40 @@ $ make images
 ```
 
 ## Windows
-#### TBD
+Install:
+
+* [Cygwin x64](http://www.cygwin.com/)  
+  Required packages: autoconf, binutils, cpio, diffutils, file, gawk, gcc-core, make, m4, unzip, zip.  
+  **Install them while installing cygwin**.
+* Visual Studio compiler toolset [Download](https://visualstudio.microsoft.com/downloads/)  
+  Visual Studio 2015 has support by default.  
+  **Install with desktop development kit, it includes Windows SDK and compilers**.
+* [Java 11](http://www.oracle.com/technetwork/java/javase/downloads/index.html)  
+  If you have problems while configuring [read java tips on cygwin](http://horstmann.com/articles/cygwin-tips.html)
+
+From command line 
+```
+"c:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
+"c:\Program_Files\cygwin64\bin\mintty.exe" /bin/bash -l
+```
+First command will set env vars, the second will run cygwin shell with proper environment.  
+In cygwin shell 
+```    
+cd JetBrainsRuntime
+bash configure --enable-option-checking=fatal --enable-option-checking=fatal --with-toolchain-version=2015 --with-boot-jdk="/cygdrive/c/Program Files/Java/jdk-11.0.5" --disable-warnings-as-errors
+make images
+```
 
 ## OSX
-#### TBD
+
+install Xcode console tools, autoconf (via homebrew)
+
+run
+
+```
+sh ./configure --prefix=$(pwd)/build  --disable-warnings-as-errors
+make images
+```
 
 ## Contribution
 We will be happy to receive your pull requests. Before you submit one, please sign our Contributor License Agreement (CLA)  https://www.jetbrains.com/agreements/cla/ 

doc/testing.html

@@ -35,6 +35,9 @@
 <li><a href="#jtreg-keywords">JTReg keywords</a></li>
 <li><a href="#gtest-keywords">Gtest keywords</a></li>
 </ul></li>
+<li><a href="#notes-for-specific-tests">Notes for Specific Tests</a><ul>
+<li><a href="#docker-tests">Docker Tests</a></li>
+</ul></li>
 </ul>
 </nav>
 <h2 id="using-the-run-test-framework">Using the run-test framework</h2>
@@ -123,5 +126,11 @@ TEST FAILURE</code></pre>
 <h4 id="options-1">OPTIONS</h4>
 <p>Additional options to the Gtest test framework.</p>
 <p>Use <code>GTEST=&quot;OPTIONS=--help&quot;</code> to see all available Gtest options.</p>
+<h2 id="notes-for-specific-tests">Notes for Specific Tests</h2>
+<h3 id="docker-tests">Docker Tests</h3>
+<p>Docker tests with default parameters may fail on systems with glibc versions not compatible with the one used in the default docker image (e.g., Oracle Linux 7.6 for x86). For example, they pass on Ubuntu 16.04 but fail on Ubuntu 18.04 if run like this on x86:</p>
+<pre><code>$ make run-test TEST=&quot;jtreg:test/hotspot/jtreg/containers/docker&quot;</code></pre>
+<p>To run these tests correctly, additional parameters for the correct docker image are required on Ubuntu 18.04 by using <code>JAVA_OPTIONS</code>.</p>
+<pre><code>$ make run-test TEST=&quot;jtreg:test/hotspot/jtreg/containers/docker&quot; JTREG=&quot;JAVA_OPTIONS=-Djdk.test.docker.image.name=ubuntu -Djdk.test.docker.image.version=latest&quot;</code></pre>
 </body>
 </html>

doc/testing.md

@@ -230,6 +230,21 @@ Additional options to the Gtest test framework.
 
 Use `GTEST="OPTIONS=--help"` to see all available Gtest options.
 
+## Notes for Specific Tests
+
+### Docker Tests
+
+Docker tests with default parameters may fail on systems with glibc versions not
+compatible with the one used in the default docker image (e.g., Oracle Linux 7.6 for x86).
+For example, they pass on Ubuntu 16.04 but fail on Ubuntu 18.04 if run like this on x86:
+
+    $ make run-test TEST="jtreg:test/hotspot/jtreg/containers/docker"
+
+To run these tests correctly, additional parameters for the correct docker image are
+required on Ubuntu 18.04 by using `JAVA_OPTIONS`.
+
+    $ make run-test TEST="jtreg:test/hotspot/jtreg/containers/docker" JTREG="JAVA_OPTIONS=-Djdk.test.docker.image.name=ubuntu -Djdk.test.docker.image.version=latest"
+
 ---
 # Override some definitions in the global css file that are not optimal for
 # this document.

jb/project/docker/Dockerfile

@@ -1,9 +1,10 @@
+# jetbrains/runtime:jbr11dev8env
 FROM centos:7
-
+RUN yum -y install centos-release-scl
-RUN yum -y install zip bzip2 unzip tar wget make autoconf automake libtool gcc gcc-c++ libstdc++-devel alsa-devel cups-devel xorg-x11-devel libjpeg62-devel giflib-devel freetype-devel file which libXtst-devel libXt-devel libXrender-devel alsa-lib-devel fontconfig-devel
+RUN yum -y install devtoolset-8
-
+RUN yum -y install zip bzip2 unzip tar wget make autoconf automake libtool alsa-devel cups-devel xorg-x11-devel libjpeg62-devel giflib-devel freetype-devel file which libXtst-devel libXt-devel libXrender-devel alsa-lib-devel fontconfig-devel libXrandr-devel libXi-devel
 # Install Java 11
-RUN wget --no-check-certificate -q --no-cookies --header "Cookie: oraclelicense=accept-securebackup-cookie" "http://download.oracle.com/otn-pub/java/jdk/11.0.1+13/90cf5d8f270a4347a95050320eef3fb7/jdk-11.0.1_linux-x64_bin.tar.gz" \
+RUN wget https://bintray.com/jetbrains/intellij-jbr/download_file?file_path=jbrsdk-11_0_3-linux-x64-b360.2.tar.gz \
 -O - | tar xz -C /
-ENV JAVA_HOME /jdk-11.0.1
+ENV JAVA_HOME /jbrsdk
-ENV PATH $JAVA_HOME/bin:$PATH
+ENV PATH $JAVA_HOME/bin:/opt/rh/devtoolset-8/root/usr/bin:$PATH

jb/project/docker/Dockerfile.x86

@@ -0,0 +1,7 @@
+FROM i386/ubuntu:xenial
+
+RUN linux32 apt-get update && apt-get install -y --no-install-recommends apt-utils
+COPY jbrsdk-11.0.5-b1 /jbrsdk-11.0.5-b1
+RUN linux32 apt-get -y install file build-essential zip unzip curl libx11-dev libxext-dev \
+  libxrender-dev libxrandr-dev libxtst-dev libxt-dev libcups2-dev libasound2-data \
+  libpng12-0 libasound2 libfreetype6 libfontconfig1-dev libasound2-dev autoconf

jb/project/hotspot-cmake/CMakeLists.txt

@@ -495,7 +495,6 @@ set(SOURCE_FILES
 ../../../src/hotspot/cpu/aarch64/vtableStubs_aarch64.cpp
 ../../../src/hotspot/cpu/aarch64/relocInfo_aarch64.hpp
 ../../../src/hotspot/cpu/aarch64/vm_version_aarch64.hpp
-../../../src/hotspot/cpu/aarch64/cpustate_aarch64.hpp
 ../../../src/hotspot/cpu/aarch64/immediate_aarch64.cpp
 ../../../src/hotspot/cpu/aarch64/vmreg_aarch64.cpp
 ../../../src/hotspot/cpu/aarch64/jniFastGetField_aarch64.cpp
@@ -520,7 +519,6 @@ set(SOURCE_FILES
 ../../../src/hotspot/cpu/aarch64/c1_FrameMap_aarch64.hpp
 ../../../src/hotspot/cpu/aarch64/templateTable_aarch64.cpp
 ../../../src/hotspot/cpu/aarch64/vmStructs_aarch64.hpp
-../../../src/hotspot/cpu/aarch64/decode_aarch64.hpp
 ../../../src/hotspot/cpu/aarch64/c1_CodeStubs_aarch64.cpp
 ../../../src/hotspot/cpu/aarch64/nativeInst_aarch64.hpp
 ../../../src/hotspot/cpu/aarch64/codeBuffer_aarch64.hpp
@@ -529,7 +527,6 @@ set(SOURCE_FILES
 ../../../src/hotspot/cpu/aarch64/assembler_aarch64.cpp
 ../../../src/hotspot/cpu/aarch64/register_aarch64.cpp
 ../../../src/hotspot/cpu/aarch64/vm_version_ext_aarch64.cpp
-../../../src/hotspot/cpu/aarch64/aarch64_call.cpp
 ../../../src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp
 ../../../src/hotspot/cpu/aarch64/bytecodes_aarch64.hpp
 ../../../src/hotspot/cpu/aarch64/c1_MacroAssembler_aarch64.hpp
@@ -1175,13 +1172,11 @@ set(SOURCE_FILES
 ../../../src/hotspot/share/jfr/recorder/stringpool/jfrStringPoolBuffer.hpp
 ../../../src/hotspot/share/jfr/recorder/repository/jfrChunkWriter.cpp
 ../../../src/hotspot/share/jfr/recorder/repository/jfrEmergencyDump.hpp
-../../../src/hotspot/share/jfr/recorder/repository/jfrChunkSizeNotifier.hpp
 ../../../src/hotspot/share/jfr/recorder/repository/jfrChunkState.hpp
 ../../../src/hotspot/share/jfr/recorder/repository/jfrRepository.cpp
 ../../../src/hotspot/share/jfr/recorder/repository/jfrChunkState.cpp
 ../../../src/hotspot/share/jfr/recorder/repository/jfrRepository.hpp
 ../../../src/hotspot/share/jfr/recorder/repository/jfrChunkWriter.hpp
-../../../src/hotspot/share/jfr/recorder/repository/jfrChunkSizeNotifier.cpp
 ../../../src/hotspot/share/jfr/recorder/repository/jfrEmergencyDump.cpp
 ../../../src/hotspot/share/jfr/recorder/checkpoint/jfrCheckpointBlob.hpp
 ../../../src/hotspot/share/jfr/recorder/checkpoint/jfrCheckpointWriter.cpp
@@ -1254,7 +1249,6 @@ set(SOURCE_FILES
 ../../../src/hotspot/share/jfr/leakprofiler/checkpoint/objectSampleDescription.hpp
 ../../../src/hotspot/share/jfr/leakprofiler/checkpoint/rootResolver.hpp
 ../../../src/hotspot/share/jfr/leakprofiler/leakProfiler.hpp
-../../../src/hotspot/share/jfr/leakprofiler/emitEventOperation.hpp
 ../../../src/hotspot/share/jfr/leakprofiler/sampling/objectSample.hpp
 ../../../src/hotspot/share/jfr/leakprofiler/sampling/objectSampler.hpp
 ../../../src/hotspot/share/jfr/leakprofiler/sampling/sampleList.cpp
@@ -1270,7 +1264,6 @@ set(SOURCE_FILES
 ../../../src/hotspot/share/jfr/leakprofiler/utilities/rootType.hpp
 ../../../src/hotspot/share/jfr/leakprofiler/utilities/unifiedOop.hpp
 ../../../src/hotspot/share/jfr/leakprofiler/startOperation.hpp
-../../../src/hotspot/share/jfr/leakprofiler/emitEventOperation.cpp
 ../../../src/hotspot/share/jfr/leakprofiler/chains/edgeUtils.cpp
 ../../../src/hotspot/share/jfr/leakprofiler/chains/rootSetClosure.cpp
 ../../../src/hotspot/share/jfr/leakprofiler/chains/edge.hpp
@@ -1481,7 +1474,6 @@ set(SOURCE_FILES
 ../../../src/hotspot/share/runtime/basicLock.hpp
 ../../../src/hotspot/share/runtime/compilationPolicy.cpp
 ../../../src/hotspot/share/runtime/java.hpp
-../../../src/hotspot/share/runtime/simpleThresholdPolicy.cpp
 ../../../src/hotspot/share/runtime/objectMonitor.inline.hpp
 ../../../src/hotspot/share/runtime/mutexLocker.cpp
 ../../../src/hotspot/share/runtime/serviceThread.cpp
@@ -1524,7 +1516,6 @@ set(SOURCE_FILES
 ../../../src/hotspot/share/runtime/compilationPolicy.hpp
 ../../../src/hotspot/share/runtime/basicLock.cpp
 ../../../src/hotspot/share/runtime/java.cpp
-../../../src/hotspot/share/runtime/simpleThresholdPolicy.hpp
 ../../../src/hotspot/share/runtime/perfData.inline.hpp
 ../../../src/hotspot/share/runtime/statSampler.hpp
 ../../../src/hotspot/share/runtime/vm_operations.cpp
@@ -1557,7 +1548,6 @@ set(SOURCE_FILES
 ../../../src/hotspot/share/runtime/handshake.hpp
 ../../../src/hotspot/share/runtime/thread.inline.hpp
 ../../../src/hotspot/share/runtime/perfMemory.hpp
-../../../src/hotspot/share/runtime/simpleThresholdPolicy.inline.hpp
 ../../../src/hotspot/share/runtime/javaCalls.cpp
 ../../../src/hotspot/share/runtime/reflection.cpp
 ../../../src/hotspot/share/runtime/icache.cpp

jb/project/java-gradle/.idea/compiler.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <bytecodeTargetLevel>
-      <module name="java-gradle.main" target="11" />
-      <module name="java-gradle.test" target="11" />
-    </bytecodeTargetLevel>
-  </component>
-</project>

jb/project/java-gradle/.idea/gradle.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="GradleSettings">
-    <option name="linkedExternalProjectsSettings">
-      <GradleProjectSettings>
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
-        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="/usr/share/gradle" />
-        <option name="gradleJvm" value="11" />
-        <option name="modules">
-          <set>
-            <option value="$PROJECT_DIR$" />
-          </set>
-        </option>
-        <option name="useAutoImport" value="true" />
-        <option name="useQualifiedModuleNames" value="true" />
-      </GradleProjectSettings>
-    </option>
-  </component>
-</project>

jb/project/java-gradle/.idea/libraries/Gradle__com_twelvemonkeys_common_common_image_3_3_2.xml

@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.twelvemonkeys.common:common-image:3.3.2">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.twelvemonkeys.common/common-image/3.3.2/9c975152864050c6dbb7226ca1100694f0aa099d/common-image-3.3.2.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.twelvemonkeys.common/common-image/3.3.2/e6fb35a9825421ec5a634af328e22546992d536d/common-image-3.3.2-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

jb/project/java-gradle/.idea/libraries/Gradle__com_twelvemonkeys_common_common_io_3_3_2.xml

@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.twelvemonkeys.common:common-io:3.3.2">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.twelvemonkeys.common/common-io/3.3.2/e00b1c744993864d3c8dc698ba7d356122019398/common-io-3.3.2.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.twelvemonkeys.common/common-io/3.3.2/dbb242585fdfd353dc4c2c0e8b3d8b0383dffbb2/common-io-3.3.2-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

jb/project/java-gradle/.idea/libraries/Gradle__com_twelvemonkeys_common_common_lang_3_3_2.xml

@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.twelvemonkeys.common:common-lang:3.3.2">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.twelvemonkeys.common/common-lang/3.3.2/ffbc5e05208c5c9cb43052438294c3ec5546aecf/common-lang-3.3.2.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.twelvemonkeys.common/common-lang/3.3.2/b695db345614a2b9344fd43a44d9ce722df4b39/common-lang-3.3.2-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

jb/project/java-gradle/.idea/libraries/Gradle__com_twelvemonkeys_imageio_imageio_core_3_3_2.xml

@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.twelvemonkeys.imageio:imageio-core:3.3.2">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.twelvemonkeys.imageio/imageio-core/3.3.2/8def41c756831dde3c23f2d525e5667cfbfa1847/imageio-core-3.3.2.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.twelvemonkeys.imageio/imageio-core/3.3.2/abcb2beaf21364467afe0e33824dce5730bef0c3/imageio-core-3.3.2-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

jb/project/java-gradle/.idea/libraries/Gradle__com_twelvemonkeys_imageio_imageio_metadata_3_3_2.xml

@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.twelvemonkeys.imageio:imageio-metadata:3.3.2">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.twelvemonkeys.imageio/imageio-metadata/3.3.2/b8a31725bde0dc6f4e6b01711784f5ca0a2275f3/imageio-metadata-3.3.2.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.twelvemonkeys.imageio/imageio-metadata/3.3.2/6fc3b223c81afbd4b829e2c924c096aab3ed0e9e/imageio-metadata-3.3.2-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

jb/project/java-gradle/.idea/libraries/Gradle__com_twelvemonkeys_imageio_imageio_tiff_3_3_2.xml

@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.twelvemonkeys.imageio:imageio-tiff:3.3.2">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.twelvemonkeys.imageio/imageio-tiff/3.3.2/9bea1214eae7d287dc0c685fb6be75102318d080/imageio-tiff-3.3.2.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.twelvemonkeys.imageio/imageio-tiff/3.3.2/cae5b3540dc01889dc9560db86f5f61bdc253107/imageio-tiff-3.3.2-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

jb/project/java-gradle/.idea/libraries/Gradle__junit_junit_4_12.xml

@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: junit:junit:4.12">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/2973d150c0dc1fefe998f834810d68f278ea58ec/junit-4.12.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/a6c32b40bf3d76eca54e3c601e5d1470c86fcdfa/junit-4.12-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

jb/project/java-gradle/.idea/libraries/Gradle__net_java_dev_jna_jna_4_4_0.xml

@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: net.java.dev.jna:jna:4.4.0">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.java.dev.jna/jna/4.4.0/cb208278274bf12ebdb56c61bd7407e6f774d65a/jna-4.4.0.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.java.dev.jna/jna/4.4.0/9d45d3dc35711eef7267d8b4fc2c0dc482ef9fd2/jna-4.4.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

jb/project/java-gradle/.idea/libraries/Gradle__org_apache_commons_commons_lang3_3_0.xml

@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: org.apache.commons:commons-lang3:3.0">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.0/8873bd0bb5cb9ee37f1b04578eb7e26fcdd44cb0/commons-lang3-3.0.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.0/d48f964b56a931ec2712ce5d411a40d114a69753/commons-lang3-3.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

jb/project/java-gradle/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3.xml

@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: org.hamcrest:hamcrest-core:1.3">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-core/1.3/42a25dc3219429f0e5d060061f71acb49bf010a0/hamcrest-core-1.3.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-core/1.3/1dc37250fbc78e23a65a67fbbaf71d2e9cbc3c0b/hamcrest-core-1.3-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

jb/project/java-gradle/.idea/libraries/Gradle__org_hamcrest_hamcrest_library_1_3.xml

@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: org.hamcrest:hamcrest-library:1.3">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-library/1.3/4785a3c21320980282f9f33d0d1264a69040538f/hamcrest-library-1.3.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-library/1.3/47a7ee46628ab7133129cd7cef1e92657bc275e/hamcrest-library-1.3-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

jb/project/java-gradle/.idea/misc.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="11" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/classes" />
-  </component>
-</project>

jb/project/java-gradle/.idea/modules.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/java-gradle.iml" filepath="$PROJECT_DIR$/.idea/modules/java-gradle.iml" />
-      <module fileurl="file://$PROJECT_DIR$/java-gradle.iml" filepath="$PROJECT_DIR$/java-gradle.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/java-gradle.main.iml" filepath="$PROJECT_DIR$/.idea/modules/java-gradle.main.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/java-gradle.test.iml" filepath="$PROJECT_DIR$/.idea/modules/java-gradle.test.iml" />
-    </modules>
-  </component>
-</project>

jb/project/java-gradle/.idea/modules/java-gradle.main.iml

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="java-gradle:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_11">
-    <output url="file://$MODULE_DIR$/../../out/production/classes" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/../../src/main" />
-    <content url="file://$MODULE_DIR$/../../../../../src">
-      <sourceFolder url="file://$MODULE_DIR$/../../../../../src/java.base/share/classes" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../../../src/java.datatransfer/share/classes" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../../../src/java.desktop/share/classes" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../../../src/java.instrument/share/classes" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../../../src/java.logging/share/classes" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../../../src/java.management.rmi/share/classes" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../../../src/java.management/share/classes" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../../../src/java.naming/share/classes" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../../../src/java.prefs/share/classes" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../../../src/java.rmi/share/classes" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../../../src/java.scripting/share/classes" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../../../src/java.se/share/classes" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../../../src/java.security.jgss/share/classes" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../../../src/java.security.sasl/share/classes" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../../../src/java.smartcardio/share/classes" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../../../src/java.sql.rowset/share/classes" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../../../src/java.sql/share/classes" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../../../src/java.xml.crypto/share/classes" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../../../src/java.base/macosx/classes" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../../../src/java.datatransfer/macosx/classes" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../../../src/java.desktop/macosx/classes" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../../../src/java.prefs/macosx/classes" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

jb/project/java-gradle/.idea/modules/java-gradle.test.iml

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="java-gradle:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_11">
-    <output-test url="file://$MODULE_DIR$/../../out/test/classes" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/../../src/test" />
-    <content url="file://$MODULE_DIR$/../../../../../test">
-      <sourceFolder url="file://$MODULE_DIR$/../../../../../test/jdk/jbu" isTestSource="true" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="java-gradle.main" />
-    <orderEntry type="library" name="Gradle: junit:junit:4.12" level="project" />
-    <orderEntry type="library" name="Gradle: org.hamcrest:hamcrest-library:1.3" level="project" />
-    <orderEntry type="library" name="Gradle: net.java.dev.jna:jna:4.4.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.twelvemonkeys.imageio:imageio-tiff:3.3.2" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.commons:commons-lang3:3.0" level="project" />
-    <orderEntry type="library" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" name="Gradle: com.twelvemonkeys.imageio:imageio-metadata:3.3.2" level="project" />
-    <orderEntry type="library" name="Gradle: com.twelvemonkeys.imageio:imageio-core:3.3.2" level="project" />
-    <orderEntry type="library" name="Gradle: com.twelvemonkeys.common:common-image:3.3.2" level="project" />
-    <orderEntry type="library" name="Gradle: com.twelvemonkeys.common:common-io:3.3.2" level="project" />
-    <orderEntry type="library" name="Gradle: com.twelvemonkeys.common:common-lang:3.3.2" level="project" />
-  </component>
-  <component name="TestModuleProperties" production-module="java-gradle.main" />
-</module>

jb/project/java-gradle/.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$/../../.." vcs="Git" />
-  </component>
-</project>

jb/project/java-gradle/build.gradle

@@ -10,11 +10,11 @@ def test_jvm = {
         file(jbsdkhome + (OperatingSystem.current().isWindows()?"/bin/java.exe" : "/bin/java")).absolutePath
     } else {
         if (OperatingSystem.current().isMacOsX()) {
-            file('../../../build/macosx-x86_64-normal-server-release/images/jdk-bundle/jdk-11.jdk/Contents/Home/bin/java').absolutePath
+            file('../../../build/macosx-x86_64-normal-server-release/images/jdk-bundle/jdk-11.0.4.jdk/Contents/Home/bin/java').absolutePath
         } else if (OperatingSystem.current().isLinux()) {
             file('../../../build/linux-x86_64-normal-server-release/images/jdk/bin/java').absolutePath
         } else {
-            file('../../../build/windows-x86_64-normal-server-release/images/j2sdk-image/bin/java.exe').absolutePath
+            file('../../../build/windows-x86_64-normal-server-release/images/jdk/bin/java.exe').absolutePath
         }
     }
 }
@@ -75,15 +75,21 @@ test.dependsOn tasks.compileTestJava
 
 test {
     systemProperty "jb.java2d.metal", "true"
-    systemProperty "testdata", file('../../../jb/tests/testdata').absolutePath
+    systemProperty "testdata", file('../../../test/jdk/jbu/testdata').absolutePath
 
 //  Generate golden images for DroidFontTest and MixedTextTest
 //    systemProperty "gentestdata", ""
 
+//  Enable Java2D logging (https://confluence.jetbrains.com/display/JRE/Java2D+Rendering+Logging)
+//  systemProperty "sun.java2d.trace", "log"
+//  systemProperty "sun.java2d.trace", "log,pimpl"
+
     outputs.upToDateWhen { false }
     executable = test_jvm()
 
-//  Enable J2D logging (only in debug build)
+//  Enable async/dtrace profiler
+    jvmArgs  "-XX:+PreserveFramePointer"
+//  Enable native J2D logging (only in debug build)
 //  Can be turned on for J2D by adding "#define DEBUG 1" into jdk/src/share/native/sun/java2d/Trace.h
 
 //    environment 'J2D_TRACE_LEVEL', '4'
@@ -96,24 +102,34 @@ if (OperatingSystem.current().isWindows()) {
     def cyg_make_cmd = new File("c:/cygwin64/bin/make.exe")
     if (cyg_make_cmd.exists()) make_cmd = cyg_make_cmd.absolutePath
 }
-
+def test_run = false
-task make_images << {
+task make_images {
-    def pb = new ProcessBuilder().command(make_cmd.toString(), "-C", buildDir.absolutePath, "images")
+    doLast {
-    def proc = pb.redirectErrorStream(true).start()
+        if (!test_run) {
-    proc.inputStream.eachLine {println it}
+            def pb = new ProcessBuilder().command(make_cmd.toString(), "-C", buildDir.absolutePath, "images")
-    assert proc.waitFor() == 0
+            def proc = pb.redirectErrorStream(true).start()
+            proc.inputStream.eachLine { println it }
+            assert proc.waitFor() == 0
+        }
+    }
 }
 
-task make_clean << {
+task make_clean {
-    def pb = new ProcessBuilder().command(make_cmd.toString(), "-C", buildDir.absolutePath, "clean")
+    doLast {
-    def proc = pb.redirectErrorStream(true).start()
+        def pb = new ProcessBuilder().command(make_cmd.toString(), "-C", buildDir.absolutePath, "clean")
-    proc.inputStream.eachLine {println it}
+        def proc = pb.redirectErrorStream(true).start()
-    assert proc.waitFor() == 0
+        proc.inputStream.eachLine { println it }
+        assert proc.waitFor() == 0
+    }
 }
 
+task run_test {
+    doLast {
+        test_run = true
+    }
+}
 
-tasks.compileJava.enabled = false
+tasks.cleanTest.dependsOn tasks.run_test
-tasks.compileTestJava.dependsOn.clear()
 classes.dependsOn.clear()
 classes.dependsOn tasks.make_images
 tasks.cleanClasses.dependsOn tasks.make_clean

jb/project/jdk-cmake/.gitignore

@@ -0,0 +1,2 @@
+.idea
+cmake-build-*

jb/project/jdk-cmake/CMakeLists.txt

@@ -192,16 +192,19 @@ set(SOURCE_FILES
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/fttypes.h
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/ftparams.h
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/ftmm.h
+        ../../../src/java.desktop/share/native/libfreetype/include/freetype/config
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/config/ftstdlib.h
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/config/ftheader.h
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/config/ftconfig.h
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/config/ftoption.h
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/config/ftmodule.h
+        ../../../src/java.desktop/share/native/libfreetype/include/freetype/ftcolor.h
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/ftmodapi.h
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/fttrigon.h
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/ftbbox.h
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/ftgzip.h
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/ftdriver.h
+        ../../../src/java.desktop/share/native/libfreetype/include/freetype/internal
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/internal/sfnt.h
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/internal/internal.h
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/internal/ftdrv.h
@@ -216,13 +219,13 @@ set(SOURCE_FILES
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/internal/tttypes.h
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/internal/ftvalid.h
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/internal/ftobjs.h
-        ../../../src/java.desktop/share/native/libfreetype/include/freetype/internal/ftpic.h
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/internal/fttrace.h
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/internal/ftmemory.h
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/internal/fthash.h
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/internal/ftgloadr.h
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/internal/ftpsprop.h
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/internal/ftserv.h
+        ../../../src/java.desktop/share/native/libfreetype/include/freetype/internal/services
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svprop.h
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svmm.h
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svcfftl.h
@@ -272,6 +275,8 @@ set(SOURCE_FILES
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/ftbdf.h
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/ftrender.h
         ../../../src/java.desktop/share/native/libfreetype/include/ft2build.h
+        ../../../src/java.desktop/share/native/libfreetype/src
+        ../../../src/java.desktop/share/native/libfreetype/src/type1
         ../../../src/java.desktop/share/native/libfreetype/src/type1/t1objs.c
         ../../../src/java.desktop/share/native/libfreetype/src/type1/t1load.h
         ../../../src/java.desktop/share/native/libfreetype/src/type1/t1afm.h
@@ -286,40 +291,42 @@ set(SOURCE_FILES
         ../../../src/java.desktop/share/native/libfreetype/src/type1/t1driver.c
         ../../../src/java.desktop/share/native/libfreetype/src/type1/t1parse.c
         ../../../src/java.desktop/share/native/libfreetype/src/type1/t1gload.h
+        ../../../src/java.desktop/share/native/libfreetype/src/sfnt
         ../../../src/java.desktop/share/native/libfreetype/src/sfnt/sfobjs.c
         ../../../src/java.desktop/share/native/libfreetype/src/sfnt/ttcmap.h
         ../../../src/java.desktop/share/native/libfreetype/src/sfnt/ttpost.h
-        ../../../src/java.desktop/share/native/libfreetype/src/sfnt/sfntpic.h
         ../../../src/java.desktop/share/native/libfreetype/src/sfnt/ttkern.c
+        ../../../src/java.desktop/share/native/libfreetype/src/sfnt/ttcolr.h
         ../../../src/java.desktop/share/native/libfreetype/src/sfnt/pngshim.h
         ../../../src/java.desktop/share/native/libfreetype/src/sfnt/ttmtx.c
         ../../../src/java.desktop/share/native/libfreetype/src/sfnt/ttload.h
         ../../../src/java.desktop/share/native/libfreetype/src/sfnt/sfdriver.c
         ../../../src/java.desktop/share/native/libfreetype/src/sfnt/ttsbit.c
         ../../../src/java.desktop/share/native/libfreetype/src/sfnt/ttcmapc.h
+        ../../../src/java.desktop/share/native/libfreetype/src/sfnt/ttcpal.c
         ../../../src/java.desktop/share/native/libfreetype/src/sfnt/ttkern.h
         ../../../src/java.desktop/share/native/libfreetype/src/sfnt/ttpost.c
-        ../../../src/java.desktop/share/native/libfreetype/src/sfnt/sfntpic.c
         ../../../src/java.desktop/share/native/libfreetype/src/sfnt/sfobjs.h
         ../../../src/java.desktop/share/native/libfreetype/src/sfnt/ttcmap.c
         ../../../src/java.desktop/share/native/libfreetype/src/sfnt/ttmtx.h
         ../../../src/java.desktop/share/native/libfreetype/src/sfnt/pngshim.c
+        ../../../src/java.desktop/share/native/libfreetype/src/sfnt/ttcolr.c
         ../../../src/java.desktop/share/native/libfreetype/src/sfnt/ttsbit.h
         ../../../src/java.desktop/share/native/libfreetype/src/sfnt/sfdriver.h
         ../../../src/java.desktop/share/native/libfreetype/src/sfnt/ttload.c
         ../../../src/java.desktop/share/native/libfreetype/src/sfnt/sferrors.h
+        ../../../src/java.desktop/share/native/libfreetype/src/sfnt/ttcpal.h
+        ../../../src/java.desktop/share/native/libfreetype/src/smooth
         ../../../src/java.desktop/share/native/libfreetype/src/smooth/ftgrays.c
         ../../../src/java.desktop/share/native/libfreetype/src/smooth/ftsmooth.h
-        ../../../src/java.desktop/share/native/libfreetype/src/smooth/ftspic.h
         ../../../src/java.desktop/share/native/libfreetype/src/smooth/ftsmerrs.h
         ../../../src/java.desktop/share/native/libfreetype/src/smooth/ftgrays.h
-        ../../../src/java.desktop/share/native/libfreetype/src/smooth/ftspic.c
         ../../../src/java.desktop/share/native/libfreetype/src/smooth/ftsmooth.c
+        ../../../src/java.desktop/share/native/libfreetype/src/cff
         ../../../src/java.desktop/share/native/libfreetype/src/cff/cffload.h
         ../../../src/java.desktop/share/native/libfreetype/src/cff/cffgload.c
         ../../../src/java.desktop/share/native/libfreetype/src/cff/cffobjs.c
         ../../../src/java.desktop/share/native/libfreetype/src/cff/cffparse.h
-        ../../../src/java.desktop/share/native/libfreetype/src/cff/cffpic.h
         ../../../src/java.desktop/share/native/libfreetype/src/cff/cffcmap.h
         ../../../src/java.desktop/share/native/libfreetype/src/cff/cffdrivr.c
         ../../../src/java.desktop/share/native/libfreetype/src/cff/cffparse.c
@@ -327,10 +334,10 @@ set(SOURCE_FILES
         ../../../src/java.desktop/share/native/libfreetype/src/cff/cffobjs.h
         ../../../src/java.desktop/share/native/libfreetype/src/cff/cffgload.h
         ../../../src/java.desktop/share/native/libfreetype/src/cff/cffload.c
-        ../../../src/java.desktop/share/native/libfreetype/src/cff/cffpic.c
         ../../../src/java.desktop/share/native/libfreetype/src/cff/cffdrivr.h
         ../../../src/java.desktop/share/native/libfreetype/src/cff/cffcmap.c
         ../../../src/java.desktop/share/native/libfreetype/src/cff/cfferrs.h
+        ../../../src/java.desktop/share/native/libfreetype/src/psaux
         ../../../src/java.desktop/share/native/libfreetype/src/psaux/psarrst.h
         ../../../src/java.desktop/share/native/libfreetype/src/psaux/psstack.h
         ../../../src/java.desktop/share/native/libfreetype/src/psaux/cffdecode.h
@@ -367,6 +374,7 @@ set(SOURCE_FILES
         ../../../src/java.desktop/share/native/libfreetype/src/psaux/afmparse.c
         ../../../src/java.desktop/share/native/libfreetype/src/psaux/psauxmod.h
         ../../../src/java.desktop/share/native/libfreetype/src/psaux/psread.h
+        ../../../src/java.desktop/share/native/libfreetype/src/cid
         ../../../src/java.desktop/share/native/libfreetype/src/cid/cidtoken.h
         ../../../src/java.desktop/share/native/libfreetype/src/cid/cidriver.c
         ../../../src/java.desktop/share/native/libfreetype/src/cid/cidparse.c
@@ -379,11 +387,12 @@ set(SOURCE_FILES
         ../../../src/java.desktop/share/native/libfreetype/src/cid/cidparse.h
         ../../../src/java.desktop/share/native/libfreetype/src/cid/cidobjs.c
         ../../../src/java.desktop/share/native/libfreetype/src/cid/cidload.h
+        ../../../src/java.desktop/share/native/libfreetype/src/autofit
         ../../../src/java.desktop/share/native/libfreetype/src/autofit/afindic.h
         ../../../src/java.desktop/share/native/libfreetype/src/autofit/afdummy.h
         ../../../src/java.desktop/share/native/libfreetype/src/autofit/afmodule.h
         ../../../src/java.desktop/share/native/libfreetype/src/autofit/afwarp.c
-        ../../../src/java.desktop/share/native/libfreetype/src/autofit/afpic.c
+        ../../../src/java.desktop/share/native/libfreetype/src/autofit/afblue.cin
         ../../../src/java.desktop/share/native/libfreetype/src/autofit/afglobal.c
         ../../../src/java.desktop/share/native/libfreetype/src/autofit/afcover.h
         ../../../src/java.desktop/share/native/libfreetype/src/autofit/afwrtsys.h
@@ -396,10 +405,10 @@ set(SOURCE_FILES
         ../../../src/java.desktop/share/native/libfreetype/src/autofit/afranges.c
         ../../../src/java.desktop/share/native/libfreetype/src/autofit/afcjk.c
         ../../../src/java.desktop/share/native/libfreetype/src/autofit/afstyles.h
+        ../../../src/java.desktop/share/native/libfreetype/src/autofit/afblue.dat
         ../../../src/java.desktop/share/native/libfreetype/src/autofit/aferrors.h
         ../../../src/java.desktop/share/native/libfreetype/src/autofit/afdummy.c
         ../../../src/java.desktop/share/native/libfreetype/src/autofit/afindic.c
-        ../../../src/java.desktop/share/native/libfreetype/src/autofit/afpic.h
         ../../../src/java.desktop/share/native/libfreetype/src/autofit/afglobal.h
         ../../../src/java.desktop/share/native/libfreetype/src/autofit/afwarp.h
         ../../../src/java.desktop/share/native/libfreetype/src/autofit/afmodule.c
@@ -409,64 +418,58 @@ set(SOURCE_FILES
         ../../../src/java.desktop/share/native/libfreetype/src/autofit/aftypes.h
         ../../../src/java.desktop/share/native/libfreetype/src/autofit/afcjk.h
         ../../../src/java.desktop/share/native/libfreetype/src/autofit/afranges.h
+        ../../../src/java.desktop/share/native/libfreetype/src/autofit/afblue.hin
         ../../../src/java.desktop/share/native/libfreetype/src/autofit/afloader.c
         ../../../src/java.desktop/share/native/libfreetype/src/autofit/aflatin.h
         ../../../src/java.desktop/share/native/libfreetype/src/autofit/afangles.h
         ../../../src/java.desktop/share/native/libfreetype/src/autofit/afhints.c
+        ../../../src/java.desktop/share/native/libfreetype/src/pshinter
         ../../../src/java.desktop/share/native/libfreetype/src/pshinter/pshmod.c
         ../../../src/java.desktop/share/native/libfreetype/src/pshinter/pshrec.h
-        ../../../src/java.desktop/share/native/libfreetype/src/pshinter/pshpic.c
         ../../../src/java.desktop/share/native/libfreetype/src/pshinter/pshglob.h
         ../../../src/java.desktop/share/native/libfreetype/src/pshinter/pshalgo.c
         ../../../src/java.desktop/share/native/libfreetype/src/pshinter/pshmod.h
         ../../../src/java.desktop/share/native/libfreetype/src/pshinter/pshnterr.h
-        ../../../src/java.desktop/share/native/libfreetype/src/pshinter/pshpic.h
         ../../../src/java.desktop/share/native/libfreetype/src/pshinter/pshrec.c
         ../../../src/java.desktop/share/native/libfreetype/src/pshinter/pshalgo.h
         ../../../src/java.desktop/share/native/libfreetype/src/pshinter/pshglob.c
+        ../../../src/java.desktop/share/native/libfreetype/src/truetype
         ../../../src/java.desktop/share/native/libfreetype/src/truetype/ttinterp.c
         ../../../src/java.desktop/share/native/libfreetype/src/truetype/ttpload.c
         ../../../src/java.desktop/share/native/libfreetype/src/truetype/ttgxvar.c
         ../../../src/java.desktop/share/native/libfreetype/src/truetype/ttsubpix.h
         ../../../src/java.desktop/share/native/libfreetype/src/truetype/tterrors.h
         ../../../src/java.desktop/share/native/libfreetype/src/truetype/ttdriver.h
-        ../../../src/java.desktop/share/native/libfreetype/src/truetype/ttpic.h
         ../../../src/java.desktop/share/native/libfreetype/src/truetype/ttobjs.c
         ../../../src/java.desktop/share/native/libfreetype/src/truetype/ttgload.h
         ../../../src/java.desktop/share/native/libfreetype/src/truetype/ttgxvar.h
         ../../../src/java.desktop/share/native/libfreetype/src/truetype/ttpload.h
         ../../../src/java.desktop/share/native/libfreetype/src/truetype/ttinterp.h
-        ../../../src/java.desktop/share/native/libfreetype/src/truetype/ttpic.c
         ../../../src/java.desktop/share/native/libfreetype/src/truetype/ttdriver.c
         ../../../src/java.desktop/share/native/libfreetype/src/truetype/ttsubpix.c
         ../../../src/java.desktop/share/native/libfreetype/src/truetype/ttobjs.h
         ../../../src/java.desktop/share/native/libfreetype/src/truetype/ttgload.c
+        ../../../src/java.desktop/share/native/libfreetype/src/raster
         ../../../src/java.desktop/share/native/libfreetype/src/raster/ftmisc.h
         ../../../src/java.desktop/share/native/libfreetype/src/raster/rasterrs.h
-        ../../../src/java.desktop/share/native/libfreetype/src/raster/rastpic.c
         ../../../src/java.desktop/share/native/libfreetype/src/raster/ftrend1.h
         ../../../src/java.desktop/share/native/libfreetype/src/raster/ftraster.h
-        ../../../src/java.desktop/share/native/libfreetype/src/raster/rastpic.h
         ../../../src/java.desktop/share/native/libfreetype/src/raster/ftraster.c
         ../../../src/java.desktop/share/native/libfreetype/src/raster/ftrend1.c
+        ../../../src/java.desktop/share/native/libfreetype/src/psnames
         ../../../src/java.desktop/share/native/libfreetype/src/psnames/psnamerr.h
         ../../../src/java.desktop/share/native/libfreetype/src/psnames/psmodule.c
-        ../../../src/java.desktop/share/native/libfreetype/src/psnames/pspic.h
         ../../../src/java.desktop/share/native/libfreetype/src/psnames/pstables.h
         ../../../src/java.desktop/share/native/libfreetype/src/psnames/psmodule.h
-        ../../../src/java.desktop/share/native/libfreetype/src/psnames/pspic.c
+        ../../../src/java.desktop/share/native/libfreetype/src/base
         ../../../src/java.desktop/share/native/libfreetype/src/base/ftobjs.c
         ../../../src/java.desktop/share/native/libfreetype/src/base/ftfntfmt.c
         ../../../src/java.desktop/share/native/libfreetype/src/base/ftinit.c
-        ../../../src/java.desktop/share/native/libfreetype/src/base/ftapi.c
         ../../../src/java.desktop/share/native/libfreetype/src/base/ftdbgmem.c
         ../../../src/java.desktop/share/native/libfreetype/src/base/fthash.c
-        ../../../src/java.desktop/share/native/libfreetype/src/base/basepic.c
-        ../../../src/java.desktop/share/native/libfreetype/src/base/ftpic.c
         ../../../src/java.desktop/share/native/libfreetype/src/base/ftbitmap.c
         ../../../src/java.desktop/share/native/libfreetype/src/base/ftpsprop.c
         ../../../src/java.desktop/share/native/libfreetype/src/base/ftcid.c
-        ../../../src/java.desktop/share/native/libfreetype/src/base/md5.h
         ../../../src/java.desktop/share/native/libfreetype/src/base/ftglyph.c
         ../../../src/java.desktop/share/native/libfreetype/src/base/ftgloadr.c
         ../../../src/java.desktop/share/native/libfreetype/src/base/ftsystem.c
@@ -480,11 +483,9 @@ set(SOURCE_FILES
         ../../../src/java.desktop/share/native/libfreetype/src/base/ftsnames.c
         ../../../src/java.desktop/share/native/libfreetype/src/base/ftdebug.c
         ../../../src/java.desktop/share/native/libfreetype/src/base/ftmm.c
-        ../../../src/java.desktop/share/native/libfreetype/src/base/basepic.h
         ../../../src/java.desktop/share/native/libfreetype/src/base/ftbase.h
         ../../../src/java.desktop/share/native/libfreetype/src/base/ftfstype.c
         ../../../src/java.desktop/share/native/libfreetype/src/base/fttrigon.c
-        ../../../src/java.desktop/share/native/libfreetype/src/base/md5.c
         ../../../src/java.desktop/share/native/libfreetype/src/base/ftbbox.c
         ../../../src/java.desktop/share/native/libfreetype/src/base/ftstroke.c
         ../../../src/java.desktop/share/native/libfreetype/src/base/ftgasp.c
@@ -742,38 +743,214 @@ set(SOURCE_FILES
         ../../../src/java.desktop/share/native/libjavajpeg/jidctred.c
         ../../../src/java.desktop/share/native/libjavajpeg/jpegint.h
         ../../../src/java.desktop/share/native/libjavajpeg/jdpostct.c
+        ../../../src/java.desktop/share/native/libfontmanager
         ../../../src/java.desktop/share/native/libfontmanager/DrawGlyphList.c
         ../../../src/java.desktop/share/native/libfontmanager/HBShaper.c
         ../../../src/java.desktop/share/native/libfontmanager/scriptMapping.c
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz
         ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-buffer.h
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-aat-fdsc-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-post-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-indic-machine.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-open-type.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-subset-plan.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-aat-layout-common.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-use-machine.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-base-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-head-table.hh
         ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-set.h
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-coretext.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-arabic-win1256.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-khmer.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shaper-list.hh
         ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-face.h
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-buffer.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-var.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-cff-interp-common.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-map.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-post-macroman.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-fallback.hh
         ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-common.h
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-deprecated.h
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-blob.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-subset.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-normalize.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-unicode.cc
         ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-version.h
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-stat-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-name-language.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-aat-ltag-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-aat.h
         ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-font.h
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-color.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-cff-interp-cs-common.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-kern.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-subset-cff-common.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-default.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-face.cc
         ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-coretext.h
-        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-tag.h
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-cff1-table.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-aat-layout-just-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-color-colr-table.hh
         ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-deprecated.h
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-subset-cff1.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-arabic-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-aat-layout-kerx-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-vorg-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-blob.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-font.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-unicode.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-indic-table.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-kern-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-subset.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-normalize.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-common.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-buffer-serialize.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-name-language.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-gpos-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-var-avar-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-subset-cff-common.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-fallback-shape.cc
         ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot.h
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-cff1-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-face.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-string-array.hh
         ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout.h
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-subset-cff1.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-aat-layout-lcar-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-var-hvar-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-gsubgpos.hh
         ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-var.h
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-atomic.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-static.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ucdn
         ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ucdn/ucdn.c
         ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ucdn/ucdn.h
         ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ucdn/ucdn_db.h
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-aat-layout-morx-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-cff2-interp-cs.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ucdn.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-khmer-machine.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-name.h
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-thai.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-hhea-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-var-mvar-table.hh
         ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shape.h
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-tag.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-subset-plan.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-os2-unicode-ranges.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-warning.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-hdmx-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-khmer.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ft.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-cff-common.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-gdef-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-glyf-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-fallback.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-buffer.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-map.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-subset-glyf.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-name-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-set.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-color.h
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-cff2-table.cc
         ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shape-plan.h
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shape-plan.cc
         ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-font.h
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-use.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-color-sbix-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-indic.hh
         ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-unicode.h
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-unicode-emoji-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-aat-layout-feat-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-object.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-myanmar.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-gasp-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-arabic.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-buffer-deserialize-json.hh
         ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape.h
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-vector.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-myanmar-machine.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-arabic-fallback.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-debug.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-tag-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-vowel-constraints.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shaper.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-aat-layout.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-iter.hh
         ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-blob.h
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-face.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-aat-layout-trak-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-cff1-interp-cs.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-hmtx-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-aat-layout-ankr-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-cff-interp-dict-common.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-aat-map.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-common.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-subset-input.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-color-cbdt-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-color-cpal-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-subset-cff2.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-utf.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-hebrew.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-map.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-var-fvar-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-font.cc
         ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-map.h
         ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb.h
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shaper.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-jstf-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-aat-layout.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-mutex.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-os2-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-face.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-gsub-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-aat-layout.h
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-subset-input.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-math-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-cmap-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-aat-layout-bsln-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-aat-map.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-font.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-maxp-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-buffer-deserialize-text.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-map.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-subset-cff2.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-array.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-set.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shape-plan.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shape.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-hangul.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-null.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-cff2-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-name.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-subset-glyf.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-set-digest.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-indic.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-open-file.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-machinery.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-myanmar.cc
         ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-subset.h
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-color-svg-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-use.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-dsalgs.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-use-table.cc
         ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-math.h
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-math.cc
         ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ft.h
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-arabic.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-vowel-constraints.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shaper-impl.hh
         ../../../src/java.desktop/share/native/libfontmanager/glyphblitting.h
         ../../../src/java.desktop/share/native/libfontmanager/hb-jdk.h
         ../../../src/java.desktop/share/native/libfontmanager/fontconfig.h
+        ../../../src/java.desktop/share/native/libfontmanager/hb-jdk-font.cc
         ../../../src/java.desktop/share/native/libfontmanager/freetypeScaler.c
         ../../../src/java.desktop/share/native/libfontmanager/scriptMapping.h
         ../../../src/java.desktop/share/native/libfontmanager/ColorGlyphSurfaceData.c
@@ -911,7 +1088,6 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
             ../../../src/java.desktop/macosx/native/libawt_lwawt/awt/CFileDialog.h
             ../../../src/java.desktop/macosx/native/libawt_lwawt/awt/AWTWindow.h
             ../../../src/java.desktop/macosx/native/libawt_lwawt/awt/LWCToolkit.h
-            ../../../src/java.desktop/macosx/native/libawt_lwawt/awt/CGraphicsConfig.m
             ../../../src/java.desktop/macosx/native/libawt_lwawt/awt/CDesktopPeer.m
             ../../../src/java.desktop/macosx/native/libawt_lwawt/awt/PrintModel.h
             ../../../src/java.desktop/macosx/native/libawt_lwawt/awt/CTrayIcon.m
@@ -1149,10 +1325,8 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin" OR ${CMAKE_SYSTEM_NAME} MATCHES "Linux"
             ../../../src/java.desktop/unix/native/libawt/awt/awt_Mlib.c
             ../../../src/java.desktop/unix/native/libawt/awt/awt_LoadLibrary.c
             ../../../src/java.desktop/unix/native/libawt/awt/initIDs.c
-            ../../../src/java.desktop/unix/native/libawt_xawt/java2d/x11/XRBackendNative.c
+            ../../../src/java.desktop/unix/native/libawt_xawt/awt
-            ../../../src/java.desktop/unix/native/libawt_xawt/java2d/x11/XRSurfaceData.c
             ../../../src/java.desktop/unix/native/libawt_xawt/awt/gtk2_interface.c
-            ../../../src/java.desktop/unix/native/libawt_xawt/awt/randr.h
             ../../../src/java.desktop/unix/native/libawt_xawt/awt/list.c
             ../../../src/java.desktop/unix/native/libawt_xawt/awt/awt_DrawingSurface.c
             ../../../src/java.desktop/unix/native/libawt_xawt/awt/swing_GTKStyle.c
@@ -1167,8 +1341,6 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin" OR ${CMAKE_SYSTEM_NAME} MATCHES "Linux"
             ../../../src/java.desktop/unix/native/libawt_xawt/awt/multi_font.c
             ../../../src/java.desktop/unix/native/libawt_xawt/awt/multiVis.h
             ../../../src/java.desktop/unix/native/libawt_xawt/awt/awt_Event.c
-            ../../../src/java.desktop/unix/native/libawt_xawt/awt/Xrandr.h
-            ../../../src/java.desktop/unix/native/libawt_xawt/awt/robot_common.c
             ../../../src/java.desktop/unix/native/libawt_xawt/awt/awt_util.c
             ../../../src/java.desktop/unix/native/libawt_xawt/awt/list.h
             ../../../src/java.desktop/unix/native/libawt_xawt/awt/gtk2_interface.h
@@ -1176,24 +1348,14 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin" OR ${CMAKE_SYSTEM_NAME} MATCHES "Linux"
             ../../../src/java.desktop/unix/native/libawt_xawt/awt/gtk3_interface.c
             ../../../src/java.desktop/unix/native/libawt_xawt/awt/gtk_interface.h
             ../../../src/java.desktop/unix/native/libawt_xawt/awt/awt_Robot.c
-            ../../../src/java.desktop/unix/native/libawt_xawt/awt/HPkeysym.h
             ../../../src/java.desktop/unix/native/libawt_xawt/awt/awt_Event.h
             ../../../src/java.desktop/unix/native/libawt_xawt/awt/multiVis.c
             ../../../src/java.desktop/unix/native/libawt_xawt/awt/canvas.h
             ../../../src/java.desktop/unix/native/libawt_xawt/awt/awt_AWTEvent.c
             ../../../src/java.desktop/unix/native/libawt_xawt/awt/multi_font.h
-            ../../../src/java.desktop/unix/native/libawt_xawt/awt/robot_common.h
             ../../../src/java.desktop/unix/native/libawt_xawt/awt/sun_awt_X11_GtkFileDialogPeer.c
             ../../../src/java.desktop/unix/native/libawt_xawt/awt/awt_GraphicsEnv.c
             ../../../src/java.desktop/unix/native/libawt_xawt/awt/awt_InputMethod.c
-            ../../../src/java.desktop/unix/native/libawt_xawt/xawt/awt_Desktop.c
-            ../../../src/java.desktop/unix/native/libawt_xawt/xawt/XToolkit.c
-            ../../../src/java.desktop/unix/native/libawt_xawt/xawt/awt_Taskbar.c
-            ../../../src/java.desktop/unix/native/libawt_xawt/xawt/gnome_interface.c
-            ../../../src/java.desktop/unix/native/libawt_xawt/xawt/XlibWrapper.c
-            ../../../src/java.desktop/unix/native/libawt_xawt/xawt/gnome_interface.h
-            ../../../src/java.desktop/unix/native/libawt_xawt/xawt/awt_Taskbar.h
-            ../../../src/java.desktop/unix/native/libawt_xawt/xawt/XWindow.c
             ../../../src/java.desktop/unix/native/libfontmanager/X11FontScaler.c
             ../../../src/java.desktop/unix/native/libfontmanager/X11TextRenderer.c
             ../../../src/java.desktop/unix/native/libsplashscreen/splashscreen_config.h

jb/project/tools/linux/scripts/mkimages.sh

@@ -0,0 +1,93 @@
+#!/bin/bash
+
+# The following parameters must be specified:
+#   JBSDK_VERSION    - specifies the current version of OpenJDK e.g. 11_0_6
+#   JDK_BUILD_NUMBER - specifies the number of OpenJDK build or the value of --with-version-build argument to configure
+#   build_number     - specifies the number of JetBrainsRuntime build
+#
+# jbrsdk-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
+# jbr-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
+# jbrlw-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
+#
+# $ ./java --version
+# openjdk 11.0.6 2020-01-14
+# OpenJDK Runtime Environment (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number})
+# OpenJDK 64-Bit Server VM (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number}, mixed mode)
+#
+
+JBSDK_VERSION=$1
+JDK_BUILD_NUMBER=$2
+build_number=$3
+
+function create_jbr {
+  if [ -d "$BASE_DIR/$JBR_BUNDLE" ]; then
+    rm -rf $BASE_DIR/$JBR_BUNDLE
+  fi
+
+  if [ ! -z "$1" ]; then
+    grep -v "jdk.compiler\|jdk.hotspot.agent" modules.list > modules_tmp.list
+  else
+    cat modules.list > modules_tmp.list
+  fi
+
+  echo Running jlink....
+  $JSDK/bin/jlink \
+    --module-path $JSDK/jmods --no-man-pages --compress=2 \
+    --add-modules $(xargs < modules_tmp.list | sed s/" "//g) --output $BASE_DIR/$JBR_BUNDLE
+
+  cp -R jcef_linux_x64/* $BASE_DIR/$JBR_BUNDLE/lib || exit $?
+  grep -v "^JAVA_VERSION" $JSDK/release | grep -v "^MODULES" >> $BASE_DIR/$JBR_BUNDLE/release
+
+  echo Creating $JBR.tar.gz ...
+  tar -pcf $JBR.tar -C $BASE_DIR $JBR_BUNDLE || exit $?
+  gzip $JBR.tar || exit $?
+}
+
+JBRSDK_BASE_NAME=jbrsdk-$JBSDK_VERSION
+JBR_BASE_NAME=jbr-$JBSDK_VERSION
+JBRLW_BASE_NAME=jbrlw-$JBSDK_VERSION
+
+sh configure \
+  --disable-warnings-as-errors \
+  --with-debug-level=release \
+  --with-version-build=$JDK_BUILD_NUMBER \
+  --with-version-pre= \
+  --with-version-opt=b$build_number \
+  --with-import-modules=./modular-sdk \
+  --enable-cds=yes || exit $?
+
+make clean CONF=linux-x86_64-normal-server-release || exit $?
+make images CONF=linux-x86_64-normal-server-release || exit $?
+
+JSDK=build/linux-x86_64-normal-server-release/images/jdk
+JBSDK=$JBRSDK_BASE_NAME-linux-x64-b$build_number
+
+echo Fixing permissions
+chmod -R a+r $JSDK
+
+BASE_DIR=build/linux-x86_64-normal-server-release/images
+JBRSDK_BUNDLE=jbrsdk
+
+rm -rf $BASE_DIR/$JBRSDK_BUNDLE
+cp -r $JSDK $BASE_DIR/$JBRSDK_BUNDLE || exit $?
+cp -R jcef_linux_x64/* $BASE_DIR/$JBRSDK_BUNDLE/lib || exit $?
+
+echo Creating $JBSDK.tar.gz ...
+tar -pcf $JBSDK.tar --exclude=*.debuginfo --exclude=demo --exclude=sample --exclude=man -C $BASE_DIR $JBRSDK_BUNDLE || exit $?
+gzip $JBSDK.tar || exit $?
+
+JBR=$JBR_BASE_NAME-linux-x64-b$build_number
+JBR_BUNDLE=jbr
+create_jbr
+
+JBR=$JBRLW_BASE_NAME-linux-x64-b$build_number
+JBR_BUNDLE=jbrlw
+create_jbr "lw"
+
+make test-image || exit $?
+
+JBRSDK_TEST=$JBRSDK_BASE_NAME-linux-test-x64-b$build_number
+
+echo Creating $JBSDK_TEST.tar.gz ...
+tar -pcf $JBRSDK_TEST.tar -C $BASE_DIR --exclude='test/jdk/demos' test || exit $?
+gzip $JBRSDK_TEST.tar || exit $?

jb/project/tools/mac/scripts/entitlements.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+    <dict>
+        <key>com.apple.security.cs.allow-jit</key>
+        <true/>
+        <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
+        <true/>
+        <key>com.apple.security.cs.allow-dyld-environment-variables</key>
+        <true/>
+        <key>com.apple.security.cs.disable-library-validation</key>
+        <true/>
+        <key>com.apple.security.cs.disable-executable-page-protection</key>
+        <true/>
+    </dict>
+</plist>

jb/project/tools/mac/scripts/mkimages.sh

@@ -0,0 +1,103 @@
+#!/bin/bash
+
+# The following parameters must be specified:
+#   JBSDK_VERSION    - specifies the current version of OpenJDK e.g. 11_0_6
+#   JDK_BUILD_NUMBER - specifies the number of OpenJDK build or the value of --with-version-build argument to configure
+#   build_number     - specifies the number of JetBrainsRuntime build
+#
+# jbrsdk-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
+# jbr-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
+# jbrlw-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
+#
+# $ ./java --version
+# openjdk 11.0.6 2020-01-14
+# OpenJDK Runtime Environment (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number})
+# OpenJDK 64-Bit Server VM (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number}, mixed mode)
+#
+
+JBSDK_VERSION=$1
+JDK_BUILD_NUMBER=$2
+build_number=$3
+
+function create_jbr {
+  mkdir -p $JRE_CONTENTS
+
+  if [ -d "$JRE_HOME" ]; then
+    rm -rf $JRE_HOME
+  fi
+
+  if [ ! -z "$1" ]; then
+    grep -v "jdk.compiler\|jdk.hotspot.agent" modules.list > modules_tmp.list
+  else
+    cat modules.list > modules_tmp.list
+  fi
+
+  $BASE_DIR/$JBRSDK_BUNDLE/Contents/Home/bin/jlink \
+      --module-path $BASE_DIR/$JBRSDK_BUNDLE/Contents/Home/jmods --no-man-pages --compress=2 \
+      --add-modules $(xargs < modules_tmp.list | sed s/" "//g) --output $JRE_HOME  || exit $?
+  grep -v "^JAVA_VERSION" $BASE_DIR/$JBRSDK_BUNDLE/Contents/Home/release | grep -v "^MODULES" >> $JRE_HOME/release
+  cp -R $BASE_DIR/$JBRSDK_BUNDLE/Contents/MacOS $JRE_CONTENTS
+  cp $BASE_DIR/$JBRSDK_BUNDLE/Contents/Info.plist $JRE_CONTENTS
+  cp -a jcef_mac/Frameworks $JRE_CONTENTS || exit $?
+  cp -a jcef_mac/Helpers    $JRE_CONTENTS || exit $?
+
+  echo Creating $JBR.tar.gz ...
+  COPYFILE_DISABLE=1 tar -pczf $JBR.tar.gz --exclude='*.dSYM' --exclude='man' -C $BASE_DIR $JBR_BUNDLE || exit $?
+}
+
+JBRSDK_BASE_NAME=jbrsdk-$JBSDK_VERSION
+JBR_BASE_NAME=jbr-$JBSDK_VERSION
+JBRLW_BASE_NAME=jbrlw-$JBSDK_VERSION
+
+sh configure \
+  --disable-warnings-as-errors \
+  --with-debug-level=release \
+  --with-version-pre= \
+  --with-version-build=$JDK_BUILD_NUMBER \
+  --with-version-opt=b$build_number \
+  --with-import-modules=./modular-sdk \
+  --with-boot-jdk=`/usr/libexec/java_home -v 11` \
+  --enable-cds=yes || exit $?
+
+make images CONF=macosx-x86_64-normal-server-release || exit $?
+
+JSDK=build/macosx-x86_64-normal-server-release/images/jdk-bundle
+JBSDK=$JBRSDK_BASE_NAME-osx-x64-b$build_number
+
+BASE_DIR=jre
+JBRSDK_BUNDLE=jbrsdk
+
+rm -rf $BASE_DIR
+mkdir $BASE_DIR || exit $?
+JBSDK_VERSION_WITH_DOTS=$(echo $JBSDK_VERSION | sed 's/_/\./g')
+cp -a build/macosx-x86_64-normal-server-release/images/jdk-bundle/jdk-$JBSDK_VERSION_WITH_DOTS.jdk \
+  $BASE_DIR/$JBRSDK_BUNDLE || exit $?
+
+echo Creating $JBSDK.tar.gz ...
+cp -a jcef_mac/Frameworks $BASE_DIR/$JBRSDK_BUNDLE/Contents/
+cp -a jcef_mac/Helpers    $BASE_DIR/$JBRSDK_BUNDLE/Contents/
+
+COPYFILE_DISABLE=1 tar -pczf $JBSDK.tar.gz -C $BASE_DIR \
+  --exclude='._*' --exclude='.DS_Store' --exclude='*~' \
+  --exclude='Home/demo' --exclude='Home/man' --exclude='Home/sample' \
+  $JBRSDK_BUNDLE || exit $?
+
+JBR=$JBR_BASE_NAME-osx-x64-b$build_number
+JBR_BUNDLE=jbr
+JRE_CONTENTS=$BASE_DIR/$JBR_BUNDLE/Contents
+JRE_HOME=$JRE_CONTENTS/Home
+create_jbr
+
+JBR=$JBRLW_BASE_NAME-osx-x64-b$build_number
+JBR_BUNDLE=jbrlw
+JRE_CONTENTS=$BASE_DIR/$JBR_BUNDLE/Contents
+JRE_HOME=$JRE_CONTENTS/Home
+create_jbr "lw"
+
+make test-image || exit $?
+
+JBRSDK_TEST=$JBRSDK_BASE_NAME-osx-test-x64-b$build_number
+
+echo Creating $JBSDK_TEST.tar.gz ...
+COPYFILE_DISABLE=1 tar -pczf $JBRSDK_TEST.tar.gz -C build/macosx-x86_64-normal-server-release/images \
+  --exclude='test/jdk/demos' test || exit $?

jb/project/tools/mac/scripts/notarize.sh

@@ -0,0 +1,120 @@
+#!/bin/bash
+
+APP_DIRECTORY=$1
+APPL_USER=$2
+APPL_PASSWORD=$3
+APP_NAME=$4
+BUNDLE_ID=$5
+FAKE_ROOT="${6:-fake-root}"
+
+if [[ -z "$APP_DIRECTORY" ]] || [[ -z "$APPL_USER" ]] || [[ -z "$APPL_PASSWORD" ]]; then
+  echo "Usage: $0 AppDirectory Username Password"
+  exit 1
+fi
+if [[ ! -d "$APP_DIRECTORY" ]]; then
+  echo "AppDirectory '$APP_DIRECTORY' does not exist or not a directory"
+  exit 1
+fi
+
+function log() {
+  echo "$(date '+[%H:%M:%S]') $*"
+}
+
+function publish-log() {
+  id=$1
+  file=$2
+  curl -T "$file" "$ARTIFACTORY_URL/$id" || true
+}
+
+function altool-upload() {
+  # Since altool uses same file for upload token we have to trick it into using different folders for token file location
+  # Also it copies zip into TMPDIR so we override it too, to simplify cleanup
+  OLD_HOME="$HOME"
+  export HOME="$FAKE_ROOT/home"
+  export TMPDIR="$FAKE_ROOT/tmp"
+  mkdir -p "$HOME"
+  mkdir -p "$TMPDIR"
+  export _JAVA_OPTIONS="-Duser.home=$HOME -Djava.io.tmpdir=$TMPDIR"
+  # Reduce amount of downloads, cache transporter libraries
+  shared_itmstransporter="$OLD_HOME/shared-itmstransporter"
+  if [[ -f "$shared_itmstransporter" ]]; then
+    cp -r "$shared_itmstransporter" "$HOME/.itmstransporter"
+  fi
+  # For some reason altool prints everything to stderr, not stdout
+  set +e
+  xcrun altool --notarize-app \
+    --username "$APPL_USER" --password "$APPL_PASSWORD" \
+    --primary-bundle-id "$BUNDLE_ID" \
+    --asc-provider JetBrainssro --file "$1" 2>&1 | tee "altool.init.out"
+  unset TMPDIR
+  export HOME="$OLD_HOME"
+  set -e
+}
+
+#immediately exit script with an error if a command fails
+set -euo pipefail
+
+file="$APP_NAME.zip"
+
+log "Zipping $file..."
+rm -rf "$file"
+ditto -c -k --sequesterRsrc --keepParent "$APP_DIRECTORY/Contents" "$file"
+
+log "Notarizing $file..."
+rm -rf "altool.init.out" "altool.check.out"
+altool-upload "$file"
+
+rm -rf "$file"
+
+notarization_info="$(grep -e "RequestUUID" "altool.init.out" | grep -oE '([0-9a-f-]{36})')"
+
+if [ -z "$notarization_info" ]; then
+  log "Faile to read RequestUUID from altool.init.out"
+  exit 10
+fi
+
+PATH="$PATH:/usr/local/bin/"
+
+log "Notarization request sent, awaiting response"
+spent=0
+
+while true; do
+  # For some reason altool prints everything to stderr, not stdout
+  xcrun altool --username "$APPL_USER" --notarization-info "$notarization_info" --password "$APPL_PASSWORD" >"altool.check.out" 2>&1 || true
+  status="$(grep -oe 'Status: .*' "altool.check.out" | cut -c 9- || true)"
+  log "Current status: $status"
+  if [ "$status" = "invalid" ]; then
+    log "Notarization failed"
+    ec=1
+  elif [ "$status" = "success" ]; then
+    log "Notarization succeeded"
+    ec=0
+  else
+    if [ "$status" != "in progress" ]; then
+      log "Unknown notarization status, waiting more, altool output:"
+      cat "altool.check.out"
+    fi
+    if [[ $spent -gt 60 ]]; then
+      log "Waiting time out (apx 60 minutes)"
+      ec=2
+      break
+    fi
+    sleep 60
+    ((spent += 1))
+    continue
+  fi
+  developer_log="developer_log.json"
+  log "Fetching $developer_log"
+  # TODO: Replace cut with trim or something better
+  url="$(grep -oe 'LogFileURL: .*' "altool.check.out" | cut -c 13-)"
+  wget "$url" -O "$developer_log" && cat "$developer_log" || true
+  if [ $ec != 0 ]; then
+    log "Publishing $developer_log"
+    publish-log "$notarization_info" "$developer_log"
+  fi
+  break
+done
+cat "altool.check.out"
+
+rm -rf "altool.init.out" "altool.check.out"
+exit $ec

jb/project/tools/mac/scripts/sign.sh

@@ -0,0 +1,95 @@
+#!/bin/bash
+
+APP_DIRECTORY=$1
+JB_CERT=$2
+
+if [[ -z "$APP_DIRECTORY" ]] || [[ -z "$JB_CERT" ]]; then
+  echo "Usage: $0 AppDirectory CertificateID"
+  exit 1
+fi
+if [[ ! -d "$APP_DIRECTORY" ]]; then
+  echo "AppDirectory '$APP_DIRECTORY' does not exist or not a directory"
+  exit 1
+fi
+
+function log() {
+  echo "$(date '+[%H:%M:%S]') $*"
+}
+
+#immediately exit script with an error if a command fails
+set -euo pipefail
+
+# Cleanup files left from previous sign attempt (if any)
+find "$APP_DIRECTORY" -name '*.cstemp' -exec rm '{}' \;
+
+log "Signing libraries and executables..."
+# -perm +111 searches for executables
+for f in \
+   "Contents/Home/bin" \
+   "Contents/Home/lib" \
+   "Contents/Frameworks" \
+   "Contents/Helpers"; do
+  if [ -d "$APP_DIRECTORY/$f" ]; then
+    find "$APP_DIRECTORY/$f" \
+      -type f \( -name "*.jnilib" -o -name "*.dylib" -o -name "*.so" -o -perm +111 \) \
+      -exec codesign --timestamp \
+      -v -s "$JB_CERT" --options=runtime \
+      --entitlements entitlements.xml {} \;
+  fi
+done
+
+log "Signing libraries in jars in $PWD"
+
+# todo: add set -euo pipefail; into the inner sh -c
+# `-e` prevents `grep -q && printf` loginc
+# with `-o pipefail` there's no input for 'while' loop
+find "$APP_DIRECTORY" -name '*.jar' \
+  -exec sh -c "set -u; unzip -l \"\$0\" | grep -q -e '\.dylib\$' -e '\.jnilib\$' -e '\.so\$' -e '^jattach\$' && printf \"\$0\0\" " {} \; |
+  while IFS= read -r -d $'\0' file; do
+    log "Processing libraries in $file"
+
+    rm -rf jarfolder jar.jar
+    mkdir jarfolder
+    filename="${file##*/}"
+    log "Filename: $filename"
+    cp "$file" jarfolder && (cd jarfolder && jar xf "$filename" && rm "$filename")
+
+    find jarfolder \
+      -type f \( -name "*.jnilib" -o -name "*.dylib" -o -name "*.so" -o -name "jattach" \) \
+      -exec codesign --timestamp \
+      -v -s "$JB_CERT" --options=runtime \
+      --entitlements entitlements.xml {} \;
+
+    (cd jarfolder; zip -q -r -o ../jar.jar .)
+    mv jar.jar "$file"
+  done
+
+rm -rf jarfolder jar.jar
+
+log "Signing other files..."
+for f in \
+  "Contents/MacOS"; do
+  if [ -d "$APP_DIRECTORY/$f" ]; then
+    find "$APP_DIRECTORY/$f" \
+      -type f \( -name "*.jnilib" -o -name "*.dylib" -o -name "*.so" -o -perm +111 \) \
+      -exec codesign --timestamp \
+      -v -s "$JB_CERT" --options=runtime \
+      --entitlements entitlements.xml {} \;
+  fi
+done
+
+#log "Signing executable..."
+#codesign --timestamp \
+#    -v -s "$JB_CERT" --options=runtime \
+#    --force \
+#    --entitlements entitlements.xml "$APP_DIRECTORY/Contents/MacOS/idea"
+
+log "Signing whole app..."
+codesign --timestamp \
+  -v -s "$JB_CERT" --options=runtime \
+  --force \
+  --entitlements entitlements.xml "$APP_DIRECTORY"
+
+log "Verifying java is not broken"
+find "$APP_DIRECTORY" \
+  -type f -name 'java' -perm +111 -exec {} -version \;

jb/project/tools/mac/scripts/signapp.sh

@@ -0,0 +1,132 @@
+#!/bin/bash
+
+#immediately exit script with an error if a command fails
+set -euo pipefail
+
+export COPY_EXTENDED_ATTRIBUTES_DISABLE=true
+export COPYFILE_DISABLE=true
+
+INPUT_FILE=$1
+EXPLODED=$2.exploded
+BACKUP_JMODS=$2.backup
+USERNAME=$3
+PASSWORD=$4
+CODESIGN_STRING=$5
+NOTARIZE=$6
+BUNDLE_ID=$7
+
+cd "$(dirname "$0")"
+
+function log() {
+  echo "$(date '+[%H:%M:%S]') $*"
+}
+
+log "Deleting $EXPLODED ..."
+if test -d "$EXPLODED"; then
+  find "$EXPLODED" -mindepth 1 -maxdepth 1 -exec chmod -R u+wx '{}' \;
+fi
+rm -rf "$EXPLODED"
+mkdir "$EXPLODED"
+rm -rf "$BACKUP_JMODS"
+mkdir "$BACKUP_JMODS"
+
+log "Unzipping $INPUT_FILE to $EXPLODED ..."
+tar -xzvf "$INPUT_FILE" --directory $EXPLODED
+rm "$INPUT_FILE"
+BUILD_NAME="$(ls "$EXPLODED")"
+if test -d $EXPLODED/$BUILD_NAME/Contents/Home/jmods; then
+  mv $EXPLODED/$BUILD_NAME/Contents/Home/jmods $BACKUP_JMODS
+fi
+
+log "$INPUT_FILE extracted and removed"
+
+APPLICATION_PATH="$EXPLODED/$BUILD_NAME"
+
+find "$APPLICATION_PATH/Contents/Home/bin" \
+  -maxdepth 1 -type f -name '*.jnilib' -print0 |
+  while IFS= read -r -d $'\0' file; do
+    if [ -f "$file" ]; then
+      log "Linking $file"
+      b="$(basename "$file" .jnilib)"
+      ln -sf "$b.jnilib" "$(dirname "$file")/$b.dylib"
+    fi
+  done
+
+find "$APPLICATION_PATH/Contents/" \
+  -maxdepth 1 -type f -name '*.txt' -print0 |
+  while IFS= read -r -d $'\0' file; do
+    if [ -f "$file" ]; then
+      log "Moving $file"
+      mv "$file" "$APPLICATION_PATH/Contents/Resources"
+    fi
+  done
+
+non_plist=$(find "$APPLICATION_PATH/Contents/" -maxdepth 1 -type f -and -not -name 'Info.plist' | wc -l)
+if [[ $non_plist -gt 0 ]]; then
+  log "Only Info.plist file is allowed in Contents directory but found $non_plist file(s):"
+  log "$(find "$APPLICATION_PATH/Contents/" -maxdepth 1 -type f -and -not -name 'Info.plist')"
+  exit 1
+fi
+
+log "Unlocking keychain..."
+# Make sure *.p12 is imported into local KeyChain
+security unlock-keychain -p "$PASSWORD" "/Users/$USERNAME/Library/Keychains/login.keychain"
+
+attempt=1
+limit=3
+set +e
+while [[ $attempt -le $limit ]]; do
+  log "Signing (attempt $attempt) $APPLICATION_PATH ..."
+  ./sign.sh "$APPLICATION_PATH" "$CODESIGN_STRING"
+  ec=$?
+  if [[ $ec -ne 0 ]]; then
+    ((attempt += 1))
+    if [ $attempt -eq $limit ]; then
+      set -e
+    fi
+    log "Signing failed, wait for 30 sec and try to sign again"
+    sleep 30
+  else
+    log "Signing done"
+    codesign -v "$APPLICATION_PATH" -vvvvv
+    log "Check sign done"
+    ((attempt += limit))
+  fi
+done
+
+set -e
+
+if [ "$NOTARIZE" = "yes" ]; then
+  log "Notarizing..."
+  # shellcheck disable=SC1090
+  source "$HOME/.notarize_token"
+  APP_NAME=$(echo ${INPUT_FILE} | awk -F"." '{ print $1 }')
+  # Since notarization tool uses same file for upload token we have to trick it into using different folders, hence fake root
+  # Also it leaves copy of zip file in TMPDIR, so notarize.sh overrides it and uses FAKE_ROOT as location for temp TMPDIR
+  FAKE_ROOT="$(pwd)/fake-root"
+  mkdir -p "$FAKE_ROOT"
+  echo "Notarization will use fake root: $FAKE_ROOT"
+  ./notarize.sh "$APPLICATION_PATH" "$APPLE_USERNAME" "$APPLE_PASSWORD" "$APP_NAME" "$BUNDLE_ID" "$FAKE_ROOT"
+  rm -rf "$FAKE_ROOT"
+
+  set +e
+  log "Stapling..."
+  xcrun stapler staple "$APPLICATION_PATH"
+else
+  log "Notarization disabled"
+  log "Stapling disabled"
+fi
+
+log "Zipping $BUILD_NAME to $INPUT_FILE ..."
+(
+  #cd "$EXPLODED"
+  #ditto -c -k --sequesterRsrc --keepParent "$BUILD_NAME" "../$INPUT_FILE"
+  if test -d $BACKUP_JMODS/jmods; then
+    mv $BACKUP_JMODS/jmods $EXPLODED/$BUILD_NAME/Contents/Home
+  fi
+
+  COPYFILE_DISABLE=1 tar -pczf $INPUT_FILE --exclude='*.dSYM' --exclude='man' -C $EXPLODED $BUILD_NAME
+  log "Finished zipping"
+)
+rm -rf "$EXPLODED"
+log "Done"

jb/project/tools/windows/scripts/mkimages.sh

@@ -0,0 +1,75 @@
+#!/bin/bash
+
+# The following parameters must be specified:
+#   JBSDK_VERSION    - specifies the current version of OpenJDK e.g. 11_0_6
+#   JDK_BUILD_NUMBER - specifies the number of OpenJDK build or the value of --with-version-build argument to configure
+#   build_number     - specifies the number of JetBrainsRuntime build
+#
+# jbrsdk-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
+# jbr-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
+# jbrlw-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
+#
+# $ ./java --version
+# openjdk 11.0.6 2020-01-14
+# OpenJDK Runtime Environment (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number})
+# OpenJDK 64-Bit Server VM (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number}, mixed mode)
+#
+
+JBSDK_VERSION=$1
+JDK_BUILD_NUMBER=$2
+build_number=$3
+
+function create_jbr {
+  rm -rf $BASE_DIR/$JBR_BUNDLE
+
+  if [ ! -z "$1" ]; then
+    grep -v "jdk.compiler\|jdk.hotspot.agent" modules.list > modules_tmp.list
+  else
+    cat modules.list > modules_tmp.list
+  fi
+
+  $JSDK/bin/jlink \
+    --module-path $JSDK/jmods --no-man-pages --compress=2 \
+    --add-modules $(xargs < modules_tmp.list | sed s/" "//g) --output $BASE_DIR/$JBR_BUNDLE || exit $?
+  cp -R jcef_win_x64/* $BASE_DIR/$JBR_BUNDLE/bin
+  echo Modifying release info ...
+  grep -v \"^JAVA_VERSION\" $JSDK/release | grep -v \"^MODULES\" >> $BASE_DIR/$JBR_BUNDLE/release
+}
+
+JBRSDK_BASE_NAME=jbrsdk-$JBSDK_VERSION
+JBR_BASE_NAME=jbr-$JBSDK_VERSION
+JBRLW_BASE_NAME=jbrlw-$JBSDK_VERSION
+WORK_DIR=$(pwd)
+
+PATH="/usr/local/bin:/usr/bin:$PATH"
+./configure \
+  --disable-warnings-as-errors \
+  --disable-debug-symbols \
+  --with-target-bits=64 \
+  --with-version-pre= \
+  --with-version-build=$JDK_BUILD_NUMBER  \
+  --with-version-opt=b$build_number \
+  --with-import-modules=$WORK_DIR/modular-sdk \
+  --with-toolchain-version=2015 \
+  --with-boot-jdk=$BOOT_JDK \
+  --disable-ccache \
+  --enable-cds=yes || exit 1
+make clean CONF=windows-x86_64-normal-server-release || exit 1
+make images CONF=windows-x86_64-normal-server-release || exit 1
+make -d test-image || exit 1
+
+JSDK=build/windows-x86_64-normal-server-release/images/jdk
+JBR=$JBR_BASE_NAME-windows-x64-b$build_number
+JBSDK=$JBRSDK_BASE_NAME-windows-x64-b$build_number
+
+BASE_DIR=build/windows-x86_64-normal-server-release/images
+JBRSDK_BUNDLE=jbrsdk
+
+rm -rf $BASE_DIR/$JBRSDK_BUNDLE && rsync -a --exclude demo --exclude sample $JSDK/ $JBRSDK_BUNDLE || exit 1
+cp -R jcef_win_x64/* $JBRSDK_BUNDLE/bin
+
+JBR_BUNDLE=jbr
+create_jbr
+
+JBR_BUNDLE=jbrlw
+create_jbr "lw"

jb/project/tools/windows/scripts/pack.sh

@@ -0,0 +1,46 @@
+#!/bin/bash
+
+# The following parameters must be specified:
+#   JBSDK_VERSION    - specifies the current version of OpenJDK e.g. 11_0_6
+#   JDK_BUILD_NUMBER - specifies the number of OpenJDK build or the value of --with-version-build argument to configure
+#   build_number     - specifies the number of JetBrainsRuntime build
+#
+# jbrsdk-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
+# jbr-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
+# jbrlw-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
+#
+# $ ./java --version
+# openjdk 11.0.6 2020-01-14
+# OpenJDK Runtime Environment (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number})
+# OpenJDK 64-Bit Server VM (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number}, mixed mode)
+#
+
+JBSDK_VERSION=$1
+JDK_BUILD_NUMBER=$2
+build_number=$3
+
+JBRSDK_BASE_NAME=jbrsdk-$JBSDK_VERSION
+JBR_BASE_NAME=jbr-$JBSDK_VERSION
+JBRLW_BASE_NAME=jbrlw-$JBSDK_VERSION
+
+JSDK=build/windows-x86_64-normal-server-release/images/jdk
+JBSDK=$JBRSDK_BASE_NAME-windows-x64-b$build_number
+
+JBRSDK_BUNDLE=jbrsdk
+BASE_DIR=build/windows-x86_64-normal-server-release/images
+echo Creating $JBSDK.tar.gz ...
+/usr/bin/tar -czf $JBSDK.tar.gz $JBRSDK_BUNDLE || exit 1
+
+JBR_BUNDLE=jbr
+JBR=$JBR_BASE_NAME-windows-x64-b$build_number
+echo Creating $JBR.tar.gz ...
+/usr/bin/tar -czf $JBR.tar.gz -C $BASE_DIR $JBR_BUNDLE || exit 1
+
+JBR_BUNDLE=jbrlw
+JBR=$JBRLW_BASE_NAME-windows-x64-b$build_number
+echo Creating $JBR.tar.gz ...
+/usr/bin/tar -czf $JBR.tar.gz -C $BASE_DIR $JBR_BUNDLE || exit 1
+
+JBRSDK_TEST=$JBRSDK_BASE_NAME-windows-test-x64-b$build_number
+echo Creating $JBRSDK_TEST.tar.gz ...
+/usr/bin/tar -czf $JBRSDK_TEST.tar.gz -C $BASE_DIR --exclude='test/jdk/demos' test || exit 1

jbr_file_list_linux.txt

@@ -1,168 +0,0 @@
-bin/jaotc
-bin/java
-bin/jjs
-bin/jrunscript
-bin/keytool
-bin/pack200
-bin/rmid
-bin/rmiregistry
-bin/unpack200
-conf/logging.properties
-conf/management/jmxremote.access
-conf/management/jmxremote.password.template
-conf/management/management.properties
-conf/net.properties
-conf/security/java.policy
-conf/security/java.security
-conf/security/policy/limited/default_local.policy
-conf/security/policy/limited/default_US_export.policy
-conf/security/policy/limited/exempt_local.policy
-conf/security/policy/README.txt
-conf/security/policy/unlimited/default_local.policy
-conf/security/policy/unlimited/default_US_export.policy
-conf/sound.properties
-legal/java.base/ADDITIONAL_LICENSE_INFO
-legal/java.base/aes.md
-legal/java.base/asm.md
-legal/java.base/ASSEMBLY_EXCEPTION
-legal/java.base/c-libutl.md
-legal/java.base/cldr.md
-legal/java.base/icu.md
-legal/java.base/LICENSE
-legal/java.base/public_suffix.md
-legal/java.base/unicode.md
-legal/java.desktop/colorimaging.md
-legal/java.desktop/giflib.md
-legal/java.desktop/harfbuzz.md
-legal/java.desktop/jpeg.md
-legal/java.desktop/lcms.md
-legal/java.desktop/libpng.md
-legal/java.desktop/mesa3d.md
-legal/java.desktop/opengl.md
-legal/java.desktop/xwindows.md
-legal/java.smartcardio/pcsclite.md
-legal/java.xml/bcel.md
-legal/java.xml/dom.md
-legal/java.xml/jcup.md
-legal/java.xml/xalan.md
-legal/java.xml/xerces.md
-legal/java.xml.crypto/santuario.md
-legal/jdk.crypto.cryptoki/pkcs11cryptotoken.md
-legal/jdk.crypto.cryptoki/pkcs11wrapper.md
-legal/jdk.crypto.ec/ecc.md
-legal/jdk.dynalink/dynalink.md
-legal/jdk.internal.le/jline.md
-legal/jdk.localedata/thaidict.md
-legal/jdk.scripting.nashorn/double-conversion.md
-legal/jdk.scripting.nashorn/joni.md
-lib/classlist
-lib/jexec
-lib/jfr/default.jfc
-lib/jfr/profile.jfc
-lib/jli/libjli.so
-lib/jrt-fs.jar
-lib/jvm.cfg
-lib/libattach.so
-lib/libawt.so
-lib/libawt_headless.so
-lib/libawt_xawt.so
-lib/libdt_socket.so
-lib/libextnet.so
-lib/libfontmanager.so
-lib/libinstrument.so
-lib/libj2gss.so
-lib/libj2pcsc.so
-lib/libj2pkcs11.so
-lib/libjaas.so
-lib/libjava.so
-lib/libjavajpeg.so
-lib/libjawt.so
-lib/libjdwp.so
-lib/libjimage.so
-lib/libjsig.so
-lib/libjsound.so
-lib/liblcms.so
-lib/libmanagement.so
-lib/libmanagement_agent.so
-lib/libmanagement_ext.so
-lib/libmlib_image.so
-lib/libnet.so
-lib/libnio.so
-lib/libprefs.so
-lib/librmi.so
-lib/libsctp.so
-lib/libsplashscreen.so
-lib/libsunec.so
-lib/libunpack.so
-lib/libverify.so
-lib/libzip.so
-lib/modules
-lib/psfont.properties.ja
-lib/psfontj2d.properties
-lib/security/blacklisted.certs
-lib/security/cacerts
-lib/security/default.policy
-lib/security/public_suffix_list.dat
-lib/server/libjsig.so
-lib/server/libjvm.so
-lib/server/Xusage.txt
-lib/tzdb.dat
-man/ja_JP.UTF-8/man1/java.1
-man/ja_JP.UTF-8/man1/jjs.1
-man/ja_JP.UTF-8/man1/keytool.1
-man/ja_JP.UTF-8/man1/pack200.1
-man/ja_JP.UTF-8/man1/rmid.1
-man/ja_JP.UTF-8/man1/rmiregistry.1
-man/ja_JP.UTF-8/man1/unpack200.1
-man/man1/java.1
-man/man1/jjs.1
-man/man1/keytool.1
-man/man1/pack200.1
-man/man1/rmid.1
-man/man1/rmiregistry.1
-man/man1/unpack200.1
-release
-bin/javapackager
-lib/libjavafx_font_pango.so
-lib/libavplugin-ffmpeg-56.so
-lib/libavplugin-56.so
-lib/libglass.so
-lib/libavplugin-57.so
-lib/libavplugin-ffmpeg-57.so
-lib/libprism_sw.so
-lib/libavplugin-53.so
-lib/libjfxmedia.so
-lib/javafx.properties
-lib/libfxplugins.so
-lib/javafx-swt.jar
-lib/ant-javafx.jar
-lib/libglassgtk3.so
-lib/libjavafx_iio.so
-lib/libgstreamer-lite.so
-lib/libprism_common.so
-lib/libjavafx_font_freetype.so
-lib/libglassgtk2.so
-lib/libavplugin-54.so
-lib/libprism_es2.so
-lib/libjfxwebkit.so
-lib/libdecora_sse.so
-lib/libjavafx_font.so
-lib/libavplugin-55.so
-legal/javafx.media/glib.md
-legal/javafx.media/gstreamer.md
-legal/javafx.media/libffi.md
-legal/javafx.media/applecoreaudio.md
-legal/javafx.web/icu_v51.md
-legal/javafx.web/webkit.md
-legal/javafx.web/libxslt.md
-legal/javafx.web/libxml2.md
-legal/javafx.graphics/jpeg_v7.md
-jmods/javafx.base.jmod
-jmods/javafx.media.jmod
-jmods/javafx.swing.jmod
-jmods/javafx.controls.jmod
-jmods/jdk.packager.services.jmod
-jmods/jdk.packager.jmod
-jmods/javafx.web.jmod
-jmods/javafx.fxml.jmod
-jmods/javafx.graphics.jmod

jbr_file_list_osx.txt

@@ -1,168 +0,0 @@
-jdk/Contents/Home/bin/jaotc
-jdk/Contents/Home/bin/java
-jdk/Contents/Home/bin/jjs
-jdk/Contents/Home/bin/jrunscript
-jdk/Contents/Home/bin/keytool
-jdk/Contents/Home/bin/pack200
-jdk/Contents/Home/bin/rmid
-jdk/Contents/Home/bin/rmiregistry
-jdk/Contents/Home/bin/unpack200
-jdk/Contents/Home/conf/logging.properties
-jdk/Contents/Home/conf/management/jmxremote.access
-jdk/Contents/Home/conf/management/jmxremote.password.template
-jdk/Contents/Home/conf/management/management.properties
-jdk/Contents/Home/conf/net.properties
-jdk/Contents/Home/conf/security/java.policy
-jdk/Contents/Home/conf/security/java.security
-jdk/Contents/Home/conf/security/policy/limited/default_local.policy
-jdk/Contents/Home/conf/security/policy/limited/default_US_export.policy
-jdk/Contents/Home/conf/security/policy/limited/exempt_local.policy
-jdk/Contents/Home/conf/security/policy/README.txt
-jdk/Contents/Home/conf/security/policy/unlimited/default_local.policy
-jdk/Contents/Home/conf/security/policy/unlimited/default_US_export.policy
-jdk/Contents/Home/conf/sound.properties
-jdk/Contents/Home/legal/java.base/ADDITIONAL_LICENSE_INFO
-jdk/Contents/Home/legal/java.base/aes.md
-jdk/Contents/Home/legal/java.base/asm.md
-jdk/Contents/Home/legal/java.base/ASSEMBLY_EXCEPTION
-jdk/Contents/Home/legal/java.base/c-libutl.md
-jdk/Contents/Home/legal/java.base/cldr.md
-jdk/Contents/Home/legal/java.base/icu.md
-jdk/Contents/Home/legal/java.base/LICENSE
-jdk/Contents/Home/legal/java.base/public_suffix.md
-jdk/Contents/Home/legal/java.base/unicode.md
-jdk/Contents/Home/legal/java.desktop/colorimaging.md
-jdk/Contents/Home/legal/java.desktop/freetype.md
-jdk/Contents/Home/legal/java.desktop/giflib.md
-jdk/Contents/Home/legal/java.desktop/harfbuzz.md
-jdk/Contents/Home/legal/java.desktop/jpeg.md
-jdk/Contents/Home/legal/java.desktop/lcms.md
-jdk/Contents/Home/legal/java.desktop/libpng.md
-jdk/Contents/Home/legal/java.desktop/mesa3d.md
-jdk/Contents/Home/legal/java.desktop/opengl.md
-jdk/Contents/Home/legal/java.desktop/xwindows.md
-jdk/Contents/Home/legal/java.smartcardio/pcsclite.md
-jdk/Contents/Home/legal/java.xml/bcel.md
-jdk/Contents/Home/legal/java.xml/dom.md
-jdk/Contents/Home/legal/java.xml/jcup.md
-jdk/Contents/Home/legal/java.xml/xalan.md
-jdk/Contents/Home/legal/java.xml/xerces.md
-jdk/Contents/Home/legal/java.xml.crypto/santuario.md
-jdk/Contents/Home/legal/jdk.crypto.cryptoki/pkcs11cryptotoken.md
-jdk/Contents/Home/legal/jdk.crypto.cryptoki/pkcs11wrapper.md
-jdk/Contents/Home/legal/jdk.crypto.ec/ecc.md
-jdk/Contents/Home/legal/jdk.dynalink/dynalink.md
-jdk/Contents/Home/legal/jdk.internal.le/jline.md
-jdk/Contents/Home/legal/jdk.localedata/thaidict.md
-jdk/Contents/Home/legal/jdk.scripting.nashorn/double-conversion.md
-jdk/Contents/Home/legal/jdk.scripting.nashorn/joni.md
-jdk/Contents/Home/lib/classlist
-jdk/Contents/Home/lib/fontconfig.bfc
-jdk/Contents/Home/lib/fontconfig.properties.src
-jdk/Contents/Home/lib/jfr/default.jfc
-jdk/Contents/Home/lib/jfr/profile.jfc
-jdk/Contents/Home/lib/jli/libjli.dylib
-jdk/Contents/Home/lib/jrt-fs.jar
-jdk/Contents/Home/lib/jspawnhelper
-jdk/Contents/Home/lib/jvm.cfg
-jdk/Contents/Home/lib/libattach.dylib
-jdk/Contents/Home/lib/libawt.dylib
-jdk/Contents/Home/lib/libawt_lwawt.dylib
-jdk/Contents/Home/lib/libdt_socket.dylib
-jdk/Contents/Home/lib/libextnet.dylib
-jdk/Contents/Home/lib/libfontmanager.dylib
-jdk/Contents/Home/lib/libfreetype.dylib
-jdk/Contents/Home/lib/libinstrument.dylib
-jdk/Contents/Home/lib/libj2gss.dylib
-jdk/Contents/Home/lib/libj2pcsc.dylib
-jdk/Contents/Home/lib/libj2pkcs11.dylib
-jdk/Contents/Home/lib/libjaas.dylib
-jdk/Contents/Home/lib/libjava.dylib
-jdk/Contents/Home/lib/libjavajpeg.dylib
-jdk/Contents/Home/lib/libjawt.dylib
-jdk/Contents/Home/lib/libjdwp.dylib
-jdk/Contents/Home/lib/libjimage.dylib
-jdk/Contents/Home/lib/libjsig.dylib
-jdk/Contents/Home/lib/libjsound.dylib
-jdk/Contents/Home/lib/liblcms.dylib
-jdk/Contents/Home/lib/libmanagement.dylib
-jdk/Contents/Home/lib/libmanagement_agent.dylib
-jdk/Contents/Home/lib/libmanagement_ext.dylib
-jdk/Contents/Home/lib/libmlib_image.dylib
-jdk/Contents/Home/lib/libnet.dylib
-jdk/Contents/Home/lib/libnio.dylib
-jdk/Contents/Home/lib/libosx.dylib
-jdk/Contents/Home/lib/libosxapp.dylib
-jdk/Contents/Home/lib/libosxkrb5.dylib
-jdk/Contents/Home/lib/libosxsecurity.dylib
-jdk/Contents/Home/lib/libosxui.dylib
-jdk/Contents/Home/lib/libprefs.dylib
-jdk/Contents/Home/lib/librmi.dylib
-jdk/Contents/Home/lib/libsplashscreen.dylib
-jdk/Contents/Home/lib/libsunec.dylib
-jdk/Contents/Home/lib/libunpack.dylib
-jdk/Contents/Home/lib/libverify.dylib
-jdk/Contents/Home/lib/libzip.dylib
-jdk/Contents/Home/lib/modules
-jdk/Contents/Home/lib/psfont.properties.ja
-jdk/Contents/Home/lib/psfontj2d.properties
-jdk/Contents/Home/lib/security/blacklisted.certs
-jdk/Contents/Home/lib/security/cacerts
-jdk/Contents/Home/lib/security/default.policy
-jdk/Contents/Home/lib/security/public_suffix_list.dat
-jdk/Contents/Home/lib/server/libjsig.dylib
-jdk/Contents/Home/lib/server/libjvm.dylib
-jdk/Contents/Home/lib/server/Xusage.txt
-jdk/Contents/Home/lib/tzdb.dat
-jdk/Contents/Home/man/ja_JP.UTF-8/man1/java.1
-jdk/Contents/Home/man/ja_JP.UTF-8/man1/jjs.1
-jdk/Contents/Home/man/ja_JP.UTF-8/man1/keytool.1
-jdk/Contents/Home/man/ja_JP.UTF-8/man1/pack200.1
-jdk/Contents/Home/man/ja_JP.UTF-8/man1/rmid.1
-jdk/Contents/Home/man/ja_JP.UTF-8/man1/rmiregistry.1
-jdk/Contents/Home/man/ja_JP.UTF-8/man1/unpack200.1
-jdk/Contents/Home/man/man1/java.1
-jdk/Contents/Home/man/man1/jjs.1
-jdk/Contents/Home/man/man1/keytool.1
-jdk/Contents/Home/man/man1/pack200.1
-jdk/Contents/Home/man/man1/rmid.1
-jdk/Contents/Home/man/man1/rmiregistry.1
-jdk/Contents/Home/man/man1/unpack200.1
-jdk/Contents/Home/release
-jdk/Contents/Info.plist
-jdk/Contents/Home/bin/javapackager
-jdk/Contents/Home/lib/libjavafx_iio.dylib
-jdk/Contents/Home/lib/libjfxmedia_avf.dylib
-jdk/Contents/Home/lib/javafx.properties
-jdk/Contents/Home/lib/libglib-lite.dylib
-jdk/Contents/Home/lib/javafx-swt.jar
-jdk/Contents/Home/lib/libfxplugins.dylib
-jdk/Contents/Home/lib/ant-javafx.jar
-jdk/Contents/Home/lib/libglass.dylib
-jdk/Contents/Home/lib/libjavafx_font.dylib
-jdk/Contents/Home/lib/libgstreamer-lite.dylib
-jdk/Contents/Home/lib/libjfxwebkit.dylib
-jdk/Contents/Home/lib/libprism_common.dylib
-jdk/Contents/Home/lib/libprism_es2.dylib
-jdk/Contents/Home/lib/libdecora_sse.dylib
-jdk/Contents/Home/lib/libjfxmedia.dylib
-jdk/Contents/Home/lib/libprism_sw.dylib
-jdk/Contents/Home/legal/javafx.media/glib.md
-jdk/Contents/Home/legal/javafx.media/gstreamer.md
-jdk/Contents/Home/legal/javafx.media/libffi.md
-jdk/Contents/Home/legal/javafx.media/applecoreaudio.md
-jdk/Contents/Home/legal/javafx.web/icu_v51.md
-jdk/Contents/Home/legal/javafx.web/webkit.md
-jdk/Contents/Home/legal/javafx.web/libxslt.md
-jdk/Contents/Home/legal/javafx.web/libxml2.md
-jdk/Contents/Home/legal/javafx.graphics/jpeg_v7.md
-jdk/Contents/Home/jmods/javafx.base.jmod
-jdk/Contents/Home/jmods/javafx.media.jmod
-jdk/Contents/Home/jmods/javafx.swing.jmod
-jdk/Contents/Home/jmods/javafx.controls.jmod
-jdk/Contents/Home/jmods/jdk.packager.services.jmod
-jdk/Contents/Home/jmods/jdk.packager.jmod
-jdk/Contents/Home/jmods/javafx.web.jmod
-jdk/Contents/Home/jmods/javafx.fxml.jmod
-jdk/Contents/Home/jmods/javafx.graphics.jmod
-jdk/Contents/MacOS/libjli.dylib

jbr_file_list_windows.txt

@@ -1,384 +0,0 @@
-bin/attach.dll
-bin/awt.dll
-bin/dt_socket.dll
-bin/fontmanager.dll
-bin/freetype.dll
-bin/instrument.dll
-bin/j2gss.dll
-bin/j2pcsc.dll
-bin/j2pkcs11.dll
-bin/jaas.dll
-bin/jabswitch.exe
-bin/jaccessinspector.exe
-bin/jaccesswalker.exe
-bin/jaotc.exe
-bin/java.dll
-bin/java.exe
-bin/javaaccessbridge.dll
-bin/javajpeg.dll
-bin/javaw.exe
-bin/jawt.dll
-bin/jdwp.dll
-bin/jimage.dll
-bin/jjs.exe
-bin/jli.dll
-bin/jrunscript.exe
-bin/jsound.dll
-bin/keytool.exe
-bin/kinit.exe
-bin/klist.exe
-bin/ktab.exe
-bin/lcms.dll
-bin/le.dll
-bin/management.dll
-bin/management_agent.dll
-bin/management_ext.dll
-bin/mlib_image.dll
-bin/msvcp140.dll
-bin/net.dll
-bin/nio.dll
-bin/pack200.exe
-bin/prefs.dll
-bin/rmi.dll
-bin/rmid.exe
-bin/rmiregistry.exe
-bin/server/jvm.dll
-bin/splashscreen.dll
-bin/sunec.dll
-bin/sunmscapi.dll
-bin/unpack.dll
-bin/unpack200.exe
-bin/verify.dll
-bin/w2k_lsa_auth.dll
-bin/windowsaccessbridge-64.dll
-bin/zip.dll
-conf/logging.properties
-conf/management/jmxremote.access
-conf/management/jmxremote.password.template
-conf/management/management.properties
-conf/net.properties
-conf/security/java.policy
-conf/security/java.security
-conf/security/policy/limited/default_local.policy
-conf/security/policy/limited/default_US_export.policy
-conf/security/policy/limited/exempt_local.policy
-conf/security/policy/README.txt
-conf/security/policy/unlimited/default_local.policy
-conf/security/policy/unlimited/default_US_export.policy
-conf/sound.properties
-legal/java.base/ADDITIONAL_LICENSE_INFO
-legal/java.base/aes.md
-legal/java.base/asm.md
-legal/java.base/ASSEMBLY_EXCEPTION
-legal/java.base/c-libutl.md
-legal/java.base/cldr.md
-legal/java.base/icu.md
-legal/java.base/LICENSE
-legal/java.base/public_suffix.md
-legal/java.base/unicode.md
-legal/java.base/zlib.md
-legal/java.compiler/ADDITIONAL_LICENSE_INFO
-legal/java.compiler/ASSEMBLY_EXCEPTION
-legal/java.compiler/LICENSE
-legal/java.datatransfer/ADDITIONAL_LICENSE_INFO
-legal/java.datatransfer/ASSEMBLY_EXCEPTION
-legal/java.datatransfer/LICENSE
-legal/java.desktop/ADDITIONAL_LICENSE_INFO
-legal/java.desktop/ASSEMBLY_EXCEPTION
-legal/java.desktop/colorimaging.md
-legal/java.desktop/freetype.md
-legal/java.desktop/giflib.md
-legal/java.desktop/harfbuzz.md
-legal/java.desktop/jpeg.md
-legal/java.desktop/lcms.md
-legal/java.desktop/libpng.md
-legal/java.desktop/LICENSE
-legal/java.desktop/mesa3d.md
-legal/java.desktop/opengl.md
-legal/java.instrument/ADDITIONAL_LICENSE_INFO
-legal/java.instrument/ASSEMBLY_EXCEPTION
-legal/java.instrument/LICENSE
-legal/java.logging/ADDITIONAL_LICENSE_INFO
-legal/java.logging/ASSEMBLY_EXCEPTION
-legal/java.logging/LICENSE
-legal/java.management/ADDITIONAL_LICENSE_INFO
-legal/java.management/ASSEMBLY_EXCEPTION
-legal/java.management/LICENSE
-legal/java.management.rmi/ADDITIONAL_LICENSE_INFO
-legal/java.management.rmi/ASSEMBLY_EXCEPTION
-legal/java.management.rmi/LICENSE
-legal/java.naming/ADDITIONAL_LICENSE_INFO
-legal/java.naming/ASSEMBLY_EXCEPTION
-legal/java.naming/LICENSE
-legal/java.net.http/ADDITIONAL_LICENSE_INFO
-legal/java.net.http/ASSEMBLY_EXCEPTION
-legal/java.net.http/LICENSE
-legal/java.prefs/ADDITIONAL_LICENSE_INFO
-legal/java.prefs/ASSEMBLY_EXCEPTION
-legal/java.prefs/LICENSE
-legal/java.rmi/ADDITIONAL_LICENSE_INFO
-legal/java.rmi/ASSEMBLY_EXCEPTION
-legal/java.rmi/LICENSE
-legal/java.scripting/ADDITIONAL_LICENSE_INFO
-legal/java.scripting/ASSEMBLY_EXCEPTION
-legal/java.scripting/LICENSE
-legal/java.se/ADDITIONAL_LICENSE_INFO
-legal/java.se/ASSEMBLY_EXCEPTION
-legal/java.se/LICENSE
-legal/java.security.jgss/ADDITIONAL_LICENSE_INFO
-legal/java.security.jgss/ASSEMBLY_EXCEPTION
-legal/java.security.jgss/LICENSE
-legal/java.security.sasl/ADDITIONAL_LICENSE_INFO
-legal/java.security.sasl/ASSEMBLY_EXCEPTION
-legal/java.security.sasl/LICENSE
-legal/java.smartcardio/ADDITIONAL_LICENSE_INFO
-legal/java.smartcardio/ASSEMBLY_EXCEPTION
-legal/java.smartcardio/LICENSE
-legal/java.sql/ADDITIONAL_LICENSE_INFO
-legal/java.sql/ASSEMBLY_EXCEPTION
-legal/java.sql/LICENSE
-legal/java.sql.rowset/ADDITIONAL_LICENSE_INFO
-legal/java.sql.rowset/ASSEMBLY_EXCEPTION
-legal/java.sql.rowset/LICENSE
-legal/java.transaction.xa/ADDITIONAL_LICENSE_INFO
-legal/java.transaction.xa/ASSEMBLY_EXCEPTION
-legal/java.transaction.xa/LICENSE
-legal/java.xml/ADDITIONAL_LICENSE_INFO
-legal/java.xml/ASSEMBLY_EXCEPTION
-legal/java.xml/bcel.md
-legal/java.xml/dom.md
-legal/java.xml/jcup.md
-legal/java.xml/LICENSE
-legal/java.xml/xalan.md
-legal/java.xml/xerces.md
-legal/java.xml.crypto/ADDITIONAL_LICENSE_INFO
-legal/java.xml.crypto/ASSEMBLY_EXCEPTION
-legal/java.xml.crypto/LICENSE
-legal/java.xml.crypto/santuario.md
-legal/jdk.accessibility/ADDITIONAL_LICENSE_INFO
-legal/jdk.accessibility/ASSEMBLY_EXCEPTION
-legal/jdk.accessibility/LICENSE
-legal/jdk.aot/ADDITIONAL_LICENSE_INFO
-legal/jdk.aot/ASSEMBLY_EXCEPTION
-legal/jdk.aot/LICENSE
-legal/jdk.charsets/ADDITIONAL_LICENSE_INFO
-legal/jdk.charsets/ASSEMBLY_EXCEPTION
-legal/jdk.charsets/LICENSE
-legal/jdk.crypto.cryptoki/ADDITIONAL_LICENSE_INFO
-legal/jdk.crypto.cryptoki/ASSEMBLY_EXCEPTION
-legal/jdk.crypto.cryptoki/LICENSE
-legal/jdk.crypto.cryptoki/pkcs11cryptotoken.md
-legal/jdk.crypto.cryptoki/pkcs11wrapper.md
-legal/jdk.crypto.ec/ADDITIONAL_LICENSE_INFO
-legal/jdk.crypto.ec/ASSEMBLY_EXCEPTION
-legal/jdk.crypto.ec/ecc.md
-legal/jdk.crypto.ec/LICENSE
-legal/jdk.crypto.mscapi/ADDITIONAL_LICENSE_INFO
-legal/jdk.crypto.mscapi/ASSEMBLY_EXCEPTION
-legal/jdk.crypto.mscapi/LICENSE
-legal/jdk.dynalink/ADDITIONAL_LICENSE_INFO
-legal/jdk.dynalink/ASSEMBLY_EXCEPTION
-legal/jdk.dynalink/dynalink.md
-legal/jdk.dynalink/LICENSE
-legal/jdk.httpserver/ADDITIONAL_LICENSE_INFO
-legal/jdk.httpserver/ASSEMBLY_EXCEPTION
-legal/jdk.httpserver/LICENSE
-legal/jdk.internal.ed/ADDITIONAL_LICENSE_INFO
-legal/jdk.internal.ed/ASSEMBLY_EXCEPTION
-legal/jdk.internal.ed/LICENSE
-legal/jdk.internal.le/ADDITIONAL_LICENSE_INFO
-legal/jdk.internal.le/ASSEMBLY_EXCEPTION
-legal/jdk.internal.le/jline.md
-legal/jdk.internal.le/LICENSE
-legal/jdk.internal.vm.ci/ADDITIONAL_LICENSE_INFO
-legal/jdk.internal.vm.ci/ASSEMBLY_EXCEPTION
-legal/jdk.internal.vm.ci/LICENSE
-legal/jdk.internal.vm.compiler/ADDITIONAL_LICENSE_INFO
-legal/jdk.internal.vm.compiler/ASSEMBLY_EXCEPTION
-legal/jdk.internal.vm.compiler/LICENSE
-legal/jdk.internal.vm.compiler.management/ADDITIONAL_LICENSE_INFO
-legal/jdk.internal.vm.compiler.management/ASSEMBLY_EXCEPTION
-legal/jdk.internal.vm.compiler.management/LICENSE
-legal/jdk.jdwp.agent/ADDITIONAL_LICENSE_INFO
-legal/jdk.jdwp.agent/ASSEMBLY_EXCEPTION
-legal/jdk.jdwp.agent/LICENSE
-legal/jdk.jfr/ADDITIONAL_LICENSE_INFO
-legal/jdk.jfr/ASSEMBLY_EXCEPTION
-legal/jdk.jfr/LICENSE
-legal/jdk.jsobject/ADDITIONAL_LICENSE_INFO
-legal/jdk.jsobject/ASSEMBLY_EXCEPTION
-legal/jdk.jsobject/LICENSE
-legal/jdk.localedata/ADDITIONAL_LICENSE_INFO
-legal/jdk.localedata/ASSEMBLY_EXCEPTION
-legal/jdk.localedata/cldr.md
-legal/jdk.localedata/LICENSE
-legal/jdk.localedata/thaidict.md
-legal/jdk.management/ADDITIONAL_LICENSE_INFO
-legal/jdk.management/ASSEMBLY_EXCEPTION
-legal/jdk.management/LICENSE
-legal/jdk.management.agent/ADDITIONAL_LICENSE_INFO
-legal/jdk.management.agent/ASSEMBLY_EXCEPTION
-legal/jdk.management.agent/LICENSE
-legal/jdk.management.jfr/ADDITIONAL_LICENSE_INFO
-legal/jdk.management.jfr/ASSEMBLY_EXCEPTION
-legal/jdk.management.jfr/LICENSE
-legal/jdk.naming.dns/ADDITIONAL_LICENSE_INFO
-legal/jdk.naming.dns/ASSEMBLY_EXCEPTION
-legal/jdk.naming.dns/LICENSE
-legal/jdk.naming.rmi/ADDITIONAL_LICENSE_INFO
-legal/jdk.naming.rmi/ASSEMBLY_EXCEPTION
-legal/jdk.naming.rmi/LICENSE
-legal/jdk.net/ADDITIONAL_LICENSE_INFO
-legal/jdk.net/ASSEMBLY_EXCEPTION
-legal/jdk.net/LICENSE
-legal/jdk.pack/ADDITIONAL_LICENSE_INFO
-legal/jdk.pack/ASSEMBLY_EXCEPTION
-legal/jdk.pack/LICENSE
-legal/jdk.scripting.nashorn/ADDITIONAL_LICENSE_INFO
-legal/jdk.scripting.nashorn/ASSEMBLY_EXCEPTION
-legal/jdk.scripting.nashorn/double-conversion.md
-legal/jdk.scripting.nashorn/joni.md
-legal/jdk.scripting.nashorn/LICENSE
-legal/jdk.scripting.nashorn.shell/ADDITIONAL_LICENSE_INFO
-legal/jdk.scripting.nashorn.shell/ASSEMBLY_EXCEPTION
-legal/jdk.scripting.nashorn.shell/LICENSE
-legal/jdk.sctp/ADDITIONAL_LICENSE_INFO
-legal/jdk.sctp/ASSEMBLY_EXCEPTION
-legal/jdk.sctp/LICENSE
-legal/jdk.security.auth/ADDITIONAL_LICENSE_INFO
-legal/jdk.security.auth/ASSEMBLY_EXCEPTION
-legal/jdk.security.auth/LICENSE
-legal/jdk.security.jgss/ADDITIONAL_LICENSE_INFO
-legal/jdk.security.jgss/ASSEMBLY_EXCEPTION
-legal/jdk.security.jgss/LICENSE
-legal/jdk.unsupported/ADDITIONAL_LICENSE_INFO
-legal/jdk.unsupported/ASSEMBLY_EXCEPTION
-legal/jdk.unsupported/LICENSE
-legal/jdk.xml.dom/ADDITIONAL_LICENSE_INFO
-legal/jdk.xml.dom/ASSEMBLY_EXCEPTION
-legal/jdk.xml.dom/LICENSE
-legal/jdk.zipfs/ADDITIONAL_LICENSE_INFO
-legal/jdk.zipfs/ASSEMBLY_EXCEPTION
-legal/jdk.zipfs/LICENSE
-lib/classlist
-lib/fontconfig.bfc
-lib/fontconfig.properties.src
-lib/jawt.lib
-lib/jfr/default.jfc
-lib/jfr/profile.jfc
-lib/jrt-fs.jar
-lib/jvm.cfg
-lib/jvm.lib
-lib/modules
-lib/psfont.properties.ja
-lib/psfontj2d.properties
-lib/security/blacklisted.certs
-lib/security/cacerts
-lib/security/default.policy
-lib/security/public_suffix_list.dat
-lib/server/Xusage.txt
-lib/tzdb.dat
-lib/tzmappings
-release
-bin/fxplugins.dll
-bin/api-ms-win-crt-time-l1-1-0.dll
-bin/api-ms-win-crt-filesystem-l1-1-0.dll
-bin/javafx_iio.dll
-bin/gstreamer-lite.dll
-bin/api-ms-win-crt-utility-l1-1-0.dll
-bin/api-ms-win-core-console-l1-1-0.dll
-bin/glass.dll
-bin/api-ms-win-core-processenvironment-l1-1-0.dll
-bin/prism_common.dll
-bin/ucrtbase.dll
-bin/prism_sw.dll
-bin/api-ms-win-core-file-l1-1-0.dll
-bin/api-ms-win-core-errorhandling-l1-1-0.dll
-bin/api-ms-win-crt-process-l1-1-0.dll
-bin/prism_d3d.dll
-bin/api-ms-win-core-heap-l1-1-0.dll
-bin/glib-lite.dll
-bin/api-ms-win-core-processthreads-l1-1-1.dll
-bin/api-ms-win-core-processthreads-l1-1-0.dll
-bin/javapackager.exe
-bin/api-ms-win-crt-convert-l1-1-0.dll
-bin/api-ms-win-crt-private-l1-1-0.dll
-bin/api-ms-win-core-file-l2-1-0.dll
-bin/jfxwebkit.dll
-bin/api-ms-win-core-debug-l1-1-0.dll
-bin/api-ms-win-crt-stdio-l1-1-0.dll
-bin/api-ms-win-core-localization-l1-2-0.dll
-bin/api-ms-win-core-datetime-l1-1-0.dll
-bin/api-ms-win-crt-math-l1-1-0.dll
-bin/api-ms-win-core-file-l1-2-0.dll
-bin/api-ms-win-core-timezone-l1-1-0.dll
-bin/api-ms-win-core-rtlsupport-l1-1-0.dll
-bin/api-ms-win-core-handle-l1-1-0.dll
-bin/decora_sse.dll
-bin/api-ms-win-core-synch-l1-1-0.dll
-bin/api-ms-win-core-string-l1-1-0.dll
-bin/api-ms-win-core-interlocked-l1-1-0.dll
-bin/api-ms-win-core-memory-l1-1-0.dll
-bin/api-ms-win-core-util-l1-1-0.dll
-bin/api-ms-win-core-namedpipe-l1-1-0.dll
-bin/api-ms-win-crt-conio-l1-1-0.dll
-bin/api-ms-win-crt-runtime-l1-1-0.dll
-bin/api-ms-win-crt-string-l1-1-0.dll
-bin/api-ms-win-crt-multibyte-l1-1-0.dll
-bin/api-ms-win-core-synch-l1-2-0.dll
-bin/api-ms-win-core-profile-l1-1-0.dll
-bin/api-ms-win-crt-locale-l1-1-0.dll
-bin/api-ms-win-crt-heap-l1-1-0.dll
-bin/api-ms-win-core-sysinfo-l1-1-0.dll
-bin/javafx_font.dll
-bin/api-ms-win-core-libraryloader-l1-1-0.dll
-bin/api-ms-win-crt-environment-l1-1-0.dll
-bin/jfxmedia.dll
-lib/javafx.properties
-lib/javafx-swt.jar
-lib/ant-javafx.jar
-legal/jdk.packager.services/LICENSE
-legal/jdk.packager.services/ADDITIONAL_LICENSE_INFO
-legal/jdk.packager.services/ASSEMBLY_EXCEPTION
-legal/jdk.packager/LICENSE
-legal/jdk.packager/ADDITIONAL_LICENSE_INFO
-legal/jdk.packager/ASSEMBLY_EXCEPTION
-legal/javafx.media/glib.md
-legal/javafx.media/gstreamer.md
-legal/javafx.media/libffi.md
-legal/javafx.media/LICENSE
-legal/javafx.media/applecoreaudio.md
-legal/javafx.media/ADDITIONAL_LICENSE_INFO
-legal/javafx.media/ASSEMBLY_EXCEPTION
-legal/javafx.web/icu_v51.md
-legal/javafx.web/LICENSE
-legal/javafx.web/webkit.md
-legal/javafx.web/libxslt.md
-legal/javafx.web/ADDITIONAL_LICENSE_INFO
-legal/javafx.web/ASSEMBLY_EXCEPTION
-legal/javafx.web/libxml2.md
-legal/javafx.swing/LICENSE
-legal/javafx.swing/ADDITIONAL_LICENSE_INFO
-legal/javafx.swing/ASSEMBLY_EXCEPTION
-legal/javafx.graphics/LICENSE
-legal/javafx.graphics/ADDITIONAL_LICENSE_INFO
-legal/javafx.graphics/ASSEMBLY_EXCEPTION
-legal/javafx.graphics/jpeg_v7.md
-legal/javafx.base/LICENSE
-legal/javafx.base/ADDITIONAL_LICENSE_INFO
-legal/javafx.base/ASSEMBLY_EXCEPTION
-legal/javafx.controls/LICENSE
-legal/javafx.controls/ADDITIONAL_LICENSE_INFO
-legal/javafx.controls/ASSEMBLY_EXCEPTION
-legal/javafx.fxml/LICENSE
-legal/javafx.fxml/ADDITIONAL_LICENSE_INFO
-legal/javafx.fxml/ASSEMBLY_EXCEPTION
-jmods/javafx.base.jmod
-jmods/javafx.media.jmod
-jmods/javafx.swing.jmod
-jmods/javafx.controls.jmod
-jmods/jdk.packager.services.jmod
-jmods/jdk.packager.jmod
-jmods/javafx.web.jmod
-jmods/javafx.fxml.jmod
-jmods/javafx.graphics.jmod

jdk/src/java.desktop/macosx/classes/com/apple/eawt/event/PressureEvent.java

@@ -23,28 +23,30 @@
  * questions.
  */
 
-#include "LWCToolkit.h"
+package com.apple.eawt.event;
-#include "GeomUtilities.h"
 
-#include "sun_awt_CGraphicsConfig.h"
+/**
-#import <JavaNativeFoundation/JavaNativeFoundation.h>
+ * Event indicating a swipe was performed by the user.
-
+ *
-/*
+ * @see PressureListener
- * Class:     sun_awt_CGraphicsConfig
+ *
- * Method:    nativeGetBounds
+ * @since Java for Mac OS X 10.10 Update 3, JDK 8
- * Signature: (I)Ljava/awt/Rectangle;
  */
-JNIEXPORT jobject JNICALL Java_sun_awt_CGraphicsConfig_nativeGetBounds
+public class PressureEvent extends GestureEvent {
-(JNIEnv *env, jclass class, jint displayID)
-{
-    jobject jrect = NULL;
 
-JNF_COCOA_ENTER(env);
+    public double getPressure() {
+        return pressure;
+    }
 
-    CGRect rect = CGDisplayBounds((CGDirectDisplayID)displayID);
+    public double getStage() {
-    jrect = CGToJavaRect(env, rect);
+        return stage;
+    }
 
-JNF_COCOA_EXIT(env);
+    private double pressure;
+    private double stage;
 
-    return jrect;
+    PressureEvent(double pressure, double stage) {
+        this.pressure = pressure;
+        this.stage = stage;
+    }
 }

jdk/src/java.desktop/macosx/classes/com/apple/eawt/event/PressureListener.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,18 +22,17 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-#ifndef _ROBOT_COMMON_H
-#define _ROBOT_COMMON_H
 
-#include "java_awt_event_InputEvent.h"
+package com.apple.eawt.event;
 
-#include <X11/Xlib.h>
+/**
-#include "gdefs.h"
+ * Listener interface for receiving pressure events.
-
+ *
-int QueryColorMap(Display *disp,
+ * @see PressureEvent
-                  Colormap src_cmap,
+ * @see GestureUtilities
-                  Visual *src_vis,
+ *
-                  XColor **src_colors,
+ * @since Java for Mac OS X 10.5 Update 7, Java for Mac OS X 10.6 Update 2
-                  int *rShift, int *gShift, int *bShift);
+ */
-
+public interface PressureListener extends GestureListener {
-#endif /* _ROBOT_COMMON_H */
+    public void pressure(final PressureEvent e);
+}

make/Bundles.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@ include $(SPEC)
 include MakeBase.gmk
 
 PRODUCT_TARGETS :=
+LEGACY_TARGETS :=
 TEST_TARGETS :=
 DOCS_TARGETS :=
 
@@ -146,19 +147,25 @@ endef
 # correct base directories.
 ifeq ($(OPENJDK_TARGET_OS)-$(DEBUG_LEVEL), macosx-release)
   JDK_IMAGE_DIR := $(JDK_MACOSX_BUNDLE_DIR)
+  JRE_IMAGE_DIR := $(JRE_MACOSX_BUNDLE_DIR)
   JDK_IMAGE_HOMEDIR := $(JDK_MACOSX_CONTENTS_DIR)/Home
+  JRE_IMAGE_HOMEDIR := $(JRE_MACOSX_CONTENTS_DIR)/Home
   JDK_BUNDLE_SUBDIR :=
+  JRE_BUNDLE_SUBDIR :=
 else
   JDK_IMAGE_HOMEDIR := $(JDK_IMAGE_DIR)
+  JRE_IMAGE_HOMEDIR := $(JRE_IMAGE_DIR)
   JDK_BUNDLE_SUBDIR := jdk-$(VERSION_NUMBER)
+  JRE_BUNDLE_SUBDIR := jre-$(VERSION_NUMBER)
   ifneq ($(DEBUG_LEVEL), release)
     JDK_BUNDLE_SUBDIR := $(JDK_BUNDLE_SUBDIR)/$(DEBUG_LEVEL)
+    JRE_BUNDLE_SUBDIR := $(JRE_BUNDLE_SUBDIR)/$(DEBUG_LEVEL)
   endif
 endif
 
 ################################################################################
 
-ifneq ($(filter product-bundles, $(MAKECMDGOALS)), )
+ifneq ($(filter product-bundles legacy-bundles, $(MAKECMDGOALS)), )
   $(eval $(call FillCacheFind, $(IMAGES_OUTPUTDIR)))
 
   SYMBOLS_EXCLUDE_PATTERN := %.debuginfo %.diz %.pdb %.map
@@ -198,6 +205,22 @@ ifneq ($(filter product-bundles, $(MAKECMDGOALS)), )
 
   TEST_DEMOS_BUNDLE_FILES := $(filter $(JDK_IMAGE_HOMEDIR)/demo/%, $(ALL_JDK_FILES))
 
+  ALL_JRE_FILES := $(call CacheFind, $(JRE_IMAGE_DIR))
+
+  # Create special filter rules when dealing with unzipped .dSYM directories on
+  # macosx
+  ifeq ($(OPENJDK_TARGET_OS), macosx)
+    ifeq ($(ZIP_EXTERNAL_DEBUG_SYMBOLS), false)
+      JRE_SYMBOLS_EXCLUDE_PATTERN := $(addprefix %, \
+          $(call containing, .dSYM/, $(patsubst $(JRE_IMAGE_DIR)/%, %, $(ALL_JRE_FILES))))
+    endif
+  endif
+
+  JRE_BUNDLE_FILES := $(filter-out \
+      $(JRE_SYMBOLS_EXCLUDE_PATTERN) \
+      $(SYMBOLS_EXCLUDE_PATTERN), \
+      $(ALL_JRE_FILES))
+
   $(eval $(call SetupBundleFile, BUILD_JDK_BUNDLE, \
       BUNDLE_NAME := $(JDK_BUNDLE_NAME), \
       FILES := $(JDK_BUNDLE_FILES), \
@@ -208,6 +231,15 @@ ifneq ($(filter product-bundles, $(MAKECMDGOALS)), )
 
   PRODUCT_TARGETS += $(BUILD_JDK_BUNDLE)
 
+  $(eval $(call SetupBundleFile, BUILD_JRE_BUNDLE, \
+      BUNDLE_NAME := $(JRE_BUNDLE_NAME), \
+      FILES := $(JRE_BUNDLE_FILES), \
+      BASE_DIRS := $(JRE_IMAGE_DIR), \
+      SUBDIR := $(JRE_BUNDLE_SUBDIR), \
+  ))
+
+  LEGACY_TARGETS += $(BUILD_JRE_BUNDLE)
+
   $(eval $(call SetupBundleFile, BUILD_JDK_SYMBOLS_BUNDLE, \
       BUNDLE_NAME := $(JDK_SYMBOLS_BUNDLE_NAME), \
       FILES := $(JDK_SYMBOLS_BUNDLE_FILES), \
@@ -268,6 +300,7 @@ $(eval $(call IncludeCustomExtension, Bundles.gmk))
 ################################################################################
 
 product-bundles: $(PRODUCT_TARGETS)
+legacy-bundles: $(LEGACY_TARGETS)
 test-bundles: $(TEST_TARGETS)
 docs-bundles: $(DOCS_TARGETS)
 

make/CompileToolsJdk.gmk

@@ -40,6 +40,7 @@ $(eval $(call IncludeCustomExtension, CompileTools.gmk))
 BUILD_TOOLS_SRC_DIRS += \
     $(TOPDIR)/make/jdk/src/classes \
     $(BUILDTOOLS_OUTPUTDIR)/interim_cldrconverter_classes \
+    $(BUILDTOOLS_OUTPUTDIR)/interim_tzdb_classes \
     #
 
 $(eval $(call SetupJavaCompilation,BUILD_TOOLS_JDK, \

make/CopyInterimTZDB.gmk

@@ -1,4 +1,5 @@
 #
+# Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -21,15 +22,29 @@
 # or visit www.oracle.com if you need additional information or have any
 # questions.
 #
-# tzdb data for noncommittal factory settings
 
-# This file is in the public domain, so clarified as of
+default: all
-# 2009-05-17 by Arthur David Olson.
 
-# For distributors who don't want to specify a timezone in their
+include $(SPEC)
-# installation procedures.  Users who run 'date' will get the
+include MakeBase.gmk
-# time zone abbreviation "-00", indicating that the actual time zone
-# is unknown.
 
-# Zone	NAME	GMTOFF	RULES	FORMAT
+##########################################################################################
-Zone	Factory	0	-	-00
+
+### TZDB tool needs files from java.time.zone package
+
+define tzdb_copyfiles
+	$(call MakeTargetDir)
+	$(RM) '$@'
+	$(SED) -e "s/package java.time.zone/package build.tools.tzdb/" \
+        < $(<) > $@
+endef
+
+$(eval $(call SetupCopyFiles,COPY_INTERIM_TZDB, \
+    SRC := $(TOPDIR)/src/java.base/share/classes/java/time/zone, \
+    DEST := $(BUILDTOOLS_OUTPUTDIR)/interim_tzdb_classes/build/tools/tzdb, \
+    FILES := ZoneRules.java ZoneOffsetTransition.java ZoneOffsetTransitionRule.java Ser.java, \
+    MACRO := tzdb_copyfiles))
+
+##########################################################################################
+
+all: $(COPY_INTERIM_TZDB)

make/ExplodedImageOptimize.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -38,7 +38,7 @@ ALL_MODULEINFO_CLASSES := $(wildcard $(JDK_OUTPUTDIR)/modules/*/module_info.clas
 
 $(PACKAGES_ATTRIBUTE_TARGET): $(ALL_MODULEINFO_CLASSES) $(BUILD_JIGSAW_CLASSES)
 	$(call LogInfo, Optimizing the exploded image)
-	$(TOOL_ADD_PACKAGES_ATTRIBUTE) $(JDK_OUTPUTDIR)
+	$(call ExecuteWithLog, $@, $(TOOL_ADD_PACKAGES_ATTRIBUTE) $(JDK_OUTPUTDIR))
 	$(TOUCH) $@
 
 TARGETS := $(PACKAGES_ATTRIBUTE_TARGET)

make/Help.gmk

@@ -119,7 +119,7 @@ print-configurations:
 run-test-prebuilt:
 	@( cd $(topdir) && \
 	    $(MAKE) --no-print-directory -r -R -I make/common/ -f make/RunTestsPrebuilt.gmk \
-	    run-test-prebuilt TEST="$(TEST)" )
+	    run-test-prebuilt CUSTOM_MAKE_DIR=$(CUSTOM_MAKE_DIR) TEST="$(TEST)" )
 
 ALL_GLOBAL_TARGETS := help print-configurations run-test-prebuilt
 

make/InitSupport.gmk

@@ -421,8 +421,8 @@ else # $(HAS_SPEC)=true
 	        $(if $(filter all, $(LOG_REPORT)), \
 	          $(GREP) -v -e "^Note: including file:" <  $(logfile) || true $(NEWLINE) \
 	        , \
-	          ($(GREP) -v -e "^Note: including file:" <  $(logfile) || true) | $(HEAD) -n 12 $(NEWLINE) \
+	          ($(GREP) -v -e "^Note: including file:" <  $(logfile) || true) | $(HEAD) -n 15 $(NEWLINE) \
-	          if test `$(WC) -l < $(logfile)` -gt 12; then \
+	          if test `$(WC) -l < $(logfile)` -gt 15; then \
 	            $(ECHO) "   ... (rest of output omitted)" ; \
 	          fi $(NEWLINE) \
 	        ) \

make/Jprt.gmk

@@ -1,107 +0,0 @@
-#
-# Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# This file contains targets and utilities needed by JPRT.
-
-# Cygpath is only defined when running on Cygwin
-ifneq ($(CYGPATH), )
-  # If we get JPRT_ARCHIVE_*BUNDLE externally, make sure they have /cygdrive
-  # style paths
-  ifdef JPRT_ARCHIVE_BUNDLE
-    override JPRT_ARCHIVE_BUNDLE := $(shell $(CYGPATH) -u $(JPRT_ARCHIVE_BUNDLE))
-  endif
-  ifdef JPRT_ARCHIVE_TEST_BUNDLE
-    override JPRT_ARCHIVE_TEST_BUNDLE := \
-        $(shell $(CYGPATH) -u $(JPRT_ARCHIVE_TEST_BUNDLE))
-  endif
-  ifdef JPRT_ARCHIVE_SYMBOLS_BUNDLE
-    override JPRT_ARCHIVE_SYMBOLS_BUNDLE := \
-        $(shell $(CYGPATH) -u $(JPRT_ARCHIVE_SYMBOLS_BUNDLE))
-  endif
-endif
-
-# When running in JPRT these will be provided. Need defaults so that this makefile
-# is valid anyway.
-ifndef JPRT_ARCHIVE_BUNDLE
-  JPRT_ARCHIVE_BUNDLE=/tmp/jprt_bundles/jdk-image.zip
-endif
-ifndef JPRT_ARCHIVE_TEST_BUNDLE
-  JPRT_ARCHIVE_TEST_BUNDLE=/tmp/jprt_bundles/test-image.zip
-endif
-ifndef JPRT_ARCHIVE_SYMBOLS_BUNDLE
-  JPRT_ARCHIVE_SYMBOLS_BUNDLE=/tmp/jprt_bundles/symbols-image.zip
-endif
-
-ifeq ($(SKIP_BOOT_CYCLE), false)
-  jprt_bundle: bootcycle-images
-endif
-
-################################################################################
-# JPRT specific bundling targets
-JPRT_TARGET ?= $(DEFAULT_MAKE_TARGET)
-ifeq ($(JPRT_TARGET), $(DEFAULT_MAKE_TARGET))
-  jprt_bundle: $(DEFAULT_MAKE_TARGET) $(JPRT_ARCHIVE_BUNDLE) \
-      $(JPRT_ARCHIVE_TEST_BUNDLE)
-
-  SRC_JDK_IMAGE_DIR := $(JDK_IMAGE_DIR)
-  SRC_TEST_IMAGE_DIR := $(TEST_IMAGE_DIR)
-
-  # This target must be called in the context of a SPEC file
-  $(JPRT_ARCHIVE_BUNDLE): product-images
-	$(call MakeDir, $(@D))
-	$(CD) $(SRC_JDK_IMAGE_DIR) && $(ZIPEXE) -y -q -r $@ .
-
-  $(JPRT_ARCHIVE_TEST_BUNDLE): test-image
-	$(call MakeDir, $(@D))
-	$(CD) $(SRC_TEST_IMAGE_DIR) && $(ZIPEXE) -y -q -r $@ .
-
-  ##############################################################################
-  # Optional symbols bundle
-  ifeq ($(GCOV_ENABLED), true)
-    jprt_bundle: $(JPRT_ARCHIVE_SYMBOLS_BUNDLE)
-
-    $(JPRT_ARCHIVE_SYMBOLS_BUNDLE): product-images
-	$(call MakeDir, $(@D))
-	$(CD) $(SYMBOLS_IMAGE_DIR) && $(ZIPEXE) -y -q -r $@ .
-
-  endif
-
-  ##############################################################################
-
-else
-  # Just fake the main bundle to satisfy JPRT
-  jprt_bundle: $(JPRT_TARGET)
-	@$(call TargetEnter)
-	$(MKDIR) -p $(OUTPUTDIR)/bundles
-	$(CD) $(TOPDIR) && $(TAR) cf - README | $(GZIP) > \
-	    $(JPRT_ARCHIVE_BUNDLE)
-	@$(call TargetExit)
-endif
-
-ALL_TARGETS += jprt_bundle
-
-################################################################################
-
-$(eval $(call IncludeCustomExtension, Jprt.gmk))

make/MacBundles.gmk

@@ -61,17 +61,15 @@ ifeq ($(OPENJDK_TARGET_OS), macosx)
       FILES := $(call CacheFind, $(JRE_IMAGE_DIR)), \
   ))
 
-  $(JDK_MACOSX_CONTENTS_DIR)/MacOS/libjli.dylib:
+   $(eval $(call SetupCopyFiles, COPY_LIBJLI_JDK, \
-	$(call LogInfo, Creating link $(patsubst $(OUTPUTDIR)/%,%,$@))
+      FILES := $(JDK_IMAGE_DIR)/lib/jli/libjli.dylib, \
-	$(MKDIR) -p $(@D)
+      DEST := $(JDK_MACOSX_CONTENTS_DIR)/MacOS, \
-	$(RM) $@
+  ))
-	$(LN) -s ../Home/lib/jli/libjli.dylib $@
 
-  $(JRE_MACOSX_CONTENTS_DIR)/MacOS/libjli.dylib:
+  $(eval $(call SetupCopyFiles, COPY_LIBJLI_JRE, \
-	$(call LogInfo, Creating link $(patsubst $(OUTPUTDIR)/%,%,$@))
+      FILES := $(JRE_IMAGE_DIR)/lib/jli/libjli.dylib, \
-	$(MKDIR) -p $(@D)
+      DEST := $(JRE_MACOSX_CONTENTS_DIR)/MacOS, \
-	$(RM) $@
+  ))
-	$(LN) -s ../Home/lib/jli/libjli.dylib $@
 
   $(eval $(call SetupTextFileProcessing, BUILD_JDK_PLIST, \
       SOURCE_FILES := $(MACOSX_PLIST_SRC)/JDK-Info.plist, \
@@ -97,13 +95,19 @@ ifeq ($(OPENJDK_TARGET_OS), macosx)
           @@VENDOR@@ => $(BUNDLE_VENDOR) , \
   ))
 
-  jdk-bundle: $(COPY_JDK_IMAGE) $(JDK_MACOSX_CONTENTS_DIR)/MacOS/libjli.dylib \
+  $(SUPPORT_OUTPUTDIR)/images/_jdk_bundle_attribute_set: $(COPY_JDK_IMAGE)
-      $(BUILD_JDK_PLIST)
 	$(SETFILE) -a B $(dir $(JDK_MACOSX_CONTENTS_DIR))
+	$(TOUCH) $@
 
-  jre-bundle: $(COPY_JRE_IMAGE) $(JRE_MACOSX_CONTENTS_DIR)/MacOS/libjli.dylib \
+  $(SUPPORT_OUTPUTDIR)/images/_jre_bundle_attribute_set: $(COPY_JRE_IMAGE)
-      $(BUILD_JRE_PLIST)
 	$(SETFILE) -a B $(dir $(JRE_MACOSX_CONTENTS_DIR))
+	$(TOUCH) $@
+
+  jdk-bundle: $(COPY_JDK_IMAGE) $(COPY_LIBJLI_JDK) \
+      $(BUILD_JDK_PLIST) $(SUPPORT_OUTPUTDIR)/images/_jdk_bundle_attribute_set
+
+  jre-bundle: $(COPY_JRE_IMAGE) $(COPY_LIBJLI_JRE) \
+      $(BUILD_JRE_PLIST) $(SUPPORT_OUTPUTDIR)/images/_jre_bundle_attribute_set
 
 else # Not macosx
 

make/Main.gmk

@@ -80,6 +80,10 @@ ifneq ($(CREATING_BUILDJDK), true)
 
   interim-cldrconverter:
 	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CopyInterimCLDRConverter.gmk)
+ 
+interim-tzdb:
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CopyInterimTZDB.gmk)
+
 
   buildtools-jdk:
 	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileToolsJdk.gmk)
@@ -92,7 +96,7 @@ ifneq ($(CREATING_BUILDJDK), true)
 endif
 
 ALL_TARGETS += buildtools-langtools interim-langtools \
-    interim-rmic interim-cldrconverter buildtools-jdk buildtools-modules \
+    interim-rmic interim-cldrconverter interim-tzdb buildtools-jdk buildtools-modules \
     buildtools-hotspot
 
 ################################################################################
@@ -568,13 +572,16 @@ ALL_TARGETS += test test-hotspot-jtreg test-hotspot-jtreg-native \
 product-bundles:
 	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Bundles.gmk product-bundles)
 
+legacy-bundles:
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Bundles.gmk legacy-bundles)
+
 test-bundles:
 	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Bundles.gmk test-bundles)
 
 docs-bundles:
 	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Bundles.gmk docs-bundles)
 
-ALL_TARGETS += product-bundles test-bundles docs-bundles
+ALL_TARGETS += product-bundles legacy-bundles test-bundles docs-bundles
 
 ################################################################################
 # Install targets
@@ -607,7 +614,7 @@ else
 
   interim-langtools: $(INTERIM_LANGTOOLS_GENSRC_TARGETS)
 
-  buildtools-jdk: interim-langtools interim-cldrconverter
+  buildtools-jdk: interim-langtools interim-cldrconverter interim-tzdb
 
   buildtools-hotspot: interim-langtools
 
@@ -630,6 +637,7 @@ else
   # Declare dependencies between hotspot-<variant>* targets
   $(foreach v, $(JVM_VARIANTS), \
       $(eval hotspot-$v: hotspot-$v-gensrc hotspot-$v-libs) \
+      $(eval hotspot-$v-gensrc: java.base-copy) \
       $(eval hotspot-$v-libs: hotspot-$v-gensrc java.base-copy) \
   )
 
@@ -882,6 +890,8 @@ else
 
   product-bundles: product-images
 
+  legacy-bundles: legacy-images
+
   test-bundles: test-image
 
   docs-bundles: docs-image
@@ -982,6 +992,9 @@ mac-bundles: mac-jdk-bundle
 # (and possibly other, more specific versions)
 product-images: jdk-image symbols-image exploded-image
 
+# This target builds the legacy images, e.g. the legacy JRE image
+legacy-images: legacy-jre-image
+
 # zip-security is actually a bundle, but for now it needs to be considered
 # an image until this can be cleaned up properly.
 product-images: zip-security
@@ -998,6 +1011,8 @@ endif
 
 ifeq ($(OPENJDK_TARGET_OS), macosx)
   product-images: mac-jdk-bundle
+
+  legacy-images: mac-legacy-jre-bundle
 endif
 
 # This target builds the documentation image
@@ -1028,7 +1043,7 @@ ALL_TARGETS += buildtools hotspot hotspot-libs hotspot-gensrc gensrc gendata \
     jdk.jdwp.agent-gensrc $(ALL_MODULES) demos \
     exploded-image-base exploded-image \
     create-buildjdk docs-jdk-api docs-javase-api docs-reference-api docs-jdk \
-    docs-javase docs-reference docs-javadoc mac-bundles product-images \
+    docs-javase docs-reference docs-javadoc mac-bundles product-images legacy-images \
     docs-image test-image all-images \
     all-bundles
 
@@ -1130,11 +1145,6 @@ ALL_TARGETS += $(addsuffix -only, $(filter-out dist-clean clean%, $(ALL_TARGETS)
 
 ################################################################################
 
-# Include JPRT targets
-include $(TOPDIR)/make/Jprt.gmk
-
-################################################################################
-
 # The following targets are intentionally not added to ALL_TARGETS since they
 # are internal only, to support Init.gmk.
 

make/RunTests.gmk

@@ -32,6 +32,43 @@ include FindTests.gmk
 # We will always run multiple tests serially
 .NOTPARALLEL:
 
+################################################################################
+# Setup global test running parameters
+################################################################################
+
+# Each factor variable comes in 3 variants. The first one is reserved for users
+# to use on command line. The other two are for predifined configurations in JDL
+# and for machine specific configurations respectively.
+TEST_JOBS_FACTOR ?= 1
+TEST_JOBS_FACTOR_JDL ?= 1
+TEST_JOBS_FACTOR_MACHINE ?= 1
+
+ifeq ($(TEST_JOBS), 0)
+  CORES_DIVIDER := 2
+  ifeq ($(OPENJDK_TARGET_CPU_ARCH), sparc)
+    # For smaller SPARC machines we see reasonable scaling of throughput up to
+    # cpus/4 without affecting test reliability. On the bigger machines, cpus/4
+    # causes intermittent timeouts.
+    ifeq ($(shell $(EXPR) $(NUM_CORES) \> 16), 1)
+      CORES_DIVIDER := 5
+    else
+      CORES_DIVIDER := 4
+    endif
+  endif
+  MEMORY_DIVIDER := 2048
+  TEST_JOBS := $(shell $(AWK) \
+    'BEGIN { \
+      c = $(NUM_CORES) / $(CORES_DIVIDER); \
+      m = $(MEMORY_SIZE) / $(MEMORY_DIVIDER); \
+      if (c > m) c = m; \
+      c = c * $(TEST_JOBS_FACTOR); \
+      c = c * $(TEST_JOBS_FACTOR_JDL); \
+      c = c * $(TEST_JOBS_FACTOR_MACHINE); \
+      if (c < 1) c = 1; \
+      printf "%.0f", c; \
+    }')
+endif
+
 ################################################################################
 # Parse global control variables
 ################################################################################
@@ -45,8 +82,8 @@ ifneq ($(TEST_VM_OPTS), )
 endif
 
 $(eval $(call ParseKeywordVariable, TEST_OPTS, \
-    KEYWORDS := JOBS TIMEOUT, \
+    SINGLE_KEYWORDS := JOBS TIMEOUT_FACTOR, \
-    STRING_KEYWORDS := VM_OPTIONS, \
+    STRING_KEYWORDS := VM_OPTIONS JAVA_OPTIONS, \
 ))
 
 # Helper function to propagate TEST_OPTS values.
@@ -65,10 +102,14 @@ ifeq ($(OPENJDK_TARGET_OS), windows)
   ifndef _NT_SYMBOL_PATH
     # Can't use PathList here as it adds quotes around the value.
     _NT_SYMBOL_PATH := \
-        $(subst $(SPACE),;, $(foreach p, $(sort $(dir $(wildcard \
+        $(subst $(SPACE),;,$(strip \
-        $(addprefix $(SYMBOLS_IMAGE_DIR)/bin/, *.pdb */*.pdb)))), $(call FixPath, $p)))
+            $(foreach p, $(sort $(dir $(wildcard \
+                $(addprefix $(SYMBOLS_IMAGE_DIR)/bin/, *.pdb */*.pdb)))), \
+              $(call FixPath, $p) \
+            ) \
+        ))
     export _NT_SYMBOL_PATH
-    $(info _NT_SYMBOL_PATH $(_NT_SYMBOL_PATH))
+    $(info _NT_SYMBOL_PATH=$(_NT_SYMBOL_PATH))
   endif
 endif
 
@@ -103,6 +144,31 @@ endif
 GTEST_LAUNCHER_DIRS := $(patsubst %/gtestLauncher, %, $(wildcard $(TEST_IMAGE_DIR)/hotspot/gtest/*/gtestLauncher))
 GTEST_VARIANTS := $(strip $(patsubst $(TEST_IMAGE_DIR)/hotspot/gtest/%, %, $(GTEST_LAUNCHER_DIRS)))
 
+################################################################################
+# Setup global test running parameters
+################################################################################
+
+# Each factor variable comes in 3 variants. The first one is reserved for users
+# to use on command line. The other two are for predifined configurations in JDL
+# and for machine specific configurations respectively.
+TEST_JOBS_FACTOR ?= 1
+TEST_JOBS_FACTOR_JDL ?= 1
+TEST_JOBS_FACTOR_MACHINE ?= 1
+
+ifeq ($(TEST_JOBS), 0)
+  # Concurrency based on min(cores / 2, 12) * TEST_JOBS_FACTOR
+  TEST_JOBS := $(shell $(AWK) \
+    'BEGIN { \
+      c = $(NUM_CORES) / 2; \
+      if (c > 12) c = 12; \
+      c = c * $(TEST_JOBS_FACTOR); \
+      c = c * $(TEST_JOBS_FACTOR_JDL); \
+      c = c * $(TEST_JOBS_FACTOR_MACHINE); \
+      if (c < 1) c = 1; \
+      printf "%.0f", c; \
+    }')
+endif
+
 ################################################################################
 # Parse control variables
 ################################################################################
@@ -110,16 +176,19 @@ GTEST_VARIANTS := $(strip $(patsubst $(TEST_IMAGE_DIR)/hotspot/gtest/%, %, $(GTE
 ifneq ($(TEST_OPTS), )
   # Inform the user
   $(info Running tests using TEST_OPTS control variable '$(TEST_OPTS)')
-
-  $(eval $(call SetTestOpt,VM_OPTIONS,JTREG))
-  $(eval $(call SetTestOpt,VM_OPTIONS,GTEST))
-
-  $(eval $(call SetTestOpt,JOBS,JTREG))
-  $(eval $(call SetTestOpt,TIMEOUT,JTREG))
 endif
 
+$(eval $(call SetTestOpt,VM_OPTIONS,JTREG))
+$(eval $(call SetTestOpt,JAVA_OPTIONS,JTREG))
+$(eval $(call SetTestOpt,VM_OPTIONS,GTEST))
+$(eval $(call SetTestOpt,JAVA_OPTIONS,GTEST))
+
+$(eval $(call SetTestOpt,JOBS,JTREG))
+$(eval $(call SetTestOpt,TIMEOUT_FACTOR,JTREG))
+
 $(eval $(call ParseKeywordVariable, JTREG, \
-    KEYWORDS := JOBS TIMEOUT TEST_MODE ASSERT VERBOSE RETAIN MAX_MEM, \
+    SINGLE_KEYWORDS := JOBS TIMEOUT_FACTOR TEST_MODE ASSERT VERBOSE RETAIN MAX_MEM \
+        EXTRA_PROBLEM_LISTS KEYWORDS, \
     STRING_KEYWORDS := OPTIONS JAVA_OPTIONS VM_OPTIONS, \
 ))
 
@@ -129,8 +198,8 @@ ifneq ($(JTREG), )
 endif
 
 $(eval $(call ParseKeywordVariable, GTEST, \
-    KEYWORDS := REPEAT, \
+    SINGLE_KEYWORDS := REPEAT, \
-    STRING_KEYWORDS := OPTIONS VM_OPTIONS, \
+    STRING_KEYWORDS := OPTIONS VM_OPTIONS JAVA_OPTIONS, \
 ))
 
 ifneq ($(GTEST), )
@@ -143,17 +212,6 @@ endif
 # Component-specific Jtreg settings
 ################################################################################
 
-ifeq ($(TEST_JOBS), 0)
-  # If TEST_JOBS is not specified, hotspot fallback default is
-  # min(num_cores / 2, 12).
-  hotspot_JTREG_JOBS := $(shell $(EXPR) $(NUM_CORES) / 2)
-  ifeq ($(hotspot_JTREG_JOBS), 0)
-    hotspot_JTREG_JOBS := 1
-  else ifeq ($(shell $(EXPR) $(hotspot_JTREG_JOBS) \> 12), 1)
-    hotspot_JTREG_JOBS := 12
-  endif
-endif
-
 hotspot_JTREG_MAX_MEM := 0
 hotspot_JTREG_ASSERT := false
 hotspot_JTREG_NATIVEPATH := $(TEST_IMAGE_DIR)/hotspot/jtreg/native
@@ -165,6 +223,8 @@ langtools_JTREG_PROBLEM_LIST += $(TOPDIR)/test/langtools/ProblemList.txt
 nashorn_JTREG_PROBLEM_LIST += $(TOPDIR)/test/nashorn/ProblemList.txt
 hotspot_JTREG_PROBLEM_LIST += $(TOPDIR)/test/hotspot/jtreg/ProblemList.txt
 
+langtools_JTREG_MAX_MEM := 768m
+
 ################################################################################
 # Parse test selection
 #
@@ -368,15 +428,16 @@ define SetupRunGtestTestBody
     $1_GTEST_REPEAT :=--gtest_repeat=$$(GTEST_REPEAT)
   endif
 
-  run-test-$1:
+  run-test-$1: $(TEST_PREREQS)
 	$$(call LogWarn)
 	$$(call LogWarn, Running test '$$($1_TEST)')
 	$$(call MakeDir, $$($1_TEST_RESULTS_DIR) $$($1_TEST_SUPPORT_DIR))
 	$$(call ExecuteWithLog, $$($1_TEST_SUPPORT_DIR)/gtest, \
 	    $$(FIXPATH) $$(TEST_IMAGE_DIR)/hotspot/gtest/$$($1_VARIANT)/gtestLauncher \
-	         -jdk $(JDK_IMAGE_DIR) $$($1_GTEST_FILTER) \
+	        -jdk $(JDK_IMAGE_DIR) $$($1_GTEST_FILTER) \
-	         --gtest_output=xml:$$($1_TEST_RESULTS_DIR)/gtest.xml \
+	        --gtest_output=xml:$$($1_TEST_RESULTS_DIR)/gtest.xml \
-	         $$($1_GTEST_REPEAT) $$(GTEST_OPTIONS) $$(GTEST_VM_OPTIONS) \
+	        $$($1_GTEST_REPEAT) $$(GTEST_OPTIONS) $$(GTEST_VM_OPTIONS) \
+	        $$($1_GTEST_JAVA_OPTIONS) \
 	        > >($(TEE) $$($1_TEST_RESULTS_DIR)/gtest.txt) \
 	    && $$(ECHO) $$$$? > $$($1_EXITCODE) \
 	    || $$(ECHO) $$$$? > $$($1_EXITCODE) \
@@ -447,12 +508,11 @@ define SetupRunJtregTestBody
 
   $1_TEST_NAME := $$(strip $$(patsubst jtreg:%, %, $$($1_TEST)))
 
-  $1_COMPONENT := \
+  $1_TEST_ROOT := \
       $$(strip $$(foreach root, $$(JTREG_TESTROOTS), \
-        $$(if $$(filter $$(root)%, $$(JTREG_TOPDIR)/$$($1_TEST_NAME)), \
+        $$(if $$(filter $$(root)%, $$(JTREG_TOPDIR)/$$($1_TEST_NAME)), $$(root)) \
-          $$(lastword $$(subst /, $$(SPACE), $$(root))) \
-        ) \
       ))
+  $1_COMPONENT := $$(lastword $$(subst /, $$(SPACE), $$($1_TEST_ROOT)))
   # This will work only as long as just hotspot has the additional "jtreg" directory
   ifeq ($$($1_COMPONENT), jtreg)
     $1_COMPONENT := hotspot
@@ -475,11 +535,12 @@ define SetupRunJtregTestBody
   $$(eval $$(call SetJtregValue,$1,JTREG_BASIC_OPTIONS))
   $$(eval $$(call SetJtregValue,$1,JTREG_PROBLEM_LIST))
 
+  # Only the problem list for the current test root should be used.
+  $1_JTREG_PROBLEM_LIST := $$(filter $$($1_TEST_ROOT)%, $$($1_JTREG_PROBLEM_LIST))
+
   ifneq ($(TEST_JOBS), 0)
-    # User has specified TEST_JOBS, use that as fallback default
     $$(eval $$(call SetJtregValue,$1,JTREG_JOBS,$$(TEST_JOBS)))
   else
-    # Use JOBS as default (except for hotspot)
     $$(eval $$(call SetJtregValue,$1,JTREG_JOBS,$$(JOBS)))
   endif
 
@@ -487,7 +548,12 @@ define SetupRunJtregTestBody
   # we may end up with a lot of JVM's
   $1_JTREG_MAX_RAM_PERCENTAGE := $$(shell $$(EXPR) 25 / $$($1_JTREG_JOBS))
 
-  JTREG_TIMEOUT ?= 4
+  # SPARC is in general slower per core so need to scale up timeouts a bit.
+  ifeq ($(OPENJDK_TARGET_CPU_ARCH), sparc)
+    JTREG_TIMEOUT_FACTOR ?= 8
+  else
+    JTREG_TIMEOUT_FACTOR ?= 4
+  endif
   JTREG_VERBOSE ?= fail,error,summary
   JTREG_RETAIN ?= fail,error
 
@@ -498,10 +564,10 @@ define SetupRunJtregTestBody
 
   $1_JTREG_BASIC_OPTIONS += -$$($1_JTREG_TEST_MODE) \
       -verbose:$$(JTREG_VERBOSE) -retain:$$(JTREG_RETAIN) \
-      -concurrency:$$($1_JTREG_JOBS) -timeoutFactor:$$(JTREG_TIMEOUT) \
+      -concurrency:$$($1_JTREG_JOBS) -timeoutFactor:$$(JTREG_TIMEOUT_FACTOR) \
       -vmoption:-XX:MaxRAMPercentage=$$($1_JTREG_MAX_RAM_PERCENTAGE)
 
-  $1_JTREG_BASIC_OPTIONS += -automatic -keywords:\!ignore -ignore:quiet
+  $1_JTREG_BASIC_OPTIONS += -automatic -ignore:quiet
 
   # Make it possible to specify the JIB_DATA_DIR for tests using the
   # JIB Artifact resolver
@@ -531,8 +597,16 @@ define SetupRunJtregTestBody
     $1_JTREG_BASIC_OPTIONS += $$(addprefix -exclude:, $$($1_JTREG_PROBLEM_LIST))
   endif
 
-  ifneq ($$(JIB_JAR), )
+  ifneq ($$(JTREG_EXTRA_PROBLEM_LISTS), )
-    $1_JTREG_BASIC_OPTIONS += -cpa:$$(JIB_JAR)
+    # Accept both absolute paths as well as relative to the current test root.
+    $1_JTREG_BASIC_OPTIONS += $$(addprefix -exclude:, $$(wildcard \
+        $$(JTREG_EXTRA_PROBLEM_LISTS) \
+        $$(addprefix $$($1_TEST_ROOT)/, $$(JTREG_EXTRA_PROBLEM_LISTS)) \
+    ))
+  endif
+
+  ifneq ($$(JIB_HOME), )
+    $1_JTREG_BASIC_OPTIONS += -e:JIB_HOME=$$(JIB_HOME)
   endif
 
   $1_JTREG_BASIC_OPTIONS += -e:TEST_IMAGE_GRAAL_DIR=${TEST_IMAGE_DIR}/hotspot/jtreg/graal
@@ -541,10 +615,21 @@ define SetupRunJtregTestBody
     $1_JTREG_LAUNCHER_OPTIONS += -Djava.library.path="$(JTREG_FAILURE_HANDLER_DIR)"
   endif
 
+  ifneq ($$(JTREG_KEYWORDS), )
+    # The keywords string may contain problematic characters and may be quoted
+    # already when it arrives here. Remove any existing quotes and replace them
+    # with one set of single quotes.
+    $1_JTREG_KEYWORDS := \
+        $$(strip $$(subst $$(SQUOTE),,$$(subst $$(DQUOTE),,$$(JTREG_KEYWORDS))))
+    ifneq ($$($1_JTREG_KEYWORDS), )
+      $1_JTREG_BASIC_OPTIONS += -k:'$$($1_JTREG_KEYWORDS)'
+    endif
+  endif
+
   clean-workdir-$1:
 	$$(RM) -r $$($1_TEST_SUPPORT_DIR)
 
-  run-test-$1: clean-workdir-$1
+  run-test-$1: clean-workdir-$1 $(TEST_PREREQS)
 	$$(call LogWarn)
 	$$(call LogWarn, Running test '$$($1_TEST)')
 	$$(call MakeDir, $$($1_TEST_RESULTS_DIR) $$($1_TEST_SUPPORT_DIR))
@@ -631,7 +716,7 @@ define SetupRunSpecialTestBody
     $$(error Invalid special test specification: $$($1_TEST_NAME))
   endif
 
-  run-test-$1:
+  run-test-$1: $(TEST_PREREQS)
 	$$(call LogWarn)
 	$$(call LogWarn, Running test '$$($1_TEST)')
 	$$(call MakeDir, $$($1_TEST_RESULTS_DIR) $$($1_TEST_SUPPORT_DIR))

make/RunTestsPrebuilt.gmk

@@ -49,10 +49,11 @@ TOPDIR := $(strip $(patsubst %/make/, %, $(dir $(makefile_path))))
 # given.
 # Note: No spaces are allowed around the arguments.
 #
-# $1: The name of the argument
+# $1: The name of the variable
 # $2: The default value, if any, or OPTIONAL (do not provide a default but
 #     do not exit if it is missing)
 # $3: If NO_CHECK, disable checking for target file/directory existence
+#     If MKDIR, create the default directory
 define SetupVariable
   ifeq ($$($1), )
     ifeq ($2, )
@@ -75,10 +76,17 @@ define SetupVariable
   endif
   # If $1 has a value (is not optional), and $3 is not set (to NO_CHECK),
   # and if wildcard is empty, then complain that the file is missing.
-  ifeq ($$(strip $$(if $$($1), , OPTIONAL) $$(wildcard $$($1)) $3), )
+  ifeq ($3, MKDIR)
-    $$(info Error: Prebuilt variable $1 points to missing file/directory:)
+    ifneq ($$(findstring $$(LOG), info debug trace), )
-    $$(info '$$($1)')
+      $$(info Creating directory for $1)
-    $$(error Cannot continue.)
+    endif
+    $$(shell mkdir -p $$($1))
+  else ifneq ($3, NO_CHECK)
+    ifeq ($$(strip $$(if $$($1), , OPTIONAL) $$(wildcard $$($1))), )
+      $$(info Error: Prebuilt variable $1 points to missing file/directory:)
+      $$(info '$$($1)')
+      $$(error Cannot continue.)
+    endif
   endif
 endef
 
@@ -87,12 +95,12 @@ endef
 # $1: The output file name
 # $2..$N: The lines to output to the file
 define CreateNewSpec
-  $(if $(strip $(26)), \
+  $(if $(strip $(27)), \
     $(error Internal makefile error: \
       Too many arguments to macro, please update CreateNewSpec in RunTestsPrebuilt.gmk) \
   ) \
   $(shell $(RM) $1) \
-  $(foreach i, $(call sequence, 2, 25), \
+  $(foreach i, $(call sequence, 2, 26), \
     $(if $(strip $($i)), \
       $(call AppendFile, $(strip $($i)), $1) \
     ) \
@@ -106,14 +114,14 @@ endef
 # Verify that user has given correct additional input.
 
 # These variables are absolutely necessary
-$(eval $(call SetupVariable,OUTPUTDIR))
+$(eval $(call SetupVariable,OUTPUTDIR,$(TOPDIR)/build/run-test-prebuilt,MKDIR))
 $(eval $(call SetupVariable,BOOT_JDK))
 $(eval $(call SetupVariable,JT_HOME))
 
 # These can have default values based on the ones above
 $(eval $(call SetupVariable,JDK_IMAGE_DIR,$(OUTPUTDIR)/images/jdk))
 $(eval $(call SetupVariable,TEST_IMAGE_DIR,$(OUTPUTDIR)/images/test))
-$(eval $(call SetupVariable,SYMBOLS_IMAGE_DIR,$(OUTPUTDIR)/images/symbols))
+$(eval $(call SetupVariable,SYMBOLS_IMAGE_DIR,$(OUTPUTDIR)/images/symbols,NO_CHECK))
 
 # Provide default values for tools that we need
 $(eval $(call SetupVariable,MAKE,make,NO_CHECK))
@@ -202,8 +210,8 @@ endif
 
 ifeq ($(OPENJDK_TARGET_OS), windows)
   ifeq ($(wildcard $(TEST_IMAGE_DIR)/bin/fixpath.exe), )
-    $$(info Error: fixpath is missing from test image '$(TEST_IMAGE_DIR)')
+    $(info Error: fixpath is missing from test image '$(TEST_IMAGE_DIR)')
-    $$(error Cannot continue.)
+    $(error Cannot continue.)
   endif
   FIXPATH := $(TEST_IMAGE_DIR)/bin/fixpath.exe -c
   PATH_SEP:=;
@@ -212,17 +220,34 @@ else
   PATH_SEP:=:
 endif
 
-# Check number of cores
+# Check number of cores and memory in MB
 ifeq ($(OPENJDK_TARGET_OS), linux)
-    NUM_CORES := $(shell $(CAT) /proc/cpuinfo  | $(GREP) -c processor)
+  NUM_CORES := $(shell $(CAT) /proc/cpuinfo  | $(GREP) -c processor)
+  MEMORY_SIZE := $(shell \
+      $(EXPR) `$(CAT) /proc/meminfo | $(GREP) MemTotal | $(AWK) '{print $$2}'` / 1024 \
+  )
 else ifeq ($(OPENJDK_TARGET_OS), macosx)
-    NUM_CORES := $(shell /usr/sbin/sysctl -n hw.ncpu)
+  NUM_CORES := $(shell /usr/sbin/sysctl -n hw.ncpu)
+  MEMORY_SIZE := $(shell $(EXPR) `/usr/sbin/sysctl -n hw.memsize` / 1024 / 1024)
 else ifeq ($(OPENJDK_TARGET_OS), solaris)
-    NUM_CORES := $(shell LC_MESSAGES=C /usr/sbin/psrinfo -v | $(GREP) -c on-line)
+  NUM_CORES := $(shell LC_MESSAGES=C /usr/sbin/psrinfo -v | $(GREP) -c on-line)
+  MEMORY_SIZE := $(shell \
+      /usr/sbin/prtconf 2> /dev/null | $(GREP) "^Memory [Ss]ize" | $(AWK) '{print $$3}' \
+  )
 else ifeq ($(OPENJDK_TARGET_OS), windows)
-    NUM_CORES := $(NUMBER_OF_PROCESSORS)
+  NUM_CORES := $(NUMBER_OF_PROCESSORS)
-else
+  MEMORY_SIZE := $(shell \
-    NUM_CORES := 1
+      $(EXPR) `wmic computersystem get totalphysicalmemory -value | $(GREP) = \
+          | $(CUT) -d "=" -f 2-` / 1024 / 1024 \
+  )
+endif
+ifeq ($(NUM_CORES), )
+  $(warn Could not find number of CPUs, assuming 1)
+  NUM_CORES := 1
+endif
+ifeq ($(MEMORY_SIZE), )
+  $(warn Could not find memory size, assuming 1024 MB)
+  MEMORY_SIZE := 1024
 endif
 
 ################################################################################
@@ -260,6 +285,7 @@ $(call CreateNewSpec, $(NEW_SPEC), \
     OPENJDK_TARGET_CPU_BITS := $(OPENJDK_TARGET_CPU_BITS), \
     OPENJDK_TARGET_CPU_ENDIAN := $(OPENJDK_TARGET_CPU_ENDIAN), \
     NUM_CORES := $(NUM_CORES), \
+    MEMORY_SIZE := $(MEMORY_SIZE), \
     include $(TOPDIR)/make/RunTestsPrebuiltSpec.gmk, \
     $(CUSTOM_NEW_SPEC_LINE), \
 )
@@ -276,9 +302,6 @@ run-test-prebuilt:
 	@$(RM) -f $(MAKESUPPORT_OUTPUTDIR)/exit-with-error
 	@cd $(TOPDIR) && $(MAKE) $(MAKE_ARGS) -f make/RunTests.gmk run-test \
 	    TEST="$(TEST)"
-	@if test -f $(MAKESUPPORT_OUTPUTDIR)/exit-with-error ; then \
-	  exit 1 ; \
-	fi
 
 all: run-test-prebuilt
 

make/RunTestsPrebuiltSpec.gmk

@@ -124,7 +124,7 @@ JLINK := $(FIXPATH) $(JLINK_CMD)
 JMOD := $(FIXPATH) $(JMOD_CMD)
 JARSIGNER := $(FIXPATH) $(JARSIGNER_CMD)
 
-BUILD_JAVA := $(JAVA)
+BUILD_JAVA := $(JDK_IMAGE_DIR)/bin/JAVA
 ################################################################################
 # Some common tools. Assume most common name and no path.
 AWK := awk
@@ -172,3 +172,17 @@ UNZIP := unzip
 EXPR := expr
 FILE := file
 HG := hg
+
+# On Solaris gnu versions of some tools are required.
+ifeq ($(OPENJDK_BUILD_OS), solaris)
+  AWK := gawk
+  GREP := ggrep
+  EGREP := ggrep -E
+  FGREP := grep -F
+  SED := gsed
+  TAR := gtar
+endif
+
+ifeq ($(OPENJDK_BUILD_OS), windows)
+  CYGPATH := cygpath
+endif

make/SourceRevision.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -23,33 +23,43 @@
 # questions.
 #
 
-default: all
-
 include $(SPEC)
 include MakeBase.gmk
 
-$(eval $(call IncludeCustomExtension, SourceRevision.gmk))
+$(eval $(call IncludeCustomExtension, SourceRevision-pre.gmk))
 
 ################################################################################
 # Keep track of what source revision is used to create the build, by creating
 # a tracker file in the output directory. This tracker file is included in the
-# image, and can be used to recreate the source revision used.
+# source image, and can be used to recreate the source revision used.
 #
-# We're either building directly from a mercurial forest, and if so, use the
+# We're either building directly from an SCM repository, and if so, use the
-# current revision from mercurial. Otherwise, we are building from a source
+# current revision from that SCM. Otherwise, we are building from a source
-# bundle. As a part of creating this source bundle, the current mercurial
+# bundle. As a part of creating this source bundle, the current SCM revisions of
-# revisions of all repos will be stored in a file in the top dir, which is then
+# all repos will be stored in a file in the top dir, which is then used when
-# used when creating the tracker file.
+# creating the tracker file.
 
 STORED_SOURCE_REVISION := $(TOPDIR)/.src-rev
 
-# Are we using mercurial?
+USE_SCM := false
 ifneq ($(and $(HG), $(wildcard $(TOPDIR)/.hg)), )
+  USE_SCM := true
+  SCM_DIR := .hg
+  ID_COMMAND := $(PRINTF) "hg:%s" "$$($(HG) id -i)"
+else ifneq ($(and $(GIT), $(wildcard $(TOPDIR)/.git)), )
+  USE_SCM := true
+  SCM_DIR := .git
+  ID_COMMAND := $(PRINTF) "git:%s%s\n" \
+      "$$(git log -n1 --format=%H | cut -c1-12)" \
+      "$$(if test -n "$$(git status --porcelain)"; then printf '+'; fi)"
+endif
+
+ifeq ($(USE_SCM), true)
 
   # Verify that the entire forest is consistent
   $(foreach repo, $(call FindAllReposRel), \
-    $(if $(wildcard $(TOPDIR)/$(repo)/.hg),, \
+    $(if $(wildcard $(TOPDIR)/$(repo)/$(SCM_DIR)),, \
-        $(error Inconsistent revision control: $(repo) is missing .hg directory)) \
+        $(error Inconsistent revision control: $(repo) is missing $(SCM_DIR) directory)) \
   )
 
   # Replace "." with "_top" and "/" with "-"
@@ -58,7 +68,9 @@ ifneq ($(and $(HG), $(wildcard $(TOPDIR)/.hg)), )
 
   ################################################################################
   # SetupGetRevisionForRepo defines a make rule for creating a file containing
-  # the name of the repository and the output of "hg id" for that repository.
+  # the name of the repository and the output of the scm command for that
+  # repository.
+  #
   # Argument 1 is the relative path to the repository from the top dir.
   #
   SetupGetRevisionForRepo = $(NamedParamsMacroTemplate)
@@ -68,7 +80,7 @@ ifneq ($(and $(HG), $(wildcard $(TOPDIR)/.hg)), )
 
     $$(SUPPORT_OUTPUTDIR)/src-rev/$$($1_FILENAME): FRC
 	$$(call MakeDir, $$(@D))
-	$$(ECHO) $$(strip $1):`$$(HG) id -i --repository $$($1_REPO_PATH)` > $$@
+	$$(ECHO) $$(strip $1):`$$(CD) $$($1_REPO_PATH) && $$(ID_COMMAND)` > $$@
 
     REPO_REVISIONS += $$(SUPPORT_OUTPUTDIR)/src-rev/$$($1_FILENAME)
   endef
@@ -94,40 +106,58 @@ ifneq ($(and $(HG), $(wildcard $(TOPDIR)/.hg)), )
 
   $(eval $(call CreateSourceRevisionFile, $(STORED_SOURCE_REVISION)))
 
-  store-source-revision: $(STORED_SOURCE_REVISION)
+  scm-store-source-revision: $(STORED_SOURCE_REVISION)
 
   $(eval $(call CreateSourceRevisionFile, $(SOURCE_REVISION_TRACKER)))
 
-  create-source-revision-tracker: $(SOURCE_REVISION_TRACKER)
+  scm-create-source-revision-tracker: $(SOURCE_REVISION_TRACKER)
+
+  STORE_SOURCE_REVISION_TARGET := scm-store-source-revision
+  CREATE_SOURCE_REVISION_TRACKER_TARGET := scm-create-source-revision-tracker
+
+  .PHONY: scm-store-source-revision scm-create-source-revision-tracker
 
 else
-  # Not using HG
+  # Not using any SCM
 
   ifneq ($(wildcard $(STORED_SOURCE_REVISION)), )
     # We have a stored source revision (.src-rev)
 
-    store-source-revision:
+    src-store-source-revision:
-	$(call LogInfo, No mercurial configuration present$(COMMA) not updating .src-rev)
+	$(call LogInfo, No SCM configuration present$(COMMA) not updating .src-rev)
 
     $(SOURCE_REVISION_TRACKER): $(STORED_SOURCE_REVISION)
 	$(install-file)
 
-    create-source-revision-tracker: $(SOURCE_REVISION_TRACKER)
+    src-create-source-revision-tracker: $(SOURCE_REVISION_TRACKER)
   else
     # We don't have a stored source revision. Can't do anything, really.
 
-    store-source-revision:
+    src-store-source-revision:
-	$(call LogWarn, Error: No mercurial configuration present$(COMMA) cannot create .src-rev)
+	$(call LogWarn, Error: No SCM configuration present$(COMMA) cannot create .src-rev)
 	exit 2
 
-    create-source-revision-tracker:
+    src-create-source-revision-tracker:
-	$(call LogWarn, Warning: No mercurial configuration present and no .src-rev)
+	$(call LogWarn, Warning: No SCM configuration present and no .src-rev)
   endif
 
+  STORE_SOURCE_REVISION_TARGET := src-store-source-revision
+  CREATE_SOURCE_REVISION_TRACKER_TARGET := src-create-source-revision-tracker
+
+  .PHONY: src-store-source-revision src-create-source-revision-tracker
+
 endif
 
-all: store-source-revision create-source-revision-tracker
+################################################################################
+
+$(eval $(call IncludeCustomExtension, SourceRevision-post.gmk))
+
+################################################################################
+
+store-source-revision: $(STORE_SOURCE_REVISION_TARGET)
+
+create-source-revision-tracker: $(CREATE_SOURCE_REVISION_TRACKER_TARGET)
 
 FRC: # Force target
 
-.PHONY: all store-source-revision create-source-revision-tracker
+.PHONY: store-source-revision create-source-revision-tracker

make/ToolsJdk.gmk

@@ -79,6 +79,9 @@ TOOL_BLACKLISTED_CERTS = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_cla
 TOOL_MAKEJAVASECURITY = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
     build.tools.makejavasecurity.MakeJavaSecurity
 
+TOOL_GENERATECACERTS = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
+    build.tools.generatecacerts.GenerateCacerts
+
 
 # TODO: There are references to the jdwpgen.jar in jdk/make/netbeans/jdwpgen/build.xml
 # and nbproject/project.properties in the same dir. Needs to be looked at.

make/autoconf/basics.m4

@@ -1190,6 +1190,7 @@ AC_DEFUN_ONCE([BASIC_SETUP_COMPLEX_TOOLS],
   BASIC_PATH_PROGS(READELF, [greadelf readelf])
   BASIC_PATH_PROGS(DOT, dot)
   BASIC_PATH_PROGS(HG, hg)
+  BASIC_PATH_PROGS(GIT, git)
   BASIC_PATH_PROGS(STAT, stat)
   BASIC_PATH_PROGS(TIME, time)
   BASIC_PATH_PROGS(FLOCK, flock)
@@ -1211,12 +1212,23 @@ AC_DEFUN_ONCE([BASIC_SETUP_COMPLEX_TOOLS],
     BASIC_REQUIRE_PROGS(MIG, mig)
     BASIC_REQUIRE_PROGS(XATTR, xattr)
     BASIC_PATH_PROGS(CODESIGN, codesign)
+
     if test "x$CODESIGN" != "x"; then
-      # Verify that the openjdk_codesign certificate is present
+      # Check for user provided code signing identity.
-      AC_MSG_CHECKING([if openjdk_codesign certificate is present])
+      # If no identity was provided, fall back to "openjdk_codesign".
+      AC_ARG_WITH([macosx-codesign-identity], [AS_HELP_STRING([--with-macosx-codesign-identity],
+        [specify the code signing identity])],
+        [MACOSX_CODESIGN_IDENTITY=$with_macosx_codesign_identity],
+        [MACOSX_CODESIGN_IDENTITY=openjdk_codesign]
+      )
+
+      AC_SUBST(MACOSX_CODESIGN_IDENTITY)
+
+      # Verify that the codesign certificate is present
+      AC_MSG_CHECKING([if codesign certificate is present])
       $RM codesign-testfile
       $TOUCH codesign-testfile
-      $CODESIGN -s openjdk_codesign codesign-testfile 2>&AS_MESSAGE_LOG_FD >&AS_MESSAGE_LOG_FD || CODESIGN=
+      $CODESIGN -s "$MACOSX_CODESIGN_IDENTITY" codesign-testfile 2>&AS_MESSAGE_LOG_FD >&AS_MESSAGE_LOG_FD || CODESIGN=
       $RM codesign-testfile
       if test "x$CODESIGN" = x; then
         AC_MSG_RESULT([no])

make/autoconf/build-performance.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -42,8 +42,11 @@ AC_DEFUN([BPERF_CHECK_CORES],
     NUM_CORES=`/usr/sbin/sysctl -n hw.ncpu`
     FOUND_CORES=yes
   elif test "x$OPENJDK_BUILD_OS" = xaix ; then
-    NUM_CORES=`/usr/sbin/prtconf | grep "^Number Of Processors" | awk '{ print [$]4 }'`
+    NUM_LCPU=`lparstat -m 2> /dev/null | $GREP -o "lcpu=[[0-9]]*" | $CUT -d "=" -f 2`
-    FOUND_CORES=yes
+    if test -n "$NUM_LCPU"; then
+      NUM_CORES=$NUM_LCPU
+      FOUND_CORES=yes
+    fi
   elif test -n "$NUMBER_OF_PROCESSORS"; then
     # On windows, look in the env
     NUM_CORES=$NUMBER_OF_PROCESSORS

make/autoconf/flags-cflags.m4

@@ -524,7 +524,7 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],
     fi
   elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then
     TOOLCHAIN_CFLAGS_JDK="-mt"
-    TOOLCHAIN_CFLAGS_JDK_CONLY="-xc99=%none -xCC -Xa -v -W0,-noglobal" # C only
+    TOOLCHAIN_CFLAGS_JDK_CONLY="-xCC -Xa -v -W0,-noglobal" # C only
     TOOLCHAIN_CFLAGS_JDK_CXXONLY="-features=no%except -norunpath -xnolib" # CXX only
     TOOLCHAIN_CFLAGS_JVM="-template=no%extdef -features=no%split_init \
         -library=stlport4 -mt -features=no%except"

make/autoconf/flags-other.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -31,9 +31,7 @@
 AC_DEFUN([FLAGS_SETUP_ARFLAGS],
 [
   # FIXME: figure out if we should select AR flags depending on OS or toolchain.
-  if test "x$OPENJDK_TARGET_OS" = xmacosx; then
+  if test "x$OPENJDK_TARGET_OS" = xaix; then
-    ARFLAGS="-r -mmacosx-version-min=$MACOSX_VERSION_MIN"
-  elif test "x$OPENJDK_TARGET_OS" = xaix; then
     ARFLAGS="-X64"
   elif test "x$OPENJDK_TARGET_OS" = xwindows; then
     # lib.exe is used as AR to create static libraries.
@@ -83,10 +81,10 @@ AC_DEFUN([FLAGS_SETUP_RCFLAGS],
     RC_FLAGS="$RC_FLAGS \
         -D\"JDK_VERSION_STRING=\$(VERSION_STRING)\" \
         -D\"JDK_COMPANY=\$(COMPANY_NAME)\" \
-        -D\"JDK_COMPONENT=\$(PRODUCT_NAME) \$(JDK_RC_PLATFORM_NAME) binary\" \
+        -D\"JDK_COMPONENT=\$(JDK_RC_NAME) binary\" \
         -D\"JDK_VER=\$(VERSION_NUMBER)\" \
         -D\"JDK_COPYRIGHT=Copyright \xA9 $COPYRIGHT_YEAR\" \
-        -D\"JDK_NAME=\$(PRODUCT_NAME) \$(JDK_RC_PLATFORM_NAME) \$(VERSION_FEATURE)\" \
+        -D\"JDK_NAME=\$(JDK_RC_NAME) \$(VERSION_FEATURE)\" \
         -D\"JDK_FVER=\$(subst .,\$(COMMA),\$(VERSION_NUMBER_FOUR_POSITIONS))\""
 
     JVM_RCFLAGS="$JVM_RCFLAGS \

make/autoconf/flags.m4

@@ -162,6 +162,10 @@ AC_DEFUN_ONCE([FLAGS_SETUP_USER_SUPPLIED_FLAGS],
     AC_MSG_WARN([Ignoring LDFLAGS($LDFLAGS) found in environment. Use --with-extra-ldflags])
   fi
 
+  if test "x$ASFLAGS" != "x"; then
+    AC_MSG_WARN([Ignoring ASFLAGS($ASFLAGS) found in environment. Use --with-extra-asflags])
+  fi
+
   AC_ARG_WITH(extra-cflags, [AS_HELP_STRING([--with-extra-cflags],
       [extra flags to be used when compiling jdk c-files])])
 
@@ -171,9 +175,13 @@ AC_DEFUN_ONCE([FLAGS_SETUP_USER_SUPPLIED_FLAGS],
   AC_ARG_WITH(extra-ldflags, [AS_HELP_STRING([--with-extra-ldflags],
       [extra flags to be used when linking jdk])])
 
+  AC_ARG_WITH(extra-asflags, [AS_HELP_STRING([--with-extra-asflags],
+      [extra flags to be passed to the assembler])])
+
   USER_CFLAGS="$with_extra_cflags"
   USER_CXXFLAGS="$with_extra_cxxflags"
   USER_LDFLAGS="$with_extra_ldflags"
+  USER_ASFLAGS="$with_extra_asflags"
 ])
 
 # Setup the sysroot flags and add them to global CFLAGS and LDFLAGS so
@@ -265,10 +273,12 @@ AC_DEFUN_ONCE([FLAGS_PRE_TOOLCHAIN],
   EXTRA_CFLAGS="$MACHINE_FLAG $USER_CFLAGS"
   EXTRA_CXXFLAGS="$MACHINE_FLAG $USER_CXXFLAGS"
   EXTRA_LDFLAGS="$MACHINE_FLAG $USER_LDFLAGS"
+  EXTRA_ASFLAGS="$USER_ASFLAGS"
 
   AC_SUBST(EXTRA_CFLAGS)
   AC_SUBST(EXTRA_CXXFLAGS)
   AC_SUBST(EXTRA_LDFLAGS)
+  AC_SUBST(EXTRA_ASFLAGS)
 
   # For autoconf testing to work, the global flags must also be stored in the
   # "unnamed" CFLAGS etc.
@@ -335,8 +345,12 @@ AC_DEFUN([FLAGS_SETUP_TOOLCHAIN_CONTROL],
     CC_OUT_OPTION='-o$(SPACE)'
     # When linking, how to specify the output
     LD_OUT_OPTION='-o$(SPACE)'
-    # When archiving, how to specify the to be create static archive for object files.
+    # When archiving, how to specify the destination static archive.
-    AR_OUT_OPTION='rcs$(SPACE)'
+    if test "x$OPENJDK_TARGET_OS" = xmacosx; then
+      AR_OUT_OPTION='-r -cs$(SPACE)'
+    else
+      AR_OUT_OPTION='-rcs$(SPACE)'
+    fi
   fi
   AC_SUBST(CC_OUT_OPTION)
   AC_SUBST(LD_OUT_OPTION)

make/autoconf/help.m4

@@ -102,7 +102,7 @@ apt_help() {
     ffi)
       PKGHANDLER_COMMAND="sudo apt-get install libffi-dev" ;;
     x11)
-      PKGHANDLER_COMMAND="sudo apt-get install libx11-dev libxext-dev libxrender-dev libxtst-dev libxt-dev" ;;
+      PKGHANDLER_COMMAND="sudo apt-get install libx11-dev libxext-dev libxrender-dev libxrandr-dev libxtst-dev libxt-dev" ;;
     ccache)
       PKGHANDLER_COMMAND="sudo apt-get install ccache" ;;
     dtrace)
@@ -125,7 +125,7 @@ yum_help() {
     freetype)
       PKGHANDLER_COMMAND="sudo yum install freetype-devel" ;;
     x11)
-      PKGHANDLER_COMMAND="sudo yum install libXtst-devel libXt-devel libXrender-devel libXi-devel" ;;
+      PKGHANDLER_COMMAND="sudo yum install libXtst-devel libXt-devel libXrender-devel libXrandr-devel libXi-devel" ;;
     ccache)
       PKGHANDLER_COMMAND="sudo yum install ccache" ;;
   esac

make/autoconf/jdk-version.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -75,9 +75,52 @@ AC_DEFUN_ONCE([JDKVER_SETUP_JDK_VERSION_NUMBERS],
   AC_SUBST(PRODUCT_SUFFIX)
   AC_SUBST(JDK_RC_PLATFORM_NAME)
   AC_SUBST(HOTSPOT_VM_DISTRO)
+
+  # Set the MACOSX Bundle Name base
+  AC_ARG_WITH(macosx-bundle-name-base, [AS_HELP_STRING([--with-macosx-bundle-name-base],
+      [Set the MacOSX Bundle Name base. This is the base name for calculating MacOSX Bundle Names.
+      @<:@not specified@:>@])])
+  if test "x$with_macosx_bundle_name_base" = xyes; then
+    AC_MSG_ERROR([--with-macosx-bundle-name-base must have a value])
+  elif [ ! [[ $with_macosx_bundle_name_base =~ ^[[:print:]]*$ ]] ]; then
+    AC_MSG_ERROR([--with-macosx-bundle-name-base contains non-printing characters: $with_macosx_bundle_name_base])
+  elif test "x$with_macosx_bundle_name_base" != x; then
+    # Set MACOSX_BUNDLE_NAME_BASE to the configured value.
+    MACOSX_BUNDLE_NAME_BASE="$with_macosx_bundle_name_base"
+  fi
   AC_SUBST(MACOSX_BUNDLE_NAME_BASE)
+
+  # Set the MACOSX Bundle ID base
+  AC_ARG_WITH(macosx-bundle-id-base, [AS_HELP_STRING([--with-macosx-bundle-id-base],
+      [Set the MacOSX Bundle ID base. This is the base ID for calculating MacOSX Bundle IDs.
+      @<:@not specified@:>@])])
+  if test "x$with_macosx_bundle_id_base" = xyes; then
+    AC_MSG_ERROR([--with-macosx-bundle-id-base must have a value])
+  elif [ ! [[ $with_macosx_bundle_id_base =~ ^[[:print:]]*$ ]] ]; then
+    AC_MSG_ERROR([--with-macosx-bundle-id-base contains non-printing characters: $with_macosx_bundle_id_base])
+  elif test "x$with_macosx_bundle_id_base" != x; then
+    # Set MACOSX_BUNDLE_ID_BASE to the configured value.
+    MACOSX_BUNDLE_ID_BASE="$with_macosx_bundle_id_base"
+  fi
   AC_SUBST(MACOSX_BUNDLE_ID_BASE)
 
+  # Set the JDK RC name
+  AC_ARG_WITH(jdk-rc-name, [AS_HELP_STRING([--with-jdk-rc-name],
+      [Set JDK RC name. This is used for FileDescription and ProductName properties
+       of MS Windows binaries. @<:@not specified@:>@])])
+  if test "x$with_jdk_rc_name" = xyes; then
+    AC_MSG_ERROR([--with-jdk-rc-name must have a value])
+  elif [ ! [[ $with_jdk_rc_name =~ ^[[:print:]]*$ ]] ]; then
+    AC_MSG_ERROR([--with-jdk-rc-name contains non-printing characters: $with_jdk_rc_name])
+  elif test "x$with_jdk_rc_name" != x; then
+    # Set JDK_RC_NAME to a custom value if '--with-jdk-rc-name' was used and is not empty.
+    JDK_RC_NAME="$with_jdk_rc_name"
+  else
+    # Otherwise calculate from "version-numbers" included above.
+    JDK_RC_NAME="$PRODUCT_NAME $JDK_RC_PLATFORM_NAME"
+  fi
+  AC_SUBST(JDK_RC_NAME)
+
   # The vendor name, if any
   AC_ARG_WITH(vendor-name, [AS_HELP_STRING([--with-vendor-name],
       [Set vendor name. Among others, used to set the 'java.vendor'

make/autoconf/lib-freetype.m4

@@ -186,6 +186,9 @@ AC_DEFUN_ONCE([LIB_SETUP_FREETYPE],
           FREETYPE_BASE_DIR="$SYSROOT/usr"
           if (test "x$OPENJDK_TARGET_CPU_BITS" = "x64"); then
             LIB_CHECK_POTENTIAL_FREETYPE([$FREETYPE_BASE_DIR/include], [$FREETYPE_BASE_DIR/lib/$OPENJDK_TARGET_CPU-linux-gnu], [well-known location])
+            if (test "x$FOUND_FREETYPE" != "xyes"); then
+              LIB_CHECK_POTENTIAL_FREETYPE([$FREETYPE_BASE_DIR/include], [$FREETYPE_BASE_DIR/lib64], [well-known location])
+            fi
           else
             LIB_CHECK_POTENTIAL_FREETYPE([$FREETYPE_BASE_DIR/include], [$FREETYPE_BASE_DIR/lib/i386-linux-gnu], [well-known location])
             if (test "x$FOUND_FREETYPE" != "xyes"); then

make/autoconf/lib-x11.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -99,8 +99,14 @@ AC_DEFUN_ONCE([LIB_SETUP_X11],
     OLD_CFLAGS="$CFLAGS"
     CFLAGS="$CFLAGS $SYSROOT_CFLAGS $X_CFLAGS"
 
+    HEADERS_TO_CHECK="X11/extensions/shape.h X11/extensions/Xrender.h X11/extensions/XTest.h X11/Intrinsic.h"
+    # There is no Xrandr extension on AIX
+    if test "x$OPENJDK_TARGET_OS" != xaix; then
+      HEADERS_TO_CHECK="$HEADERS_TO_CHECK X11/extensions/Xrandr.h"
+    fi
+
     # Need to include Xlib.h and Xutil.h to avoid "present but cannot be compiled" warnings on Solaris 10
-    AC_CHECK_HEADERS([X11/extensions/shape.h X11/extensions/Xrender.h X11/extensions/XTest.h X11/Intrinsic.h],
+    AC_CHECK_HEADERS([$HEADERS_TO_CHECK],
         [X11_HEADERS_OK=yes],
         [X11_HEADERS_OK=no; break],
         [
@@ -111,7 +117,7 @@ AC_DEFUN_ONCE([LIB_SETUP_X11],
 
     if test "x$X11_HEADERS_OK" = xno; then
       HELP_MSG_MISSING_DEPENDENCY([x11])
-      AC_MSG_ERROR([Could not find all X11 headers (shape.h Xrender.h XTest.h Intrinsic.h). $HELP_MSG])
+      AC_MSG_ERROR([Could not find all X11 headers (shape.h Xrender.h Xrandr.h XTest.h Intrinsic.h). $HELP_MSG])
     fi
 
     # If XLinearGradient isn't available in Xrender.h, signal that it needs to be

make/autoconf/libraries.m4

@@ -130,6 +130,11 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBRARIES],
     BASIC_JVM_LIBS="$BASIC_JVM_LIBS -lthread"
   fi
 
+  # perfstat lib
+  if test "x$OPENJDK_TARGET_OS" = xaix; then
+    BASIC_JVM_LIBS="$BASIC_JVM_LIBS -lperfstat"
+  fi
+
   if test "x$OPENJDK_TARGET_OS" = xsolaris; then
     BASIC_JVM_LIBS="$BASIC_JVM_LIBS -lsocket -lsched -ldoor -ldemangle -lnsl \
         -lrt -lkstat"

make/autoconf/spec.gmk.in

@@ -148,6 +148,7 @@ LAUNCHER_NAME:=@LAUNCHER_NAME@
 PRODUCT_NAME:=@PRODUCT_NAME@
 PRODUCT_SUFFIX:=@PRODUCT_SUFFIX@
 JDK_RC_PLATFORM_NAME:=@JDK_RC_PLATFORM_NAME@
+JDK_RC_NAME:=@JDK_RC_NAME@
 COMPANY_NAME:=@COMPANY_NAME@
 HOTSPOT_VM_DISTRO:=@HOTSPOT_VM_DISTRO@
 MACOSX_BUNDLE_NAME_BASE=@MACOSX_BUNDLE_NAME_BASE@
@@ -386,6 +387,9 @@ MACOSX_VERSION_MIN=@MACOSX_VERSION_MIN@
 # The highest allowed version of macosx
 MACOSX_VERSION_MAX=@MACOSX_VERSION_MAX@
 
+# The macosx code signing identity to use
+MACOSX_CODESIGN_IDENTITY=@MACOSX_CODESIGN_IDENTITY@
+
 # Toolchain type: gcc, clang, solstudio, lxc, microsoft...
 TOOLCHAIN_TYPE:=@TOOLCHAIN_TYPE@
 TOOLCHAIN_VERSION := @TOOLCHAIN_VERSION@
@@ -461,6 +465,7 @@ JVM_RCFLAGS := @JVM_RCFLAGS@
 EXTRA_CFLAGS = @EXTRA_CFLAGS@
 EXTRA_CXXFLAGS = @EXTRA_CXXFLAGS@
 EXTRA_LDFLAGS = @EXTRA_LDFLAGS@
+EXTRA_ASFLAGS = @EXTRA_ASFLAGS@
 
 CXX:=@FIXPATH@ @CCACHE@ @ICECC@ @CXX@
 
@@ -724,12 +729,13 @@ EXPR:=@EXPR@
 FILE:=@FILE@
 DOT:=@DOT@
 HG:=@HG@
+GIT:=@GIT@
 OBJCOPY:=@OBJCOPY@
 SETFILE:=@SETFILE@
 XATTR:=@XATTR@
 JT_HOME:=@JT_HOME@
 JTREGEXE:=@JTREGEXE@
-JIB_JAR:=@JIB_JAR@
+JIB_HOME:=@JIB_HOME@
 XCODEBUILD=@XCODEBUILD@
 DTRACE := @DTRACE@
 FIXPATH:=@FIXPATH@
@@ -879,12 +885,14 @@ else
   JDK_BUNDLE_EXTENSION := tar.gz
 endif
 JDK_BUNDLE_NAME := jdk-$(BASE_NAME)_bin$(DEBUG_PART).$(JDK_BUNDLE_EXTENSION)
+JRE_BUNDLE_NAME := jre-$(BASE_NAME)_bin$(DEBUG_PART).$(JDK_BUNDLE_EXTENSION)
 JDK_SYMBOLS_BUNDLE_NAME := jdk-$(BASE_NAME)_bin$(DEBUG_PART)-symbols.tar.gz
 TEST_DEMOS_BUNDLE_NAME := jdk-$(BASE_NAME)_bin-tests-demos$(DEBUG_PART).tar.gz
 TEST_BUNDLE_NAME := jdk-$(BASE_NAME)_bin-tests$(DEBUG_PART).tar.gz
 DOCS_BUNDLE_NAME := jdk-$(BASE_NAME)_doc-api-spec$(DEBUG_PART).tar.gz
 
 JDK_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(JDK_BUNDLE_NAME)
+JRE_BUNDLE :=  $(BUNDLES_OUTPUTDIR)/$(JRE_BUNDLE_NAME)
 JDK_SYMBOLS_BUNDLE :=  $(BUNDLES_OUTPUTDIR)/$(JDK_SYMBOLS_BUNDLE_NAME)
 TEST_DEMOS_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(TEST_DEMOS_BUNDLE_NAME)
 TEST_BUNDLE :=  $(BUNDLES_OUTPUTDIR)/$(TEST_BUNDLE_NAME)

make/autoconf/toolchain.m4

@@ -1144,5 +1144,5 @@ AC_DEFUN_ONCE([TOOLCHAIN_SETUP_JIB],
     fi
   fi
 
-  AC_SUBST(JIB_JAR)
+  AC_SUBST(JIB_HOME)
 ])

make/autoconf/version-numbers

@@ -27,12 +27,12 @@
 
 DEFAULT_VERSION_FEATURE=11
 DEFAULT_VERSION_INTERIM=0
-DEFAULT_VERSION_UPDATE=2
+DEFAULT_VERSION_UPDATE=6
 DEFAULT_VERSION_PATCH=0
 DEFAULT_VERSION_EXTRA1=0
 DEFAULT_VERSION_EXTRA2=0
 DEFAULT_VERSION_EXTRA3=0
-DEFAULT_VERSION_DATE=2019-01-15
+DEFAULT_VERSION_DATE=2020-01-14
 DEFAULT_VERSION_CLASSFILE_MAJOR=55  # "`$EXPR $DEFAULT_VERSION_FEATURE + 44`"
 DEFAULT_VERSION_CLASSFILE_MINOR=0
 DEFAULT_ACCEPTABLE_BOOT_VERSIONS="10 11"

make/common/MakeBase.gmk

@@ -347,6 +347,7 @@ SOURCE_REVISION_TRACKER := $(SUPPORT_OUTPUTDIR)/src-rev/source-revision-tracker
 FindAllReposAbs = \
     $(strip $(sort $(dir $(filter-out $(TOPDIR)/build/%, $(wildcard \
         $(addprefix $(TOPDIR)/, .hg */.hg */*/.hg */*/*/.hg */*/*/*/.hg) \
+        $(addprefix $(TOPDIR)/, .git */.git */*/.git */*/*/.git */*/*/*/.git) \
     )))))
 
 # Locate all hg repositories included in the forest, as relative paths
@@ -841,7 +842,7 @@ endef
 # Parameter 1 is the name of the rule, and is also the name of the variable.
 #
 # Remaining parameters are named arguments. These include:
-#   KEYWORDS          A list of valid keywords
+#   SINGLE_KEYWORDS   A list of valid keywords with single string values
 #   STRING_KEYWORDS   A list of valid keywords, processed as string. This means
 #       that '%20' will be replaced by ' ' to allow for multi-word strings.
 #
@@ -855,7 +856,7 @@ define ParseKeywordVariableBody
       $$(eval mangled_part_eval := $$(call DoubleDollar, $$(mangled_part))) \
       $$(eval part := $$$$(subst ||||,$$$$(SPACE),$$$$(mangled_part_eval))) \
       $$(eval $1_NO_MATCH := true) \
-      $$(foreach keyword, $$($1_KEYWORDS), \
+      $$(foreach keyword, $$($1_SINGLE_KEYWORDS), \
         $$(eval keyword_eval := $$(call DoubleDollar, $$(keyword))) \
         $$(if $$(filter $$(keyword)=%, $$(part)), \
           $$(eval $(strip $1)_$$$$(keyword_eval) := $$$$(strip $$$$(patsubst $$$$(keyword_eval)=%, %, $$$$(part)))) \
@@ -870,11 +871,11 @@ define ParseKeywordVariableBody
         ) \
       ) \
       $$(if $$($1_NO_MATCH), \
-        $$(if $$(filter $$(part), $$($1_KEYWORDS) $$($1_STRING_KEYWORDS)), \
+        $$(if $$(filter $$(part), $$($1_SINGLE_KEYWORDS) $$($1_STRING_KEYWORDS)), \
           $$(info Keyword $$(part) for $1 needs to be assigned a value.) \
         , \
           $$(info $$(part) is not a valid keyword for $1.) \
-          $$(info Valid keywords: $$($1_KEYWORDS) $$($1_STRING_KEYWORDS).) \
+          $$(info Valid keywords: $$($1_SINGLE_KEYWORDS) $$($1_STRING_KEYWORDS).) \
         ) \
         $$(error Cannot continue) \
       ) \

make/common/NativeCompilation.gmk

@@ -936,7 +936,7 @@ define SetupNativeCompilationBody
 
     $1_VARDEPS := $$($1_LD) $$($1_SYSROOT_LDFLAGS) $$($1_LDFLAGS) $$($1_EXTRA_LDFLAGS) \
         $$(GLOBAL_LIBS) $$($1_LIBS) $$($1_EXTRA_LIBS) $$($1_MT) \
-        $$($1_CODESIGN) $$($1_CREATE_DEBUGINFO_CMDS) $$($1_MANIFEST_VERSION) \
+        $$($1_CREATE_DEBUGINFO_CMDS) $$($1_MANIFEST_VERSION) \
         $$($1_STRIP_CMD)
     $1_VARDEPS_FILE := $$(call DependOnVariable, $1_VARDEPS, \
         $$($1_OBJECT_DIR)/$$($1_NOSUFFIX).vardeps)
@@ -1015,9 +1015,8 @@ define SetupNativeCompilationBody
                 # This only works if the openjdk_codesign identity is present on the system. Let
                 # silently fail otherwise.
                 ifneq ($(CODESIGN), )
-                  ifneq ($$($1_CODESIGN), )
+		  $(CODESIGN) -s "$(MACOSX_CODESIGN_IDENTITY)" --timestamp --options runtime \
-		    $(CODESIGN) -s openjdk_codesign $$@
+		  --entitlements $(TOPDIR)/make/data/macosxsigning/entitlements.plist $$@
-                  endif
                 endif
   endif
 endef

make/conf/jib-profiles.js

@@ -525,8 +525,7 @@ var getJibProfilesProfiles = function (input, common, data) {
             profiles[maketestName].default_make_targets = [ "test-make" ];
         });
 
-    // Profiles for building the zero jvm variant. These are used for verification
+    // Profiles for building the zero jvm variant. These are used for verification.
-    // in JPRT.
     var zeroProfiles = {
         "linux-x64-zero": {
             target_os: "linux",
@@ -725,18 +724,8 @@ var getJibProfilesProfiles = function (input, common, data) {
         });
     });
 
-    // Profiles used to run tests. Used in JPRT and Mach 5.
+    // Profiles used to run tests.
     var testOnlyProfiles = {
-        "run-test-jprt": {
-            target_os: input.build_os,
-            target_cpu: input.build_cpu,
-            dependencies: [ "jtreg", "gnumake", "boot_jdk", "devkit", "jib" ],
-            labels: "test",
-            environment: {
-                "JT_JAVA": common.boot_jdk_home
-            }
-        },
-
         "run-test": {
             target_os: input.build_os,
             target_cpu: input.build_cpu,
@@ -758,16 +747,15 @@ var getJibProfilesProfiles = function (input, common, data) {
         "run-test-prebuilt": {
             target_os: input.build_os,
             target_cpu: input.build_cpu,
-            src: "src.conf",
             dependencies: [ "jtreg", "gnumake", "boot_jdk", "jib", testedProfile + ".jdk",
-                testedProfile + ".test", "src.full"
+                testedProfile + ".test"
             ],
-            work_dir: input.get("src.full", "install_path") + "/test",
+            src: "src.conf",
+            make_args: [ "run-test-prebuilt", "LOG_CMDLINES=true" ],
             environment: {
-                "JT_JAVA": common.boot_jdk_home,
+                "BOOT_JDK": common.boot_jdk_home,
-                "PRODUCT_HOME": input.get(testedProfile + ".jdk", "home_path"),
+                "JDK_IMAGE_DIR": input.get(testedProfile + ".jdk", "home_path"),
-                "TEST_IMAGE_DIR": input.get(testedProfile + ".test", "home_path"),
+                "TEST_IMAGE_DIR": input.get(testedProfile + ".test", "home_path")
-                "TEST_OUTPUT_DIR": input.src_top_dir
             },
             labels: "test"
         }
@@ -798,7 +786,6 @@ var getJibProfilesProfiles = function (input, common, data) {
                 + "/Xcode.app/Contents/Developer/usr/bin"
         };
         profiles["run-test"] = concatObjects(profiles["run-test"], macosxRunTestExtra);
-        profiles["run-test-jprt"] = concatObjects(profiles["run-test-jprt"], macosxRunTestExtra);
         profiles["run-test-prebuilt"] = concatObjects(profiles["run-test-prebuilt"], macosxRunTestExtra);
     }
     // On windows we want the debug symbols available at test time
@@ -806,13 +793,34 @@ var getJibProfilesProfiles = function (input, common, data) {
         windowsRunTestPrebuiltExtra = {
             dependencies: [ testedProfile + ".jdk_symbols" ],
             environment: {
-                "PRODUCT_SYMBOLS_HOME": input.get(testedProfile + ".jdk_symbols", "home_path"),
+                "SYMBOLS_IMAGE_DIR": input.get(testedProfile + ".jdk_symbols", "home_path"),
             }
         };
         profiles["run-test-prebuilt"] = concatObjects(profiles["run-test-prebuilt"],
             windowsRunTestPrebuiltExtra);
     }
 
+    // The profile run-test-prebuilt defines src.conf as the src bundle. When
+    // running in Mach 5, this reduces the time it takes to populate the
+    // considerably. But with just src.conf, we cannot actually run any tests,
+    // so if running from a workspace with just src.conf in it, we need to also
+    // get src.full as a dependency, and define the work_dir (where make gets
+    // run) to be in the src.full install path. By running in the install path,
+    // the same cached installation of the full src can be reused for multiple
+    // test tasks. Care must however be taken not to polute that work dir by
+    // setting the appropriate make variables to control output directories.
+    //
+    // Use the existance of the top level README as indication of if this is
+    // the full source or just src.conf.
+    if (!new java.io.File(__DIR__, "../../README").exists()) {
+        var runTestPrebuiltSrcFullExtra = {
+            dependencies: "src.full",
+            work_dir: input.get("src.full", "install_path"),
+        }
+        profiles["run-test-prebuilt"] = concatObjects(profiles["run-test-prebuilt"],
+            runTestPrebuiltSrcFullExtra);
+    }
+
     // Generate the missing platform attributes
     profiles = generatePlatformAttributes(profiles);
     profiles = generateDefaultMakeTargetsConfigureArg(common, profiles);
@@ -829,7 +837,7 @@ var getJibProfilesProfiles = function (input, common, data) {
 var getJibProfilesDependencies = function (input, common) {
 
     var devkit_platform_revisions = {
-        linux_x64: "gcc7.3.0-OEL6.4+1.0",
+        linux_x64: "gcc7.3.0-OEL6.4+1.1",
         macosx_x64: "Xcode9.4-MacOSX10.13+1.0",
         solaris_x64: "SS12u4-Solaris11u1+1.0",
         solaris_sparcv9: "SS12u4-Solaris11u1+1.1",
@@ -839,7 +847,7 @@ var getJibProfilesDependencies = function (input, common) {
                     : "gcc7.3.0-Fedora27+1.0"),
         linux_arm: (input.profile != null && input.profile.indexOf("hflt") >= 0
                     ? "gcc-linaro-arm-linux-gnueabihf-raspbian-2012.09-20120921_linux+1.0"
-                    : (input.profile.indexOf("arm32") >= 0
+                    : (input.profile != null && input.profile.indexOf("arm32") >= 0
                        ? "gcc7.3.0-Fedora27+1.0"
                        : "arm-linaro-4.7+1.0"
                        )
@@ -953,9 +961,9 @@ var getJibProfilesDependencies = function (input, common) {
             ext: "zip",
             classifier: "distribution",
             revision: "3.0-SNAPSHOT",
-            environment_name: "JIB_JAR",
+            environment_name: "JIB_HOME",
             environment_value: input.get("jib", "install_path")
-                + "/jib-3.0-SNAPSHOT-distribution/lib/jib-3.0-SNAPSHOT.jar"
+                + "/jib-3.0-SNAPSHOT-distribution"
         },
 
         ant: {
@@ -1146,7 +1154,10 @@ var getVersion = function (feature, interim, update, patch) {
     var version = (feature != null ? feature : version_numbers.get("DEFAULT_VERSION_FEATURE"))
         + "." + (interim != null ? interim : version_numbers.get("DEFAULT_VERSION_INTERIM"))
         + "." + (update != null ? update :  version_numbers.get("DEFAULT_VERSION_UPDATE"))
-        + "." + (patch != null ? patch : version_numbers.get("DEFAULT_VERSION_PATCH"));
+        + "." + (patch != null ? patch : version_numbers.get("DEFAULT_VERSION_PATCH"))
+        + "." + version_numbers.get("DEFAULT_VERSION_EXTRA1")
+        + "." + version_numbers.get("DEFAULT_VERSION_EXTRA2")
+        + "." + version_numbers.get("DEFAULT_VERSION_EXTRA3");
     while (version.match(".*\\.0$")) {
         version = version.substring(0, version.length - 2);
     }

make/copy/Copy-java.base.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -162,17 +162,17 @@ TARGETS += $(DEF_POLICY_DST)
 
 ################################################################################
 
-ifeq ($(CACERTS_FILE), )
+# CACERTS_FILE is optionally set in configure to override the default cacerts
-  CACERTS_FILE := $(TOPDIR)/src/java.base/share/lib/security/cacerts
+# which is otherwise generated in Gendata-java.base.gmk
-endif
-
 CACERTS_DST := $(LIB_DST_DIR)/security/cacerts
 
 $(CACERTS_DST): $(CACERTS_FILE)
 	$(call LogInfo, Copying $(patsubst $(OUTPUTDIR)/%, %, $@))
 	$(call install-file)
 
-TARGETS += $(CACERTS_DST)
+ifneq ($(CACERTS_FILE), )
+  TARGETS += $(CACERTS_DST)
+endif
 
 ################################################################################
 

make/data/cacerts/README

@@ -0,0 +1,10 @@
+Each file in this directory (except for this README) contains a CA certificate in PEM format. It can be generated with
+
+keytool -J-Duser.timezone=GMT -printcert -file ca.cert | sed -n '1,4p;8,10p'
+keytool -printcert -file ca.cert -rfc
+
+Please note the textual part before the "-----BEGIN CERTIFICATE-----" line is just a suggestion and not arbitrary.
+
+After any change in this directory, please remember to update the content of `test/jdk/sun/security/lib/cacerts/VerifyCACerts.java` as well.
+
+All changes to this directory need to be approved by the Security group.

make/data/cacerts/actalisauthenticationrootca

@@ -0,0 +1,40 @@
+Owner: CN=Actalis Authentication Root CA, O=Actalis S.p.A./03358520967, L=Milan, C=IT
+Issuer: CN=Actalis Authentication Root CA, O=Actalis S.p.A./03358520967, L=Milan, C=IT
+Serial number: 570a119742c4e3cc
+Valid from: Thu Sep 22 11:22:02 GMT 2011 until: Sun Sep 22 11:22:02 GMT 2030
+Signature algorithm name: SHA256withRSA
+Subject Public Key Algorithm: 4096-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIFuzCCA6OgAwIBAgIIVwoRl0LE48wwDQYJKoZIhvcNAQELBQAwazELMAkGA1UE
+BhMCSVQxDjAMBgNVBAcMBU1pbGFuMSMwIQYDVQQKDBpBY3RhbGlzIFMucC5BLi8w
+MzM1ODUyMDk2NzEnMCUGA1UEAwweQWN0YWxpcyBBdXRoZW50aWNhdGlvbiBSb290
+IENBMB4XDTExMDkyMjExMjIwMloXDTMwMDkyMjExMjIwMlowazELMAkGA1UEBhMC
+SVQxDjAMBgNVBAcMBU1pbGFuMSMwIQYDVQQKDBpBY3RhbGlzIFMucC5BLi8wMzM1
+ODUyMDk2NzEnMCUGA1UEAwweQWN0YWxpcyBBdXRoZW50aWNhdGlvbiBSb290IENB
+MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAp8bEpSmkLO/lGMWwUKNv
+UTufClrJwkg4CsIcoBh/kbWHuUA/3R1oHwiD1S0eiKD4j1aPbZkCkpAW1V8IbInX
+4ay8IMKx4INRimlNAJZaby/ARH6jDuSRzVju3PvHHkVH3Se5CAGfpiEd9UEtL0z9
+KK3giq0itFZljoZUj5NDKd45RnijMCO6zfB9E1fAXdKDa0hMxKufgFpbOr3JpyI/
+gCczWw63igxdBzcIy2zSekciRDXFzMwujt0q7bd9Zg1fYVEiVRvjRuPjPdA1Yprb
+rxTIW6HMiRvhMCb8oJsfgadHHwTrozmSBp+Z07/T6k9QnBn+locePGX2oxgkg4YQ
+51Q+qDp2JE+BIcXjDwL4k5RHILv+1A7TaLndxHqEguNTVHnd25zS8gebLra8Pu2F
+be8lEfKXGkJh90qX6IuxEAf6ZYGyojnP9zz/GPvG8VqLWeICrHuS0E4UT1lF9gxe
+KF+w6D9Fz8+vm2/7hNN3WpVvrJSEnu68wEqPSpP4RCHiMUVhUE4Q2OM1fEwZtN4F
+v6MGn8i1zeQf1xcGDXqVdFUNaBr8EBtiZJ1t4JWgw5QHVw0U5r0F+7if5t+L4sbn
+fpb2U8WANFAoWPASUHEXMLrmeGO89LKtmyuy/uE5jF66CyCU3nuDuP/jVo23Eek7
+jPKxwV2dpAtMK9myGPW1n0sCAwEAAaNjMGEwHQYDVR0OBBYEFFLYiDrIn3hm7Ynz
+ezhwlMkCAjbQMA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAUUtiIOsifeGbt
+ifN7OHCUyQICNtAwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBCwUAA4ICAQAL
+e3KHwGCmSUyIWOYdiPcUZEim2FgKDk8TNd81HdTtBjHIgT5q1d07GjLukD0R0i70
+jsNjLiNmsGe+b7bAEzlgqqI0JZN1Ut6nna0Oh4lScWoWPBkdg/iaKWW+9D+a2fDz
+WochcYBNy+A4mz+7+uAwTc+G02UQGRjRlwKxK3JCaKygvU5a2hi/a5iB0P2avl4V
+SM0RFbnAKVy06Ij3Pjaut2L9HmLecHgQHEhb2rykOLpn7VU+Xlff1ANATIGk0k9j
+pwlCCRT8AKnCgHNPLsBA2RF7SOp6AsDT6ygBJlh0wcBzIm2Tlf05fbsq4/aC4yyX
+X04fkZT6/iyj2HYauE2yOE+b+h1IYHkm4vP9qdCa6HCPSXrW5b0KDtst842/6+Ok
+fcvHlXHo2qN8xcL4dJIEG4aspCJTQLas/kx2z/uUMsA1n3Y/buWQbqCmJqK4LL7R
+K4X9p2jIugErsWx0Hbhzlefut8cl8ABMALJ+tguLHPPAUJ4lueAI3jZm/zel0btU
+ZCzJJ7VLkn5l/9Mt4blOvH+kQSGQQXemOR/qnuOf0GZvBeyqdn6/axag67XH/JJU
+LysRJyU3eExRarDzzFhdFPFqSBX/wge2sY0PjlxQRrM9vwGYT7JZVEc+NHt4bVaT
+LnPqZih4zR0Uv6CPLy64Lo7yFIrM6bV8+2ydDKXhlg==
+-----END CERTIFICATE-----

make/data/cacerts/addtrustclass1ca

@@ -0,0 +1,31 @@
+Owner: CN=AddTrust Class 1 CA Root, OU=AddTrust TTP Network, O=AddTrust AB, C=SE
+Issuer: CN=AddTrust Class 1 CA Root, OU=AddTrust TTP Network, O=AddTrust AB, C=SE
+Serial number: 1
+Valid from: Tue May 30 10:38:31 GMT 2000 until: Sat May 30 10:38:31 GMT 2020
+Signature algorithm name: SHA1withRSA
+Subject Public Key Algorithm: 2048-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIEGDCCAwCgAwIBAgIBATANBgkqhkiG9w0BAQUFADBlMQswCQYDVQQGEwJTRTEU
+MBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3
+b3JrMSEwHwYDVQQDExhBZGRUcnVzdCBDbGFzcyAxIENBIFJvb3QwHhcNMDAwNTMw
+MTAzODMxWhcNMjAwNTMwMTAzODMxWjBlMQswCQYDVQQGEwJTRTEUMBIGA1UEChML
+QWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3b3JrMSEwHwYD
+VQQDExhBZGRUcnVzdCBDbGFzcyAxIENBIFJvb3QwggEiMA0GCSqGSIb3DQEBAQUA
+A4IBDwAwggEKAoIBAQCWltQhSWDia+hBBwzexODcEyPNwTXH+9ZOEQpnXvUGW2ul
+CDtbKRY654eyNAbFvAWlA3yCyykQruGIgb3WntP+LVbBFc7jJp0VLhD7Bo8wBN6n
+tGO0/7Gcrjyvd7ZWxbWroulpOj0OM3kyP3CCkplhbY0wCI9xP6ZIVxn4JdxLZlyl
+dI+Yrsj5wAYi56xz36Uu+1LcsRVlIPo1Zmne3yzxbrww2ywkEtvrNTVokMsAsJch
+PXQhI2U0K7t4WaPW4XY5mqRJjox0r26kmqPZm9I4XJuiGMx1I4S+6+JNM3GOGvDC
++Mcdoq0Dlyz4zyXG9rgkMbFjXZJ/Y/AlyVMuH79NAgMBAAGjgdIwgc8wHQYDVR0O
+BBYEFJWxtPCUtr3H2tERCSG+wa9J/RB7MAsGA1UdDwQEAwIBBjAPBgNVHRMBAf8E
+BTADAQH/MIGPBgNVHSMEgYcwgYSAFJWxtPCUtr3H2tERCSG+wa9J/RB7oWmkZzBl
+MQswCQYDVQQGEwJTRTEUMBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFk
+ZFRydXN0IFRUUCBOZXR3b3JrMSEwHwYDVQQDExhBZGRUcnVzdCBDbGFzcyAxIENB
+IFJvb3SCAQEwDQYJKoZIhvcNAQEFBQADggEBACxtZBsfzQ3duQH6lmM0MkhHma6X
+7f1yFqZzR1r0693p9db7RcwpiURdv0Y5PejuvE1Uhh4dbOMXJ0PhiVYrqW9yTkkz
+43J8KiOavD7/KCrto/8cI7pDVwlnTUtiBi34/2ydYB7YHEt9tTEv2dB8Xfjea4MY
+eDdXL+gzB2ffHsdrKpV2ro9Xo/D0UrSpUwjP4E/TelOL/bscVjby/rK25Xa71SJl
+pz/+0WatC7xrmYbvP33zGDLKe8bjq2RGlfgmadlVg3sslgf/WSxEo8bl6ancoWOA
+WiFeIc9TVPC6b4nbqKqVz4vjccweGyBECMB6tkD9xOQ14R0WHNC8K47Wcdk=
+-----END CERTIFICATE-----

make/data/cacerts/addtrustexternalca

@@ -0,0 +1,32 @@
+Owner: CN=AddTrust External CA Root, OU=AddTrust External TTP Network, O=AddTrust AB, C=SE
+Issuer: CN=AddTrust External CA Root, OU=AddTrust External TTP Network, O=AddTrust AB, C=SE
+Serial number: 1
+Valid from: Tue May 30 10:48:38 GMT 2000 until: Sat May 30 10:48:38 GMT 2020
+Signature algorithm name: SHA1withRSA
+Subject Public Key Algorithm: 2048-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIENjCCAx6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBvMQswCQYDVQQGEwJTRTEU
+MBIGA1UEChMLQWRkVHJ1c3QgQUIxJjAkBgNVBAsTHUFkZFRydXN0IEV4dGVybmFs
+IFRUUCBOZXR3b3JrMSIwIAYDVQQDExlBZGRUcnVzdCBFeHRlcm5hbCBDQSBSb290
+MB4XDTAwMDUzMDEwNDgzOFoXDTIwMDUzMDEwNDgzOFowbzELMAkGA1UEBhMCU0Ux
+FDASBgNVBAoTC0FkZFRydXN0IEFCMSYwJAYDVQQLEx1BZGRUcnVzdCBFeHRlcm5h
+bCBUVFAgTmV0d29yazEiMCAGA1UEAxMZQWRkVHJ1c3QgRXh0ZXJuYWwgQ0EgUm9v
+dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALf3GjPm8gAELTngTlvt
+H7xsD821+iO2zt6bETOXpClMfZOfvUq8k+0DGuOPz+VtUFrWlymUWoCwSXrbLpX9
+uMq/NzgtHj6RQa1wVsfwTz/oMp50ysiQVOnGXw94nZpAPA6sYapeFI+eh6FqUNzX
+mk6vBbOmcZSccbNQYArHE504B4YCqOmoaSYYkKtMsE8jqzpPhNjfzp/haW+710LX
+a0Tkx63ubUFfclpxCDezeWWkWaCUN/cALw3CknLa0Dhy2xSoRcRdKn23tNbE7qzN
+E0S3ySvdQwAl+mG5aWpYIxG3pzOPVnVZ9c0p10a3CitlttNCbxWyuHv77+ldU9U0
+WicCAwEAAaOB3DCB2TAdBgNVHQ4EFgQUrb2YejS0Jvf6xCZU7wO94CTLVBowCwYD
+VR0PBAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wgZkGA1UdIwSBkTCBjoAUrb2YejS0
+Jvf6xCZU7wO94CTLVBqhc6RxMG8xCzAJBgNVBAYTAlNFMRQwEgYDVQQKEwtBZGRU
+cnVzdCBBQjEmMCQGA1UECxMdQWRkVHJ1c3QgRXh0ZXJuYWwgVFRQIE5ldHdvcmsx
+IjAgBgNVBAMTGUFkZFRydXN0IEV4dGVybmFsIENBIFJvb3SCAQEwDQYJKoZIhvcN
+AQEFBQADggEBALCb4IUlwtYj4g+WBpKdQZic2YR5gdkeWxQHIzZlj7DYd7usQWxH
+YINRsPkyPef89iYTx4AWpb9a/IfPeHmJIZriTAcKhjW88t5RxNKWt9x+Tu5w/Rw5
+6wwCURQtjr0W4MHfRnXnJK3s9EK0hZNwEGe6nQY1ShjTK3rMUUKhemPR5ruhxSvC
+Nr4TDea9Y355e6cJDUCrat2PisP29owaQgVR1EX1n6diIWgVIEM8med8vSTYqZEX
+c4g/VhsxOBi0cQ+azcgOno4uG+GMmIPLHzHxREzGBHNJdmAPx/i9F4BrLunMTA5a
+mnkPIAou1Z5jJh5VkpTYghdae9C8x49OhgQ=
+-----END CERTIFICATE-----

make/data/cacerts/addtrustqualifiedca

@@ -0,0 +1,32 @@
+Owner: CN=AddTrust Qualified CA Root, OU=AddTrust TTP Network, O=AddTrust AB, C=SE
+Issuer: CN=AddTrust Qualified CA Root, OU=AddTrust TTP Network, O=AddTrust AB, C=SE
+Serial number: 1
+Valid from: Tue May 30 10:44:50 GMT 2000 until: Sat May 30 10:44:50 GMT 2020
+Signature algorithm name: SHA1withRSA
+Subject Public Key Algorithm: 2048-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIEHjCCAwagAwIBAgIBATANBgkqhkiG9w0BAQUFADBnMQswCQYDVQQGEwJTRTEU
+MBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3
+b3JrMSMwIQYDVQQDExpBZGRUcnVzdCBRdWFsaWZpZWQgQ0EgUm9vdDAeFw0wMDA1
+MzAxMDQ0NTBaFw0yMDA1MzAxMDQ0NTBaMGcxCzAJBgNVBAYTAlNFMRQwEgYDVQQK
+EwtBZGRUcnVzdCBBQjEdMBsGA1UECxMUQWRkVHJ1c3QgVFRQIE5ldHdvcmsxIzAh
+BgNVBAMTGkFkZFRydXN0IFF1YWxpZmllZCBDQSBSb290MIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEA5B6a/twJWoekn0e+EV+vhDTbYjx5eLfpMLXsDBwq
+xBb/4Oxx64r1EW7tTw2R0hIYLUkVAcKkIhPHEWT/IhKauY5cLwjPcWqzZwFZ8V1G
+87B4pfYOQnrjfxvM0PC3KP0q6p6zsLkEqv32x7SxuCqg+1jxGaBvcCV+PmlKfw8i
+2O+tCBGaKZnhqkRFmhJePp1tUvznoD1oL/BLcHwTOK28FSXx1s6rosAx1i+f4P8U
+WfyEk9mHfExUE+uf0S0R+Bg6Ot4l2ffTQO2kBhLEO+GRwVY18BTcZTYJbqukB8c1
+0cIDMzZbdSZtQvESa0NvS3GU+jQd7RNuyoB/mC9suWXY6QIDAQABo4HUMIHRMB0G
+A1UdDgQWBBQ5lYtii1zJ1IC6WA+XPxUIQ8yYpzALBgNVHQ8EBAMCAQYwDwYDVR0T
+AQH/BAUwAwEB/zCBkQYDVR0jBIGJMIGGgBQ5lYtii1zJ1IC6WA+XPxUIQ8yYp6Fr
+pGkwZzELMAkGA1UEBhMCU0UxFDASBgNVBAoTC0FkZFRydXN0IEFCMR0wGwYDVQQL
+ExRBZGRUcnVzdCBUVFAgTmV0d29yazEjMCEGA1UEAxMaQWRkVHJ1c3QgUXVhbGlm
+aWVkIENBIFJvb3SCAQEwDQYJKoZIhvcNAQEFBQADggEBABmrder4i2VhlRO6aQTv
+hsoToMeqT2QbPxj2qC0sVY8FtzDqQmodwCVRLae/DLPt7wh/bDxGGuoYQ992zPlm
+hpwsaPXpF/gxsxjE1kh9I0xowX67ARRvxdlu3rsEQmr49lx95dr6h+sNNVJn0J6X
+dgWTP5XHAeZpVTh/EGGZyeNfpso+gmNIquIISD6q8rKFYqa0p9m9N5xotS1WfbC3
+P6CxB9bpT9zeRXEwMn8bLgn5v1Kh7sKAPgZcLlVAwRv1cEWw3F369nJad9Jjzc9Y
+iQBCYz95OdBEsIJuQRno3eDBiFrRHnGTHyQwdOUeqN48Jzd/g66ed8/wMLH/S5no
+xqE=
+-----END CERTIFICATE-----

make/data/cacerts/affirmtrustcommercialca

@@ -0,0 +1,27 @@
+Owner: CN=AffirmTrust Commercial, O=AffirmTrust, C=US
+Issuer: CN=AffirmTrust Commercial, O=AffirmTrust, C=US
+Serial number: 7777062726a9b17c
+Valid from: Fri Jan 29 14:06:06 GMT 2010 until: Tue Dec 31 14:06:06 GMT 2030
+Signature algorithm name: SHA256withRSA
+Subject Public Key Algorithm: 2048-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIDTDCCAjSgAwIBAgIId3cGJyapsXwwDQYJKoZIhvcNAQELBQAwRDELMAkGA1UE
+BhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVz
+dCBDb21tZXJjaWFsMB4XDTEwMDEyOTE0MDYwNloXDTMwMTIzMTE0MDYwNlowRDEL
+MAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZp
+cm1UcnVzdCBDb21tZXJjaWFsMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEA9htPZwcroRX1BiLLHwGy43NFBkRJLLtJJRTWzsO3qyxPxkEylFf6EqdbDuKP
+Hx6GGaeqtS25Xw2Kwq+FNXkyLbscYjfysVtKPcrNcV/pQr6U6Mje+SJIZMblq8Yr
+ba0F8PrVC8+a5fBQpIs7R6UjW3p6+DM/uO+Zl+MgwdYoic+U+7lF7eNAFxHUdPAL
+MeIrJmqbTFeurCA+ukV6BfO9m2kVrn1OIGPENXY6BwLJN/3HR+7o8XYdcxXyl6S1
+yHp52UKqK39c/s4mT6NmgTWvRLpUHhwwMmWd5jyTXlBOeuM61G7MGvv50jeuJCqr
+VwMiKA1JdX+3KNp1v47j3A55MQIDAQABo0IwQDAdBgNVHQ4EFgQUnZPGU4teyq8/
+nx4P5ZmVvCT2lI8wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwDQYJ
+KoZIhvcNAQELBQADggEBAFis9AQOzcAN/wr91LoWXym9e2iZWEnStB03TX8nfUYG
+XUPGhi4+c7ImfU+TqbbEKpqrIZcUsd6M06uJFdhrJNTxFq7YpFzUf1GO7RgBsZNj
+vbz4YYCanrHOQnDiqX0GJX0nof5v7LMeJNrjS1UaADs1tDvZ110w/YETifLCBivt
+Z8SOyUOyXGsViQK8YvxO8rUzqrJv0wqiUOP2O+guRMLbZjipM1ZI8W0bM40NjD9g
+N53Tym1+NH4Nn3J2ixufcv1SNUFFApYvHLKac0khsUlHRUe072o0EclNmsxZt9YC
+nlpOZbWUrhvfKbAW8b8Angc6F2S1BLUjIZkKlTuXfO8=
+-----END CERTIFICATE-----

make/data/cacerts/affirmtrustnetworkingca

@@ -0,0 +1,27 @@
+Owner: CN=AffirmTrust Networking, O=AffirmTrust, C=US
+Issuer: CN=AffirmTrust Networking, O=AffirmTrust, C=US
+Serial number: 7c4f04391cd4992d
+Valid from: Fri Jan 29 14:08:24 GMT 2010 until: Tue Dec 31 14:08:24 GMT 2030
+Signature algorithm name: SHA1withRSA
+Subject Public Key Algorithm: 2048-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIDTDCCAjSgAwIBAgIIfE8EORzUmS0wDQYJKoZIhvcNAQEFBQAwRDELMAkGA1UE
+BhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVz
+dCBOZXR3b3JraW5nMB4XDTEwMDEyOTE0MDgyNFoXDTMwMTIzMTE0MDgyNFowRDEL
+MAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZp
+cm1UcnVzdCBOZXR3b3JraW5nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAtITMMxcua5Rsa2FSoOujz3mUTOWUgJnLVWREZY9nZOIG41w3SfYvm4SEHi3y
+YJ0wTsyEheIszx6e/jarM3c1RNg1lho9Nuh6DtjVR6FqaYvZ/Ls6rnla1fTWcbua
+kCNrmreIdIcMHl+5ni36q1Mr3Lt2PpNMCAiMHqIjHNRqrSK6mQEubWXLviRmVSRL
+QESxG9fhwoXA3hA/Pe24/PHxI1Pcv2WXb9n5QHGNfb2V1M6+oF4nI979ptAmDgAp
+6zxG8D1gvz9Q0twmQVGeFDdCBKNwV6gbh+0t+nvujArjqWaJGctB+d1ENmHP4ndG
+yH329JKBNv3bNPFyfvMMFr20FQIDAQABo0IwQDAdBgNVHQ4EFgQUBx/S55zawm6i
+QLSwelAQUHTEyL0wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwDQYJ
+KoZIhvcNAQEFBQADggEBAIlXshZ6qML91tmbmzTCnLQyFE2npN/svqe++EPbkTfO
+tDIuUFUaNU52Q3Eg75N3ThVwLofDwR1t3Mu1J9QsVtFSUzpE0nPIxBsFZVpikpzu
+QY0x2+c06lkh1QF612S4ZDnNye2v7UsDSKegmQGA3GWjNq5lWUhPgkvIZfFXHeVZ
+Lgo/bNjR9eUJtGxUAArgFU2HdW23WJZa3W3SAKD0m0i+wzekujbgfIeFlxoVot4u
+olu9rxj5kFDNcFn4J2dHy8egBzp90SxdbBk6ZrV9/ZFvgrG+CJPbFEfxojfHRZ48
+x3evZKiT3/Zpg4Jg8klCNO1aAFSFHBY2kgxc+qatv9s=
+-----END CERTIFICATE-----

make/data/cacerts/affirmtrustpremiumca

@@ -0,0 +1,38 @@
+Owner: CN=AffirmTrust Premium, O=AffirmTrust, C=US
+Issuer: CN=AffirmTrust Premium, O=AffirmTrust, C=US
+Serial number: 6d8c1446b1a60aee
+Valid from: Fri Jan 29 14:10:36 GMT 2010 until: Mon Dec 31 14:10:36 GMT 2040
+Signature algorithm name: SHA384withRSA
+Subject Public Key Algorithm: 4096-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIFRjCCAy6gAwIBAgIIbYwURrGmCu4wDQYJKoZIhvcNAQEMBQAwQTELMAkGA1UE
+BhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MRwwGgYDVQQDDBNBZmZpcm1UcnVz
+dCBQcmVtaXVtMB4XDTEwMDEyOTE0MTAzNloXDTQwMTIzMTE0MTAzNlowQTELMAkG
+A1UEBhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MRwwGgYDVQQDDBNBZmZpcm1U
+cnVzdCBQcmVtaXVtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAxBLf
+qV/+Qd3d9Z+K4/as4Tx4mrzY8H96oDMq3I0gW64tb+eT2TZwamjPjlGjhVtnBKAQ
+JG9dKILBl1fYSCkTtuG+kU3fhQxTGJoeJKJPj/CihQvL9Cl/0qRY7iZNyaqoe5rZ
++jjeRFcV5fiMyNlI4g0WJx0eyIOFJbe6qlVBzAMiSy2RjYvmia9mx+n/K+k8rNrS
+s8PhaJyJ+HoAVt70VZVs+7pk3WKL3wt3MutizCaam7uqYoNMtAZ6MMgpv+0GTZe5
+HMQxK9VfvFMSF5yZVylmd2EhMQcuJUmdGPLu8ytxjLW6OQdJd/zvLpKQBY0tL3d7
+70O/Nbua2Plzpyzy0FfuKE4mX4+QaAkvuPjcBukumj5Rp9EixAqnOEhss/n/fauG
+V+O61oV4d7pD6kh/9ti+I20ev9E2bFhc8e6kGVQa9QPSdubhjL08s9NIS+LI+H+S
+qHZGnEJlPqQewQcDWkYtuJfzt9WyVSHvutxMAJf7FJUnM7/oQ0dG0giZFmA7mn7S
+5u046uwBHjxIVkkJx0w3AJ6IDsBz4W9m6XJHMD4Q5QsDyZpCAGzFlH5hxIrff4Ia
+C1nEWTJ3s7xgaVY5/bQGeyzWZDbZvUjthB9+pSKPKrhC9IK31FOQeE4tGv2Bb0TX
+OwF0lkLgAOIua+rF7nKsu7/+6qqo+Nz2snmKtmcCAwEAAaNCMEAwHQYDVR0OBBYE
+FJ3AZ6YMItkm9UWrpmVSESfYRaxjMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/
+BAQDAgEGMA0GCSqGSIb3DQEBDAUAA4ICAQCzV00QYk465KzquByvMiPIs0laUZx2
+KI15qldGF9X1Uva3ROgIRL8YhNILgM3FEv0AVQVhh0HctSSePMTYyPtwni94loMg
+Nt58D2kTiKV1NpgIpsbfrM7jWNa3Pt668+s0QNiigfV4Py/VpfzZotReBA4Xrf5B
+8OWycvpEgjNC6C1Y91aMYj+6QrCcDFx+LmUmXFNPALJ4fqENmS2NuB2OosSw/WDQ
+MKSOyARiqcTtNd56l+0OOF6SL5Nwpamcb6d9Ex1+xghIsV5n61EIJenmJWtSKZGc
+0jlzCFfemQa0W50QBuHCAKi4HEoCChTQwUHK+4w1IX2COPKpVJEZNZOUbWo6xbLQ
+u4mGk+ibyQ86p3q4ofB4Rvr8Ny/lioTz3/4E2aFooC8k4gmVBtWVyuEklut89pMF
+u+1z6S3RdTnX5yTb2E5fQ4+e0BQ5v1VwSJlXMbSc7kqYA5YwH2AG7hsj/oFgIxpH
+YoWlzBk0gG+zrBrjn/B7SK3VAdlntqlyk+otZrWyuOQ9PLLvTIzq6we/qzWaVYa8
+GKa1qF60g2xraUDTn9zxw2lrueFtCfTxqlB2Cnp9ehehVZZCmTEJ3WARjQUwfuaO
+RtGdFNrHF+QFlozEJLUbzxQHskD4o55BhrwE0GuWyCqANP2/7waj3VjFhT0+j/6e
+KeC2uAloGRwYQw==
+-----END CERTIFICATE-----

make/data/cacerts/affirmtrustpremiumeccca

@@ -0,0 +1,20 @@
+Owner: CN=AffirmTrust Premium ECC, O=AffirmTrust, C=US
+Issuer: CN=AffirmTrust Premium ECC, O=AffirmTrust, C=US
+Serial number: 7497258ac73f7a54
+Valid from: Fri Jan 29 14:20:24 GMT 2010 until: Mon Dec 31 14:20:24 GMT 2040
+Signature algorithm name: SHA384withECDSA
+Subject Public Key Algorithm: 384-bit EC (secp384r1) key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIB/jCCAYWgAwIBAgIIdJclisc/elQwCgYIKoZIzj0EAwMwRTELMAkGA1UEBhMC
+VVMxFDASBgNVBAoMC0FmZmlybVRydXN0MSAwHgYDVQQDDBdBZmZpcm1UcnVzdCBQ
+cmVtaXVtIEVDQzAeFw0xMDAxMjkxNDIwMjRaFw00MDEyMzExNDIwMjRaMEUxCzAJ
+BgNVBAYTAlVTMRQwEgYDVQQKDAtBZmZpcm1UcnVzdDEgMB4GA1UEAwwXQWZmaXJt
+VHJ1c3QgUHJlbWl1bSBFQ0MwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQNMF4bFZ0D
+0KF5Nbc6PJJ6yhUczWLznCZcBz3lVPqj1swS6vQUX+iOGasvLkjmrBhDeKzQN8O9
+ss0s5kfiGuZjuD0uL3jET9v0D6RoTFVya5UdThhClXjMNzyR4ptlKymjQjBAMB0G
+A1UdDgQWBBSaryl6wBE1NSZRMADDav5A1a7WPDAPBgNVHRMBAf8EBTADAQH/MA4G
+A1UdDwEB/wQEAwIBBjAKBggqhkjOPQQDAwNnADBkAjAXCfOHiFBar8jAQr9HX/Vs
+aobgxCd05DhT1wV/GzTjxi+zygk8N53X57hG8f2h4nECMEJZh0PUUd+60wkyWs6I
+flc9nF9Ca/UHLbXwgpP5WW+uZPpY5Yse42O+tYHNbwKMeQ==
+-----END CERTIFICATE-----

make/data/cacerts/amazonrootca1

@@ -0,0 +1,27 @@
+Owner: CN=Amazon Root CA 1, O=Amazon, C=US
+Issuer: CN=Amazon Root CA 1, O=Amazon, C=US
+Serial number: 66c9fcf99bf8c0a39e2f0788a43e696365bca
+Valid from: Tue May 26 00:00:00 GMT 2015 until: Sun Jan 17 00:00:00 GMT 2038
+Signature algorithm name: SHA256withRSA
+Subject Public Key Algorithm: 2048-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIDQTCCAimgAwIBAgITBmyfz5m/jAo54vB4ikPmljZbyjANBgkqhkiG9w0BAQsF
+ADA5MQswCQYDVQQGEwJVUzEPMA0GA1UEChMGQW1hem9uMRkwFwYDVQQDExBBbWF6
+b24gUm9vdCBDQSAxMB4XDTE1MDUyNjAwMDAwMFoXDTM4MDExNzAwMDAwMFowOTEL
+MAkGA1UEBhMCVVMxDzANBgNVBAoTBkFtYXpvbjEZMBcGA1UEAxMQQW1hem9uIFJv
+b3QgQ0EgMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALJ4gHHKeNXj
+ca9HgFB0fW7Y14h29Jlo91ghYPl0hAEvrAIthtOgQ3pOsqTQNroBvo3bSMgHFzZM
+9O6II8c+6zf1tRn4SWiw3te5djgdYZ6k/oI2peVKVuRF4fn9tBb6dNqcmzU5L/qw
+IFAGbHrQgLKm+a/sRxmPUDgH3KKHOVj4utWp+UhnMJbulHheb4mjUcAwhmahRWa6
+VOujw5H5SNz/0egwLX0tdHA114gk957EWW67c4cX8jJGKLhD+rcdqsq08p8kDi1L
+93FcXmn/6pUCyziKrlA4b9v7LWIbxcceVOF34GfID5yHI9Y/QCB/IIDEgEw+OyQm
+jgSubJrIqg0CAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
+AYYwHQYDVR0OBBYEFIQYzIU07LwMlJQuCFmcx7IQTgoIMA0GCSqGSIb3DQEBCwUA
+A4IBAQCY8jdaQZChGsV2USggNiMOruYou6r4lK5IpDB/G/wkjUu0yKGX9rbxenDI
+U5PMCCjjmCXPI6T53iHTfIUJrU6adTrCC2qJeHZERxhlbI1Bjjt/msv0tadQ1wUs
+N+gDS63pYaACbvXy8MWy7Vu33PqUXHeeE6V/Uq2V8viTO96LXFvKWlJbYK8U90vv
+o/ufQJVtMVT8QtPHRh8jrdkPSHCa2XV4cdFyQzR1bldZwgJcJmApzyMZFo6IQ6XU
+5MsI+yMRQ+hDKXJioaldXgjUkK642M4UwtBV8ob2xJNDd2ZhwLnoQdeXeGADbkpy
+rqXRfboQnoZsG4q5WTP468SQvvG5
+-----END CERTIFICATE-----

make/data/cacerts/amazonrootca2

@@ -0,0 +1,38 @@
+Owner: CN=Amazon Root CA 2, O=Amazon, C=US
+Issuer: CN=Amazon Root CA 2, O=Amazon, C=US
+Serial number: 66c9fd29635869f0a0fe58678f85b26bb8a37
+Valid from: Tue May 26 00:00:00 GMT 2015 until: Sat May 26 00:00:00 GMT 2040
+Signature algorithm name: SHA384withRSA
+Subject Public Key Algorithm: 4096-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIFQTCCAymgAwIBAgITBmyf0pY1hp8KD+WGePhbJruKNzANBgkqhkiG9w0BAQwF
+ADA5MQswCQYDVQQGEwJVUzEPMA0GA1UEChMGQW1hem9uMRkwFwYDVQQDExBBbWF6
+b24gUm9vdCBDQSAyMB4XDTE1MDUyNjAwMDAwMFoXDTQwMDUyNjAwMDAwMFowOTEL
+MAkGA1UEBhMCVVMxDzANBgNVBAoTBkFtYXpvbjEZMBcGA1UEAxMQQW1hem9uIFJv
+b3QgQ0EgMjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAK2Wny2cSkxK
+gXlRmeyKy2tgURO8TW0G/LAIjd0ZEGrHJgw12MBvIITplLGbhQPDW9tK6Mj4kHbZ
+W0/jTOgGNk3Mmqw9DJArktQGGWCsN0R5hYGCrVo34A3MnaZMUnbqQ523BNFQ9lXg
+1dKmSYXpN+nKfq5clU1Imj+uIFptiJXZNLhSGkOQsL9sBbm2eLfq0OQ6PBJTYv9K
+8nu+NQWpEjTj82R0Yiw9AElaKP4yRLuH3WUnAnE72kr3H9rN9yFVkE8P7K6C4Z9r
+2UXTu/Bfh+08LDmG2j/e7HJV63mjrdvdfLC6HM783k81ds8P+HgfajZRRidhW+me
+z/CiVX18JYpvL7TFz4QuK/0NURBs+18bvBt+xa47mAExkv8LV/SasrlX6avvDXbR
+8O70zoan4G7ptGmh32n2M8ZpLpcTnqWHsFcQgTfJU7O7f/aS0ZzQGPSSbtqDT6Zj
+mUyl+17vIWR6IF9sZIUVyzfpYgwLKhbcAS4y2j5L9Z469hdAlO+ekQiG+r5jqFoz
+7Mt0Q5X5bGlSNscpb/xVA1wf+5+9R+vnSUeVC06JIglJ4PVhHvG/LopyboBZ/1c6
++XUyo05f7O0oYtlNc/LMgRdg7c3r3NunysV+Ar3yVAhU/bQtCSwXVEqY0VThUWcI
+0u1ufm8/0i2BWSlmy5A5lREedCf+3euvAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMB
+Af8wDgYDVR0PAQH/BAQDAgGGMB0GA1UdDgQWBBSwDPBMMPQFWAJI/TPlUq9LhONm
+UjANBgkqhkiG9w0BAQwFAAOCAgEAqqiAjw54o+Ci1M3m9Zh6O+oAA7CXDpO8Wqj2
+LIxyh6mx/H9z/WNxeKWHWc8w4Q0QshNabYL1auaAn6AFC2jkR2vHat+2/XcycuUY
++gn0oJMsXdKMdYV2ZZAMA3m3MSNjrXiDCYZohMr/+c8mmpJ5581LxedhpxfL86kS
+k5Nrp+gvU5LEYFiwzAJRGFuFjWJZY7attN6a+yb3ACfAXVU3dJnJUH/jWS5E4ywl
+7uxMMne0nxrpS10gxdr9HIcWxkPo1LsmmkVwXqkLN1PiRnsn/eBG8om3zEK2yygm
+btmlyTrIQRNg91CMFa6ybRoVGld45pIq2WWQgj9sAq+uEjonljYE1x2igGOpm/Hl
+urR8FLBOybEfdF849lHqm/osohHUqS0nGkWxr7JOcQ3AWEbWaQbLU8uz/mtBzUF+
+fUwPfHJ5elnNXkoOrJupmHN5fLT0zLm4BwyydFy4x2+IoZCn9Kr5v2c69BoVYh63
+n749sSmvZ6ES8lgQGVMDMBu4Gon2nL2XA46jCfMdiyHxtN/kHNGfZQIG6lzWE7OE
+76KlXIx3KadowGuuQNKotOrN8I1LOJwZmhsoVLiJkO/KdYE+HvJkJMcYr07/R54H
+9jVlpNMKVv/1F2Rs76giJUmTtt8AF9pYfl3uxRuw0dFfIRDH+fO6AgonB8Xx1sfT
+4PsJYGw=
+-----END CERTIFICATE-----

make/data/cacerts/amazonrootca3

@@ -0,0 +1,19 @@
+Owner: CN=Amazon Root CA 3, O=Amazon, C=US
+Issuer: CN=Amazon Root CA 3, O=Amazon, C=US
+Serial number: 66c9fd5749736663f3b0b9ad9e89e7603f24a
+Valid from: Tue May 26 00:00:00 GMT 2015 until: Sat May 26 00:00:00 GMT 2040
+Signature algorithm name: SHA256withECDSA
+Subject Public Key Algorithm: 256-bit EC key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIBtjCCAVugAwIBAgITBmyf1XSXNmY/Owua2eiedgPySjAKBggqhkjOPQQDAjA5
+MQswCQYDVQQGEwJVUzEPMA0GA1UEChMGQW1hem9uMRkwFwYDVQQDExBBbWF6b24g
+Um9vdCBDQSAzMB4XDTE1MDUyNjAwMDAwMFoXDTQwMDUyNjAwMDAwMFowOTELMAkG
+A1UEBhMCVVMxDzANBgNVBAoTBkFtYXpvbjEZMBcGA1UEAxMQQW1hem9uIFJvb3Qg
+Q0EgMzBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABCmXp8ZBf8ANm+gBG1bG8lKl
+ui2yEujSLtf6ycXYqm0fc4E7O5hrOXwzpcVOho6AF2hiRVd9RFgdszflZwjrZt6j
+QjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMB0GA1UdDgQWBBSr
+ttvXBp43rDCGB5Fwx5zEGbF4wDAKBggqhkjOPQQDAgNJADBGAiEA4IWSoxe3jfkr
+BqWTrBqYaGFy+uGh0PsceGCmQ5nFuMQCIQCcAu/xlJyzlvnrxir4tiz+OpAUFteM
+YyRIHN8wfdVoOw==
+-----END CERTIFICATE-----

make/data/cacerts/amazonrootca4

@@ -0,0 +1,20 @@
+Owner: CN=Amazon Root CA 4, O=Amazon, C=US
+Issuer: CN=Amazon Root CA 4, O=Amazon, C=US
+Serial number: 66c9fd7c1bb104c2943e5717b7b2cc81ac10e
+Valid from: Tue May 26 00:00:00 GMT 2015 until: Sat May 26 00:00:00 GMT 2040
+Signature algorithm name: SHA384withECDSA
+Subject Public Key Algorithm: 384-bit EC key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIB8jCCAXigAwIBAgITBmyf18G7EEwpQ+Vxe3ssyBrBDjAKBggqhkjOPQQDAzA5
+MQswCQYDVQQGEwJVUzEPMA0GA1UEChMGQW1hem9uMRkwFwYDVQQDExBBbWF6b24g
+Um9vdCBDQSA0MB4XDTE1MDUyNjAwMDAwMFoXDTQwMDUyNjAwMDAwMFowOTELMAkG
+A1UEBhMCVVMxDzANBgNVBAoTBkFtYXpvbjEZMBcGA1UEAxMQQW1hem9uIFJvb3Qg
+Q0EgNDB2MBAGByqGSM49AgEGBSuBBAAiA2IABNKrijdPo1MN/sGKe0uoe0ZLY7Bi
+9i0b2whxIdIA6GO9mif78DluXeo9pcmBqqNbIJhFXRbb/egQbeOc4OO9X4Ri83Bk
+M6DLJC9wuoihKqB1+IGuYgbEgds5bimwHvouXKNCMEAwDwYDVR0TAQH/BAUwAwEB
+/zAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYEFNPsxzplbszh2naaVvuc84ZtV+WB
+MAoGCCqGSM49BAMDA2gAMGUCMDqLIfG9fhGt0O9Yli/W651+kI0rz2ZVwyzjKKlw
+CkcO8DdZEv8tmZQoTipPNU0zWgIxAOp1AE47xDqUEpHJWEadIRNyp4iciuRMStuW
+1KyLa2tJElMzrdfkviT8tQp21KW8EA==
+-----END CERTIFICATE-----

make/data/cacerts/baltimorecybertrustca

@@ -0,0 +1,28 @@
+Owner: CN=Baltimore CyberTrust Root, OU=CyberTrust, O=Baltimore, C=IE
+Issuer: CN=Baltimore CyberTrust Root, OU=CyberTrust, O=Baltimore, C=IE
+Serial number: 20000b9
+Valid from: Fri May 12 18:46:00 GMT 2000 until: Mon May 12 23:59:00 GMT 2025
+Signature algorithm name: SHA1withRSA
+Subject Public Key Algorithm: 2048-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIDdzCCAl+gAwIBAgIEAgAAuTANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQGEwJJ
+RTESMBAGA1UEChMJQmFsdGltb3JlMRMwEQYDVQQLEwpDeWJlclRydXN0MSIwIAYD
+VQQDExlCYWx0aW1vcmUgQ3liZXJUcnVzdCBSb290MB4XDTAwMDUxMjE4NDYwMFoX
+DTI1MDUxMjIzNTkwMFowWjELMAkGA1UEBhMCSUUxEjAQBgNVBAoTCUJhbHRpbW9y
+ZTETMBEGA1UECxMKQ3liZXJUcnVzdDEiMCAGA1UEAxMZQmFsdGltb3JlIEN5YmVy
+VHJ1c3QgUm9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKMEuyKr
+mD1X6CZymrV51Cni4eiVgLGw41uOKymaZN+hXe2wCQVt2yguzmKiYv60iNoS6zjr
+IZ3AQSsBUnuId9Mcj8e6uYi1agnnc+gRQKfRzMpijS3ljwumUNKoUMMo6vWrJYeK
+mpYcqWe4PwzV9/lSEy/CG9VwcPCPwBLKBsua4dnKM3p31vjsufFoREJIE9LAwqSu
+XmD+tqYF/LTdB1kC1FkYmGP1pWPgkAx9XbIGevOF6uvUA65ehD5f/xXtabz5OTZy
+dc93Uk3zyZAsuT3lySNTPx8kmCFcB5kpvcY67Oduhjprl3RjM71oGDHweI12v/ye
+jl0qhqdNkNwnGjkCAwEAAaNFMEMwHQYDVR0OBBYEFOWdWTCCR1jMrPoIVDaGezq1
+BE3wMBIGA1UdEwEB/wQIMAYBAf8CAQMwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3
+DQEBBQUAA4IBAQCFDF2O5G9RaEIFoN27TyclhAO992T9Ldcw46QQF+vaKSm2eT92
+9hkTI7gQCvlYpNRhcL0EYWoSihfVCr3FvDB81ukMJY2GQE/szKN+OMY3EU/t3Wgx
+jkzSswF07r51XgdIGn9w/xZchMB5hbgF/X++ZRGjD8ACtPhSNzkE1akxehi/oCr0
+Epn3o0WC4zxe9Z2etciefC7IpJ5OCBRLbf1wbWsaY71k5h+3zvDyny67G7fyUIhz
+ksLi4xaNmjICq44Y3ekQEe5+NauQrz4wlHrQMz2nZQ/1/I6eYs9HRCwBXbsdtTLS
+R9I4LtD+gdwyah617jzV/OeBHRnDJELqYzmp
+-----END CERTIFICATE-----

make/data/cacerts/buypassclass2ca

@@ -0,0 +1,38 @@
+Owner: CN=Buypass Class 2 Root CA, O=Buypass AS-983163327, C=NO
+Issuer: CN=Buypass Class 2 Root CA, O=Buypass AS-983163327, C=NO
+Serial number: 2
+Valid from: Tue Oct 26 08:38:03 GMT 2010 until: Fri Oct 26 08:38:03 GMT 2040
+Signature algorithm name: SHA256withRSA
+Subject Public Key Algorithm: 4096-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIFWTCCA0GgAwIBAgIBAjANBgkqhkiG9w0BAQsFADBOMQswCQYDVQQGEwJOTzEd
+MBsGA1UECgwUQnV5cGFzcyBBUy05ODMxNjMzMjcxIDAeBgNVBAMMF0J1eXBhc3Mg
+Q2xhc3MgMiBSb290IENBMB4XDTEwMTAyNjA4MzgwM1oXDTQwMTAyNjA4MzgwM1ow
+TjELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBhc3MgQVMtOTgzMTYzMzI3MSAw
+HgYDVQQDDBdCdXlwYXNzIENsYXNzIDIgUm9vdCBDQTCCAiIwDQYJKoZIhvcNAQEB
+BQADggIPADCCAgoCggIBANfHXvfBB9R3+0Mh9PT1aeTuMgHbo4Yf5FkNuud1g1Lr
+6hxhFUi7HQfKjK6w3Jad6sNgkoaCKHOcVgb/S2TwDCo3SbXlzwx87vFKu3MwZfPV
+L4O2fuPn9Z6rYPnT8Z2SdIrkHJasW4DptfQxh6NR/Md+oW+OU3fUl8FVM5I+GC91
+1K2GScuVr1QGbNgGE41b/+EmGVnAJLqBcXmQRFBoJJRfuLMR8SlBYaNByyM21cHx
+MlAQTn/0hpPshNOOvEu/XAFOBz3cFIqUCqTqc/sLUegTBxj6DvEr0VQVfTzh97QZ
+QmdiXnfgolXsttlpF9U6r0TtSsWe5HonfOV116rLJeffawrbD02TTqigzXsu8lkB
+arcNuAeBfos4GzjmCleZPe4h6KP1DBbdi+w0jpwqHAAVF41og9JwnxgIzRFo1clr
+Us3ERo/ctfPYV3Me6ZQ5BL/T3jjetFPsaRyifsSP5BtwrfKi+fv3FmRmaZ9JUaLi
+FRhnBkp/1Wy1TbMz4GHrXb7pmA8y1x1LPC5aAVKRCfLf6o3YBkBjqhHk/sM3nhRS
+P/TizPJhk9H9Z2vXUq6/aKtAQ6BXNVN48FP4YUIHZMbXb5tMOA1jrGKvNouicwoN
+9SG9dKpN6nIDSdvHXx1iY8f93ZHsM+71bbRuMGjeyNYmsHVee7QHIJihdjK4TWxP
+AgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFMmAd+BikoL1Rpzz
+uvdMw964o605MA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAgEAU18h
+9bqwOlI5LJKwbADJ784g7wbylp7ppHR/ehb8t/W2+xUbP6umwHJdELFx7rxP462s
+A20ucS6vxOOto70MEae0/0qyexAQH6dXQbLArvQsWdZHEIjzIVEpMMpghq9Gqx3t
+OluwlN5E40EIosHsHdb9T7bWR9AUC8rmyrV7d35BH16Dx7aMOZawP5aBQW9gkOLo
++fsicdl9sz1Gv7SEr5AcD48Saq/v7h56rgJKihcrdv6sVIkkLE8/trKnToyokZf7
+KcZ7XC25y2a2t6hbElGFtQl+Ynhw/qlqYLYdDnkM/crqJIByw5c/8nerQyIKx+u2
+DISCLIBrQYoIwOula9+ZEsuK1V6ADJHgJgg2SMX6OBE1/yWDLfJ6v9r9jv6ly0Us
+H8SIU653DtmadsWOLB2jutXsMq7Aqqz30XpN69QH4kj3Io6wpJ9qzo6ysmD0oyLQ
+I+uUWnpp3Q+/QFesa1lQ2aOZ4W7+jQF5JyMV3pKdewlNWudLSDBaGOYKbeaP4NK7
+5t98biGCwWg5TbSYWGZizEqQXsP6JwSxeRV0mcy+rSDeJmAc61ZRpqPq5KM/p/9h
+3PFaTWwyI0PurKju7koSCTxdccK+efrCh2gdC/1cacwG0Jp9VJkqyTkaGa9LKkPz
+Y11aWOIv4x3kqdbQCtCev9eBCfHJxyYNrJgWVqA=
+-----END CERTIFICATE-----

make/data/cacerts/buypassclass3ca

@@ -0,0 +1,38 @@
+Owner: CN=Buypass Class 3 Root CA, O=Buypass AS-983163327, C=NO
+Issuer: CN=Buypass Class 3 Root CA, O=Buypass AS-983163327, C=NO
+Serial number: 2
+Valid from: Tue Oct 26 08:28:58 GMT 2010 until: Fri Oct 26 08:28:58 GMT 2040
+Signature algorithm name: SHA256withRSA
+Subject Public Key Algorithm: 4096-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIFWTCCA0GgAwIBAgIBAjANBgkqhkiG9w0BAQsFADBOMQswCQYDVQQGEwJOTzEd
+MBsGA1UECgwUQnV5cGFzcyBBUy05ODMxNjMzMjcxIDAeBgNVBAMMF0J1eXBhc3Mg
+Q2xhc3MgMyBSb290IENBMB4XDTEwMTAyNjA4Mjg1OFoXDTQwMTAyNjA4Mjg1OFow
+TjELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBhc3MgQVMtOTgzMTYzMzI3MSAw
+HgYDVQQDDBdCdXlwYXNzIENsYXNzIDMgUm9vdCBDQTCCAiIwDQYJKoZIhvcNAQEB
+BQADggIPADCCAgoCggIBAKXaCpUWUOOV8l6ddjEGMnqb8RB2uACatVI2zSRHsJ8Y
+ZLya9vrVediQYkwiL944PdbgqOkcLNt4EemOaFEVcsfzM4fkoF0LXOBXByow9c3E
+N3coTRiR5r/VUv1xLXA+58bEiuPwKAv0dpihi4dVsjoT/Lc+JzeOIuOoTyrvYLs9
+tznDDgFHmV0ST9tD+leh7fmdvhFHJlsTmKtdFoqwNxxXnUX/iJY2v7vKB3tvh2PX
+0DJq1l1sDPGzbjniazEuOQAnFN44wOwZZoYS6J1yFhNkUsepNxz9gjDthBgd9K5c
+/3ATAOux9TN6S9ZV+AWNS2mw9bMoNlwUxFFzTWsL8TQH2xc519woe2v1n/MuwU8X
+KhDzzMro6/1rqy6any2CbgTUUgGTLT2G/H783+9CHaZr77kgxve9oKeV/afmiSTY
+zIw0bOIjL9kSGiG5VZFvC5F5GQytQIgLcOJ60g7YaEi7ghM5EFjp2CoHxhLbWNvS
+O1UQRwUVZ2J+GGOmRj8JDlQyXr8NYnon74Do29lLBlo3WiXQCBJ31G8JUJc9yB3D
+34xFMFbG02SrZvPAXpacw8Tvw3xrizp5f7NJzz3iiZ+gMEuFuZyUJHmPfWupRWgP
+K9Dx2hzLabjKSWJtyNBjYt1gD1iqj6G8BaVmos8bdrKEZLFMOVLAMLrwjEsCsLa3
+AgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFEe4zf/lb+74suwv
+Tg75JbCOPGvDMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAgEAACAj
+QTUEkMJAYmDv4jVM1z+s4jSQuKFvdvoWFqRINyzpkMLyPPgKn9iB5btb2iUspKdV
+cSQy9sgL8rxq+JOssgfCX5/bzMiKqr5qb+FJEMwx14C7u8jYog5kV+qi9cKpMRXS
+IGrs/CIBKM+GuIAeqcwRpTzyFrNHnfzSgCHEy9BHcEGhyoMZCCxt8l13nIoUE9Q2
+HJLw5QY33KbmkJs4j1xrG0aGQ0JfPgEHU1RdZX33inOhmlRaHylDFCfChQ+1iHsa
+O5S3HWCntZznKWlXWpuTekMwGwPXYshApqr8ZORK15FTAaggiG6cX0S5y2CBNOxv
+033aSF/rtJC8LakcC6wc1aJoIIAE1vyxjy+7SjENSoYc6+I2KSb12tjE8nVhz36u
+dmNKekBlk4f4HoCMhuWG1o8O/FMsYOgWYRqiPkN7zTlgVGr18okmAWiDSKIz6MkE
+kbIRNBE+6tBDGR8Dk5AM/1E9V/RBbuHLoL7ryWPNbczk+DaqaJ3tvV2XcEQNtg41
+3OEMXbugUZTLfhbrES+jkkXITHHZvMmZUldGL1DPvTVp9D0VzgalLA8+9oG6lLvD
+u79leNKGef9JOxqDDPDeeOzI8k1MGt6CKfjBWtrt7uYnXuhF0J0cUahoq0Tj0Itq
+4/g7u9xN12TyUb7mqqta6THuBrxzvxNiCp/HuZc=
+-----END CERTIFICATE-----

make/data/cacerts/camerfirmachambersca

@@ -0,0 +1,49 @@
+Owner: CN=Chambers of Commerce Root - 2008, O=AC Camerfirma S.A., SERIALNUMBER=A82743287, L=Madrid (see current address at www.camerfirma.com/address), C=EU
+Issuer: CN=Chambers of Commerce Root - 2008, O=AC Camerfirma S.A., SERIALNUMBER=A82743287, L=Madrid (see current address at www.camerfirma.com/address), C=EU
+Serial number: a3da427ea4b1aeda
+Valid from: Fri Aug 01 12:29:50 GMT 2008 until: Sat Jul 31 12:29:50 GMT 2038
+Signature algorithm name: SHA1withRSA
+Subject Public Key Algorithm: 4096-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIHTzCCBTegAwIBAgIJAKPaQn6ksa7aMA0GCSqGSIb3DQEBBQUAMIGuMQswCQYD
+VQQGEwJFVTFDMEEGA1UEBxM6TWFkcmlkIChzZWUgY3VycmVudCBhZGRyZXNzIGF0
+IHd3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTESMBAGA1UEBRMJQTgyNzQzMjg3
+MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMuQS4xKTAnBgNVBAMTIENoYW1iZXJz
+IG9mIENvbW1lcmNlIFJvb3QgLSAyMDA4MB4XDTA4MDgwMTEyMjk1MFoXDTM4MDcz
+MTEyMjk1MFowga4xCzAJBgNVBAYTAkVVMUMwQQYDVQQHEzpNYWRyaWQgKHNlZSBj
+dXJyZW50IGFkZHJlc3MgYXQgd3d3LmNhbWVyZmlybWEuY29tL2FkZHJlc3MpMRIw
+EAYDVQQFEwlBODI3NDMyODcxGzAZBgNVBAoTEkFDIENhbWVyZmlybWEgUy5BLjEp
+MCcGA1UEAxMgQ2hhbWJlcnMgb2YgQ29tbWVyY2UgUm9vdCAtIDIwMDgwggIiMA0G
+CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCvAMtwNyuAWko6bHiUfaN/Gh/2NdW9
+28sNRHI+JrKQUrpjOyhYb6WzbZSm891kDFX29ufyIiKAXuFixrYp4YFs8r/lfTJq
+VKAyGVn+H4vXPWCGhSRv4xGzdz4gljUha7MI2XAuZPeEklPWDrCQiorjh40G072Q
+DuKZoRuGDtqaCrsLYVAGUvGef3bsyw/QHg3PmTA9HMRFEFis1tPo1+XqxQEHd9ZR
+5gN/ikilTWh1uem8nk4ZcfUyS5xtYBkL+8ydddy/Js2Pk3g5eXNeJQ7KXOt3EgfL
+ZEFHcpOrUMPrCXZkNNI5t3YRCQ12RcSprj1qr7V9ZS+UWBDsXHyvfuK2GNnQm05a
+Sd+pZgvMPMZ4fKecHePOjlO+Bd5gD2vlGts/4+EhySnB8esHnFIbAURRPHsl18Tl
+UlRdJQfKFiC4reRB7noI/plvg6aRArBsNlVq5331lubKgdaX8ZSD6e2wsWsSaR6s
++12pxZjptFtYer49okQ6Y1nUCyXeG0+95QGezdIp1Z8XGQpvvwyQ0wlf2eOKNcx5
+Wk0ZN5K3xMGtr/R5JJqyAQuxr1yW84Ay+1w9mPGgP0revq+ULtlVmhduYJ1jbLhj
+ya6BXBg14JC7vjxPNyK5fuvPnnchpj04gftI2jE9K+OJ9dC1vX7gUMQSibMjmhAx
+hduub+84Mxh2EQIDAQABo4IBbDCCAWgwEgYDVR0TAQH/BAgwBgEB/wIBDDAdBgNV
+HQ4EFgQU+SSsD7K1+HnA+mCIG8TZTQKeFxkwgeMGA1UdIwSB2zCB2IAU+SSsD7K1
++HnA+mCIG8TZTQKeFxmhgbSkgbEwga4xCzAJBgNVBAYTAkVVMUMwQQYDVQQHEzpN
+YWRyaWQgKHNlZSBjdXJyZW50IGFkZHJlc3MgYXQgd3d3LmNhbWVyZmlybWEuY29t
+L2FkZHJlc3MpMRIwEAYDVQQFEwlBODI3NDMyODcxGzAZBgNVBAoTEkFDIENhbWVy
+ZmlybWEgUy5BLjEpMCcGA1UEAxMgQ2hhbWJlcnMgb2YgQ29tbWVyY2UgUm9vdCAt
+IDIwMDiCCQCj2kJ+pLGu2jAOBgNVHQ8BAf8EBAMCAQYwPQYDVR0gBDYwNDAyBgRV
+HSAAMCowKAYIKwYBBQUHAgEWHGh0dHA6Ly9wb2xpY3kuY2FtZXJmaXJtYS5jb20w
+DQYJKoZIhvcNAQEFBQADggIBAJASryI1wqM58C7e6bXpeHxIvj99RZJe6dqxGfwW
+PJ+0W2aeaufDuV2I6A+tzyMP3iU6XsxPpcG1Lawk0lgH3qLPaYRgM+gQDROpI9CF
+5Y57pp49chNyM/WqfcZjHwj0/gF/JM8rLFQJ3uIrbZLGOU8W6jx+ekbURWpGqOt1
+glanq6B8aBMz9p0w8G8nOSQjKpD9kCk18pPfNKXG9/jvjA9iSnyu0/VU+I22mlaH
+FoI6M6taIgj3grrqLuBHmrS1RaMFO9ncLkVAO+rcf+g769HsJtg1pDDFOqxXnrN2
+pSB7+R5KBWIBpih1YJeSDW4+TTdDDZIVnBgizVGZoCkaPF+KMjNbMMeJL0eYD6MD
+xvbxrN8y8NmBGuScvfaAFPDRLLmF9dijscilIeUcE5fuDr3fKanvNFNb0+RqE4QG
+tjICxFKuItLcsiFCGtpA8CnJ7AoMXOLQusxI0zcKzBIKinmwPQN/aUv0NCB9szTq
+jktk9T79syNnFQ0EuPAtwQlRPLJsFfClI9eDdOTlLsn+mCdCxqvGnrDQWzilm1De
+fhiYtUU79nm06PcaewaD+9CL2rvHvRirCG88gGtAPxkZumWK5r7VXNM21+9AUiRg
+OGcEMeyP84LG3rlV8zsxkVrctQgVrXYlCg17LofiDKYGvCYQbTed7N14jHyAxfDZ
+d0jQ
+-----END CERTIFICATE-----

make/data/cacerts/camerfirmachamberscommerceca

@@ -0,0 +1,35 @@
+Owner: CN=Chambers of Commerce Root, OU=http://www.chambersign.org, O=AC Camerfirma SA CIF A82743287, C=EU
+Issuer: CN=Chambers of Commerce Root, OU=http://www.chambersign.org, O=AC Camerfirma SA CIF A82743287, C=EU
+Serial number: 0
+Valid from: Tue Sep 30 16:13:43 GMT 2003 until: Wed Sep 30 16:13:44 GMT 2037
+Signature algorithm name: SHA1withRSA
+Subject Public Key Algorithm: 2048-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIEvTCCA6WgAwIBAgIBADANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJFVTEn
+MCUGA1UEChMeQUMgQ2FtZXJmaXJtYSBTQSBDSUYgQTgyNzQzMjg3MSMwIQYDVQQL
+ExpodHRwOi8vd3d3LmNoYW1iZXJzaWduLm9yZzEiMCAGA1UEAxMZQ2hhbWJlcnMg
+b2YgQ29tbWVyY2UgUm9vdDAeFw0wMzA5MzAxNjEzNDNaFw0zNzA5MzAxNjEzNDRa
+MH8xCzAJBgNVBAYTAkVVMScwJQYDVQQKEx5BQyBDYW1lcmZpcm1hIFNBIENJRiBB
+ODI3NDMyODcxIzAhBgNVBAsTGmh0dHA6Ly93d3cuY2hhbWJlcnNpZ24ub3JnMSIw
+IAYDVQQDExlDaGFtYmVycyBvZiBDb21tZXJjZSBSb290MIIBIDANBgkqhkiG9w0B
+AQEFAAOCAQ0AMIIBCAKCAQEAtzZV5aVdGDDg2olUkfzIx1L4L1DZ77F1c2VHfRtb
+unXF/KGIJPov7coISjlUxFF6tdpg6jg8gbLL8bvZkSM/SAFwdakFKq0fcfPJVD0d
+BmpAPrMMhe5cG3nCYsS4No41XQEMIwRHNaqbYE6gZj3LJgqcQKH0XZi/caulAGgq
+7YN6D6IUtdQis4CwPAxaUWktWBiP7Zme8a7ileb2R6jWDA+wWFjbw2Y3npuRVDM3
+0pQcakjJyfKl2qUMI/cjDpwyVV5xnIQFUZot/eZOKjRa3spAN2cMVCFVd9oKDMyX
+roDclDZK9D7ONhMeU+SsTjoF7Nuucpw4i9A5O4kKPnf+dQIBA6OCAUQwggFAMBIG
+A1UdEwEB/wQIMAYBAf8CAQwwPAYDVR0fBDUwMzAxoC+gLYYraHR0cDovL2NybC5j
+aGFtYmVyc2lnbi5vcmcvY2hhbWJlcnNyb290LmNybDAdBgNVHQ4EFgQU45T1sU3p
+26EpW1eLTXYGduHRooowDgYDVR0PAQH/BAQDAgEGMBEGCWCGSAGG+EIBAQQEAwIA
+BzAnBgNVHREEIDAegRxjaGFtYmVyc3Jvb3RAY2hhbWJlcnNpZ24ub3JnMCcGA1Ud
+EgQgMB6BHGNoYW1iZXJzcm9vdEBjaGFtYmVyc2lnbi5vcmcwWAYDVR0gBFEwTzBN
+BgsrBgEEAYGHLgoDATA+MDwGCCsGAQUFBwIBFjBodHRwOi8vY3BzLmNoYW1iZXJz
+aWduLm9yZy9jcHMvY2hhbWJlcnNyb290Lmh0bWwwDQYJKoZIhvcNAQEFBQADggEB
+AAxBl8IahsAifJ/7kPMa0QOx7xP5IV8EnNrJpY0nbJaHkb5BkAFyk+cefV/2icZd
+p0AJPaxJRUXcLo0waLIJuvvDL8y6C98/d3tGfToSJI6WjzwFCm/SlCgdbQzALogi
+1djPHRPH8EjX1wWnz8dHnjs8NMiAT9QUu/wNUPf6s+xCX6ndbcj0dc97wXImsQEc
+XCz9ek60AcUFV7nnPKoF2YjpB0ZBzu9Bga5Y34OirsrXdx/nADydb47kMgkdTXg0
+eDQ8lJsm7U9xxhl6vSAiSFr+S30Dt+dYvsYyTnQeaN2oaFuzPu5ifdmA6Ap1erfu
+tGWaIZDgqtCYvDi1czyL+Nw=
+-----END CERTIFICATE-----

make/data/cacerts/camerfirmachambersignca

@@ -0,0 +1,48 @@
+Owner: CN=Global Chambersign Root - 2008, O=AC Camerfirma S.A., SERIALNUMBER=A82743287, L=Madrid (see current address at www.camerfirma.com/address), C=EU
+Issuer: CN=Global Chambersign Root - 2008, O=AC Camerfirma S.A., SERIALNUMBER=A82743287, L=Madrid (see current address at www.camerfirma.com/address), C=EU
+Serial number: c9cdd3e9d57d23ce
+Valid from: Fri Aug 01 12:31:40 GMT 2008 until: Sat Jul 31 12:31:40 GMT 2038
+Signature algorithm name: SHA1withRSA
+Subject Public Key Algorithm: 4096-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIHSTCCBTGgAwIBAgIJAMnN0+nVfSPOMA0GCSqGSIb3DQEBBQUAMIGsMQswCQYD
+VQQGEwJFVTFDMEEGA1UEBxM6TWFkcmlkIChzZWUgY3VycmVudCBhZGRyZXNzIGF0
+IHd3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTESMBAGA1UEBRMJQTgyNzQzMjg3
+MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMuQS4xJzAlBgNVBAMTHkdsb2JhbCBD
+aGFtYmVyc2lnbiBSb290IC0gMjAwODAeFw0wODA4MDExMjMxNDBaFw0zODA3MzEx
+MjMxNDBaMIGsMQswCQYDVQQGEwJFVTFDMEEGA1UEBxM6TWFkcmlkIChzZWUgY3Vy
+cmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTESMBAG
+A1UEBRMJQTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMuQS4xJzAl
+BgNVBAMTHkdsb2JhbCBDaGFtYmVyc2lnbiBSb290IC0gMjAwODCCAiIwDQYJKoZI
+hvcNAQEBBQADggIPADCCAgoCggIBAMDfVtPkOpt2RbQT2//BthmLN0EYlVJH6xed
+KYiONWwGMi5HYvNJBL99RDaxccy9Wglz1dmFRP+RVyXfXjaOcNFccUMd2drvXNL7
+G706tcuto8xEpw2uIRU/uXpbknXYpBI4iRmKt4DS4jJvVpyR1ogQC7N0ZJJ0YPP2
+zxhPYLIj0Mc7zmFLmY/CDNBAspjcDahOo7kKrmCgrUVSY7pmvWjg+b4aqIG7HkF4
+ddPB/gBVsIdU6CeQNR1MM62X/JcumIS/LMmjv9GYERTtY/jKmIhYF5ntRQOXfjyG
+HoiMvvKRhI9lNNgATH23MRdaKXoKGCQwoze1eqkBfSbW+Q6OWfH9GzO1KTsXO0G2
+Id3UwD2ln58fQ1DJu7xsepeY7s2MH/ucUa6LcL0nn3HAa6x9kGbo1106DbDVwo3V
+yJ2dwW3Q0L9R5OP4wzg2rtandeavhENdk5IMagfeOx2YItaswTXbo6Al/3K1dh3e
+beksZixShNBFks4c5eUzHdwHU1SjqoI7mjcv3N2gZOnm3b2u/GSFHTynyQbehP9r
+6GsaPMWis0L7iwk+XwhSx2LE1AVxv8Rk5Pihg+g+EpuoHtQ2TS9x9o0o9oOpE9Jh
+wZG7SMA0j0GMS0zbaRL/UJScIINZc+18ofLx/d33SdNDWKBWY8o9PeU1VlnpDsog
+zCtLkykPAgMBAAGjggFqMIIBZjASBgNVHRMBAf8ECDAGAQH/AgEMMB0GA1UdDgQW
+BBS5CcqcHtvTbDprru1U8VuTBjUuXjCB4QYDVR0jBIHZMIHWgBS5CcqcHtvTbDpr
+ru1U8VuTBjUuXqGBsqSBrzCBrDELMAkGA1UEBhMCRVUxQzBBBgNVBAcTOk1hZHJp
+ZCAoc2VlIGN1cnJlbnQgYWRkcmVzcyBhdCB3d3cuY2FtZXJmaXJtYS5jb20vYWRk
+cmVzcykxEjAQBgNVBAUTCUE4Mjc0MzI4NzEbMBkGA1UEChMSQUMgQ2FtZXJmaXJt
+YSBTLkEuMScwJQYDVQQDEx5HbG9iYWwgQ2hhbWJlcnNpZ24gUm9vdCAtIDIwMDiC
+CQDJzdPp1X0jzjAOBgNVHQ8BAf8EBAMCAQYwPQYDVR0gBDYwNDAyBgRVHSAAMCow
+KAYIKwYBBQUHAgEWHGh0dHA6Ly9wb2xpY3kuY2FtZXJmaXJtYS5jb20wDQYJKoZI
+hvcNAQEFBQADggIBAICIf3DekijZBZRG/5BXqfEv3xoNa/p8DhxJJHkn2EaqbylZ
+UohwEurdPfWbU1Rv4WCiqAm57OtZfMY18dwY6fFn5a+6ReAJ3spED8IXDneRRXoz
+X1+WLGiLwUePmJs9wOzL9dWCkoQ10b42OFZyMVtHLaoXpGNR6woBrX/sdZ7LoR/x
+fxKxueRkf2fWIyr0uDldmOghp+G9PUIadJpwr2hsUF1Jz//7Dl3mLEfXgTpZALVz
+a2Mg9jFFCDkO9HB+QHBaP9BrQql0PSgvAm11cpUJjUhjxsYjV5KTXjXBjfkK9yyd
+Yhz2rXzdpjEetrHHfoUm+qRqtdpjMNHvkzeyZi99Bffnt0uYlDXA2TopwZ2yUDMd
+SqlapskD7+3056huirRXhOukP9DuqqqHW2Pok+JrqNS4cnhrG+055F3Lm6qH1U9O
+AP7Zap88MQ8oAgF9mOinsKJknnn4SPIVqczmyETrP3iZ8ntxPjzxmKfFGBI/5rso
+M0LpRQp8bfKGeS/Fghl9CYl8slR2iK7ewfPM4W7bMdaTrpmg7yVqc5iJWzouE4ge
+v8CSlDQb4ye3ix5vQv/n6TebUB0tovkC7stYWDpxvGjjqsGvHCgfotwjZT+B6q6Z
+09gwzxMNTxXJhLynSC34MCN32EZLeW32jO06f2ARePTpm67VVMB0gNELQp/B
+-----END CERTIFICATE-----

make/data/cacerts/certumca

@@ -0,0 +1,26 @@
+Owner: CN=Certum CA, O=Unizeto Sp. z o.o., C=PL
+Issuer: CN=Certum CA, O=Unizeto Sp. z o.o., C=PL
+Serial number: 10020
+Valid from: Tue Jun 11 10:46:39 GMT 2002 until: Fri Jun 11 10:46:39 GMT 2027
+Signature algorithm name: SHA1withRSA
+Subject Public Key Algorithm: 2048-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIDDDCCAfSgAwIBAgIDAQAgMA0GCSqGSIb3DQEBBQUAMD4xCzAJBgNVBAYTAlBM
+MRswGQYDVQQKExJVbml6ZXRvIFNwLiB6IG8uby4xEjAQBgNVBAMTCUNlcnR1bSBD
+QTAeFw0wMjA2MTExMDQ2MzlaFw0yNzA2MTExMDQ2MzlaMD4xCzAJBgNVBAYTAlBM
+MRswGQYDVQQKExJVbml6ZXRvIFNwLiB6IG8uby4xEjAQBgNVBAMTCUNlcnR1bSBD
+QTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM6xwS7TT3zNJc4YPk/E
+jG+AanPIW1H4m9LcuwBcsaD8dQPugfCI7iNS6eYVM42sLQnFdvkrOYCJ5JdLkKWo
+ePhzQ3ukYbDYWMzhbGZ+nPMJXlVjhNWo7/OxLjBos8Q82KxujZlakE403Daaj4GI
+ULdtlkIJ89eVgw1BS7Bqa/j8D35in2fE7SZfECYPCE/wpFcozo+47UX2bu4lXapu
+Ob7kky/ZR6By6/qmW6/KUz/iDsaWVhFu9+lmqSbYf5VT7QqFiLpPKaVCjF62/IUg
+AKpoC6EahQGcxEZjgoi2IrHu/qpGWX7PNSzVttpd90gzFFS269lvzs2I1qsb2pY7
+HVkCAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEA
+uI3O7+cUus/usESSbLQ5PqKEbq24IXfS1HeCh+YgQYHu4vgRt2PRFze+GXYkHAQa
+TOs9qmdvLdTN/mUxcMUbpgIKumB7bVjCmkn+YzILa+M6wKyrO7Do0wlRjBCDxjTg
+xSvgGrZgFCdsMneMvLJymM/NzD+5yCRCFNZX/OYmQ6kd5YCQzgNUKD73P9P4Te1q
+CjqTE5s7FCMTY5w/0YcneeVMUeMBrYVdGjux1XMQpNPyvG5k9VpWkKjHDkx0Dy5x
+O/fIR/RpbxXyEV6DHpx8Uq79AtoSqFlnGNu8cN2bsWntgM6JQEhqDjXKKWYVIZQs
+6GAqm4VKQPNriiTsBhYscw==
+-----END CERTIFICATE-----

make/data/cacerts/certumtrustednetworkca

@@ -0,0 +1,29 @@
+Owner: CN=Certum Trusted Network CA, OU=Certum Certification Authority, O=Unizeto Technologies S.A., C=PL
+Issuer: CN=Certum Trusted Network CA, OU=Certum Certification Authority, O=Unizeto Technologies S.A., C=PL
+Serial number: 444c0
+Valid from: Wed Oct 22 12:07:37 GMT 2008 until: Mon Dec 31 12:07:37 GMT 2029
+Signature algorithm name: SHA1withRSA
+Subject Public Key Algorithm: 2048-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIDuzCCAqOgAwIBAgIDBETAMA0GCSqGSIb3DQEBBQUAMH4xCzAJBgNVBAYTAlBM
+MSIwIAYDVQQKExlVbml6ZXRvIFRlY2hub2xvZ2llcyBTLkEuMScwJQYDVQQLEx5D
+ZXJ0dW0gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxIjAgBgNVBAMTGUNlcnR1bSBU
+cnVzdGVkIE5ldHdvcmsgQ0EwHhcNMDgxMDIyMTIwNzM3WhcNMjkxMjMxMTIwNzM3
+WjB+MQswCQYDVQQGEwJQTDEiMCAGA1UEChMZVW5pemV0byBUZWNobm9sb2dpZXMg
+Uy5BLjEnMCUGA1UECxMeQ2VydHVtIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MSIw
+IAYDVQQDExlDZXJ0dW0gVHJ1c3RlZCBOZXR3b3JrIENBMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEA4/t9o3K6wvDJFIf1awFO4W5AB7ptJ11/91sts1rH
+UV+rpDKmYYe2bg+G0jACl/jXaVehGDldamR5xgFZrDwxSjh80gTSSyjoIF87B6LM
+TXPb865Px1bVWqeWifrzq2jUI4ZZJ88JJ7ysbnKDHDBy3+Ci6dLhdHUZvSqeexVU
+BBvXQzmtVSjF4hq79MDkrjhJM8x2hZ85RdKknvISjFH4fOQtf/WsX+sWn7Et0brM
+kUJ3TCXJkDhv2/DM+44el1k+1WBO5gUo7Ul5E0u6SNsv+XLTOcr+H9g0cvW0QM8x
+AcPs3hEtF10fuFDRXhmnad4HMyjKUJX5p1TLVIZQRan5SQIDAQABo0IwQDAPBgNV
+HRMBAf8EBTADAQH/MB0GA1UdDgQWBBQIds3LB/8k9sXN7buQvOKEN0Z19zAOBgNV
+HQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQEFBQADggEBAKaorSLOAT2mo/9i0Eidi15y
+sHhE49wcrwn9I0j6vSrEuVUEtRCjjSfeC4Jj0O7eDDd5QVsisrCaQVymcODU0HfL
+I9MA4GxWL+FpDQ3Zqr8hgVDZBqWo/5U30Kr+4rP1mS1FhIrlQgnXdAIv94nYmem8
+J9RHjboNRhx3zxSkHLmkMcScKHQDNP8zGSal6Q10tz6XxnboJ5ajZt3hrvJBW8qY
+VoNzcOSGGtIxQbovvi0TWnZvTuhOgQ4/WwMioBK+ZlgRSssDxLQqKi2WF+A5VLxI
+03YnnZotBqbJ7DnSq9ufmgsnAjUpsUCV5/nonFWIGUbWtzT1fs45mtk48VH3Tyw=
+-----END CERTIFICATE-----

make/data/cacerts/chunghwaepkirootca

@@ -0,0 +1,40 @@
+Owner: OU=ePKI Root Certification Authority, O="Chunghwa Telecom Co., Ltd.", C=TW
+Issuer: OU=ePKI Root Certification Authority, O="Chunghwa Telecom Co., Ltd.", C=TW
+Serial number: 15c8bd65475cafb897005ee406d2bc9d
+Valid from: Mon Dec 20 02:31:27 GMT 2004 until: Wed Dec 20 02:31:27 GMT 2034
+Signature algorithm name: SHA1withRSA
+Subject Public Key Algorithm: 4096-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIFsDCCA5igAwIBAgIQFci9ZUdcr7iXAF7kBtK8nTANBgkqhkiG9w0BAQUFADBe
+MQswCQYDVQQGEwJUVzEjMCEGA1UECgwaQ2h1bmdod2EgVGVsZWNvbSBDby4sIEx0
+ZC4xKjAoBgNVBAsMIWVQS0kgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAe
+Fw0wNDEyMjAwMjMxMjdaFw0zNDEyMjAwMjMxMjdaMF4xCzAJBgNVBAYTAlRXMSMw
+IQYDVQQKDBpDaHVuZ2h3YSBUZWxlY29tIENvLiwgTHRkLjEqMCgGA1UECwwhZVBL
+SSBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIICIjANBgkqhkiG9w0BAQEF
+AAOCAg8AMIICCgKCAgEA4SUP7o3biDN1Z82tH306Tm2d0y8U82N0ywEhajfqhFAH
+SyZbCUNsIZ5qyNUD9WBpj8zwIuQf5/dqIjG3LBXy4P4AakP/h2XGtRrBp0xtInAh
+ijHyl3SJCRImHJ7K2RKilTza6We/CKBk49ZCt0Xvl/T29de1ShUCWH2YWEtgvM3X
+DZoTM1PRYfl61dd4s5oz9wCGzh1NlDivqOx4UXCKXBCDUSH3ET00hl7lSM2XgYI1
+TBnsZfZrxQWh7kcT1rMhJ5QQCtkkO7q+RBNGMD+XPNjX12ruOzjjK9SXDrkb5wdJ
+fzcq+Xd4z1TtW0ado4AOkUPB1ltfFLqfpo0kR0BZv3I4sjZsN/+Z0V0OWQqraffA
+sgRFelQArr5T9rXn4fg8ozHSqf4hUmTFpmfwdQcGlBSBVcYn5AGPF8Fqcde+S/uU
+WH1+ETOxQvdibBjWzwloPn9s9h6PYq2lY9sJpx8iQkEeb5mKPtf5P0B6ebClAZLS
+nT0IFaUQAS2zMnaolQ2zepr7BxB4EW/hj8e6DyUadCrlHJhBmd8hh+iVBmoKs2pH
+dmX2Os+PYhcZewoozRrSgx4hxyy/vv9haLdnG7t4TY3OZ+XkwY63I2binZB1NJip
+NiuKmpS5nezMirH4JYlcWrYvjB9teSSnUmjDhDXiZo1jDiVN1Rmy5nk3pyKdVDEC
+AwEAAaNqMGgwHQYDVR0OBBYEFB4M97Zn8uGSJglFwFU5Lnc/QkqiMAwGA1UdEwQF
+MAMBAf8wOQYEZyoHAAQxMC8wLQIBADAJBgUrDgMCGgUAMAcGBWcqAwAABBRFsMLH
+ClZ87lt4DJX5GFPBphzYEDANBgkqhkiG9w0BAQUFAAOCAgEACbODU1kBPpVJufGB
+uvl2ICO1J2B01GqZNF5sAFPZn/KmsSQHRGoqxqWOeBLoR9lYGxMqXnmbnwoqZ6Yl
+PwZpVnPDimZI+ymBV3QGypzqKOg4ZyYr8dW1P2WT+DZdjo2NQCCHGervJ8A9tDkP
+JXtoUHRVnAxZfVo9QZQlUgjgRywVMRnVvwdVxrsStZf0X4OFunHB2WyBEXYKCrC/
+gpf36j36+uwtqSiUO1bd0lEursC9CBWMd1I0ltabrNMdjmEPNXubrjlpC2JgQCA2
+j6/7Nu4tCEoduL+bXPjqpRugc6bY+G7gMwRfaKonh+3ZwZCc7b3jajWvY9+rGNm6
+5ulK6lCKD2GTHuItGeIwlDWSXQ62B68ZgI9HkFFLLk3dheLSClIKF5r8GrBQAuUB
+o2M3IUxExJtRmREOc5wGj1QupyheRDmHVi03vYVElOEMSyycw5KFNGHLD7ibSkNS
+/jQ6fbjpKdx2qcgw+BRxgMYeNkh0IkFch4LoGHGLQYlE535YW6i4jRPpp2zDR+2z
+Gp1iro2C6pSe3VkQw63d4k3jMdXH7OjysP6SHhYKGvzZ8/gntsm+HbRsZJB/9OTE
+W9c3rkIO3aQab3yIVMUWbuF6aC74Or8NpDyJO3inTmODBCEIZ43ygknQW/2xzQ+D
+hNQ+IIX3Sj0rnP0qCglN6oH4EZw=
+-----END CERTIFICATE-----

make/data/cacerts/comodoaaaca

@@ -0,0 +1,32 @@
+Owner: CN=AAA Certificate Services, O=Comodo CA Limited, L=Salford, ST=Greater Manchester, C=GB
+Issuer: CN=AAA Certificate Services, O=Comodo CA Limited, L=Salford, ST=Greater Manchester, C=GB
+Serial number: 1
+Valid from: Thu Jan 01 00:00:00 GMT 2004 until: Sun Dec 31 23:59:59 GMT 2028
+Signature algorithm name: SHA1withRSA
+Subject Public Key Algorithm: 2048-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIEMjCCAxqgAwIBAgIBATANBgkqhkiG9w0BAQUFADB7MQswCQYDVQQGEwJHQjEb
+MBkGA1UECAwSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRow
+GAYDVQQKDBFDb21vZG8gQ0EgTGltaXRlZDEhMB8GA1UEAwwYQUFBIENlcnRpZmlj
+YXRlIFNlcnZpY2VzMB4XDTA0MDEwMTAwMDAwMFoXDTI4MTIzMTIzNTk1OVowezEL
+MAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UE
+BwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxITAfBgNVBAMM
+GEFBQSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAL5AnfRu4ep2hxxNRUSOvkbIgwadwSr+GB+O5AL686tdUIoWMQua
+BtDFcCLNSS1UY8y2bmhGC1Pqy0wkwLxyTurxFa70VJoSCsN6sjNg4tqJVfMiWPPe
+3M/vg4aijJRPn2jymJBGhCfHdr/jzDUsi14HZGWCwEiwqJH5YZ92IFCokcdmtet4
+YgNW8IoaE+oxox6gmf049vYnMlhvB/VruPsUK6+3qszWY19zjNoFmag4qMsXeDZR
+rOme9Hg6jc8P2ULimAyrL58OAd7vn5lJ8S3frHRNG5i1R8XlKdH5kBjHYpy+g8cm
+ez6KJcfA3Z3mNWgQIJ2P2N7Sw4ScDV7oL8kCAwEAAaOBwDCBvTAdBgNVHQ4EFgQU
+oBEKIz6W8Qfs4q8p74Klf9AwpLQwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQF
+MAMBAf8wewYDVR0fBHQwcjA4oDagNIYyaHR0cDovL2NybC5jb21vZG9jYS5jb20v
+QUFBQ2VydGlmaWNhdGVTZXJ2aWNlcy5jcmwwNqA0oDKGMGh0dHA6Ly9jcmwuY29t
+b2RvLm5ldC9BQUFDZXJ0aWZpY2F0ZVNlcnZpY2VzLmNybDANBgkqhkiG9w0BAQUF
+AAOCAQEACFb8AvCb6P+k+tZ7xkSAzk/ExfYAWMymtrwUSWgEdujm7l3sAg9g1o1Q
+GE8mTgHj5rCl7r+8dFRBv/38ErjHT1r0iWAFf2C3BUrz9vHCv8S5dIa2LX1rzNLz
+Rt0vxuBqw8M0Ayx9lt1awg6nCpnBBYurDC/zXDrPbDdVCYfeU0BsWO/8tqtlbgT2
+G9w84FoVxp7Z8VlIMCFlA2zs6SFz7JsDoeA3raAVGI/6ugLOpyypEBMs1OUIJqsi
+l2D4kF501KKaU73yqWjgom7C12yxow+ev+to51byrvLjKzg6CYG1a4XXvi3tPxq3
+smPi9WIsgtRqAEFQ8TmDn5XpNpaYbg==
+-----END CERTIFICATE-----

make/data/cacerts/comodoeccca

@@ -0,0 +1,23 @@
+Owner: CN=COMODO ECC Certification Authority, O=COMODO CA Limited, L=Salford, ST=Greater Manchester, C=GB
+Issuer: CN=COMODO ECC Certification Authority, O=COMODO CA Limited, L=Salford, ST=Greater Manchester, C=GB
+Serial number: 1f47afaa62007050544c019e9b63992a
+Valid from: Thu Mar 06 00:00:00 GMT 2008 until: Mon Jan 18 23:59:59 GMT 2038
+Signature algorithm name: SHA384withECDSA
+Subject Public Key Algorithm: 384-bit EC (secp384r1) key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIICiTCCAg+gAwIBAgIQH0evqmIAcFBUTAGem2OZKjAKBggqhkjOPQQDAzCBhTEL
+MAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UE
+BxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMT
+IkNPTU9ETyBFQ0MgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDgwMzA2MDAw
+MDAwWhcNMzgwMTE4MjM1OTU5WjCBhTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdy
+ZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09N
+T0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBFQ0MgQ2VydGlmaWNhdGlv
+biBBdXRob3JpdHkwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQDR3svdcmCFYX7deSR
+FtSrYpn1PlILBs5BAH+X4QokPB0BBO490o0JlwzgdeT6+3eKKvUDYEs2ixYjFq0J
+cfRK9ChQtP6IHG4/bC8vCVlbpVsLM5niwz2J+Wos77LTBumjQjBAMB0GA1UdDgQW
+BBR1cacZSBm8nZ3qQUfflMRId5nTeTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/
+BAUwAwEB/zAKBggqhkjOPQQDAwNoADBlAjEA7wNbeqy3eApyt4jf/7VGFAkK+qDm
+fQjGGoe9GKhzvSbKYAydzpmfz1wPMOG+FDHqAjAU9JM8SaczepBGR7NjfRObTrdv
+GDeAU/7dIOA1mjbRxwG55tzd8/8dLDoWV9mSOdY=
+-----END CERTIFICATE-----

make/data/cacerts/comodorsaca

@@ -0,0 +1,41 @@
+Owner: CN=COMODO RSA Certification Authority, O=COMODO CA Limited, L=Salford, ST=Greater Manchester, C=GB
+Issuer: CN=COMODO RSA Certification Authority, O=COMODO CA Limited, L=Salford, ST=Greater Manchester, C=GB
+Serial number: 4caaf9cadb636fe01ff74ed85b03869d
+Valid from: Tue Jan 19 00:00:00 GMT 2010 until: Mon Jan 18 23:59:59 GMT 2038
+Signature algorithm name: SHA384withRSA
+Subject Public Key Algorithm: 4096-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIF2DCCA8CgAwIBAgIQTKr5yttjb+Af907YWwOGnTANBgkqhkiG9w0BAQwFADCB
+hTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
+A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNV
+BAMTIkNPTU9ETyBSU0EgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMTAwMTE5
+MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBhTELMAkGA1UEBhMCR0IxGzAZBgNVBAgT
+EkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UEChMR
+Q09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBSU0EgQ2VydGlmaWNh
+dGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCR
+6FSS0gpWsawNJN3Fz0RndJkrN6N9I3AAcbxT38T6KhKPS38QVr2fcHK3YX/JSw8X
+pz3jsARh7v8Rl8f0hj4K+j5c+ZPmNHrZFGvnnLOFoIJ6dq9xkNfs/Q36nGz637CC
+9BR++b7Epi9Pf5l/tfxnQ3K9DADWietrLNPtj5gcFKt+5eNu/Nio5JIk2kNrYrhV
+/erBvGy2i/MOjZrkm2xpmfh4SDBF1a3hDTxFYPwyllEnvGfDyi62a+pGx8cgoLEf
+Zd5ICLqkTqnyg0Y3hOvozIFIQ2dOciqbXL1MGyiKXCJ7tKuY2e7gUYPDCUZObT6Z
++pUX2nwzV0E8jVHtC7ZcryxjGt9XyD+86V3Em69FmeKjWiS0uqlWPc9vqv9JWL7w
+qP/0uK3pN/u6uPQLOvnoQ0IeidiEyxPx2bvhiWC4jChWrBQdnArncevPDt09qZah
+SL0896+1DSJMwBGB7FY79tOi4lu3sgQiUpWAk2nojkxl8ZEDLXB0AuqLZxUpaVIC
+u9ffUGpVRr+goyhhf3DQw6KqLCGqR84onAZFdr+CGCe01a60y1Dma/RMhnEw6abf
+Fobg2P9A3fvQQoh/ozM6LlweQRGBY84YcWsr7KaKtzFcOmpH4MN5WdYgGq/yapiq
+crxXStJLnbsQ/LBMQeXtHT1eKJ2czL+zUdqnR+WEUwIDAQABo0IwQDAdBgNVHQ4E
+FgQUu69+Aj36pvE8hI6t7jiY7NkyMtQwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB
+/wQFMAMBAf8wDQYJKoZIhvcNAQEMBQADggIBAArx1UaEt65Ru2yyTUEUAJNMnMvl
+wFTPoCWOAvn9sKIN9SCYPBMtrFaisNZ+EZLpLrqeLppysb0ZRGxhNaKatBYSaVqM
+4dc+pBroLwP0rmEdEBsqpIt6xf4FpuHA1sj+nq6PK7o9mfjYcwlYRm6mnPTXJ9OV
+2jeDchzTc+CiR5kDOF3VSXkAKRzH7JsgHAckaVd4sjn8OoSgtZx8jb8uk2Intzna
+FxiuvTwJaP+EmzzV1gsD41eeFPfR60/IvYcjt7ZJQ3mFXLrrkguhxuhoqEwWsRqZ
+CuhTLJK7oQkYdQxlqHvLI7cawiiFwxv/0Cti76R7CZGYZ4wUAc1oBmpjIXUDgIiK
+boHGhfKppC3n9KUkEEeDys30jXlYsQab5xoq2Z0B15R97QNKyvDb6KkBPvVWmcke
+jkk9u+UJueBPSZI9FoJAzMxZxuY67RIuaTxslbH9qh17f4a+Hg4yRvv7E491f0yL
+S0Zj/gA0QHDBw7mh3aZw4gSzQbzpgJHqZJx64SIDqZxubw5lT2yHh17zbqD5daWb
+QOhTsiedSrnAdyGN/4fy3ryM7xfft0kL0fJuMAsaDk527RH89elWsn2/x20Kk4yl
+0MC2Hb46TpSi125sC8KKfPog88Tk5c0NqMuRkrF8hey1FGlmDoLnzc7ILaZRfyHB
+NVOFBkpdn627G190
+-----END CERTIFICATE-----

make/data/cacerts/digicertassuredidg2

@@ -0,0 +1,29 @@
+Owner: CN=DigiCert Assured ID Root G2, OU=www.digicert.com, O=DigiCert Inc, C=US
+Issuer: CN=DigiCert Assured ID Root G2, OU=www.digicert.com, O=DigiCert Inc, C=US
+Serial number: b931c3ad63967ea6723bfc3af9af44b
+Valid from: Thu Aug 01 12:00:00 GMT 2013 until: Fri Jan 15 12:00:00 GMT 2038
+Signature algorithm name: SHA256withRSA
+Subject Public Key Algorithm: 2048-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIDljCCAn6gAwIBAgIQC5McOtY5Z+pnI7/Dr5r0SzANBgkqhkiG9w0BAQsFADBl
+MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
+d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJv
+b3QgRzIwHhcNMTMwODAxMTIwMDAwWhcNMzgwMTE1MTIwMDAwWjBlMQswCQYDVQQG
+EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNl
+cnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgRzIwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZ5ygvUj82ckmIkzTz+GoeMVSA
+n61UQbVH35ao1K+ALbkKz3X9iaV9JPrjIgwrvJUXCzO/GU1BBpAAvQxNEP4Htecc
+biJVMWWXvdMX0h5i89vqbFCMP4QMls+3ywPgym2hFEwbid3tALBSfK+RbLE4E9Hp
+EgjAALAcKxHad3A2m67OeYfcgnDmCXRwVWmvo2ifv922ebPynXApVfSr/5Vh88lA
+bx3RvpO704gqu52/clpWcTs/1PPRCv4o76Pu2ZmvA9OPYLfykqGxvYmJHzDNw6Yu
+YjOuFgJ3RFrngQo8p0Quebg/BLxcoIfhG69Rjs3sLPr4/m3wOnyqi+RnlTGNAgMB
+AAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMB0GA1UdDgQW
+BBTOw0q5mVXyuNtgv6l+vVa1lzan1jANBgkqhkiG9w0BAQsFAAOCAQEAyqVVjOPI
+QW5pJ6d1Ee88hjZv0p3GeDgdaZaikmkuOGybfQTUiaWxMTeKySHMq2zNixya1r9I
+0jJmwYrA8y8678Dj1JGG0VDjA9tzd29KOVPt3ibHtX2vK0LRdWLjSisCx1BL4Gni
+lmwORGYQRI+tBev4eaymG+g3NJ1TyWGqolKvSnAWhsI6yLETcDbYz+70CjTVW0z9
+B5yiutkBclzzTcHdDrEcDcRjvq30FPuJ7KJBDkzMyFdA0G4Dqs0MjomZmWzwPDCv
+ON9vvKO+KSAnq3T/EyJ43pdSVR6DtVQgA+6uwE9W3jfMw3+qBCe703e4YtsXfJwo
+IhNzbM8m9Yop5w==
+-----END CERTIFICATE-----