Merge 1.1.4-SNAPSHOT into 1.2.0-SNAPSHOT

Signed-off-by: Oleh Dokuka <[email protected]>

Author: OlegDokuka

.github/workflows/gradle-main.yml

@@ -142,10 +142,14 @@ jobs:
         run: chmod +x gradlew
       - name: Publish Packages to Artifactory
         if: ${{ matrix.jdk == '1.8' }}
-        run: ./gradlew -PversionSuffix="-SNAPSHOT" -PbuildNumber="${buildNumber}" publishMavenPublicationToGitHubPackagesRepository --no-daemon --stacktrace
+        run: ./gradlew -PversionSuffix="-SNAPSHOT" -PbuildNumber="${buildNumber}" publishMavenPublicationToSonatypeRepository --no-daemon --stacktrace
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           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}}
       - name: Aggregate test reports with ciMate
         if: always()
         continue-on-error: true

build.gradle

@@ -17,7 +17,7 @@
 plugins {
     id 'com.github.sherter.google-java-format' version '0.9' apply false
     id 'me.champeau.jmh' version '0.6.7' apply false
-    id 'io.spring.dependency-management' version '1.0.13.RELEASE' apply false
+    id 'io.spring.dependency-management' version '1.0.15.RELEASE' apply false
     id 'io.morethan.jmhreport' version '0.9.0' apply false
     id 'io.github.reyerizo.gradle.jcstress' version '0.8.13' apply false
     id 'com.github.vlsi.gradle-extensions'  version '1.76' apply false
@@ -33,17 +33,17 @@ subprojects {
     apply plugin: 'com.github.sherter.google-java-format'
     apply plugin: 'com.github.vlsi.gradle-extensions'
 
-    ext['reactor-bom.version'] = '2020.0.23'
+    ext['reactor-bom.version'] = '2022.0.7-SNAPSHOT'
     ext['logback.version'] = '1.2.10'
-    ext['netty-bom.version'] = '4.1.81.Final'
-    ext['netty-boringssl.version'] = '2.0.54.Final'
+    ext['netty-bom.version'] = '4.1.90.Final'
+    ext['netty-boringssl.version'] = '2.0.59.Final'
     ext['hdrhistogram.version'] = '2.1.12'
     ext['mockito.version'] = '4.4.0'
     ext['slf4j.version'] = '1.7.36'
     ext['jmh.version'] = '1.35'
     ext['junit.version'] = '5.8.1'
-    ext['micrometer.version'] = '1.10.0-SNAPSHOT'
-    ext['micrometer-tracing.version'] = '1.0.0-SNAPSHOT'
+    ext['micrometer.version'] = '1.10.6'
+    ext['micrometer-tracing.version'] = '1.0.4'
     ext['assertj.version'] = '3.22.0'
     ext['netflix.limits.version'] = '0.3.6'
     ext['bouncycastle-bcpkix.version'] = '1.70'
@@ -70,18 +70,15 @@ subprojects {
             mavenBom "io.projectreactor:reactor-bom:${ext['reactor-bom.version']}"
             mavenBom "io.netty:netty-bom:${ext['netty-bom.version']}"
             mavenBom "org.junit:junit-bom:${ext['junit.version']}"
+            mavenBom "io.micrometer:micrometer-bom:${ext['micrometer.version']}"
+            mavenBom "io.micrometer:micrometer-tracing-bom:${ext['micrometer-tracing.version']}"
         }
 
         dependencies {
             dependency "com.netflix.concurrency-limits:concurrency-limits-core:${ext['netflix.limits.version']}"
             dependency "ch.qos.logback:logback-classic:${ext['logback.version']}"
             dependency "io.netty:netty-tcnative-boringssl-static:${ext['netty-boringssl.version']}"
             dependency "org.bouncycastle:bcpkix-jdk15on:${ext['bouncycastle-bcpkix.version']}"
-            dependency "io.micrometer:micrometer-core:${ext['micrometer.version']}"
-            dependency "io.micrometer:micrometer-observation:${ext['micrometer.version']}"
-            dependency "io.micrometer:micrometer-test:${ext['micrometer.version']}"
-            dependency "io.micrometer:micrometer-tracing:${ext['micrometer-tracing.version']}"
-            dependency "io.micrometer:micrometer-tracing-integration-test:${ext['micrometer-tracing.version']}"
             dependency "org.assertj:assertj-core:${ext['assertj.version']}"
             dependency "org.hdrhistogram:HdrHistogram:${ext['hdrhistogram.version']}"
             dependency "org.slf4j:slf4j-api:${ext['slf4j.version']}"
@@ -109,6 +106,7 @@ subprojects {
                 includeGroup "io.micrometer"
                 includeGroup "io.projectreactor"
                 includeGroup "io.projectreactor.netty"
+                includeGroup "io.micrometer"
             }
         }
 
@@ -179,8 +177,6 @@ subprojects {
                 }
             }
 
-            forkEvery = 1
-
             if (isCiServer) {
                 def stdout = new LinkedList<TestOutputEvent>()
                 beforeTest { TestDescriptor td ->

gradle.properties

@@ -11,5 +11,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-version=1.2.0
-perfBaselineVersion=1.1.2
+version=1.1.4
+perfBaselineVersion=1.1.3

gradle/publications.gradle

@@ -21,16 +21,6 @@ subprojects {
                             }
                         }
                         developers {
-                            developer {
-                                id = 'rdegnan'
-                                name = 'Ryland Degnan'
-                                email = '[email protected]'
-                            }
-                            developer {
-                                id = 'yschimke'
-                                name = 'Yuri Schimke'
-                                email = '[email protected]'
-                            }
                             developer {
                                 id = 'OlegDokuka'
                                 name = 'Oleh Dokuka'

gradle/sonotype.gradle

@@ -20,7 +20,9 @@ subprojects {
 		  repositories {
 			maven {
 			  name = "sonatype"
-			  url = "https://oss.sonatype.org/service/local/staging/deploy/maven2"
+			  url = project.version.contains("-SNAPSHOT")
+					  ? "https://oss.sonatype.org/content/repositories/snapshots/"
+					  : "https://oss.sonatype.org/service/local/staging/deploy/maven2"
 			  credentials {
 				username project.findProperty("sonatypeUsername")
 				password project.findProperty("sonatypePassword")

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists