diff --git a/.github/workflows/benchmark-pull-request.yml b/.github/workflows/benchmark-pull-request.yml index 1459cb06b03b6..368ecc20d1528 100644 --- a/.github/workflows/benchmark-pull-request.yml +++ b/.github/workflows/benchmark-pull-request.yml @@ -22,7 +22,7 @@ jobs: echo "PR_NUMBER=${{ github.event.issue.number }}" >> $GITHUB_ENV echo "REPOSITORY=${{ github.event.repository.full_name }}" >> $GITHUB_ENV OPENSEARCH_VERSION=$(awk -F '=' '/^opensearch[[:space:]]*=/ {gsub(/[[:space:]]/, "", $2); print $2}' buildSrc/version.properties) - echo "OPENSEARCH_VERSION=$OPENSEARCH_VERSION-beta1" >> $GITHUB_ENV + echo "OPENSEARCH_VERSION=$OPENSEARCH_VERSION" >> $GITHUB_ENV major_version=$(echo $OPENSEARCH_VERSION | cut -d'.' -f1) echo "OPENSEARCH_MAJOR_VERSION=$major_version" >> $GITHUB_ENV echo "USER_TAGS=pull_request_number:${{ github.event.issue.number }},repository:OpenSearch" >> $GITHUB_ENV @@ -147,7 +147,7 @@ jobs: distribution: 'temurin' - name: Build and Assemble OpenSearch from PR run: | - ./gradlew :distribution:archives:linux-tar:assemble -Dbuild.snapshot=false -Dbuild.version_qualifier=beta1 + ./gradlew :distribution:archives:linux-tar:assemble -Dbuild.snapshot=false - name: Configure AWS credentials uses: aws-actions/configure-aws-credentials@v4 with: diff --git a/.github/workflows/publish-maven-snapshots.yml b/.github/workflows/publish-maven-snapshots.yml index 56b9c00338fe3..98ef855b808bc 100644 --- a/.github/workflows/publish-maven-snapshots.yml +++ b/.github/workflows/publish-maven-snapshots.yml @@ -37,4 +37,4 @@ jobs: export SONATYPE_PASSWORD=$(aws secretsmanager get-secret-value --secret-id maven-snapshots-password --query SecretString --output text) echo "::add-mask::$SONATYPE_USERNAME" echo "::add-mask::$SONATYPE_PASSWORD" - ./gradlew publishNebulaPublicationToSnapshotsRepository -Dbuild.version_qualifier=beta1 + ./gradlew publishNebulaPublicationToSnapshotsRepository diff --git a/CHANGELOG.md b/CHANGELOG.md index 6d75bfaadafd6..075476d48adcf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - Add multi-threaded writer support in pull-based ingestion ([#17912](https://github.com/opensearch-project/OpenSearch/pull/17912)) - Unset discovery nodes for every transport node actions request ([#17682](https://github.com/opensearch-project/OpenSearch/pull/17682)) - Implement parallel shard refresh behind cluster settings ([#17782](https://github.com/opensearch-project/OpenSearch/pull/17782)) +- Bump OpenSearch Core main branch to 3.0.0 ([#18039](https://github.com/opensearch-project/OpenSearch/pull/18039)) ### Changed - Change the default max header size from 8KB to 16KB. ([#18024](https://github.com/opensearch-project/OpenSearch/pull/18024)) diff --git a/distribution/tools/plugin-cli/src/main/java/org/opensearch/tools/cli/plugin/InstallPluginCommand.java b/distribution/tools/plugin-cli/src/main/java/org/opensearch/tools/cli/plugin/InstallPluginCommand.java index 94864828f61cc..5bd45f2ba975e 100644 --- a/distribution/tools/plugin-cli/src/main/java/org/opensearch/tools/cli/plugin/InstallPluginCommand.java +++ b/distribution/tools/plugin-cli/src/main/java/org/opensearch/tools/cli/plugin/InstallPluginCommand.java @@ -602,7 +602,7 @@ private Path downloadAndValidate( /** * Verify the signature of the downloaded plugin ZIP. The signature is obtained from the source of the downloaded plugin by appending - * ".sig" to the URL. It is expected that the plugin is signed with the OpenSearch signing key with ID C2EE2AF6542C03B4. + * ".sig" to the URL. It is expected that the plugin is signed with the OpenSearch Release signing key with ID 4E9275EE6BA2427F for 3.0.0 or above. * * @param zip the path to the downloaded plugin ZIP * @param urlString the URL source of the downloade plugin ZIP @@ -663,7 +663,7 @@ InputStream pluginZipInputStream(final Path zip) throws IOException { * @return the public key ID */ String getPublicKeyId() { - return "C2EE2AF6542C03B4"; + return "4E9275EE6BA2427F"; } /**