Merge 1.0.x into master

Signed-off-by: Oleh Dokuka <[email protected]> Signed-off-by: Oleh Dokuka <[email protected]> Signed-off-by: Oleh Dokuka <[email protected]>
rsocket · Jun 9, 2021 · 133401e · 133401e
2 parents f521a6a + a1996a1
commit 133401e
Show file tree

Hide file tree

Showing 13 changed files with 76 additions and 80 deletions.
diff --git a/.github/workflows/gradle-release.yml b/.github/workflows/gradle-release.yml
@@ -32,13 +32,13 @@ jobs:
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
       - name: Build with Gradle
-        run: ./gradlew clean build
-      - name: Publish Packages to Bintray
-        run: ./gradlew -PbintrayUser="${bintrayUser}" -PbintrayKey="${bintrayKey}" -PsonatypeUsername="${sonatypeUsername}" -PsonatypePassword="${sonatypePassword}" -Pversion="${githubRef#refs/tags/}" -PbuildNumber="${buildNumber}" bintrayUpload
+        run: ./gradlew clean build -x test
+      - name: Publish Packages to Sonotype
+        run: ./gradlew -Pversion="${githubRef#refs/tags/}" -PbuildNumber="${buildNumber}" sign publishMavenPublicationToSonatypeRepository
         env:
-          bintrayUser: ${{ secrets.bintrayUser }}
-          bintrayKey: ${{ secrets.bintrayKey }}
-          sonatypeUsername: ${{ secrets.sonatypeUsername }}
-          sonatypePassword: ${{ secrets.sonatypePassword }}
           githubRef: ${{ github.ref }}
-          buildNumber: ${{ github.run_number }}
+          buildNumber: ${{ github.run_number }}
+          ORG_GRADLE_PROJECT_signingKey: ${{secrets.signingKey}}
+          ORG_GRADLE_PROJECT_signingPassword: ${{secrets.signingPassword}}
+          ORG_GRADLE_PROJECT_sonatypeUsername: ${{secrets.sonatypeUsername}}
+          ORG_GRADLE_PROJECT_sonatypePassword: ${{secrets.sonatypePassword}}
diff --git a/build.gradle b/build.gradle
@@ -17,7 +17,6 @@
 plugins {
     id 'com.github.sherter.google-java-format' version '0.9' apply false
     id 'com.jfrog.artifactory' version '4.21.0' apply false
-    id 'com.jfrog.bintray' version '1.8.5' apply false
     id 'me.champeau.jmh' version '0.6.4' 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/bintray.gradle b/gradle/bintray.gradle
diff --git a/gradle/github-pkg.gradle b/gradle/github-pkg.gradle
@@ -0,0 +1,23 @@
+subprojects {
+
+  plugins.withType(JavaLibraryPlugin) {
+	plugins.withType(MavenPublishPlugin) {
+	  publishing {
+		repositories {
+		  maven {
+			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")
+			}
+		  }
+		}
+	  }
+
+	  tasks.named("publish").configure {
+		onlyIf { System.getenv('SKIP_RELEASE') != "true" }
+	  }
+	}
+  }
+}
diff --git a/gradle/publications.gradle b/gradle/publications.gradle
@@ -1,5 +1,6 @@
 apply from: "${rootDir}/gradle/artifactory.gradle"
-apply from: "${rootDir}/gradle/bintray.gradle"
+apply from: "${rootDir}/gradle/github-pkg.gradle"
+apply from: "${rootDir}/gradle/sonotype.gradle"
 
 subprojects {
     plugins.withType(MavenPublishPlugin) {

diff --git a/gradle/sonotype.gradle b/gradle/sonotype.gradle
@@ -0,0 +1,36 @@
+subprojects {
+  if (project.hasProperty('sonatypeUsername') && project.hasProperty('sonatypePassword')) {
+	plugins.withType(JavaLibraryPlugin) {
+	  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")
+
+			useInMemoryPgpKeys(signingKey, signingPassword)
+
+			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")
+				}
+			  }
+			}
+		  }
+		}
+	  }
+	}
+  }
+}
diff --git a/rsocket-bom/build.gradle b/rsocket-bom/build.gradle
@@ -16,8 +16,8 @@
 plugins {
     id 'java-platform'
     id 'maven-publish'
+    id 'signing'
     id 'com.jfrog.artifactory'
-    id 'com.jfrog.bintray'
 }
 
 description = 'RSocket Java Bill of materials.'

diff --git a/rsocket-core/build.gradle b/rsocket-core/build.gradle
@@ -17,8 +17,8 @@
 plugins {
     id 'java-library'
     id 'maven-publish'
+    id 'signing'
     id 'com.jfrog.artifactory'
-    id 'com.jfrog.bintray'
     id 'io.morethan.jmhreport'
     id 'me.champeau.jmh'
     id 'io.github.reyerizo.gradle.jcstress'

diff --git a/rsocket-load-balancer/build.gradle b/rsocket-load-balancer/build.gradle
@@ -17,8 +17,8 @@
 plugins {
     id 'java-library'
     id 'maven-publish'
+    id 'signing'
     id 'com.jfrog.artifactory'
-    id 'com.jfrog.bintray'
 }
 
 dependencies {

diff --git a/rsocket-micrometer/build.gradle b/rsocket-micrometer/build.gradle
@@ -17,8 +17,8 @@
 plugins {
     id 'java-library'
     id 'maven-publish'
+    id 'signing'
     id 'com.jfrog.artifactory'
-    id 'com.jfrog.bintray'
 }
 
 dependencies {

diff --git a/rsocket-test/build.gradle b/rsocket-test/build.gradle
@@ -17,8 +17,8 @@
 plugins {
     id 'java-library'
     id 'maven-publish'
+    id 'signing'
     id 'com.jfrog.artifactory'
-    id 'com.jfrog.bintray'
 }
 
 dependencies {

diff --git a/rsocket-transport-local/build.gradle b/rsocket-transport-local/build.gradle
@@ -17,8 +17,8 @@
 plugins {
     id 'java-library'
     id 'maven-publish'
+    id 'signing'
     id 'com.jfrog.artifactory'
-    id 'com.jfrog.bintray'
 }
 
 dependencies {

diff --git a/rsocket-transport-netty/build.gradle b/rsocket-transport-netty/build.gradle
@@ -17,8 +17,8 @@
 plugins {
     id 'java-library'
     id 'maven-publish'
+    id 'signing'
     id 'com.jfrog.artifactory'
-    id 'com.jfrog.bintray'
     id "com.google.osdetector" version "1.4.0"
 }