Skip to content
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
2 changes: 1 addition & 1 deletion aws-bundle/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ project(":iceberg-aws-bundle") {

shadowJar {
archiveClassifier.set(null)
zip64 true
zip64 = true

// include the LICENSE and NOTICE files for the shaded Jar
from(projectDir) {
Expand Down
2 changes: 1 addition & 1 deletion azure-bundle/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ project(":iceberg-azure-bundle") {

shadowJar {
archiveClassifier.set(null)
zip64 true
zip64 = true

// include the LICENSE and NOTICE files for the shaded Jar
from(projectDir) {
Expand Down
3 changes: 1 addition & 2 deletions baseline.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ subprojects {

// Thus we concede to applying all of the Baseline plugins individually on all the projects we are
// ready to enforce linting on.
apply plugin: 'org.inferred.processors'

if (!project.hasProperty('quick')) {
apply plugin: 'com.palantir.baseline-checkstyle'
apply plugin: 'com.palantir.baseline-error-prone'
Expand All @@ -49,7 +49,6 @@ subprojects {
t.setReproducibleFileOrder(true);
t.setDuplicatesStrategy(DuplicatesStrategy.WARN);
});
apply plugin: 'com.palantir.baseline-exact-dependencies'
apply plugin: 'com.diffplug.spotless'

pluginManager.withPlugin('com.diffplug.spotless') {
Expand Down
21 changes: 21 additions & 0 deletions bom/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/

// This file is intentionally minimal - BOM configuration is in root build.gradle

15 changes: 9 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,10 @@ buildscript {
classpath 'com.gradleup.shadow:shadow-gradle-plugin:8.3.9'
classpath 'com.palantir.baseline:gradle-baseline-java:5.72.0'
classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.25.0'
classpath 'gradle.plugin.org.inferred:gradle-processors:3.7.0'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: I would add just a note to explain why processors plugin can be removed.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

added

classpath 'me.champeau.jmh:jmh-gradle-plugin:0.7.3'
// Commented out for Gradle 9.x compatibility - plugin uses deprecated 'convention' property
// Modern Gradle has native annotation processor support via annotationProcessor configuration
// classpath 'gradle.plugin.org.inferred:gradle-processors:3.7.0'
classpath 'gradle.plugin.io.morethan.jmhreport:gradle-jmh-report:0.9.6'
classpath "com.github.alisiikh:gradle-scalastyle-plugin:3.5.0"
classpath 'org.revapi:gradle-revapi:1.8.0'
Expand Down Expand Up @@ -239,7 +241,7 @@ subprojects {
} else {
events "failed"
}
exceptionFormat "full"
exceptionFormat = "full"
}

systemProperty 'project.version', project.version
Expand Down Expand Up @@ -274,7 +276,7 @@ project(':iceberg-bundled-guava') {
shadowJar {
archiveClassifier.set(null)
configurations = [project.configurations.compileClasspath]
zip64 true
zip64 = true

// include the LICENSE and NOTICE files for the shaded Jar
from(projectDir) {
Expand Down Expand Up @@ -428,7 +430,7 @@ project(':iceberg-data') {
test {
useJUnitPlatform()
// Only for TestSplitScan as of Gradle 5.0+
maxHeapSize '1500m'
maxHeapSize = '1500m'
}
}

Expand Down Expand Up @@ -1024,7 +1026,8 @@ project(':iceberg-open-api') {
dependencies {
testImplementation project(':iceberg-api')
testImplementation project(':iceberg-core')
testImplementation project(':iceberg-core').sourceSets.test.runtimeClasspath
testImplementation project(path: ':iceberg-core', configuration: 'testArtifacts')
testImplementation project(path: ':iceberg-api', configuration: 'testArtifacts')
testImplementation(testFixtures(project(':iceberg-open-api')))

testImplementation libs.junit.jupiter
Expand Down Expand Up @@ -1108,7 +1111,7 @@ project(':iceberg-open-api') {
archiveClassifier.set(null)
configurations = [project.configurations.testFixturesRuntimeClasspath]
from sourceSets.testFixtures.output
zip64 true
zip64 = true

// include the LICENSE and NOTICE files for the runtime Jar
from(projectDir) {
Expand Down
8 changes: 4 additions & 4 deletions deploy.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,13 @@ subprojects {
task sourceJar(type: Jar, dependsOn: classes) {
archiveClassifier.set('sources')
from sourceSets.main.allSource
group 'build'
group = 'build'
}

task javadocJar(type: Jar, dependsOn: javadoc) {
archiveClassifier.set('javadoc')
from javadoc.destinationDir
group 'build'
group = 'build'
}

task testJar(type: Jar) {
Expand Down Expand Up @@ -124,8 +124,8 @@ subprojects {
repositories {
maven {
credentials {
username project.hasProperty('mavenUser') ? "$mavenUser" : ""
password project.hasProperty('mavenPassword') ? "$mavenPassword" : ""
username = project.hasProperty('mavenUser') ? "$mavenUser" : ""
password = project.hasProperty('mavenPassword') ? "$mavenPassword" : ""
}
// upload to the releases repository using ./gradlew -Prelease publish
def apacheSnapshotsRepoUrl = 'https://repository.apache.org/content/repositories/snapshots'
Expand Down
3 changes: 2 additions & 1 deletion flink/v2.1/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ project(":iceberg-flink:iceberg-flink-runtime-${flinkMajorVersion}") {
shadowJar {
configurations = [project.configurations.runtimeClasspath]

zip64 true
zip64 = true

// include the LICENSE and NOTICE files for the shaded Jar
from(projectDir) {
Expand Down Expand Up @@ -255,6 +255,7 @@ project(":iceberg-flink:iceberg-flink-runtime-${flinkMajorVersion}") {
task integrationTest(type: Test) {
description = "Test Flink Runtime Jar against Flink ${flinkMajorVersion}"
group = "verification"
failOnNoDiscoveredTests = false
jvmArgs += project.property('extraJvmArgs')
testClassesDirs = sourceSets.integration.output.classesDirs
classpath = sourceSets.integration.runtimeClasspath + files(shadowJar.archiveFile.get().asFile.path)
Expand Down
2 changes: 1 addition & 1 deletion gcp-bundle/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ project(":iceberg-gcp-bundle") {

shadowJar {
archiveClassifier.set(null)
zip64 true
zip64 = true

// include the LICENSE and NOTICE files for the shaded Jar
from(projectDir) {
Expand Down
3 changes: 1 addition & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@ systemProp.knownScalaVersions=2.12,2.13
org.gradle.caching=true
# enable Gradle parallel builds
org.gradle.parallel=true
# configure only necessary Gradle tasks
org.gradle.configureondemand=true
# Note: org.gradle.configureondemand has been removed as it is deprecated in Gradle 9.x
# explicitly disable the configuration cache
org.gradle.configuration-cache=false
org.gradle.jvmargs=-Xmx1536m
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionSha256Sum=bd71102213493060956ec229d946beee57158dbd89d0e62b91bca0fa2c5f3531
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
distributionSha256Sum=df67a32e86e3276d011735facb1535f64d0d88df84fa87521e90becc2d735444
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
2 changes: 1 addition & 1 deletion mr/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ project(':iceberg-mr') {

test {
// testJoinTables / testScanTable
maxHeapSize '2500m'
maxHeapSize = '2500m'
}
}

4 changes: 2 additions & 2 deletions spark/v4.0/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ project(":iceberg-spark:iceberg-spark-${sparkMajorVersion}_${scalaVersion}") {

tasks.withType(Test) {
// Vectorized reads need more memory
maxHeapSize '3160m'
maxHeapSize = '3160m'
}
}

Expand Down Expand Up @@ -296,7 +296,7 @@ project(":iceberg-spark:iceberg-spark-runtime-${sparkMajorVersion}_${scalaVersio
shadowJar {
configurations = [project.configurations.runtimeClasspath]

zip64 true
zip64 = true

// include the LICENSE and NOTICE files for the shaded Jar
from(projectDir) {
Expand Down
2 changes: 1 addition & 1 deletion tasks.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ task aggregateJavadoc(type: Javadoc) {
def javadocTasks = subprojects.findAll { it.name != 'iceberg-bom' }.javadoc
dependsOn javadocTasks
source javadocTasks.source
destinationDir project.rootProject.file("site/docs/javadoc/${getJavadocVersion()}")
destinationDir = project.rootProject.file("site/docs/javadoc/${getJavadocVersion()}")
classpath = project.rootProject.files(javadocTasks.classpath)

final JAVADOC_FIX_SEARCH_STR = '\n\n' +
Expand Down
Loading