Skip to content

Upgrade to Gradle 7.5 #1980

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.

Sign up for GitHub

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

Merged
merged 4 commits into from
Jul 25, 2022
Merged

Upgrade to Gradle 7.5 #1980

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5af5fe5
Update Spark qa version
jbaiera Jul 21, 2022
1900426
Upgrade Gradle to 7.5 to fix build issue
jbaiera Jul 21, 2022
93801ed
Add opens
jbaiera Jul 21, 2022
93917a1
Disable hives web ui
jbaiera Jul 22, 2022
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
2 changes: 1 addition & 1 deletion ...org/elasticsearch/hadoop/gradle/fixture/hadoop/services/SparkYarnServiceDescriptor.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ class SparkYarnServiceDescriptor implements ServiceDescriptor {

@Override
Version defaultVersion() {
return new Version(3, 2, 1)
return new Version(3, 2, 2)
}

String hadoopVersionCompatibility() {
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
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.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
1 change: 1 addition & 0 deletions hive/src/itest/java/org/elasticsearch/hadoop/integration/hive/HiveEmbeddedServer2.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ public void start() throws Exception {
hiveServer = new HiveServer2();
port = MetaStoreUtils.findFreePort();
config.setIntVar(ConfVars.HIVE_SERVER2_THRIFT_PORT, port);
config.setIntVar(ConfVars.HIVE_SERVER2_WEBUI_PORT, 0); // Disable web UI
hiveServer.init(config);
hiveServer.start();
waitForStartup();
Expand Down
1 change: 1 addition & 0 deletions mr/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@ itestJar {

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

eclipse.classpath.file {
Expand Down
1 change: 1 addition & 0 deletions spark/core/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@ if (JavaVersion.current() >= JavaVersion.VERSION_17) {
task.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
jvmArgs "--add-opens=java.base/java.lang=ALL-UNNAMED" // Needed for secure mock
}
}
}
Expand Down
1 change: 1 addition & 0 deletions spark/sql-20/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,7 @@ if (JavaVersion.current() >= JavaVersion.VERSION_16) {
if (task.getName().startsWith("test"))
task.configure {
jvmArgs "--add-opens=java.base/java.io=ALL-UNNAMED" // Needed for IOUtils's BYTE_ARRAY_BUFFER reflection
jvmArgs "--add-opens=java.base/java.lang=ALL-UNNAMED" // Needed for secure mock
}}
}

Expand Down
1 change: 1 addition & 0 deletions spark/sql-30/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@ if (JavaVersion.current() >= JavaVersion.VERSION_16) {
task.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
jvmArgs "--add-opens=java.base/java.lang=ALL-UNNAMED" // Needed for secure mock
}}
}

Expand Down