From ac8d3982c5386e7232987fe74ef6f535d264d636 Mon Sep 17 00:00:00 2001 From: Susi Rathmann <5439308+sushithegreat@users.noreply.github.com> Date: Fri, 21 Oct 2022 12:44:49 -0500 Subject: [PATCH 01/24] Update CD.yml --- .github/workflows/CD.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CD.yml b/.github/workflows/CD.yml index a59fd18..51a79d5 100644 --- a/.github/workflows/CD.yml +++ b/.github/workflows/CD.yml @@ -28,7 +28,7 @@ jobs: java-version: "11" architecture: x64 distribution: "adopt" - server-id: MAVEN_USERNAME + server-username: MAVEN_USERNAME server-password: MAVEN_PASSWORD - name: Publish package to Maven run: | From b98e18e9c719a397c6e0ae2de5a3f8ee885607c9 Mon Sep 17 00:00:00 2001 From: Susi Rathmann <5439308+sushithegreat@users.noreply.github.com> Date: Fri, 21 Oct 2022 15:11:01 -0500 Subject: [PATCH 02/24] Update CD.yml --- .github/workflows/CD.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/CD.yml b/.github/workflows/CD.yml index 51a79d5..8900cf6 100644 --- a/.github/workflows/CD.yml +++ b/.github/workflows/CD.yml @@ -28,12 +28,18 @@ jobs: java-version: "11" architecture: x64 distribution: "adopt" - server-username: MAVEN_USERNAME - server-password: MAVEN_PASSWORD + cache: 'maven' + server-id: ossrh # Value of the distributionManagement/repository/id field of the pom.xml + server-username: OSSRH_USERNAME # env variable for username in deploy + server-password: OSSRH_TOKEN # env variable for token in deploy + gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Value of the GPG private key to import + gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase + - name: Publish package to Maven run: | mvn --batch-mode deploy -Dmaven.test.skip=true env: MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }} + MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }} if: ${{ steps.release.outputs.release_created }} From bc3c4734b9f54ae3998d0e8604d6aee6ef217a8c Mon Sep 17 00:00:00 2001 From: Susi Rathmann <5439308+sushithegreat@users.noreply.github.com> Date: Fri, 21 Oct 2022 15:28:26 -0500 Subject: [PATCH 03/24] Update CD.yml --- .github/workflows/CD.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/CD.yml b/.github/workflows/CD.yml index 8900cf6..134ef2e 100644 --- a/.github/workflows/CD.yml +++ b/.github/workflows/CD.yml @@ -28,7 +28,8 @@ jobs: java-version: "11" architecture: x64 distribution: "adopt" - cache: 'maven' + cache: "maven" + overwrite-settings: false server-id: ossrh # Value of the distributionManagement/repository/id field of the pom.xml server-username: OSSRH_USERNAME # env variable for username in deploy server-password: OSSRH_TOKEN # env variable for token in deploy From 0b1c0f7770725a0d77fe098b143eeae5da862897 Mon Sep 17 00:00:00 2001 From: Susi Rathmann <5439308+sushithegreat@users.noreply.github.com> Date: Mon, 24 Oct 2022 10:14:32 -0500 Subject: [PATCH 04/24] Update CD.yml --- .github/workflows/CD.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/CD.yml b/.github/workflows/CD.yml index 134ef2e..2ff2010 100644 --- a/.github/workflows/CD.yml +++ b/.github/workflows/CD.yml @@ -17,11 +17,8 @@ jobs: release-type: simple package-name: shipengine - # Checkout code if release was created - uses: actions/checkout@v2.5.0 - if: ${{ steps.release.outputs.release_created }} - - # Setup Java and deploy if a release was created + - name: Setup Java uses: actions/setup-java@v3.6.0 with: From ad1ef6f50a3b303bdf9c7ab82b6814d50e172606 Mon Sep 17 00:00:00 2001 From: Susi Rathmann <5439308+sushithegreat@users.noreply.github.com> Date: Mon, 24 Oct 2022 10:29:16 -0500 Subject: [PATCH 05/24] Update CD.yml --- .github/workflows/CD.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/CD.yml b/.github/workflows/CD.yml index 2ff2010..d26e456 100644 --- a/.github/workflows/CD.yml +++ b/.github/workflows/CD.yml @@ -25,7 +25,6 @@ jobs: java-version: "11" architecture: x64 distribution: "adopt" - cache: "maven" overwrite-settings: false server-id: ossrh # Value of the distributionManagement/repository/id field of the pom.xml server-username: OSSRH_USERNAME # env variable for username in deploy From 480687e9024b56e2506d81ca249eb7bb0cef4c46 Mon Sep 17 00:00:00 2001 From: Susi Rathmann <5439308+sushithegreat@users.noreply.github.com> Date: Mon, 24 Oct 2022 10:37:02 -0500 Subject: [PATCH 06/24] Update CD.yml --- .github/workflows/CD.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/CD.yml b/.github/workflows/CD.yml index d26e456..a03107f 100644 --- a/.github/workflows/CD.yml +++ b/.github/workflows/CD.yml @@ -39,4 +39,3 @@ jobs: MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }} MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }} - if: ${{ steps.release.outputs.release_created }} From 66f4741fb8091e30b679725074ab79f4ee6b4671 Mon Sep 17 00:00:00 2001 From: Susi Rathmann <5439308+sushithegreat@users.noreply.github.com> Date: Mon, 24 Oct 2022 11:05:39 -0500 Subject: [PATCH 07/24] Update CD.yml --- .github/workflows/CD.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CD.yml b/.github/workflows/CD.yml index a03107f..7085656 100644 --- a/.github/workflows/CD.yml +++ b/.github/workflows/CD.yml @@ -34,7 +34,7 @@ jobs: - name: Publish package to Maven run: | - mvn --batch-mode deploy -Dmaven.test.skip=true + mvn -X --batch-mode deploy -Dmaven.test.skip=true env: MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }} From 5f3821cd7a30ac4d6d8995c67c5ae7c6807a52d7 Mon Sep 17 00:00:00 2001 From: Susi Rathmann <5439308+sushithegreat@users.noreply.github.com> Date: Mon, 24 Oct 2022 13:13:36 -0500 Subject: [PATCH 08/24] Update CD.yml --- .github/workflows/CD.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/CD.yml b/.github/workflows/CD.yml index 7085656..336b417 100644 --- a/.github/workflows/CD.yml +++ b/.github/workflows/CD.yml @@ -25,7 +25,6 @@ jobs: java-version: "11" architecture: x64 distribution: "adopt" - overwrite-settings: false server-id: ossrh # Value of the distributionManagement/repository/id field of the pom.xml server-username: OSSRH_USERNAME # env variable for username in deploy server-password: OSSRH_TOKEN # env variable for token in deploy From f04dcbd9a45c8ac857c15706495a7a2129e11ef2 Mon Sep 17 00:00:00 2001 From: Susi Rathmann <5439308+sushithegreat@users.noreply.github.com> Date: Mon, 24 Oct 2022 13:24:12 -0500 Subject: [PATCH 09/24] Update CD.yml --- .github/workflows/CD.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/CD.yml b/.github/workflows/CD.yml index 336b417..1cadf63 100644 --- a/.github/workflows/CD.yml +++ b/.github/workflows/CD.yml @@ -30,7 +30,10 @@ jobs: server-password: OSSRH_TOKEN # env variable for token in deploy gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Value of the GPG private key to import gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase - + + - name: Build with Maven + run: mvn -B package --file pom.xml + - name: Publish package to Maven run: | mvn -X --batch-mode deploy -Dmaven.test.skip=true From d12a3f8e2caea5c67bae4f5d98b9f97e8b900d4c Mon Sep 17 00:00:00 2001 From: Susi Rathmann <5439308+sushithegreat@users.noreply.github.com> Date: Mon, 24 Oct 2022 14:10:51 -0500 Subject: [PATCH 10/24] Update CD.yml --- .github/workflows/CD.yml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/.github/workflows/CD.yml b/.github/workflows/CD.yml index 1cadf63..8c46a50 100644 --- a/.github/workflows/CD.yml +++ b/.github/workflows/CD.yml @@ -18,7 +18,15 @@ jobs: package-name: shipengine - uses: actions/checkout@v2.5.0 - + + - name: Build with Maven + run: mvn clean compile -Dmaven.test.skip=true && mvn package -Dmaven.test.skip=true && mvn verify -Dmaven.test.skip=true + + - name: Publish to GitHub Packages Apache Maven + run: mvn deploy + env: + GITHUB_TOKEN: ${{ github.token }} # GITHUB_TOKEN is the default env for the password + - name: Setup Java uses: actions/setup-java@v3.6.0 with: @@ -30,11 +38,8 @@ jobs: server-password: OSSRH_TOKEN # env variable for token in deploy gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Value of the GPG private key to import gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase - - - name: Build with Maven - run: mvn -B package --file pom.xml - - name: Publish package to Maven + - name: Publish package to Maven Central run: | mvn -X --batch-mode deploy -Dmaven.test.skip=true env: From c96f8512983805597ff24018cee56e3ef9577786 Mon Sep 17 00:00:00 2001 From: Susi Rathmann <5439308+sushithegreat@users.noreply.github.com> Date: Mon, 24 Oct 2022 14:24:50 -0500 Subject: [PATCH 11/24] Update CD.yml --- .github/workflows/CD.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/CD.yml b/.github/workflows/CD.yml index 8c46a50..bdc8e1a 100644 --- a/.github/workflows/CD.yml +++ b/.github/workflows/CD.yml @@ -36,8 +36,6 @@ jobs: server-id: ossrh # Value of the distributionManagement/repository/id field of the pom.xml server-username: OSSRH_USERNAME # env variable for username in deploy server-password: OSSRH_TOKEN # env variable for token in deploy - gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Value of the GPG private key to import - gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase - name: Publish package to Maven Central run: | @@ -45,4 +43,3 @@ jobs: env: MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }} - MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }} From 46f08a8249db2551aedc51087c90badffa84e612 Mon Sep 17 00:00:00 2001 From: Susi Rathmann <5439308+sushithegreat@users.noreply.github.com> Date: Mon, 24 Oct 2022 14:30:36 -0500 Subject: [PATCH 12/24] Update CD.yml --- .github/workflows/CD.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/CD.yml b/.github/workflows/CD.yml index bdc8e1a..a8f5ccb 100644 --- a/.github/workflows/CD.yml +++ b/.github/workflows/CD.yml @@ -21,6 +21,10 @@ jobs: - name: Build with Maven run: mvn clean compile -Dmaven.test.skip=true && mvn package -Dmaven.test.skip=true && mvn verify -Dmaven.test.skip=true + env: + MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} + MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }} + MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }} - name: Publish to GitHub Packages Apache Maven run: mvn deploy @@ -36,6 +40,9 @@ jobs: server-id: ossrh # Value of the distributionManagement/repository/id field of the pom.xml server-username: OSSRH_USERNAME # env variable for username in deploy server-password: OSSRH_TOKEN # env variable for token in deploy + gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Value of the GPG private key to import + gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase + MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }} - name: Publish package to Maven Central run: | @@ -43,3 +50,4 @@ jobs: env: MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }} + MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }} From 05556e2b3863c31a7fe02ef5c027d2557a69e111 Mon Sep 17 00:00:00 2001 From: Susi Rathmann <5439308+sushithegreat@users.noreply.github.com> Date: Mon, 24 Oct 2022 14:37:01 -0500 Subject: [PATCH 13/24] Update CD.yml --- .github/workflows/CD.yml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/CD.yml b/.github/workflows/CD.yml index a8f5ccb..9e1edae 100644 --- a/.github/workflows/CD.yml +++ b/.github/workflows/CD.yml @@ -18,20 +18,22 @@ jobs: package-name: shipengine - uses: actions/checkout@v2.5.0 + - name: Set up JDK 11 + uses: actions/setup-java@v3 + with: + java-version: "11" + architecture: x64 + distribution: "adopt" - name: Build with Maven run: mvn clean compile -Dmaven.test.skip=true && mvn package -Dmaven.test.skip=true && mvn verify -Dmaven.test.skip=true - env: - MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} - MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }} - MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }} - name: Publish to GitHub Packages Apache Maven run: mvn deploy env: GITHUB_TOKEN: ${{ github.token }} # GITHUB_TOKEN is the default env for the password - - name: Setup Java + - name: Setup Maven central uses: actions/setup-java@v3.6.0 with: java-version: "11" @@ -46,7 +48,7 @@ jobs: - name: Publish package to Maven Central run: | - mvn -X --batch-mode deploy -Dmaven.test.skip=true + mvn -X deploy env: MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }} From 99a0b610a4465e1e992ca85c27aebc8367f6ba56 Mon Sep 17 00:00:00 2001 From: Susi Rathmann <5439308+sushithegreat@users.noreply.github.com> Date: Mon, 24 Oct 2022 14:50:32 -0500 Subject: [PATCH 14/24] Update CD.yml --- .github/workflows/CD.yml | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/.github/workflows/CD.yml b/.github/workflows/CD.yml index 9e1edae..e55986e 100644 --- a/.github/workflows/CD.yml +++ b/.github/workflows/CD.yml @@ -18,16 +18,7 @@ jobs: package-name: shipengine - uses: actions/checkout@v2.5.0 - - name: Set up JDK 11 - uses: actions/setup-java@v3 - with: - java-version: "11" - architecture: x64 - distribution: "adopt" - - - name: Build with Maven - run: mvn clean compile -Dmaven.test.skip=true && mvn package -Dmaven.test.skip=true && mvn verify -Dmaven.test.skip=true - + - name: Publish to GitHub Packages Apache Maven run: mvn deploy env: From e5df5174467d6ae08a619e2db1c0e400bb33d52f Mon Sep 17 00:00:00 2001 From: Susi Rathmann <5439308+sushithegreat@users.noreply.github.com> Date: Mon, 24 Oct 2022 14:58:10 -0500 Subject: [PATCH 15/24] Update CD.yml --- .github/workflows/CD.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/CD.yml b/.github/workflows/CD.yml index e55986e..b23a278 100644 --- a/.github/workflows/CD.yml +++ b/.github/workflows/CD.yml @@ -18,11 +18,6 @@ jobs: package-name: shipengine - uses: actions/checkout@v2.5.0 - - - name: Publish to GitHub Packages Apache Maven - run: mvn deploy - env: - GITHUB_TOKEN: ${{ github.token }} # GITHUB_TOKEN is the default env for the password - name: Setup Maven central uses: actions/setup-java@v3.6.0 From 368501883c6b6d7519dd50f3f0176573ce922f9a Mon Sep 17 00:00:00 2001 From: Susi Rathmann <5439308+sushithegreat@users.noreply.github.com> Date: Mon, 24 Oct 2022 15:03:29 -0500 Subject: [PATCH 16/24] Update CD.yml --- .github/workflows/CD.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CD.yml b/.github/workflows/CD.yml index b23a278..9f7c74a 100644 --- a/.github/workflows/CD.yml +++ b/.github/workflows/CD.yml @@ -34,7 +34,7 @@ jobs: - name: Publish package to Maven Central run: | - mvn -X deploy + mvn -X --batch-mode deploy -Dmaven.test.skip=true env: MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }} From dded3aa48ee347f35fbf18b42d1f29f00699e0e9 Mon Sep 17 00:00:00 2001 From: Susi Rathmann <5439308+sushithegreat@users.noreply.github.com> Date: Mon, 24 Oct 2022 15:39:16 -0500 Subject: [PATCH 17/24] Update CD.yml --- .github/workflows/CD.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/CD.yml b/.github/workflows/CD.yml index 9f7c74a..7710bd0 100644 --- a/.github/workflows/CD.yml +++ b/.github/workflows/CD.yml @@ -29,8 +29,7 @@ jobs: server-username: OSSRH_USERNAME # env variable for username in deploy server-password: OSSRH_TOKEN # env variable for token in deploy gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Value of the GPG private key to import - gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase - MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }} + gpg-passphrase: ${{ secrets.MAVEN_GPG_PASSPHRASE }} # env variable for GPG private key passphrase - name: Publish package to Maven Central run: | From b77686e2cbd5d62ede8fb9c04a8b6cb9787c4f5a Mon Sep 17 00:00:00 2001 From: Susi Rathmann <5439308+sushithegreat@users.noreply.github.com> Date: Mon, 24 Oct 2022 15:41:22 -0500 Subject: [PATCH 18/24] Update CD.yml --- .github/workflows/CD.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CD.yml b/.github/workflows/CD.yml index 7710bd0..8477546 100644 --- a/.github/workflows/CD.yml +++ b/.github/workflows/CD.yml @@ -29,7 +29,7 @@ jobs: server-username: OSSRH_USERNAME # env variable for username in deploy server-password: OSSRH_TOKEN # env variable for token in deploy gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Value of the GPG private key to import - gpg-passphrase: ${{ secrets.MAVEN_GPG_PASSPHRASE }} # env variable for GPG private key passphrase + gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase - name: Publish package to Maven Central run: | From b816a7734f5d8a76cbd150be783a4ac580c4c723 Mon Sep 17 00:00:00 2001 From: Susi Rathmann <5439308+sushithegreat@users.noreply.github.com> Date: Mon, 24 Oct 2022 16:04:43 -0500 Subject: [PATCH 19/24] Update CD.yml --- .github/workflows/CD.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/CD.yml b/.github/workflows/CD.yml index 8477546..623f6ad 100644 --- a/.github/workflows/CD.yml +++ b/.github/workflows/CD.yml @@ -26,10 +26,10 @@ jobs: architecture: x64 distribution: "adopt" server-id: ossrh # Value of the distributionManagement/repository/id field of the pom.xml - server-username: OSSRH_USERNAME # env variable for username in deploy - server-password: OSSRH_TOKEN # env variable for token in deploy + server-username: ${{ secrets.OSSRH_USERNAME }} # env variable for username in deploy + server-password: ${{ secrets.OSSRH_TOKEN }} # env variable for token in deploy gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Value of the GPG private key to import - gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase + gpg-passphrase: ${{ secrets.MAVEN_GPG_PASSPHRASE }} # env variable for GPG private key passphrase - name: Publish package to Maven Central run: | @@ -37,4 +37,3 @@ jobs: env: MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }} - MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }} From 7410fe4104a75c992bd9b939174e98dbda3b499a Mon Sep 17 00:00:00 2001 From: Susi Rathmann <5439308+sushithegreat@users.noreply.github.com> Date: Mon, 24 Oct 2022 16:57:10 -0500 Subject: [PATCH 20/24] Update CD.yml --- .github/workflows/CD.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/CD.yml b/.github/workflows/CD.yml index 623f6ad..8072afc 100644 --- a/.github/workflows/CD.yml +++ b/.github/workflows/CD.yml @@ -29,7 +29,7 @@ jobs: server-username: ${{ secrets.OSSRH_USERNAME }} # env variable for username in deploy server-password: ${{ secrets.OSSRH_TOKEN }} # env variable for token in deploy gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Value of the GPG private key to import - gpg-passphrase: ${{ secrets.MAVEN_GPG_PASSPHRASE }} # env variable for GPG private key passphrase + gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase - name: Publish package to Maven Central run: | @@ -37,3 +37,4 @@ jobs: env: MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }} + MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }} From 73316649a5ce251a7292306d485fd2cc08a42a9b Mon Sep 17 00:00:00 2001 From: Susi Rathmann <5439308+sushithegreat@users.noreply.github.com> Date: Mon, 24 Oct 2022 17:15:00 -0500 Subject: [PATCH 21/24] Update CD.yml --- .github/workflows/CD.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CD.yml b/.github/workflows/CD.yml index 8072afc..5e26b5a 100644 --- a/.github/workflows/CD.yml +++ b/.github/workflows/CD.yml @@ -33,7 +33,7 @@ jobs: - name: Publish package to Maven Central run: | - mvn -X --batch-mode deploy -Dmaven.test.skip=true + mvn -Darguments=-Dgpg.passphrase=MAVEN_GPG_PASSPHRASE --batch-mode deploy -Dmaven.test.skip=true env: MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }} From bf68736b78521f0196e545e6bfb1801186b42761 Mon Sep 17 00:00:00 2001 From: Susi Rathmann <5439308+sushithegreat@users.noreply.github.com> Date: Mon, 24 Oct 2022 18:02:37 -0500 Subject: [PATCH 22/24] Update CD.yml --- .github/workflows/CD.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/CD.yml b/.github/workflows/CD.yml index 5e26b5a..8693884 100644 --- a/.github/workflows/CD.yml +++ b/.github/workflows/CD.yml @@ -26,14 +26,14 @@ jobs: architecture: x64 distribution: "adopt" server-id: ossrh # Value of the distributionManagement/repository/id field of the pom.xml - server-username: ${{ secrets.OSSRH_USERNAME }} # env variable for username in deploy - server-password: ${{ secrets.OSSRH_TOKEN }} # env variable for token in deploy + server-username: MAVEN_USERNAME # env variable for username in deploy + server-password: MAVEN_PASSWORD # env variable for token in deploy gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Value of the GPG private key to import gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase - name: Publish package to Maven Central run: | - mvn -Darguments=-Dgpg.passphrase=MAVEN_GPG_PASSPHRASE --batch-mode deploy -Dmaven.test.skip=true + mvn --batch-mode deploy -Dmaven.test.skip=true env: MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }} From f8bca01e115aba99343f64de30282c25c13ea045 Mon Sep 17 00:00:00 2001 From: Joe Pill Date: Mon, 8 Jan 2024 15:34:49 -0600 Subject: [PATCH 23/24] fix: update timeout to 60s --- CHANGELOG.md | 6 ++++++ README.md | 2 +- pom.xml | 2 +- src/main/java/com/shipengine/Config.java | 4 ++-- src/test/java/com/shipengine/ShipEngineTest.java | 6 +++--- 5 files changed, 13 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0af3ac7..ab2d9f1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,3 +9,9 @@ * Fixed bug in deriveUserAgent method in the InternalClient now reads sdk version from resources/project.properties instead of version.txt. ([2aa3d13](https://github.com/ShipEngine/shipengine-java/commit/2aa3d133756cfb311beb10bec3474dfad91bffef)) * Testing and linting working CI ([748d2ce](https://github.com/ShipEngine/shipengine-java/commit/748d2ceced376e0d66f895f5251ba166e70d9c5f)) * Updated pom.xml settings to fix JaCoCo coverage reporting bug. ([a91ef99](https://github.com/ShipEngine/shipengine-java/commit/a91ef99f29adf74e99478cc248291731be38ddff)) + +## 1.0.3 + +### Changes + +* increase default timeout to 60s \ No newline at end of file diff --git a/README.md b/README.md index dc44d75..06250d8 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ public class ShipEngineDemo { put("apiKey", ""); put("pageSize", 75); put("retries", 3); - put("timeout", 8000); + put("timeout", 60000); }}); } } diff --git a/pom.xml b/pom.xml index aabdc4f..ac5ad49 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.shipengine shipengine - 1.0.2 + 1.0.3 ShipEngine SDK The official Java SDK for ShipEngine API. diff --git a/src/main/java/com/shipengine/Config.java b/src/main/java/com/shipengine/Config.java index 00a3538..ad68b68 100644 --- a/src/main/java/com/shipengine/Config.java +++ b/src/main/java/com/shipengine/Config.java @@ -24,7 +24,7 @@ public void setBaseUrl(String baseUrl) { /** * Client timeout in milliseconds. */ - private int timeout = 5000; + private int timeout = 60000; public Config(Map config) { if (config.containsKey("apiKey")) { @@ -114,7 +114,7 @@ public void setApiKey(String apiKey) throws ValidationException { * The maximum amount of time (in milliseconds) to wait for a response from the * ShipEngine server. * - * Defaults to 5000 (5 seconds). + * Defaults to 60000 (60 seconds). */ public int getTimeout() { return timeout; diff --git a/src/test/java/com/shipengine/ShipEngineTest.java b/src/test/java/com/shipengine/ShipEngineTest.java index 3ddf7a1..de116ae 100644 --- a/src/test/java/com/shipengine/ShipEngineTest.java +++ b/src/test/java/com/shipengine/ShipEngineTest.java @@ -42,7 +42,7 @@ public class ShipEngineTest { "apiKey", Constants.API_KEY, "baseUrl", Constants.TEST_URL, "retries", 8, - "timeout", 8000 + "timeout", 60000 ); @Before @@ -77,10 +77,10 @@ public void successfulInstantiationWithStringAPIKey() { @Test(timeout = 1500) public void successfulInstantiationWithIndividualArgs() { - ShipEngine shipengine = new ShipEngine(stubApiKey, 8000, 3, 75); + ShipEngine shipengine = new ShipEngine(stubApiKey, 60000, 3, 75); assertEquals(stubApiKey, shipengine.getConfig().getApiKey()); assertEquals(3, shipengine.getConfig().getRetries()); - assertEquals(8000, shipengine.getConfig().getTimeout()); + assertEquals(60000, shipengine.getConfig().getTimeout()); assertEquals(75, shipengine.getConfig().getPageSize()); } From 9fe30e956905a9d2b2def85e7053655613a41794 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 17 Jan 2024 16:17:35 +0000 Subject: [PATCH 24/24] chore(main): release 1.0.3 --- CHANGELOG.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ab2d9f1..e04b0cd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # CHANGELOG +## [1.0.3](https://github.com/ShipEngine/shipengine-java/compare/v1.0.2...v1.0.3) (2024-01-17) + + +### Bug Fixes + +* update timeout to 60s ([f8bca01](https://github.com/ShipEngine/shipengine-java/commit/f8bca01e115aba99343f64de30282c25c13ea045)) + ## 1.0.2 (2022-10-21) @@ -14,4 +21,4 @@ ### Changes -* increase default timeout to 60s \ No newline at end of file +* increase default timeout to 60s