diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f14236a8..3a188b77 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -46,13 +46,15 @@ jobs: - name: Maven release ${{steps.metadata.outputs.current-version}} run: | + git checkout -b release mvn -B release:prepare -Prelease -DreleaseVersion=${{steps.metadata.outputs.current-version}} -DdevelopmentVersion=${{steps.metadata.outputs.next-version}} + cat release.properties + git checkout ${{github.base_ref}} + git rebase release mvn -B release:perform -Darguments=-DperformRelease -DperformRelease -Prelease env: MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} MAVEN_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} - - name: Push changes to ${{github.base_ref}} branch - run: | - git push - git push origin ${{steps.metadata.outputs.current-version}} + - name: Push tags + run: git push && git push --tags diff --git a/pom.xml b/pom.xml index 0bb4b2b6..65ecc39e 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ ${java.version} 1.0.1 3.6.0 - 2.3.2 + 3.0.1 3.3.0 2.22.0 @@ -433,7 +433,7 @@ - ossrh + ossrh-snapshots https://oss.sonatype.org/content/repositories/snapshots