diff --git a/.github/workflows/publishing2sonatype.yml b/.github/workflows/publishing2sonatype.yml index c36a5d7a..19867c0c 100644 --- a/.github/workflows/publishing2sonatype.yml +++ b/.github/workflows/publishing2sonatype.yml @@ -33,6 +33,11 @@ jobs: run: | sed -i -e 's|.*sonatypeUsername.*| username = "${{ secrets.SUSER }}"|' ./build.gradle sed -i -e 's|.*sonatypePassword.*| password = "${{ secrets.SPASSWORD }}"|' ./build.gradle - - name: Publish to Sonatype + - name: Sonatype Publish run: | - ./gradlew publishJarPublicationToStagingRepository \ No newline at end of file + ./gradlew publishJarPublicationToStagingRepository + BEARER=$(printf "${{ secrets.SUSER }}:${{ secrets.SPASSWORD }}" | base64) + curl --request POST \ + --verbose \ + --header "Authorization: Bearer ${BEARER}" \ + https://ossrh-staging-api.central.sonatype.com/manual/upload/defaultRepository/${{ secrets.SREPO_ID }} diff --git a/build.gradle b/build.gradle index 587fe65e..1bd02452 100644 --- a/build.gradle +++ b/build.gradle @@ -74,13 +74,12 @@ def pomConfig = { inceptionYear 2016 organization { name 'Sift Science' - url 'https://siftscience.com' + url 'https://sift.com' } developers { developer { - id 'lopatin' - name 'Alex Lopatin' - url 'https://github.com/lopatin' + id 'sift-api-platform' + name 'Sift API Platform Team' } } scm { @@ -121,37 +120,6 @@ publishing { last.parent().appendNode('description', 'Sift Science Java API') last + pomConfig } - - // Sign the pom.xml. - pom.withXml { - def pomFile = file("${project.buildDir}/generated-pom.xml") - writeTo(pomFile) - def pomAscFile = signing.sign(pomFile).signatureFiles[0] - artifact(pomAscFile) { - classifier = null - extension = 'pom.asc' - } - pomFile.delete() - } - - // Sign the artifacts. - project.tasks.signArchives.signatureFiles.each { - artifact(it) { - def matcher = it.file =~ /-(sources|javadoc)\.jar\.asc$/ - def zipMatcher = it.file =~ /\.(zip|tar)\.asc$/ - def extensionPrefix = 'jar' - if (zipMatcher.find()) { - extensionPrefix = zipMatcher.group(1) - } - if (matcher.find()) { - classifier = matcher.group(1) - } else { - classifier = null - } - - extension = extensionPrefix + '.asc' - } - } } } @@ -168,10 +136,9 @@ publishing { } } -model { - tasks.publishJarPublicationToStagingRepository { - dependsOn(project.tasks.signArchives) - } +signing { + required { gradle.taskGraph.hasTask("publish") } + sign publishing.publications.jar } distributions {