replaces artifactory release with github packages for snapshots

OlegDokuka · OlegDokuka · commit ee5a93467a57 · 2021-06-09T11:07:56.000+03:00
Signed-off-by: Oleh Dokuka &lt;oleh.dokuka@icloud.com&gt;
Signed-off-by: Oleh Dokuka &lt;odokuka@vmware.com&gt;
Signed-off-by: Oleh Dokuka &lt;oleh.dokuka@icloud.com&gt;
diff --git a/.github/workflows/gradle-all.yml b/.github/workflows/gradle-all.yml
@@ -37,9 +37,8 @@ jobs:
         run: ./gradlew clean build
       - name: Publish Packages to Artifactory
         if: ${{ matrix.jdk == '1.8' }}
-        run: ./gradlew -PbintrayUser="${bintrayUser}" -PbintrayKey="${bintrayKey}" -PversionSuffix="-${githubRef#refs/heads/}-SNAPSHOT" -PbuildNumber="${buildNumber}" artifactoryPublish --stacktrace
+        run: ./gradlew -PversionSuffix="-${githubRef#refs/heads/}-SNAPSHOT" -PbuildNumber="${buildNumber}" publishMavenPublicationToGitHubPackagesRepository --stacktrace
         env:
-          bintrayUser: ${{ secrets.bintrayUser }}
-          bintrayKey: ${{ secrets.bintrayKey }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           githubRef: ${{ github.ref }}
           buildNumber: ${{ github.run_number }}
diff --git a/.github/workflows/gradle-main.yml b/.github/workflows/gradle-main.yml
@@ -37,10 +37,9 @@ jobs:
         run: ./gradlew clean build
       - name: Publish Packages to Artifactory
         if: ${{ matrix.jdk == '1.8' }}
-        run: ./gradlew -PbintrayUser="${bintrayUser}" -PbintrayKey="${bintrayKey}" -PversionSuffix="-SNAPSHOT" -PbuildNumber="${buildNumber}" artifactoryPublish --stacktrace
+        run: ./gradlew -PversionSuffix="-SNAPSHOT" -PbuildNumber="${buildNumber}" publishMavenPublicationToGitHubPackagesRepository --stacktrace
         env:
-          bintrayUser: ${{ secrets.bintrayUser }}
-          bintrayKey: ${{ secrets.bintrayKey }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           buildNumber: ${{ github.run_number }}
       - name: Aggregate test reports with ciMate
         if: always()
diff --git a/build.gradle b/build.gradle
@@ -16,7 +16,6 @@
 
 plugins {
     id 'com.github.sherter.google-java-format' version '0.8' apply false
-    id 'com.jfrog.artifactory' version '4.21.0' apply false
     id 'me.champeau.gradle.jmh' version '0.5.0' apply false
     id 'io.spring.dependency-management' version '1.0.11.RELEASE' apply false
     id 'io.morethan.jmhreport' version '0.9.0' apply false
diff --git a/gradle/artifactory.gradle b/gradle/artifactory.gradle
diff --git a/gradle/github-pkg.gradle b/gradle/github-pkg.gradle
@@ -8,8 +8,8 @@ subprojects {
 			name = "GitHubPackages"
 			url = uri("https://maven.pkg.github.com/rsocket/rsocket-java")
 			credentials {
-			  username = project.findProperty("gpr.user") ?: System.getenv("USERNAME")
-			  password = project.findProperty("gpr.key") ?: System.getenv("TOKEN")
+			  username = project.findProperty("gpr.user") ?: System.getenv("GITHUB_ACTOR")
+			  password = project.findProperty("gpr.key") ?: System.getenv("GITHUB_TOKEN")
 			}
 		  }
 		}
diff --git a/gradle/publications.gradle b/gradle/publications.gradle
@@ -1,4 +1,3 @@
-apply from: "${rootDir}/gradle/artifactory.gradle"
 apply from: "${rootDir}/gradle/github-pkg.gradle"
 apply from: "${rootDir}/gradle/sonotype.gradle"
 
diff --git a/gradle/sonotype.gradle b/gradle/sonotype.gradle
@@ -1,31 +1,29 @@
 subprojects {
   if (project.hasProperty('sonatypeUsername') && project.hasProperty('sonatypePassword')) {
-	plugins.withType(JavaLibraryPlugin) {
-	  plugins.withType(MavenPublishPlugin) {
-		plugins.withType(SigningPlugin) {
+	plugins.withType(MavenPublishPlugin) {
+	  plugins.withType(SigningPlugin) {
 
-		  signing {
-			//requiring signature if there is a publish task that is not to MavenLocal
-			required { gradle.taskGraph.allTasks.any { it.name.toLowerCase().contains("publish") && !it.name.contains("MavenLocal") } }
-			def signingKey = project.findProperty("signingKey")
-			def signingPassword = project.findProperty("signingPassword")
+		signing {
+		  //requiring signature if there is a publish task that is not to MavenLocal
+		  required { gradle.taskGraph.allTasks.any { it.name.toLowerCase().contains("publish") && !it.name.contains("MavenLocal") } }
+		  def signingKey = project.findProperty("signingKey")
+		  def signingPassword = project.findProperty("signingPassword")
 
-			useInMemoryPgpKeys(signingKey, signingPassword)
+		  useInMemoryPgpKeys(signingKey, signingPassword)
 
-			afterEvaluate {
-			  sign publishing.publications.maven
-			}
+		  afterEvaluate {
+			sign publishing.publications.maven
 		  }
+		}
 
-		  publishing {
-			repositories {
-			  maven {
-				name = "sonatype"
-				url = "https://s01.oss.sonatype.org/service/local/staging/deploy/maven2"
-				credentials {
-				  username project.findProperty("sonatypeUsername")
-				  password project.findProperty("sonatypePassword")
-				}
+		publishing {
+		  repositories {
+			maven {
+			  name = "sonatype"
+			  url = "https://oss.sonatype.org/service/local/staging/deploy/maven2"
+			  credentials {
+				username project.findProperty("sonatypeUsername")
+				password project.findProperty("sonatypePassword")
 			  }
 			}
 		  }
diff --git a/rsocket-bom/build.gradle b/rsocket-bom/build.gradle
@@ -17,7 +17,6 @@ plugins {
     id 'java-platform'
     id 'maven-publish'
     id 'signing'
-    id 'com.jfrog.artifactory'
 }
 
 description = 'RSocket Java Bill of materials.'
diff --git a/rsocket-core/build.gradle b/rsocket-core/build.gradle
@@ -18,7 +18,6 @@ plugins {
     id 'java-library'
     id 'maven-publish'
     id 'signing'
-    id 'com.jfrog.artifactory'
     id 'io.morethan.jmhreport'
     id 'me.champeau.gradle.jmh'
 }
diff --git a/rsocket-load-balancer/build.gradle b/rsocket-load-balancer/build.gradle
@@ -18,7 +18,6 @@ plugins {
     id 'java-library'
     id 'maven-publish'
     id 'signing'
-    id 'com.jfrog.artifactory'
 }
 
 dependencies {
diff --git a/rsocket-micrometer/build.gradle b/rsocket-micrometer/build.gradle
@@ -18,7 +18,6 @@ plugins {
     id 'java-library'
     id 'maven-publish'
     id 'signing'
-    id 'com.jfrog.artifactory'
 }
 
 dependencies {
diff --git a/rsocket-test/build.gradle b/rsocket-test/build.gradle
@@ -18,7 +18,6 @@ plugins {
     id 'java-library'
     id 'maven-publish'
     id 'signing'
-    id 'com.jfrog.artifactory'
 }
 
 dependencies {
diff --git a/rsocket-transport-local/build.gradle b/rsocket-transport-local/build.gradle
@@ -18,7 +18,6 @@ plugins {
     id 'java-library'
     id 'maven-publish'
     id 'signing'
-    id 'com.jfrog.artifactory'
 }
 
 dependencies {
diff --git a/rsocket-transport-netty/build.gradle b/rsocket-transport-netty/build.gradle
@@ -18,7 +18,6 @@ plugins {
     id 'java-library'
     id 'maven-publish'
     id 'signing'
-    id 'com.jfrog.artifactory'
     id "com.google.osdetector" version "1.4.0"
 }
 

Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,8 @@ subprojects {`
`8`	`8`	`name = "GitHubPackages"`
`9`	`9`	`url = uri("https://maven.pkg.github.com/rsocket/rsocket-java")`
`10`	`10`	`credentials {`
`11`		`- username = project.findProperty("gpr.user") ?: System.getenv("USERNAME")`
`12`		`- password = project.findProperty("gpr.key") ?: System.getenv("TOKEN")`
	`11`	`+ username = project.findProperty("gpr.user") ?: System.getenv("GITHUB_ACTOR")`
	`12`	`+ password = project.findProperty("gpr.key") ?: System.getenv("GITHUB_TOKEN")`
`13`	`13`	`}`
`14`	`14`	`}`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-apply from: "${rootDir}/gradle/artifactory.gradle"`
`2`	`1`	`apply from: "${rootDir}/gradle/github-pkg.gradle"`
`3`	`2`	`apply from: "${rootDir}/gradle/sonotype.gradle"`
`4`	`3`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,6 @@ plugins {`
`17`	`17`	`id 'java-platform'`
`18`	`18`	`id 'maven-publish'`
`19`	`19`	`id 'signing'`
`20`		`- id 'com.jfrog.artifactory'`
`21`	`20`	`}`
`22`	`21`
`23`	`22`	`description = 'RSocket Java Bill of materials.'`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,6 @@ plugins {`
`18`	`18`	`id 'java-library'`
`19`	`19`	`id 'maven-publish'`
`20`	`20`	`id 'signing'`
`21`		`- id 'com.jfrog.artifactory'`
`22`	`21`	`id 'io.morethan.jmhreport'`
`23`	`22`	`id 'me.champeau.gradle.jmh'`
`24`	`23`	`}`