diff --git a/.github/actions/setup-java-for-deployment/action.yml b/.github/actions/setup-java-for-deployment/action.yml index 7df549d01a..9a04ca3f23 100644 --- a/.github/actions/setup-java-for-deployment/action.yml +++ b/.github/actions/setup-java-for-deployment/action.yml @@ -16,8 +16,8 @@ runs: java-version: '17' distribution: 'temurin' cache: 'maven' # Cache Maven dependencies between workflow runs - # Properties for deployment to OSSRH: - server-id: ossrh + # Properties for deployment to Maven Central Portal: + server-id: central-portal server-username: MAVEN_USERNAME server-password: MAVEN_PASSWORD # Properties for gpg signing: diff --git a/.github/workflows/maven-build-master-and-publish-snapshot.yml b/.github/workflows/maven-build-master-and-publish-snapshot.yml index 12e6cdd8bd..03ff4706bf 100644 --- a/.github/workflows/maven-build-master-and-publish-snapshot.yml +++ b/.github/workflows/maven-build-master-and-publish-snapshot.yml @@ -1,4 +1,4 @@ -# This workflow will build a Java project with Maven and will publish snapshot versions to the OSSRH Snapshots repository +# This workflow will build a Java project with Maven and will publish snapshot versions to the Central Portal Snapshots repository # For more information see: # https://github.com/actions/setup-java/blob/main/docs/advanced-usage.md#Publishing-using-Apache-Maven # https://docs.github.com/en/actions/publishing-packages/publishing-java-packages-with-maven @@ -25,10 +25,10 @@ jobs: with: gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} - - run: mvn deploy -Ppublish-to-maven-central -Dgpg.skip=true + - run: mvn deploy -Ppublish-to-maven-central working-directory: symja_android_library - # Deployment of all modules is deferred to the last module by nexus-staging-maven-plugin + # Deployment of all modules is deferred to the last module by central-publishing-maven-plugin env: - MAVEN_USERNAME: ${{ secrets.OSSRH_TOKEN_USERNAME }} - MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN_PASSWORD }} + MAVEN_USERNAME: ${{ secrets.CENTRAL_PORTAL_TOKEN_USERNAME }} + MAVEN_PASSWORD: ${{ secrets.CENTRAL_PORTAL_TOKEN_PASSWORD }} MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }} diff --git a/.github/workflows/maven-perform-release.yml b/.github/workflows/maven-perform-release.yml index cb4fdbd3b5..a59db79f0e 100644 --- a/.github/workflows/maven-perform-release.yml +++ b/.github/workflows/maven-perform-release.yml @@ -67,10 +67,10 @@ jobs: - run: mvn release:perform -DlocalCheckout=true working-directory: symja_android_library - # Deployment of all modules is deferred to the last module by nexus-staging-maven-plugin + # Deployment of all modules is deferred to the last module by central-publishing-maven-plugin env: - MAVEN_USERNAME: ${{ secrets.OSSRH_TOKEN_USERNAME }} - MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN_PASSWORD }} + MAVEN_USERNAME: ${{ secrets.CENTRAL_PORTAL_TOKEN_USERNAME }} + MAVEN_PASSWORD: ${{ secrets.CENTRAL_PORTAL_TOKEN_PASSWORD }} MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }} - name: Publish release commits and tag to master @@ -86,7 +86,7 @@ jobs: tag_name: ${{ env.release_tag }} draft: false prerelease: false - files: ./symja_android_library/target/checkout/symja_android_library/target/nexus-staging/**/*.jar + files: ./symja_android_library/target/checkout/symja_android_library/target/central-staging/**/*.jar body: | We are pleased to announce the release of Symja ${{ env.release_version }}. diff --git a/CHANGELOG.md b/CHANGELOG.md index 1dabe29eb8..a48fa6e5c6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ Noteworthy changes are documented in this file. -## [unreleased](https://github.com/axkr/symja_android_library/compare/...) - YYYY-MM-DD +## [Unreleased](https://github.com/axkr/symja_android_library/compare/v3.0.0...HEAD) - Java 11 required - Maven modules matheclipse-parser, matheclipse-logging, matheclipse-core are LGPL licensed - Maven modules matheclipse-gpl and dependents are GPL licensed diff --git a/symja_android_library/pom.xml b/symja_android_library/pom.xml index c53056fa33..a0ed26fd44 100644 --- a/symja_android_library/pom.xml +++ b/symja_android_library/pom.xml @@ -74,12 +74,14 @@ - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2 + central-portal + https://repo.maven.apache.org/maven2 + - ossrh - https://oss.sonatype.org/content/repositories/snapshots + central-portal + https://central.sonatype.com/repository/maven-snapshots @@ -566,12 +568,17 @@ 3.6.3 - org.sonatype.plugins - nexus-staging-maven-plugin - 1.7.0 + org.sonatype.central + central-publishing-maven-plugin + 0.10.0 + true - ossrh - https://oss.sonatype.org/ + + false + ${deployment.suppress} + MathEclipse-${project.version} + central-portal + validated @@ -730,15 +737,8 @@ - org.sonatype.plugins - nexus-staging-maven-plugin - true - - ${deployment.suppress} - - false - + org.sonatype.central + central-publishing-maven-plugin