honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade bundled JDK and Docker images to JDK 12 (#40229) 

This commit bumps the JDK used the bundled JDK and the Docker images to
JDK 12.
This commit is contained in:
Jason Tedor 2019-03-19 23:44:19 -04:00
parent 1ec9fb3597
commit c2a566a64e
No known key found for this signature in database
GPG Key ID: FA89F05560F16BC5
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buildSrc/version.properties
View File

@ -1,7 +1,7 @@
elasticsearch = 7.1.0 elasticsearch = 7.1.0
lucene = 8.0.0 lucene = 8.0.0
bundled_jdk = 11.0.2+9 bundled_jdk = 12+33
# optional dependencies # optional dependencies
spatial4j = 0.7 spatial4j = 0.7

6
distribution/build.gradle
View File

@ -218,14 +218,14 @@ xpack.subprojects.findAll { it.parent == xpack }.each { Project xpackModule ->
*****************************************************************************/ *****************************************************************************/
// extract the bundled jdk version, broken into elements as: [feature, interim, update, build] // extract the bundled jdk version, broken into elements as: [feature, interim, update, build]
// Note the "patch" version is not yet handled here, as it has not yet been used by java. // Note the "patch" version is not yet handled here, as it has not yet been used by java.
Pattern JDK_VERSION = Pattern.compile("(\\d+)\\.(\\d+)\\.(\\d+)\\+(\\d+)") Pattern JDK_VERSION = Pattern.compile("(\\d+)(\\.\\d+\\.\\d+)?\\+(\\d+)")
Matcher jdkVersionMatcher = JDK_VERSION.matcher(VersionProperties.bundledJdk) Matcher jdkVersionMatcher = JDK_VERSION.matcher(VersionProperties.bundledJdk)
if (jdkVersionMatcher.matches() == false) { if (jdkVersionMatcher.matches() == false) {
throw new IllegalArgumentException("Malformed jdk version [" + VersionProperties.bundledJdk + "]") throw new IllegalArgumentException("Malformed jdk version [" + VersionProperties.bundledJdk + "]")
} }
String jdkVersion = jdkVersionMatcher.group(1) + '.' + jdkVersionMatcher.group(2) + '.' + jdkVersionMatcher.group(3) String jdkVersion = jdkVersionMatcher.group(1) + (jdkVersionMatcher.group(2) != null ? (jdkVersionMatcher.group(2)) : "")
String jdkMajor = jdkVersionMatcher.group(1) String jdkMajor = jdkVersionMatcher.group(1)
String jdkBuild = jdkVersionMatcher.group(4) String jdkBuild = jdkVersionMatcher.group(3)
repositories { repositories {
ivy { ivy {

4
distribution/docker/build.gradle
View File

@ -22,8 +22,8 @@ ext.expansions = { oss ->
final String elasticsearch = oss ? "elasticsearch-oss-${VersionProperties.elasticsearch}-${classifier}.tar.gz" : "elasticsearch-${VersionProperties.elasticsearch}-${classifier}.tar.gz" final String elasticsearch = oss ? "elasticsearch-oss-${VersionProperties.elasticsearch}-${classifier}.tar.gz" : "elasticsearch-${VersionProperties.elasticsearch}-${classifier}.tar.gz"
return [ return [
'elasticsearch' : elasticsearch, 'elasticsearch' : elasticsearch,
'jdkUrl' : 'https://download.java.net/java/GA/jdk11/9/GPL/openjdk-11.0.2_linux-x64_bin.tar.gz', 'jdkUrl' : 'https://download.java.net/java/GA/jdk12/GPL/openjdk-12_linux-x64_bin.tar.gz',
'jdkVersion' : '11.0.2', 'jdkVersion' : '12',
'license' : oss ? 'Apache-2.0' : 'Elastic License', 'license' : oss ? 'Apache-2.0' : 'Elastic License',
'source_elasticsearch': local() ? "COPY $elasticsearch /opt/" : "RUN curl --retry 8 -s -L -O https://artifacts.elastic.co/downloads/elasticsearch/${elasticsearch}", 'source_elasticsearch': local() ? "COPY $elasticsearch /opt/" : "RUN curl --retry 8 -s -L -O https://artifacts.elastic.co/downloads/elasticsearch/${elasticsearch}",
'version' : VersionProperties.elasticsearch 'version' : VersionProperties.elasticsearch