diff --git a/.github/settings.xml b/.github/settings.xml deleted file mode 100644 index ab7ee0ea9..000000000 --- a/.github/settings.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - sonatype-nexus-snapshots - ${env.SONATYPE_USERNAME} - ${env.SONATYPE_PASSWORD} - - - ossrh - ${env.SONATYPE_USERNAME} - ${env.SONATYPE_PASSWORD} - - - - diff --git a/.github/workflows/maven-deploy.yml b/.github/workflows/maven-deploy.yml index 8f23b7aa9..29bb56e78 100644 --- a/.github/workflows/maven-deploy.yml +++ b/.github/workflows/maven-deploy.yml @@ -5,19 +5,27 @@ on: branches: - main - develop + - 'develop-jakartaee-*' + +permissions: + contents: read jobs: deploy: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - name: Set up JDK 8 + - name: Set up Maven Central Repository uses: actions/setup-java@v3 with: java-version: 17 distribution: 'temurin' cache: 'maven' - - run: ./mvnw --batch-mode -s .github/settings.xml -DperformRelease -DskipTests -Dgpg.skip=true deploy + server-id: ossrh + server-username: MAVEN_USERNAME + server-password: MAVEN_PASSWORD + - name: Publish snapshot + run: mvn deploy -DskipTests env: - SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} - SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} + MAVEN_USERNAME: ${{ secrets.SONATYPE_USERNAME }} + MAVEN_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} diff --git a/pom.xml b/pom.xml index 9b7a32a59..88cbbab19 100644 --- a/pom.xml +++ b/pom.xml @@ -37,6 +37,13 @@ 2.5.5 26.1.1.Final + + + 3.0.0-M6 + 1.3.0 + 3.0.1 + 1.3.0 + 1.6.13 @@ -83,6 +90,21 @@ org.apache.maven.plugins maven-shade-plugin + + + org.sonatype.plugins + nexus-staging-maven-plugin + true + + ossrh + https://oss.sonatype.org + true + + + + org.kordamp.maven + pomchecker-maven-plugin + org.apache.maven.plugins maven-release-plugin @@ -96,6 +118,7 @@ + org.apache.maven.plugins maven-failsafe-plugin @@ -131,6 +154,31 @@ -Xdoclint:none + + org.apache.maven.plugins + maven-release-plugin + ${version.maven-release-plugin} + + + org.apache.maven.plugins + maven-gpg-plugin + ${version.maven-gpg-plugin} + + + org.codehaus.mojo + flatten-maven-plugin + ${version.maven-flatten-plugin} + + + org.kordamp.maven + pomchecker-maven-plugin + ${version.pomchecker-maven-plugin} + + + org.sonatype.plugins + nexus-staging-maven-plugin + ${version.nexus-staging-plugin} +