From 2a4df9e4d40efabe5fd7bdbc7d209aeba553136f Mon Sep 17 00:00:00 2001 From: Vastin <3690049+vastin@users.noreply.github.com> Date: Thu, 26 Jun 2025 20:39:40 +0000 Subject: [PATCH 01/11] update for sonatype contral repo and add test workflow --- .github/workflows/sonatype-test.yml | 48 +++++++++++++++++++++++++++++ build.gradle.kts | 12 ++++---- 2 files changed, 54 insertions(+), 6 deletions(-) create mode 100644 .github/workflows/sonatype-test.yml diff --git a/.github/workflows/sonatype-test.yml b/.github/workflows/sonatype-test.yml new file mode 100644 index 00000000..d7e8d65b --- /dev/null +++ b/.github/workflows/sonatype-test.yml @@ -0,0 +1,48 @@ +on: + push: + branches: + - migrate-sonatype-test + +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-java@v1 + with: + java-version: 11 + - name: Cache Gradle Modules + uses: actions/cache@v4 + with: + path: ~/.gradle/caches + key: gradle-caches-${{ hashFiles('**/*.gradle.kts') }} + - name: Cache Gradle Wrapper + uses: actions/cache@v4 + with: + path: ~/.gradle/wrapper + key: gradle-wrapper-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }} + - name: Build and test + run: ./gradlew build -Prelease.version=0.0.1-test --stacktrace + env: + CI: true + - name: Build and publish to sonatype + run: ./gradlew final closeAndReleaseSonatypeStagingRepository -Prelease.version=0.0.1-test --stacktrace + env: + CI: true + SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME_TEST }} + SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD_TEST }} + GPG_KEY_ID: ${{ secrets.GPG_KEY_ID }} + GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }} + GPG_PASSWORD: ${{ secrets.GPG_PASSWORD }} + GRGIT_USER: ${{ github.actor }} + GRGIT_PASS: ${{ secrets.GITHUB_TOKEN }} + # - name: Create Release + # id: create_release + # uses: actions/create-release@v1 + # env: + # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # with: + # tag_name: v${{ github.event.inputs.version }} + # release_name: Release v${{ github.event.inputs.version }} + # draft: true + # prerelease: false diff --git a/build.gradle.kts b/build.gradle.kts index d7110e07..2ff9fc19 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -43,16 +43,16 @@ release { nexusPublishing { repositories { sonatype { - nexusUrl.set(uri("https://aws.oss.sonatype.org/service/local/")) - snapshotRepositoryUrl.set(uri("https://aws.oss.sonatype.org/content/repositories/snapshots/")) - username.set("${findProperty("aws.sonatype.username") ?: System.getenv("SONATYPE_USERNAME")}") - password.set("${findProperty("aws.sonatype.password") ?: System.getenv("SONATYPE_PASSWORD")}") + nexusUrl.set(uri("https://ossrh-staging-api.central.sonatype.com/service/local/")) + snapshotRepositoryUrl.set(uri("https://central.sonatype.com/repository/maven-snapshots/")) + username.set(System.getenv("PUBLISH_TOKEN_USERNAME_TEST")) + password.set(System.getenv("PUBLISH_TOKEN_PASSWORD_TEST")) } } } allprojects { - group = "com.amazonaws" + group = "com.sonatype.central.testing.amazon" repositories { mavenCentral() @@ -301,7 +301,7 @@ allprojects { } subprojects { - group = "com.amazonaws" + group = "com.sonatype.central.testing.amazon" plugins.withId("java-library") { plugins.apply("jacoco") From ec07fa5ca456a3400e173c3a1d4aba4d8f0f927c Mon Sep 17 00:00:00 2001 From: Vastin <3690049+vastin@users.noreply.github.com> Date: Thu, 26 Jun 2025 20:47:40 +0000 Subject: [PATCH 02/11] test From 333470e2e84d68dd8a22b2f206c54ab39c8e894c Mon Sep 17 00:00:00 2001 From: Vastin <3690049+vastin@users.noreply.github.com> Date: Thu, 26 Jun 2025 21:09:45 +0000 Subject: [PATCH 03/11] update release branch pattern --- build.gradle.kts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build.gradle.kts b/build.gradle.kts index 2ff9fc19..3f631ed4 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -40,6 +40,10 @@ release { defaultVersionStrategy = Strategies.getSNAPSHOT() } +nebulaRelease { + addReleaseBranchPattern("migrate-sonatype-test") +} + nexusPublishing { repositories { sonatype { From f646392a4a66c8b4624ad29fd6acff2939f62bd5 Mon Sep 17 00:00:00 2001 From: Vastin <3690049+vastin@users.noreply.github.com> Date: Thu, 26 Jun 2025 21:54:49 +0000 Subject: [PATCH 04/11] test new token From 9ee60ce34e835ba7959166bef813abe0cee43d13 Mon Sep 17 00:00:00 2001 From: Vastin <3690049+vastin@users.noreply.github.com> Date: Fri, 27 Jun 2025 00:47:24 +0000 Subject: [PATCH 05/11] ignore .vscode folder --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index aeb27406..ea4264b3 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ .project .classpath .DS_Store +.vscode *.iml /.idea From 4f4091953ed6d9e2fc48f83eef4a9b28c92fcd1d Mon Sep 17 00:00:00 2001 From: Vastin <3690049+vastin@users.noreply.github.com> Date: Fri, 27 Jun 2025 00:47:54 +0000 Subject: [PATCH 06/11] Releasing 0.0.1-test --- README.md | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 57d75d39..7b26ec7a 100644 --- a/README.md +++ b/README.md @@ -20,67 +20,67 @@ Add the AWS X-Ray SDK dependencies to your pom.xml: com.amazonaws aws-xray-recorder-sdk-core - 2.18.2 + 0.0.1-test com.amazonaws aws-xray-recorder-sdk-apache-http - 2.18.2 + 0.0.1-test com.amazonaws aws-xray-recorder-sdk-aws-sdk - 2.18.2 + 0.0.1-test com.amazonaws aws-xray-recorder-sdk-aws-sdk-v2 - 2.18.2 + 0.0.1-test com.amazonaws aws-xray-recorder-sdk-aws-sdk-instrumentor - 2.18.2 + 0.0.1-test com.amazonaws aws-xray-recorder-sdk-aws-sdk-v2-instrumentor - 2.18.2 + 0.0.1-test com.amazonaws aws-xray-recorder-sdk-sql - 2.18.2 + 0.0.1-test com.amazonaws aws-xray-recorder-sdk-sql-mysql - 2.18.2 + 0.0.1-test com.amazonaws aws-xray-recorder-sdk-sql-postgres - 2.18.2 + 0.0.1-test com.amazonaws aws-xray-recorder-sdk-spring - 2.18.2 + 0.0.1-test com.amazonaws aws-xray-recorder-sdk-log4j - 2.18.2 + 0.0.1-test com.amazonaws aws-xray-recorder-sdk-slf4j - 2.18.2 + 0.0.1-test com.amazonaws aws-xray-recorder-sdk-metrics - 2.18.2 + 0.0.1-test ``` From 28f1196bedd6a05efd77ee9fb107934335c45823 Mon Sep 17 00:00:00 2001 From: Vastin <3690049+vastin@users.noreply.github.com> Date: Fri, 27 Jun 2025 01:20:34 +0000 Subject: [PATCH 07/11] update --- .github/workflows/sonatype-test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/sonatype-test.yml b/.github/workflows/sonatype-test.yml index d7e8d65b..fa2c5322 100644 --- a/.github/workflows/sonatype-test.yml +++ b/.github/workflows/sonatype-test.yml @@ -22,11 +22,11 @@ jobs: path: ~/.gradle/wrapper key: gradle-wrapper-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }} - name: Build and test - run: ./gradlew build -Prelease.version=0.0.1-test --stacktrace + run: ./gradlew build -Prelease.version=0.0.1-sonatype-test --stacktrace env: CI: true - name: Build and publish to sonatype - run: ./gradlew final closeAndReleaseSonatypeStagingRepository -Prelease.version=0.0.1-test --stacktrace + run: ./gradlew final closeAndReleaseSonatypeStagingRepository -Prelease.version=0.0.1-sonatype-test --stacktrace env: CI: true SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME_TEST }} From 02a9a703cb5015cae5737dedb32570b5a3eae15b Mon Sep 17 00:00:00 2001 From: Vastin <3690049+vastin@users.noreply.github.com> Date: Mon, 30 Jun 2025 17:07:48 +0000 Subject: [PATCH 08/11] fix env var names --- .github/workflows/sonatype-test.yml | 4 ++-- build.gradle.kts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/sonatype-test.yml b/.github/workflows/sonatype-test.yml index fa2c5322..4adc4cc1 100644 --- a/.github/workflows/sonatype-test.yml +++ b/.github/workflows/sonatype-test.yml @@ -29,8 +29,8 @@ jobs: run: ./gradlew final closeAndReleaseSonatypeStagingRepository -Prelease.version=0.0.1-sonatype-test --stacktrace env: CI: true - SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME_TEST }} - SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD_TEST }} + SONATYPE_USERNAME_TEST: ${{ secrets.SONATYPE_USERNAME_TEST }} + SONATYPE_PASSWORD_TEST: ${{ secrets.SONATYPE_PASSWORD_TEST }} GPG_KEY_ID: ${{ secrets.GPG_KEY_ID }} GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }} GPG_PASSWORD: ${{ secrets.GPG_PASSWORD }} diff --git a/build.gradle.kts b/build.gradle.kts index 3f631ed4..5d385178 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -49,8 +49,8 @@ nexusPublishing { sonatype { nexusUrl.set(uri("https://ossrh-staging-api.central.sonatype.com/service/local/")) snapshotRepositoryUrl.set(uri("https://central.sonatype.com/repository/maven-snapshots/")) - username.set(System.getenv("PUBLISH_TOKEN_USERNAME_TEST")) - password.set(System.getenv("PUBLISH_TOKEN_PASSWORD_TEST")) + username.set(System.getenv("SONATYPE_USERNAME_TEST")) + password.set(System.getenv("SONATYPE_USERNAME_TEST")) } } } From 417205f86475cae2ed107fedf99156eaff1dc0a1 Mon Sep 17 00:00:00 2001 From: Vastin <3690049+vastin@users.noreply.github.com> Date: Mon, 30 Jun 2025 17:16:36 +0000 Subject: [PATCH 09/11] fix --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 5d385178..bdd08525 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -50,7 +50,7 @@ nexusPublishing { nexusUrl.set(uri("https://ossrh-staging-api.central.sonatype.com/service/local/")) snapshotRepositoryUrl.set(uri("https://central.sonatype.com/repository/maven-snapshots/")) username.set(System.getenv("SONATYPE_USERNAME_TEST")) - password.set(System.getenv("SONATYPE_USERNAME_TEST")) + password.set(System.getenv("SONATYPE_PASSWORD_TEST")) } } } From 995a9311e78bd9ccf982c72e7dc92ed55dab9908 Mon Sep 17 00:00:00 2001 From: Vastin <3690049+vastin@users.noreply.github.com> Date: Mon, 30 Jun 2025 17:28:43 +0000 Subject: [PATCH 10/11] update From ec05cf736baf00fd585173b7ab4ad30c34fbd5a8 Mon Sep 17 00:00:00 2001 From: Vastin <3690049+vastin@users.noreply.github.com> Date: Mon, 30 Jun 2025 22:13:26 +0000 Subject: [PATCH 11/11] update --- build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index bdd08525..2434c807 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -49,8 +49,8 @@ nexusPublishing { sonatype { nexusUrl.set(uri("https://ossrh-staging-api.central.sonatype.com/service/local/")) snapshotRepositoryUrl.set(uri("https://central.sonatype.com/repository/maven-snapshots/")) - username.set(System.getenv("SONATYPE_USERNAME_TEST")) - password.set(System.getenv("SONATYPE_PASSWORD_TEST")) + username.set("${findProperty("aws.sonatype.username") ?: System.getenv("SONATYPE_USERNAME_TEST")}") + password.set("${findProperty("aws.sonatype.password") ?: System.getenv("SONATYPE_PASSWORD_TEST")}") } } }