From f083262aaf29f631f0dec82c6ec755ff332ffcdf Mon Sep 17 00:00:00 2001 From: dekm Date: Tue, 26 Mar 2024 11:14:39 +0100 Subject: [PATCH 1/4] update workflow to publish in maved using the correct project directory structure also add a settings file. --- .github/workflows/maven-publish.yml | 9 +++++---- pax-sdk/settings.xml | 30 +++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 4 deletions(-) create mode 100644 pax-sdk/settings.xml diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index 5d7fc50..3ec0c1f 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -16,18 +16,19 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Set up JDK 11 + + - name: Set up JDK 17 uses: actions/setup-java@v3 with: - java-version: '11' + java-version: '17' distribution: 'temurin' server-id: github # Value of the distributionManagement/repository/id field of the pom.xml - settings-path: ${{ github.workspace }} # location for the settings.xml file + settings-path: ${{ github.workspace }}/pax-sdk # location for the settings.xml file - name: Build with Maven run: mvn -B package -DskipTests --file pom.xml - name: Publish to GitHub Packages Apache Maven - run: mvn deploy -s $GITHUB_WORKSPACE/settings.xml + run: mvn deploy -s $GITHUB_WORKSPACE/pax-sdk/settings.xml env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/pax-sdk/settings.xml b/pax-sdk/settings.xml new file mode 100644 index 0000000..ed011dc --- /dev/null +++ b/pax-sdk/settings.xml @@ -0,0 +1,30 @@ + + + + github + + + central + https://repo.maven.apache.org/maven2 + true + true + + + github + Unigrid Cosmos SDK Java Apache Maven Packages + https://maven.pkg.github.com/unigrid-project/pax-sdk-java + + + + + + + + github + + ${env.GITHUB_TOKEN} + + + From 148accf40ee5ab285fc52d7e888dbfd53c79479a Mon Sep 17 00:00:00 2001 From: dekm Date: Tue, 26 Mar 2024 11:20:09 +0100 Subject: [PATCH 2/4] fix directory structure in workflow for the pom file --- .github/workflows/maven-publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index 3ec0c1f..2a889db 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -29,6 +29,6 @@ jobs: run: mvn -B package -DskipTests --file pom.xml - name: Publish to GitHub Packages Apache Maven - run: mvn deploy -s $GITHUB_WORKSPACE/pax-sdk/settings.xml + run: mvn deploy -s pax-sdk/settings.xml --file pax-sdk/pom.xml env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From bd54b727458f8ec60defe81c3f74859abf1cb798 Mon Sep 17 00:00:00 2001 From: dekm Date: Tue, 26 Mar 2024 11:24:56 +0100 Subject: [PATCH 3/4] build also needs the pom location --- .github/workflows/maven-publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index 2a889db..f301f67 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -26,7 +26,7 @@ jobs: settings-path: ${{ github.workspace }}/pax-sdk # location for the settings.xml file - name: Build with Maven - run: mvn -B package -DskipTests --file pom.xml + run: mvn -B package -DskipTests --file pax-sdk/pom.xml - name: Publish to GitHub Packages Apache Maven run: mvn deploy -s pax-sdk/settings.xml --file pax-sdk/pom.xml From ddf2c0d22a3804ede4c8e449f72f172292403d32 Mon Sep 17 00:00:00 2001 From: dekm Date: Tue, 26 Mar 2024 15:15:57 +0100 Subject: [PATCH 4/4] modify to use maven repo for publishing so everything is public. Hosted on OSSRH --- .github/workflows/maven-publish.yml | 18 +++---- pax-sdk/pom.xml | 76 ++++++++++++++++++++++++----- pax-sdk/settings.xml | 27 ++-------- 3 files changed, 78 insertions(+), 43 deletions(-) diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index f301f67..3608115 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -1,4 +1,4 @@ -name: Maven Package +name: Maven Release Package on: release: @@ -8,11 +8,10 @@ on: workflow_dispatch: jobs: - build: + build-and-deploy: runs-on: ubuntu-latest permissions: contents: read - packages: write steps: - uses: actions/checkout@v3 @@ -22,13 +21,14 @@ jobs: with: java-version: '17' distribution: 'temurin' - server-id: github # Value of the distributionManagement/repository/id field of the pom.xml - settings-path: ${{ github.workspace }}/pax-sdk # location for the settings.xml file + server-id: ossrh # Server ID from your settings.xml + gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }} # Imported from GitHub secrets + gpg-passphrase: ${{ secrets.GPG_PASSPHRASE }} # Imported from GitHub secrets - name: Build with Maven - run: mvn -B package -DskipTests --file pax-sdk/pom.xml + run: mvn clean install -B -P release --file pax-sdk/pom.xml - - name: Publish to GitHub Packages Apache Maven - run: mvn deploy -s pax-sdk/settings.xml --file pax-sdk/pom.xml + - name: Sign and Deploy to OSSRH + run: mvn deploy -B -P release --settings pax-sdk/settings.xml --file pax-sdk/pom.xml env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} diff --git a/pax-sdk/pom.xml b/pax-sdk/pom.xml index 8a36d7b..bac1c0f 100644 --- a/pax-sdk/pom.xml +++ b/pax-sdk/pom.xml @@ -3,13 +3,32 @@ 4.0.0 org.unigrid pax-sdk - 0.0.1-SNAPSHOT + 0.0.1 jar + + pax-sdk + A Java SDK to connect to the Unigrid Cosmos SDK Network + https://unigrid.org + + + + dekm + Evan Green + info@unigrid.org + + UTF-8 17 17 + + + https://github.com/unigrid-project/pax-sdk-java + scm:git:git://github.com/unigrid-project/pax-sdk-java.git + scm:git:ssh://github.com:unigrid-project/pax-sdk-java.git + + @@ -93,20 +112,15 @@ + + ossrh + https://s01.oss.sonatype.org/content/repositories/snapshots + - github - GitHub Apache Maven Packages - https://maven.pkg.github.com/unigrid-project/pax-sdk-java + ossrh + https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ - - - - github - Unigrid Cosmos SDK Java Apache Maven Packages - https://maven.pkg.github.com/unigrid-project/pax-sdk-java - - @@ -566,6 +580,44 @@ 17 + + org.apache.maven.plugins + maven-gpg-plugin + 1.6 + + + sign-artifacts + verify + + sign + + + + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + + jar-no-fork + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + attach-javadocs + + jar + + + + \ No newline at end of file diff --git a/pax-sdk/settings.xml b/pax-sdk/settings.xml index ed011dc..af81f32 100644 --- a/pax-sdk/settings.xml +++ b/pax-sdk/settings.xml @@ -1,30 +1,13 @@ - - - github - - - central - https://repo.maven.apache.org/maven2 - true - true - - - github - Unigrid Cosmos SDK Java Apache Maven Packages - https://maven.pkg.github.com/unigrid-project/pax-sdk-java - - - - + - github - - ${env.GITHUB_TOKEN} + ossrh + ${env.OSSRH_USERNAME} + ${env.OSSRH_PASSWORD} - + \ No newline at end of file