From c1427a7e29ad53d4152d9ee183f05bf284f23a91 Mon Sep 17 00:00:00 2001 From: Piotr Findeisen Date: Sat, 15 Jun 2024 14:19:51 +0200 Subject: [PATCH] Build: Rename allVersions flag to allModules (#10499) The meaning of the flag is to enable all modules. In particular, it does not enable all Scala versions for the build. The new name more directly conveys the intent. --- .github/workflows/java-ci.yml | 2 +- .github/workflows/publish-snapshot.yml | 2 +- README.md | 2 +- settings.gradle | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/java-ci.yml b/.github/workflows/java-ci.yml index 7effd4ab7f53..bc4b01ed2203 100644 --- a/.github/workflows/java-ci.yml +++ b/.github/workflows/java-ci.yml @@ -96,7 +96,7 @@ jobs: with: distribution: zulu java-version: 8 - - run: ./gradlew -DallVersions build -x test -x javadoc -x integrationTest + - run: ./gradlew -DallModules build -x test -x javadoc -x integrationTest build-javadoc: runs-on: ubuntu-22.04 diff --git a/.github/workflows/publish-snapshot.yml b/.github/workflows/publish-snapshot.yml index 0d7147b24a67..411c3a5636c9 100644 --- a/.github/workflows/publish-snapshot.yml +++ b/.github/workflows/publish-snapshot.yml @@ -40,5 +40,5 @@ jobs: java-version: 8 - run: | ./gradlew printVersion - ./gradlew -DallVersions publishApachePublicationToMavenRepository -PmavenUser=${{ secrets.NEXUS_USER }} -PmavenPassword=${{ secrets.NEXUS_PW }} + ./gradlew -DallModules publishApachePublicationToMavenRepository -PmavenUser=${{ secrets.NEXUS_USER }} -PmavenPassword=${{ secrets.NEXUS_PW }} ./gradlew -DflinkVersions= -DsparkVersions=3.3,3.4,3.5 -DscalaVersion=2.13 -DhiveVersions= publishApachePublicationToMavenRepository -PmavenUser=${{ secrets.NEXUS_USER }} -PmavenPassword=${{ secrets.NEXUS_PW }} diff --git a/README.md b/README.md index 8d36b212b953..8200a23ed63b 100644 --- a/README.md +++ b/README.md @@ -56,7 +56,7 @@ Iceberg is built using Gradle with Java 8, 11, or 17. * To invoke a build and run tests: `./gradlew build` * To skip tests: `./gradlew build -x test -x integrationTest` * To fix code style for default versions: `./gradlew spotlessApply` -* To fix code style for all versions of Spark/Hive/Flink:`./gradlew spotlessApply -DallVersions` +* To fix code style for all versions of Spark/Hive/Flink:`./gradlew spotlessApply -DallModules` Iceberg table support is organized in library modules: diff --git a/settings.gradle b/settings.gradle index 4f42d24c32cf..2fa05fb46d0d 100644 --- a/settings.gradle +++ b/settings.gradle @@ -70,7 +70,7 @@ project(':delta-lake').name = 'iceberg-delta-lake' project(':kafka-connect').name = 'iceberg-kafka-connect' project(':open-api').name = 'iceberg-open-api' -if (null != System.getProperty("allVersions")) { +if (null != System.getProperty("allModules")) { System.setProperty("flinkVersions", System.getProperty("knownFlinkVersions")) System.setProperty("sparkVersions", System.getProperty("knownSparkVersions")) System.setProperty("hiveVersions", System.getProperty("knownHiveVersions"))