Skip to content

Build on java 17 #1785

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@ class BuildPlugin implements Plugin<Project> {

// Enable HTML test reports
project.tasks.withType(Test) { Test testTask ->
testTask.getReports().getByName('html').setEnabled(true)
testTask.getReports().getByName('html').setRequired(true)
}

// Configure project jar task with manifest and include license and notice data.
Expand Down Expand Up @@ -846,7 +846,7 @@ class BuildPlugin implements Plugin<Project> {
maxGranularity 2
}

integrationTest.reports.html.enabled = false
integrationTest.reports.html.required = false
}

private static void configurePrecommit(Project project) {
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
4 changes: 4 additions & 0 deletions pig/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,10 @@ dependencies {
javadocSources(project(":elasticsearch-hadoop-mr"))
}

tasks.named("test").configure {
jvmArgs "--add-opens=java.base/java.io=ALL-UNNAMED" // Needed for IOUtils's BYTE_ARRAY_BUFFER reflection
}

jar {
dependsOn(project.configurations.embedded)
from(project.configurations.embedded.collect { it.isDirectory() ? it : zipTree(it)}) {
Expand Down
11 changes: 7 additions & 4 deletions spark/core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@ sparkVariants {
setCoreDefaultVariant "spark20scala212", spark24Version, scala212Version
addCoreFeatureVariant "spark30scala212", spark30Version, scala212Version
addCoreFeatureVariant "spark20scala211", spark24Version, scala211Version
addCoreFeatureVariant "spark20scala210", spark22Version, scala210Version
addCoreFeatureVariant "spark13scala211", spark13Version, scala211Version
addCoreFeatureVariant "spark13scala210", spark13Version, scala210Version

all { SparkVariantPlugin.SparkVariant variant ->

Expand All @@ -26,7 +23,6 @@ sparkVariants {
project.getTasks().getByName(scalaCompileTaskName) { ScalaCompile compileScala ->
configure(compileScala.scalaCompileOptions.forkOptions) {
memoryMaximumSize = '1g'
jvmArgs = ['-XX:MaxPermSize=512m']
}
compileScala.scalaCompileOptions.additionalParameters = [
"-feature",
Expand Down Expand Up @@ -146,6 +142,13 @@ configurations.matching{ it.name.contains('CompilerPlugin') == false }.all { Con
tasks.named("test").configure {
jvmArgs "--add-opens=java.base/java.io=ALL-UNNAMED" // Needed for IOUtils's BYTE_ARRAY_BUFFER reflection
}
tasks.named("testSpark20scala211").configure {
jvmArgs "--add-opens=java.base/java.io=ALL-UNNAMED" // Needed for IOUtils's BYTE_ARRAY_BUFFER reflection
}
tasks.named("testSpark30scala212").configure {
jvmArgs "--add-opens=java.base/java.io=ALL-UNNAMED" // Needed for IOUtils's BYTE_ARRAY_BUFFER reflection
jvmArgs "--add-opens=java.base/java.nio=ALL-UNNAMED" // Needed for org.apache.spark.SparkConf, which indirectly uses java.nio.DirectByteBuffer
}

// Set minimum compatibility and java home for compiler task
tasks.withType(ScalaCompile) { ScalaCompile task ->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -566,7 +566,9 @@ class AbstractScalaEsScalaSpark(prefix: String, readMetadata: jl.Boolean) extend
"ctx._source.counter += 1"
}

if (version.onOrAfter(EsMajorVersion.V_5_X)) {
if (version.onOrAfter(EsMajorVersion.V_8_X)) {
RestUtils.put(s"_scripts/$scriptName", s"""{"script":{"lang":"$lang", "source": "$script"}}""".getBytes(StringUtils.UTF_8))
} else if (version.onOrAfter(EsMajorVersion.V_5_X)) {
RestUtils.put(s"_scripts/$scriptName", s"""{"script":{"lang":"$lang", "code": "$script"}}""".getBytes(StringUtils.UTF_8))
} else {
RestUtils.put(s"_scripts/$lang/$scriptName", s"""{"script":"$script"}""".getBytes(StringUtils.UTF_8))
Expand Down
190 changes: 0 additions & 190 deletions spark/sql-13/build.gradle

This file was deleted.

1 change: 0 additions & 1 deletion spark/sql-13/licenses/commons-logging-1.1.1.jar.sha1

This file was deleted.

Loading