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

Bump multi-release JARs to Java 11

This commit is contained in:
Dan Hermann 2020-03-31 06:48:46 -05:00 committed by GitHub
parent eeb23e9e73
commit 2ede8662e1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
libs/core/build.gradle
View File

@ -25,40 +25,40 @@ apply plugin: 'nebula.maven-scm'
archivesBaseName = 'elasticsearch-core'
// we want to keep the JDKs in our IDEs set to JDK 8 until minimum JDK is bumped to 9 so we do not include this source set in our IDEs
// we want to keep the JDKs in our IDEs set to JDK 8 until minimum JDK is bumped to 11 so we do not include this source set in our IDEs
if (!isEclipse) {
sourceSets {
java9 {
java11 {
java {
srcDirs = ['src/main/java9']
srcDirs = ['src/main/java11']
}
}
}
configurations {
java9Compile.extendsFrom(compile)
java11Compile.extendsFrom(compile)
}
dependencies {
java9Compile sourceSets.main.output
java11Compile sourceSets.main.output
}
compileJava9Java {
sourceCompatibility = 9
targetCompatibility = 9
compileJava11Java {
sourceCompatibility = 11
targetCompatibility = 11
}
forbiddenApisJava9 {
if (BuildParams.runtimeJavaVersion < JavaVersion.VERSION_1_9) {
targetCompatibility = JavaVersion.VERSION_1_9.getMajorVersion()
forbiddenApisJava11 {
if (BuildParams.runtimeJavaVersion < JavaVersion.VERSION_11) {
targetCompatibility = JavaVersion.VERSION_11.getMajorVersion()
}
replaceSignatureFiles 'jdk-signatures'
}
jar {
metaInf {
into 'versions/9'
from sourceSets.java9.output
into 'versions/11'
from sourceSets.java11.output
}
manifest.attributes('Multi-Release': 'true')
}
@ -81,7 +81,7 @@ dependencies {
testCompile "org.hamcrest:hamcrest:${versions.hamcrest}"
if (!isEclipse) {
java9Compile sourceSets.main.output
java11Compile sourceSets.main.output
}
testCompile(project(":test:framework")) {

0
libs/core/src/main/java9/org/elasticsearch/core/internal/io/Streams.java → libs/core/src/main/java11/org/elasticsearch/core/internal/io/Streams.java
View File

28
server/build.gradle
View File

@ -34,41 +34,41 @@ publishing {
archivesBaseName = 'elasticsearch'
// we want to keep the JDKs in our IDEs set to JDK 8 until minimum JDK is bumped to 9 so we do not include this source set in our IDEs
// we want to keep the JDKs in our IDEs set to JDK 8 until minimum JDK is bumped to 11 so we do not include this source set in our IDEs
if (!isEclipse) {
sourceSets {
java9 {
java11 {
java {
srcDirs = ['src/main/java9']
srcDirs = ['src/main/java11']
}
}
}
configurations {
java9Compile.extendsFrom(compile)
java11Compile.extendsFrom(compile)
}
dependencies {
java9Compile sourceSets.main.output
java11Compile sourceSets.main.output
}
compileJava9Java {
sourceCompatibility = 9
targetCompatibility = 9
compileJava11Java {
sourceCompatibility = 11
targetCompatibility = 11
}
forbiddenApisJava9 {
forbiddenApisJava11 {
doFirst {
if (BuildParams.runtimeJavaVersion < JavaVersion.VERSION_1_9) {
targetCompatibility = JavaVersion.VERSION_1_9.getMajorVersion()
if (BuildParams.runtimeJavaVersion < JavaVersion.VERSION_11) {
targetCompatibility = JavaVersion.VERSION_11.getMajorVersion()
}
}
}
jar {
metaInf {
into 'versions/9'
from sourceSets.java9.output
into 'versions/11'
from sourceSets.java11.output
}
manifest.attributes('Multi-Release': 'true')
}
@ -124,7 +124,7 @@ dependencies {
compile "org.elasticsearch:jna:${versions.jna}"
if (!isEclipse) {
java9Compile sourceSets.main.output
java11Compile sourceSets.main.output
}
testCompile(project(":test:framework")) {

0
server/src/main/java9/org/elasticsearch/monitor/jvm/JvmPid.java → server/src/main/java11/org/elasticsearch/monitor/jvm/JvmPid.java
View File