From 7d34f47db5404ea79e402dde47df55177470e4a7 Mon Sep 17 00:00:00 2001 From: TP Date: Mon, 6 Jul 2026 09:36:40 +0200 Subject: [PATCH 1/5] Additional setup for Java SDK release See changes to the README file to understand what changed and for what purposes. Mostly just plumbing... --- java-sdk/LICENSE | 201 ++++++++++++++++++ java-sdk/NOTICE | 5 + java-sdk/README.md | 139 +++++++++++- java-sdk/build.gradle.kts | 109 ++++++++++ .../main/kotlin/airflow-publish.gradle.kts | 29 ++- 5 files changed, 462 insertions(+), 21 deletions(-) create mode 100644 java-sdk/LICENSE create mode 100644 java-sdk/NOTICE create mode 100644 java-sdk/build.gradle.kts diff --git a/java-sdk/LICENSE b/java-sdk/LICENSE new file mode 100644 index 0000000000000..11069edd79019 --- /dev/null +++ b/java-sdk/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + +Copyright [yyyy] [name of copyright owner] + +Licensed 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. diff --git a/java-sdk/NOTICE b/java-sdk/NOTICE new file mode 100644 index 0000000000000..7ae90975b7a8d --- /dev/null +++ b/java-sdk/NOTICE @@ -0,0 +1,5 @@ +Apache Airflow Java SDK +Copyright 2016-2026 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). diff --git a/java-sdk/README.md b/java-sdk/README.md index 2ae22e60fbaee..b6af2de6186dc 100644 --- a/java-sdk/README.md +++ b/java-sdk/README.md @@ -98,6 +98,12 @@ The SDK is published to Maven Central via the The full release process follows the [ASF Maven publishing guide](https://infra.apache.org/publishing-maven-artifacts.html). +Any versions published to Maven Central (instead of Snapshots) are considered +releases, including alpha, beta, etc (see the +[ASF Release Policy](https://www.apache.org/legal/release-policy.html#release-types)). +Every release therefore requires a PMC vote before it is published; only +`-SNAPSHOT` builds may be published without a vote. + ### Prerequisites * An ASF committer account with access to @@ -116,6 +122,30 @@ projectVersion=1.0.0 Commit the change and push it to the release branch. +Use a Maven-compatible version string, as defined by the +[Maven version order specification](https://maven.apache.org/pom.html#Version_Order_Specification). +For example, version 1 beta 1 is `1.0.0-beta1`, and the eventual +general-availability release is `1.0.0`. + +*NOTE:* Editing `gradle.properties` as above is the standard procedure. You can +alternatively override the version for a single command without editing the +file, by passing `-PprojectVersion=1.0.0-beta1` to any Gradle invocation. This +is handy for one-off or pre-release builds. Either way, `main` should stay on a +`-SNAPSHOT` version between releases: a snapshot sorts after `1.0.0-beta1` and +before the `1.0.0` GA, so no extra bump is needed after a beta. + +### Tag the release candidate + +Tag the release commit, keeping the RC number in the tag name so a failed vote +simply bumps to the next RC (the artifact version itself does not carry the RC +suffix). Push the tag before sending the vote so reviewers can check out the +exact source being voted on. + +```bash +git tag -s java-sdk/1.0.0-beta1-rc1 -m "Java SDK 1.0.0-beta1 RC 1" +git push origin java-sdk/1.0.0-beta1-rc1 +``` + ### Verify the POM locally Before touching any remote repository, publish to your local Maven cache and @@ -172,10 +202,15 @@ mavenPassword=your-asf-nexus-token-password signing.password=your-gpg-key-passphrase ``` -Then run the publish task. +Then stage and close the release. The +[Gradle Nexus Publish Plugin](https://github.com/gradle-nexus/publish-plugin) +(applied in the root `build.gradle.kts`) gathers every module into one staging +repository, so there is no per-module fan-out to reconcile. ```bash -./gradlew publish -P"signing.key=$(gpg --armor --export-secret-keys your-gpg-key-fingerprint)" +./gradlew publishToApache closeApacheStagingRepository \ + --no-configuration-cache \ + -P"signing.key=$(gpg --armor --export-secret-keys your-gpg-key-fingerprint)" ``` *NOTE:* The signing key is supplied through the command line since it contains @@ -185,13 +220,109 @@ newlines, which does not work well in a Gradle properties file. credentials instead: `ASF_NEXUS_USERNAME`, `ASF_NEXUS_PASSWORD`, `SIGNING_KEY`, and `SIGNING_PASSWORD`. This is especially useful on e.g. CI. +*NOTE:* We enable Gradle's configuration cache globally, but the staging tasks +(`publishToApache`, `closeApacheStagingRepository`, `releaseApacheStagingRepository`) +talk to the Nexus REST API and are not configuration-cache compatible. Hence +the `--no-configuration-cache` flag on the release commands. + ### Verify the upload -Verify all artifacts have been released correctly to the -[ASF Nexus server](https://repository.apache.org/#nexus-search;quick~org.apache.airflow). +Under *Staging Repositories* on the +[ASF Nexus server](https://repository.apache.org/), open the closed repository +and verify it contains all modules, each with its jar, `-sources.jar`, +`-javadoc.jar` (where applicable), `.pom`, and `.asc` signature. Check *Updated by* (should be your ID), *Uploaded Date*, and *Last Modified*. +### Upload the source package + +The closed staging repository from the previous step is the convenience-binary +URL you link in the vote. + +The signed source package is the artifact the vote is formally on; the Maven +artifacts are convenience binaries. The `sourceRelease` task builds it from the +committed `java-sdk` sources (`LICENSE` and `NOTICE` included) and produces its +signature and checksum in one step: + +```bash +# Signing uses your local gpg keyring, so have your key/passphrase ready. +./gradlew sourceRelease -PgitRef=java-sdk/1.0.0-beta1-rc1 +``` + +This writes three files to `build/distributions/`: + +``` +apache-airflow-java-sdk-1.0.0-beta1-src.tar.gz +apache-airflow-java-sdk-1.0.0-beta1-src.tar.gz.asc +apache-airflow-java-sdk-1.0.0-beta1-src.tar.gz.sha512 +``` + +Copy the three files into your checkout of the ASF dist *dev* repo and commit +them with Subversion. If you don't already have the repo checked out, replace +`` with wherever you want it and `` with this +project's location: + +```bash +# One-time: check out the Airflow dist dev area. +svn checkout https://dist.apache.org/repos/dist/dev/airflow + +cd +mkdir -p java-sdk/1.0.0-beta1-rc1 +cp /java-sdk/build/distributions/apache-airflow-java-sdk-1.0.0-beta1-src.tar.gz* \ + java-sdk/1.0.0-beta1-rc1/ + +svn add --parents java-sdk/1.0.0-beta1-rc1 +svn commit -m "Add Apache Airflow Java SDK 1.0.0-beta1-rc1 source release candidate" +``` + +The commit publishes them under +`https://dist.apache.org/repos/dist/dev/airflow/java-sdk/1.0.0-beta1-rc1/`, which +is the source-package URL you link in the vote. + +### Call the vote + +Send a `[VOTE]` email to `dev@airflow.apache.org` linking the git tag and +commit, the source package in `dist/dev`, the closed Nexus staging repository, +and the `KEYS` file. + +### After a successful vote + +Reply with a `[RESULT][VOTE]` tally, then: + +1. **Release** the staging repository so the artifacts sync to Maven Central + (a few hours). Nothing is rebuilt or re-signed: + + ```bash + ./gradlew releaseApacheStagingRepository --no-configuration-cache + ``` + + (Or click *Release* on the repository in the Nexus UI.) + +2. **Move** the source package from `dist/dev` to `dist/release`: + + ```bash + svn mv https://dist.apache.org/repos/dist/dev/airflow/java-sdk/1.0.0-beta1-rc1 \ + https://dist.apache.org/repos/dist/release/airflow/java-sdk/1.0.0-beta1 \ + -m "Release Apache Airflow Java SDK 1.0.0-beta1" + ``` + +3. **Tag** the final version on the same commit that was voted: + + ```bash + git tag -s java-sdk/1.0.0-beta1 -m "Apache Airflow Java SDK 1.0.0-beta1" + git push origin java-sdk/1.0.0-beta1 + ``` + + Keep the RC tag for traceability. + +4. Update the download page and wait ~1 hour after promoting so Central has + synced. Send the `[ANNOUNCE]` email. + +### If the vote fails + +Close the vote, **drop** the staging repository in Nexus, remove the `dist/dev` +candidate, fix the issue, and cut the next RC (`...-rc2`). The released version +stays the same (e.g. `1.0.0-beta1`); only the RC counter in the tag increments. ## Contributing diff --git a/java-sdk/build.gradle.kts b/java-sdk/build.gradle.kts new file mode 100644 index 0000000000000..33a5434d6f6ae --- /dev/null +++ b/java-sdk/build.gradle.kts @@ -0,0 +1,109 @@ +/* + * 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. + */ + +plugins { + id("io.github.gradle-nexus.publish-plugin") version "2.0.0" +} + +val projectVersion: String by project + +group = "org.apache.airflow" +version = projectVersion + +if (!project.hasProperty("mavenUrl")) { + nexusPublishing { + repositories { + create("apache") { + nexusUrl.set(uri("https://repository.apache.org/service/local/")) + snapshotRepositoryUrl.set( + uri("https://repository.apache.org/content/repositories/snapshots/"), + ) + username.set( + providers.gradleProperty("mavenUsername") + .orElse(providers.environmentVariable("ASF_NEXUS_USERNAME")), + ) + password.set( + providers.gradleProperty("mavenPassword") + .orElse(providers.environmentVariable("ASF_NEXUS_PASSWORD")), + ) + } + } + } +} + +val sourceReleaseDir = layout.buildDirectory.dir("distributions") +val sourceReleaseTarball = sourceReleaseDir.map { it.file("apache-airflow-java-sdk-$version-src.tar.gz") } + +val sourceTarball by tasks.registering(Exec::class) { + group = "release" + description = "Assembles the source tarball from committed java-sdk sources." + workingDir = rootDir + doFirst { + val ref = + providers.gradleProperty("gitRef").orNull ?: throw GradleException( + "sourceRelease requires -PgitRef=, " + + "e.g. -PgitRef=java-sdk/1.0.0-beta1-rc1", + ) + sourceReleaseDir.get().asFile.mkdirs() + commandLine( + "git", "archive", + "--format=tar.gz", + "--prefix=apache-airflow-java-sdk-$version/", + "-o", sourceReleaseTarball.get().asFile.absolutePath, + "$ref:java-sdk", + ) + } +} + +val signSourceTarball by tasks.registering(Exec::class) { + group = "release" + description = "Creates the detached OpenPGP signature (.asc) for the source tarball." + dependsOn(sourceTarball) + workingDir = rootDir + commandLine( + "gpg", "--armor", "--yes", "--detach-sign", + sourceReleaseTarball.get().asFile.absolutePath, + ) +} + +val checksumSourceTarball by tasks.registering { + group = "release" + description = "Writes the SHA-512 checksum (.sha512) for the source tarball." + dependsOn(sourceTarball) + doLast { + val tarball = sourceReleaseTarball.get().asFile + val digest = java.security.MessageDigest.getInstance("SHA-512") + tarball.inputStream().use { input -> + val buffer = ByteArray(8192) + while (true) { + val read = input.read(buffer) + if (read < 0) break + digest.update(buffer, 0, read) + } + } + val hex = digest.digest().joinToString("") { "%02x".format(it) } + tarball.resolveSibling("${tarball.name}.sha512").writeText("$hex ${tarball.name}\n") + } +} + +tasks.register("sourceRelease") { + group = "release" + description = "Builds the source tarball plus its .asc signature and .sha512 checksum." + dependsOn(sourceTarball, signSourceTarball, checksumSourceTarball) +} diff --git a/java-sdk/buildSrc/src/main/kotlin/airflow-publish.gradle.kts b/java-sdk/buildSrc/src/main/kotlin/airflow-publish.gradle.kts index ec727c16856b4..f3c148a7c7f9f 100644 --- a/java-sdk/buildSrc/src/main/kotlin/airflow-publish.gradle.kts +++ b/java-sdk/buildSrc/src/main/kotlin/airflow-publish.gradle.kts @@ -78,23 +78,18 @@ publishing { } repositories { - maven { - name = "maven" - val repoPath = - getProperty("mavenUrl") - ?: if (projectVersion.endsWith("-SNAPSHOT")) { - "https://repository.apache.org/content/repositories/snapshots/" - } else { - "https://repository.apache.org/service/local/staging/deploy/maven2/" - } - url = uri(repoPath) - if (!repoPath.startsWith("file:")) { - val user = getProperty("mavenUsername", "ASF_NEXUS_USERNAME") - val pass = getProperty("mavenPassword", "ASF_NEXUS_PASSWORD") - if (user != null && pass != null) { - credentials { - username = user - password = pass + getProperty("mavenUrl")?.let { path -> + maven { + name = "maven" + url = uri(path) + if (url.scheme != "file") { + val user = getProperty("mavenUsername", "ASF_NEXUS_USERNAME") + val pass = getProperty("mavenPassword", "ASF_NEXUS_PASSWORD") + if (user != null && pass != null) { + credentials { + username = user + password = pass + } } } } From 3b80b62a035ba6dc859578607c8a33475b8d3624 Mon Sep 17 00:00:00 2001 From: TP Date: Tue, 7 Jul 2026 07:12:15 +0200 Subject: [PATCH 2/5] Fix Gradle CC compat for sourceRelease --- java-sdk/build.gradle.kts | 41 +++++++++++++++++++++++++-------------- 1 file changed, 26 insertions(+), 15 deletions(-) diff --git a/java-sdk/build.gradle.kts b/java-sdk/build.gradle.kts index 33a5434d6f6ae..bef3b10a41401 100644 --- a/java-sdk/build.gradle.kts +++ b/java-sdk/build.gradle.kts @@ -17,6 +17,8 @@ * under the License. */ +import org.gradle.process.CommandLineArgumentProvider + plugins { id("io.github.gradle-nexus.publish-plugin") version "2.0.0" } @@ -53,22 +55,28 @@ val sourceReleaseTarball = sourceReleaseDir.map { it.file("apache-airflow-java-s val sourceTarball by tasks.registering(Exec::class) { group = "release" description = "Assembles the source tarball from committed java-sdk sources." + executable = "git" workingDir = rootDir - doFirst { - val ref = - providers.gradleProperty("gitRef").orNull ?: throw GradleException( - "sourceRelease requires -PgitRef=, " + - "e.g. -PgitRef=java-sdk/1.0.0-beta1-rc1", + + // Capture early to keep compatibility to the Gradle configuration cache. + val gitRef = providers.gradleProperty("gitRef").getOrNull() + val archiveVersion = version.toString() + val tarball = sourceReleaseTarball.get().asFile + + argumentProviders.add( + CommandLineArgumentProvider { + if (gitRef == null) throw GradleException("sourceRelease requires -PgitRef=") + listOf( + "archive", + "--format=tar.gz", + "--prefix=apache-airflow-java-sdk-$archiveVersion/", + "-o", tarball.absolutePath, + gitRef, ) - sourceReleaseDir.get().asFile.mkdirs() - commandLine( - "git", "archive", - "--format=tar.gz", - "--prefix=apache-airflow-java-sdk-$version/", - "-o", sourceReleaseTarball.get().asFile.absolutePath, - "$ref:java-sdk", - ) - } + }, + ) + + doFirst { tarball.parentFile.mkdirs() } } val signSourceTarball by tasks.registering(Exec::class) { @@ -86,8 +94,11 @@ val checksumSourceTarball by tasks.registering { group = "release" description = "Writes the SHA-512 checksum (.sha512) for the source tarball." dependsOn(sourceTarball) + + // Capture early to keep compatibility to the Gradle configuration cache. + val tarball = sourceReleaseTarball.get().asFile + doLast { - val tarball = sourceReleaseTarball.get().asFile val digest = java.security.MessageDigest.getInstance("SHA-512") tarball.inputStream().use { input -> val buffer = ByteArray(8192) From a7bace35e923d6d0fe4c3197b43794d9e739d64b Mon Sep 17 00:00:00 2001 From: TP Date: Tue, 7 Jul 2026 09:19:16 +0200 Subject: [PATCH 3/5] Exclude Gradle wrapper jar from source archive --- java-sdk/.gitattributes | 4 ++++ java-sdk/README.md | 8 ++++++++ java-sdk/gradle/wrapper/gradle-wrapper.properties | 1 + 3 files changed, 13 insertions(+) diff --git a/java-sdk/.gitattributes b/java-sdk/.gitattributes index a87d264c425cf..428710f2ee4ea 100644 --- a/java-sdk/.gitattributes +++ b/java-sdk/.gitattributes @@ -9,3 +9,7 @@ # Binary files should be left untouched *.jar binary + +# Keep the Gradle wrapper jar out of source releases. +# See: https://issues.apache.org/jira/browse/LEGAL-570 +gradle/wrapper/gradle-wrapper.jar export-ignore diff --git a/java-sdk/README.md b/java-sdk/README.md index b6af2de6186dc..1489a941029f2 100644 --- a/java-sdk/README.md +++ b/java-sdk/README.md @@ -257,6 +257,14 @@ apache-airflow-java-sdk-1.0.0-beta1-src.tar.gz.asc apache-airflow-java-sdk-1.0.0-beta1-src.tar.gz.sha512 ``` +*NOTE:* The source archive deliberately omits `gradle/wrapper/gradle-wrapper.jar` +since ASF source releases must not contain compiled code (see [LEGAL-570]). To +build an *extracted* source package, use a locally installed Gradle instead: +either run `gradle build`, or use `gradle wrapper` once to regenerate the jar +and then `./gradlew build`. + +[LEGAL-570]: https://issues.apache.org/jira/browse/LEGAL-570 + Copy the three files into your checkout of the ASF dist *dev* repo and commit them with Subversion. If you don't already have the repo checked out, replace `` with wherever you want it and `` with this diff --git a/java-sdk/gradle/wrapper/gradle-wrapper.properties b/java-sdk/gradle/wrapper/gradle-wrapper.properties index ed9937b14b9fe..32eda11fc6db6 100644 --- a/java-sdk/gradle/wrapper/gradle-wrapper.properties +++ b/java-sdk/gradle/wrapper/gradle-wrapper.properties @@ -18,6 +18,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.4-bin.zip +distributionSha256Sum=f1771298a70f6db5a29daf62378c4e18a17fc33c9ba6b14362e0cdf40610380d networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME From 4925d5f82aa8128ad788f0e211a3a5be2953aa0c Mon Sep 17 00:00:00 2001 From: TP Date: Tue, 7 Jul 2026 09:28:21 +0200 Subject: [PATCH 4/5] Instruct to use 'upstream' as remote name --- java-sdk/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/java-sdk/README.md b/java-sdk/README.md index 1489a941029f2..cd8874a95526a 100644 --- a/java-sdk/README.md +++ b/java-sdk/README.md @@ -143,7 +143,7 @@ exact source being voted on. ```bash git tag -s java-sdk/1.0.0-beta1-rc1 -m "Java SDK 1.0.0-beta1 RC 1" -git push origin java-sdk/1.0.0-beta1-rc1 +git push upstream java-sdk/1.0.0-beta1-rc1 ``` ### Verify the POM locally @@ -318,7 +318,7 @@ Reply with a `[RESULT][VOTE]` tally, then: ```bash git tag -s java-sdk/1.0.0-beta1 -m "Apache Airflow Java SDK 1.0.0-beta1" - git push origin java-sdk/1.0.0-beta1 + git push upstream java-sdk/1.0.0-beta1 ``` Keep the RC tag for traceability. From 131dfb000012b0a974e69b1902b30a8c27fdd22f Mon Sep 17 00:00:00 2001 From: TP Date: Tue, 7 Jul 2026 09:40:56 +0200 Subject: [PATCH 5/5] Derive tarball name from Git ref This avoids a footgun where the RM runs the command on the wrong ref (e.g. the branch instead of the tag). The value from gitRef is always used, so the same result is produced no matter which ref the work tree is currently using. --- java-sdk/build.gradle.kts | 47 +++++++++++++++++++++++++-------------- 1 file changed, 30 insertions(+), 17 deletions(-) diff --git a/java-sdk/build.gradle.kts b/java-sdk/build.gradle.kts index bef3b10a41401..f3581a7308884 100644 --- a/java-sdk/build.gradle.kts +++ b/java-sdk/build.gradle.kts @@ -50,7 +50,16 @@ if (!project.hasProperty("mavenUrl")) { } val sourceReleaseDir = layout.buildDirectory.dir("distributions") -val sourceReleaseTarball = sourceReleaseDir.map { it.file("apache-airflow-java-sdk-$version-src.tar.gz") } + +// Derive the version from the tag, so the tarball's name matches its contents. +val sourceReleaseVersion = + providers.gradleProperty("gitRef").map { + it.substringAfterLast('/').replace(Regex("-rc\\d+$"), "") + } +val sourceReleaseTarball = + sourceReleaseDir.zip(sourceReleaseVersion) { dir, version -> + dir.file("apache-airflow-java-sdk-$version-src.tar.gz") + } val sourceTarball by tasks.registering(Exec::class) { group = "release" @@ -59,34 +68,38 @@ val sourceTarball by tasks.registering(Exec::class) { workingDir = rootDir // Capture early to keep compatibility to the Gradle configuration cache. - val gitRef = providers.gradleProperty("gitRef").getOrNull() - val archiveVersion = version.toString() - val tarball = sourceReleaseTarball.get().asFile + val gitRef = providers.gradleProperty("gitRef") + val archiveVersion = sourceReleaseVersion + val tarball = sourceReleaseTarball argumentProviders.add( CommandLineArgumentProvider { - if (gitRef == null) throw GradleException("sourceRelease requires -PgitRef=") listOf( "archive", "--format=tar.gz", - "--prefix=apache-airflow-java-sdk-$archiveVersion/", - "-o", tarball.absolutePath, - gitRef, + "--prefix=apache-airflow-java-sdk-${archiveVersion.get()}/", + "-o", tarball.get().asFile.absolutePath, + gitRef.get(), ) }, ) - doFirst { tarball.parentFile.mkdirs() } + doFirst { tarball.get().asFile.parentFile.mkdirs() } } val signSourceTarball by tasks.registering(Exec::class) { group = "release" description = "Creates the detached OpenPGP signature (.asc) for the source tarball." - dependsOn(sourceTarball) + executable = "gpg" workingDir = rootDir - commandLine( - "gpg", "--armor", "--yes", "--detach-sign", - sourceReleaseTarball.get().asFile.absolutePath, + dependsOn(sourceTarball) + + // Capture early to keep compatibility to the Gradle configuration cache. + val tarball = sourceReleaseTarball + argumentProviders.add( + CommandLineArgumentProvider { + listOf("--armor", "--yes", "--detach-sign", tarball.get().asFile.absolutePath) + }, ) } @@ -96,11 +109,11 @@ val checksumSourceTarball by tasks.registering { dependsOn(sourceTarball) // Capture early to keep compatibility to the Gradle configuration cache. - val tarball = sourceReleaseTarball.get().asFile - + val tarball = sourceReleaseTarball doLast { + val file = tarball.get().asFile val digest = java.security.MessageDigest.getInstance("SHA-512") - tarball.inputStream().use { input -> + file.inputStream().use { input -> val buffer = ByteArray(8192) while (true) { val read = input.read(buffer) @@ -109,7 +122,7 @@ val checksumSourceTarball by tasks.registering { } } val hex = digest.digest().joinToString("") { "%02x".format(it) } - tarball.resolveSibling("${tarball.name}.sha512").writeText("$hex ${tarball.name}\n") + file.resolveSibling("${file.name}.sha512").writeText("$hex ${file.name}\n") } }