From 2a4907c2630d0d4e792d9924f31c67d3e2d8b5f8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Jun 2026 13:20:31 -0400 Subject: [PATCH 1/3] Bump com.github.jk1.dependency-license-report from 3.1.2 to 3.1.4 (#2003) Bumps com.github.jk1.dependency-license-report from 3.1.2 to 3.1.4. --- updated-dependencies: - dependency-name: com.github.jk1.dependency-license-report dependency-version: 3.1.4 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- java-client/build.gradle.kts | 2 +- java-codegen/build.gradle.kts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java-client/build.gradle.kts b/java-client/build.gradle.kts index f16a552c0..a17e7f223 100644 --- a/java-client/build.gradle.kts +++ b/java-client/build.gradle.kts @@ -51,7 +51,7 @@ plugins { java `java-library` `maven-publish` - id("com.github.jk1.dependency-license-report") version "3.1.2" + id("com.github.jk1.dependency-license-report") version "3.1.4" id("org.owasp.dependencycheck") version "12.2.2" id("opensearch-java.spotless-conventions") diff --git a/java-codegen/build.gradle.kts b/java-codegen/build.gradle.kts index d00cce22a..bfbf3a002 100644 --- a/java-codegen/build.gradle.kts +++ b/java-codegen/build.gradle.kts @@ -30,7 +30,7 @@ buildscript { plugins { application - id("com.github.jk1.dependency-license-report") version "3.1.2" + id("com.github.jk1.dependency-license-report") version "3.1.4" id("org.owasp.dependencycheck") version "12.2.2" id("de.undercouch.download") version "5.7.0" From dcfe6fa5f1a7b3809f5fd7b6543ab9ad1353f417 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Jun 2026 13:50:24 -0400 Subject: [PATCH 2/3] Bump org.opensearch.gradle:build-tools (#2004) Bumps org.opensearch.gradle:build-tools from 3.7.0-SNAPSHOT to 3.8.0-SNAPSHOT. --- updated-dependencies: - dependency-name: org.opensearch.gradle:build-tools dependency-version: 3.8.0-SNAPSHOT dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- java-client/build.gradle.kts | 2 +- java-codegen/build.gradle.kts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java-client/build.gradle.kts b/java-client/build.gradle.kts index a17e7f223..dfa02ffea 100644 --- a/java-client/build.gradle.kts +++ b/java-client/build.gradle.kts @@ -43,7 +43,7 @@ buildscript { gradlePluginPortal() } dependencies { - "classpath"(group = "org.opensearch.gradle", name = "build-tools", version = "3.7.0-SNAPSHOT") + "classpath"(group = "org.opensearch.gradle", name = "build-tools", version = "3.8.0-SNAPSHOT") } } diff --git a/java-codegen/build.gradle.kts b/java-codegen/build.gradle.kts index bfbf3a002..0b9bcb660 100644 --- a/java-codegen/build.gradle.kts +++ b/java-codegen/build.gradle.kts @@ -24,7 +24,7 @@ buildscript { gradlePluginPortal() } dependencies { - "classpath"(group = "org.opensearch.gradle", name = "build-tools", version = "3.7.0-SNAPSHOT") + "classpath"(group = "org.opensearch.gradle", name = "build-tools", version = "3.8.0-SNAPSHOT") } } From f5e75f0af5c4eb04dce78977ba9f7a3b0869f4f2 Mon Sep 17 00:00:00 2001 From: Sayali Gaikawad Date: Mon, 15 Jun 2026 12:52:39 -0700 Subject: [PATCH 3/3] Fix release workflows to use pre-releases and update releasing.md with new process (#2010) Signed-off-by: Sayali Gaikawad --- .github/workflows/release-drafter.yml | 14 +++++++------- RELEASING.md | 2 +- jenkins/release.jenkinsFile | 5 ++--- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml index 287f8f649..2783a9519 100644 --- a/.github/workflows/release-drafter.yml +++ b/.github/workflows/release-drafter.yml @@ -10,8 +10,8 @@ jobs: name: Draft a release runs-on: ubuntu-latest permissions: - issues: write # trstringer/manual-approval - contents: write # softprops/action-gh-release + issues: write + contents: write steps: - name: Checkout code uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 @@ -39,9 +39,9 @@ jobs: echo Building the version: $VERSION ./gradlew --no-daemon publishPublishMavenPublicationToLocalRepoRepository && tar -C build -cvf artifacts.tar.gz repository - name: Draft a release - uses: softprops/action-gh-release@b4309332981a82ec1c5618f44dd2e27cc8bfbfda # v3 + uses: ncipollo/release-action@339a81892b84b4eeb0f6e744e4574d79d0d9b8dd with: - draft: true - generate_release_notes: true - files: | - artifacts.tar.gz + immutableCreate: true + generateReleaseNotes: true + artifacts: "artifacts.tar.gz" + prerelease: true diff --git a/RELEASING.md b/RELEASING.md index cfa689c0e..1d92efb1b 100644 --- a/RELEASING.md +++ b/RELEASING.md @@ -83,7 +83,7 @@ Assuming the following current state. ### Automated Release -The [release-drafter workflow](.github/workflows/release-drafter.yml) will be automatically kicked off and is responsible for drafting a new release on GitHub containing release artifacts. Before creating a draft release, this workflow creates a GitHub issue asking for approval from the [maintainers](MAINTAINERS.md). See sample [issue](https://github.com/gaiksaya/opensearch-java/issues/1). The maintainers need to approve in order to continue the workflow run. Once a release is drafted [opensearch-java-maven-sign-and-release](https://build.ci.opensearch.org/job/opensearch-java-maven-sign-and-release/) Jenkins workflow is triggered. The artifacts will be automatically signed and published to maven. +The [release-drafter workflow](.github/workflows/release-drafter.yml) will be automatically kicked off and is responsible for drafting a new pre-release on GitHub containing release artifacts. Before creating a release, this workflow creates a GitHub issue asking for approval from the [maintainers](MAINTAINERS.md). See sample [issue](https://github.com/opensearch-project/opensearch-java/issues/2000). The maintainers need to approve in order to continue the workflow run. Once a pre-release is created [opensearch-java-maven-sign-and-release](https://build.ci.opensearch.org/job/opensearch-java-maven-sign-and-release/) Jenkins workflow is triggered. The artifacts will be automatically signed and published to maven. Once the above release workflow is successful, it creates a GitHub issue requesting maintainers to manually publish the pre-release to release on GitHub. ### CHANGELOG Entries diff --git a/jenkins/release.jenkinsFile b/jenkins/release.jenkinsFile index 80ca95644..35736b67e 100644 --- a/jenkins/release.jenkinsFile +++ b/jenkins/release.jenkinsFile @@ -1,4 +1,4 @@ -lib = library(identifier: 'jenkins@12.0.0', retriever: modernSCM([ +lib = library(identifier: 'jenkins@13.0.1', retriever: modernSCM([ $class: 'GitSCMSource', remote: 'https://github.com/opensearch-project/opensearch-build-libraries.git', ])) @@ -7,8 +7,7 @@ standardReleasePipelineWithGenericTrigger( overrideDockerImage: 'opensearchstaging/ci-runner:release-centos7-clients-v4', tokenIdCredential: 'jenkins-opensearch-java-generic-webhook-token', causeString: 'A tag was cut on opensearch-project/opensearch-java repository causing this workflow to run', - downloadReleaseAsset: true, - publishRelease: true) { + downloadReleaseAsset: true) { publishToMaven( signingArtifactsPath: "$WORKSPACE/repository/", mavenArtifactsPath: "$WORKSPACE/repository/",