diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 641b345..d3f3bac 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -37,16 +37,17 @@ jobs: - 18080:8080 steps: - - uses: actions/checkout@v3 + - name: Checkout + uses: actions/checkout@v5 - name: Set up Maven Central Repository - uses: actions/setup-java@v3 + uses: actions/setup-java@v5 with: - java-version: 17 distribution: temurin - server-id: ossrh - server-username: MAVEN_USERNAME - server-password: MAVEN_PASSWORD + java-version: 21 + server-id: central + server-username: MAVEN_CENTRAL_USERNAME + server-password: MAVEN_CENTRAL_PASSWORD gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} gpg-passphrase: MAVEN_GPG_PASSPHRASE @@ -72,7 +73,7 @@ jobs: run: | # Assign the tag name to a variable tag_name="${{ github.event.release.tag_name }}" - + # Check if the tag name starts with 'v' and strip it if present if [[ $tag_name == v* ]]; then tag_name="${tag_name:1}" @@ -82,6 +83,6 @@ jobs: git config --global user.name "DenktMit eG" mvn -Drevision=${tag_name} -Dchangelist= -B -ntp -DskipTests -Pci-cd clean deploy env: - MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} - MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }} + MAVEN_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }} + MAVEN_PASSWORD: ${{ secrets.MAVEN_CENTRAL_PASSWORD }} MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }} \ No newline at end of file diff --git a/pom.xml b/pom.xml index 0c8d330..a6dda6b 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ ${java.version} UTF-8 UTF-8 - 0.1.2 + 0.1.3 ${skipTests} @@ -49,7 +49,7 @@ ${version.org.junit} 23.0.6 42.6.0 - 1.6.13 + 0.9.0 3.2.2 @@ -383,14 +383,36 @@ - org.sonatype.plugins - nexus-staging-maven-plugin - ${version.org.sonatype.plugins.nexus-staging-maven-plugin} + org.apache.maven.plugins + maven-gpg-plugin + ${version.org.apache.maven.plugins.maven-gpg-plugin} + + + sign-artifacts + + sign + + verify + + + + --pinentry-mode + loopback + + + + + + + org.sonatype.central + central-publishing-maven-plugin + ${version.org.sonatype.central.central-publishing-maven-plugin} true - ossrh - https://s01.oss.sonatype.org/ - true + central + true + published @@ -431,10 +453,6 @@ org.apache.maven.plugins maven-javadoc-plugin - - org.sonatype.plugins - nexus-staging-maven-plugin - @@ -464,13 +482,6 @@ main - - - ossrh - https://s01.oss.sonatype.org/content/repositories/snapshots - - - ci-cd @@ -479,24 +490,10 @@ org.apache.maven.plugins maven-gpg-plugin - ${version.org.apache.maven.plugins.maven-gpg-plugin} - - - sign-artifacts - - sign - - verify - - - - --pinentry-mode - loopback - - - - + + + org.sonatype.central + central-publishing-maven-plugin