Skip to content

Commit 7e663c0

Browse files
Neerja BhatnagarNeerja Bhatnagar
authored andcommitted
#14094: upgrade gradle to 9.2.0
1 parent 53c046e commit 7e663c0

File tree

13 files changed

+47
-24
lines changed

13 files changed

+47
-24
lines changed

aws-bundle/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ project(":iceberg-aws-bundle") {
4444

4545
shadowJar {
4646
archiveClassifier.set(null)
47-
zip64 true
47+
zip64 = true
4848

4949
// include the LICENSE and NOTICE files for the shaded Jar
5050
from(projectDir) {

azure-bundle/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ project(":iceberg-azure-bundle") {
3131

3232
shadowJar {
3333
archiveClassifier.set(null)
34-
zip64 true
34+
zip64 = true
3535

3636
// include the LICENSE and NOTICE files for the shaded Jar
3737
from(projectDir) {

baseline.gradle

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ subprojects {
3636

3737
// Thus we concede to applying all of the Baseline plugins individually on all the projects we are
3838
// ready to enforce linting on.
39-
apply plugin: 'org.inferred.processors'
39+
4040
if (!project.hasProperty('quick')) {
4141
apply plugin: 'com.palantir.baseline-checkstyle'
4242
apply plugin: 'com.palantir.baseline-error-prone'
@@ -49,7 +49,6 @@ subprojects {
4949
t.setReproducibleFileOrder(true);
5050
t.setDuplicatesStrategy(DuplicatesStrategy.WARN);
5151
});
52-
apply plugin: 'com.palantir.baseline-exact-dependencies'
5352
apply plugin: 'com.diffplug.spotless'
5453

5554
pluginManager.withPlugin('com.diffplug.spotless') {

bom/build.gradle

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one
3+
* or more contributor license agreements. See the NOTICE file
4+
* distributed with this work for additional information
5+
* regarding copyright ownership. The ASF licenses this file
6+
* to you under the Apache License, Version 2.0 (the
7+
* "License"); you may not use this file except in compliance
8+
* with the License. You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
18+
*/
19+
20+
// This file is intentionally minimal - BOM configuration is in root build.gradle
21+

build.gradle

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,10 @@ buildscript {
2929
classpath 'com.gradleup.shadow:shadow-gradle-plugin:8.3.9'
3030
classpath 'com.palantir.baseline:gradle-baseline-java:5.72.0'
3131
classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.25.0'
32-
classpath 'gradle.plugin.org.inferred:gradle-processors:3.7.0'
3332
classpath 'me.champeau.jmh:jmh-gradle-plugin:0.7.3'
33+
// Commented out for Gradle 9.x compatibility - plugin uses deprecated 'convention' property
34+
// Modern Gradle has native annotation processor support via annotationProcessor configuration
35+
// classpath 'gradle.plugin.org.inferred:gradle-processors:3.7.0'
3436
classpath 'gradle.plugin.io.morethan.jmhreport:gradle-jmh-report:0.9.6'
3537
classpath "com.github.alisiikh:gradle-scalastyle-plugin:3.5.0"
3638
classpath 'org.revapi:gradle-revapi:1.8.0'
@@ -239,7 +241,7 @@ subprojects {
239241
} else {
240242
events "failed"
241243
}
242-
exceptionFormat "full"
244+
exceptionFormat = "full"
243245
}
244246

245247
systemProperty 'project.version', project.version
@@ -274,7 +276,7 @@ project(':iceberg-bundled-guava') {
274276
shadowJar {
275277
archiveClassifier.set(null)
276278
configurations = [project.configurations.compileClasspath]
277-
zip64 true
279+
zip64 = true
278280

279281
// include the LICENSE and NOTICE files for the shaded Jar
280282
from(projectDir) {
@@ -428,7 +430,7 @@ project(':iceberg-data') {
428430
test {
429431
useJUnitPlatform()
430432
// Only for TestSplitScan as of Gradle 5.0+
431-
maxHeapSize '1500m'
433+
maxHeapSize = '1500m'
432434
}
433435
}
434436

@@ -1024,7 +1026,8 @@ project(':iceberg-open-api') {
10241026
dependencies {
10251027
testImplementation project(':iceberg-api')
10261028
testImplementation project(':iceberg-core')
1027-
testImplementation project(':iceberg-core').sourceSets.test.runtimeClasspath
1029+
testImplementation project(path: ':iceberg-core', configuration: 'testArtifacts')
1030+
testImplementation project(path: ':iceberg-api', configuration: 'testArtifacts')
10281031
testImplementation(testFixtures(project(':iceberg-open-api')))
10291032

10301033
testImplementation libs.junit.jupiter
@@ -1108,7 +1111,7 @@ project(':iceberg-open-api') {
11081111
archiveClassifier.set(null)
11091112
configurations = [project.configurations.testFixturesRuntimeClasspath]
11101113
from sourceSets.testFixtures.output
1111-
zip64 true
1114+
zip64 = true
11121115

11131116
// include the LICENSE and NOTICE files for the runtime Jar
11141117
from(projectDir) {

deploy.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@ subprojects {
3333
task sourceJar(type: Jar, dependsOn: classes) {
3434
archiveClassifier.set('sources')
3535
from sourceSets.main.allSource
36-
group 'build'
36+
group = 'build'
3737
}
3838

3939
task javadocJar(type: Jar, dependsOn: javadoc) {
4040
archiveClassifier.set('javadoc')
4141
from javadoc.destinationDir
42-
group 'build'
42+
group = 'build'
4343
}
4444

4545
task testJar(type: Jar) {
@@ -124,8 +124,8 @@ subprojects {
124124
repositories {
125125
maven {
126126
credentials {
127-
username project.hasProperty('mavenUser') ? "$mavenUser" : ""
128-
password project.hasProperty('mavenPassword') ? "$mavenPassword" : ""
127+
username = project.hasProperty('mavenUser') ? "$mavenUser" : ""
128+
password = project.hasProperty('mavenPassword') ? "$mavenPassword" : ""
129129
}
130130
// upload to the releases repository using ./gradlew -Prelease publish
131131
def apacheSnapshotsRepoUrl = 'https://repository.apache.org/content/repositories/snapshots'

flink/v2.1/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ project(":iceberg-flink:iceberg-flink-runtime-${flinkMajorVersion}") {
226226
shadowJar {
227227
configurations = [project.configurations.runtimeClasspath]
228228

229-
zip64 true
229+
zip64 = true
230230

231231
// include the LICENSE and NOTICE files for the shaded Jar
232232
from(projectDir) {
@@ -255,6 +255,7 @@ project(":iceberg-flink:iceberg-flink-runtime-${flinkMajorVersion}") {
255255
task integrationTest(type: Test) {
256256
description = "Test Flink Runtime Jar against Flink ${flinkMajorVersion}"
257257
group = "verification"
258+
failOnNoDiscoveredTests = false
258259
jvmArgs += project.property('extraJvmArgs')
259260
testClassesDirs = sourceSets.integration.output.classesDirs
260261
classpath = sourceSets.integration.runtimeClasspath + files(shadowJar.archiveFile.get().asFile.path)

gcp-bundle/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ project(":iceberg-gcp-bundle") {
3333

3434
shadowJar {
3535
archiveClassifier.set(null)
36-
zip64 true
36+
zip64 = true
3737

3838
// include the LICENSE and NOTICE files for the shaded Jar
3939
from(projectDir) {

gradle.properties

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@ systemProp.knownScalaVersions=2.12,2.13
2828
org.gradle.caching=true
2929
# enable Gradle parallel builds
3030
org.gradle.parallel=true
31-
# configure only necessary Gradle tasks
32-
org.gradle.configureondemand=true
31+
# Note: org.gradle.configureondemand has been removed as it is deprecated in Gradle 9.x
3332
# explicitly disable the configuration cache
3433
org.gradle.configuration-cache=false
3534
org.gradle.jvmargs=-Xmx1536m

gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionSha256Sum=bd71102213493060956ec229d946beee57158dbd89d0e62b91bca0fa2c5f3531
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
3+
distributionSha256Sum=df67a32e86e3276d011735facb1535f64d0d88df84fa87521e90becc2d735444
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-bin.zip
55
networkTimeout=10000
66
validateDistributionUrl=true
77
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)