diff --git a/.github/actions/maven-publish/action.yml b/.github/actions/maven-publish/action.yml index 9191200..2cf6926 100644 --- a/.github/actions/maven-publish/action.yml +++ b/.github/actions/maven-publish/action.yml @@ -35,7 +35,7 @@ runs: - name: Publish Java Packages to Maven shell: bash - run: ./gradlew publish -PisSnapshot=false --stacktrace + run: ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository -PisSnapshot=false --stacktrace env: JAVA_HOME: ${{ env.JAVA_HOME }} MAVEN_USERNAME: ${{ inputs.ossr-username }} diff --git a/build.gradle b/build.gradle index 37b686e..c9715cf 100644 --- a/build.gradle +++ b/build.gradle @@ -13,6 +13,7 @@ plugins { id 'java' id 'jacoco' id 'me.champeau.gradle.japicmp' version '0.2.9' + id 'io.github.gradle-nexus.publish-plugin' version '2.0.0' } jacoco { diff --git a/gradle/maven-publish.gradle b/gradle/maven-publish.gradle index 6427a73..139f8a0 100644 --- a/gradle/maven-publish.gradle +++ b/gradle/maven-publish.gradle @@ -26,21 +26,18 @@ artifacts { } -final releaseRepositoryUrl = "https://oss.sonatype.org/service/local/staging/deploy/maven2/" -final snapshotRepositoryUrl = "https://oss.sonatype.org/content/repositories/snapshots/" - publishing { publications { mavenJava(MavenPublication) { + from components.java + + artifact sourcesJar + artifact javadocJar groupId = GROUP artifactId = POM_ARTIFACT_ID version = getVersionName() - artifact("$buildDir/libs/${project.name}-${version}.jar") - artifact sourcesJar - artifact javadocJar - pom { name = POM_NAME packaging = POM_PACKAGING @@ -82,14 +79,15 @@ publishing { } } } +} + +nexusPublishing { repositories { - maven { - name = "sonatype" - url = version.endsWith('SNAPSHOT') ? snapshotRepositoryUrl : releaseRepositoryUrl - credentials { - username = System.getenv("MAVEN_USERNAME") - password = System.getenv("MAVEN_PASSWORD") - } + sonatype { + nexusUrl.set(uri('https://ossrh-staging-api.central.sonatype.com/service/local/')) + snapshotRepositoryUrl.set(uri('https://central.sonatype.com/repository/maven-snapshots/')) + username.set(System.getenv("MAVEN_USERNAME")) + password.set(System.getenv("MAVEN_PASSWORD")) } } }