Support For Spring Boot 3 #25 (#26)

Author: veltmanj

.github/workflows/gradle-pr.yml

@@ -11,18 +11,19 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up JDK 1.8
-      uses: actions/setup-java@v1
+    - uses: actions/checkout@v3
+    - name: Set up JDK 17
+      uses: actions/setup-java@v3
       with:
-        java-version: 1.8
+        java-version: 17
+        distribution: 'temurin'
     - name: Cache Gradle packages
-      uses: actions/cache@v1
+      uses: actions/cache@v3
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
         restore-keys: ${{ runner.os }}-gradle
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
     - name: Build with Gradle
-      run: ./gradlew build -Dbuild.number=$GITHUB_RUN_ID
+      run: ./gradlew build -Dbuild.number=$GITHUB_RUN_ID

.github/workflows/gradle-release.yml

@@ -16,13 +16,14 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up JDK 1.8
-      uses: actions/setup-java@v1
+    - uses: actions/checkout@v3
+    - name: Set up JDK 17
+      uses: actions/setup-java@v3
       with:
-        java-version: 1.8
+        java-version: 17
+        distribution: 'temurin'
     - name: Cache Gradle packages
-      uses: actions/cache@v1
+      uses: actions/cache@v3
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}

.github/workflows/gradle.yml

@@ -15,13 +15,14 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up JDK 1.8
-      uses: actions/setup-java@v1
+    - uses: actions/checkout@v3
+    - name: Set up JDK 17
+      uses: actions/setup-java@v3
       with:
-        java-version: 1.8
+        java-version: 17
+        distribution: 'temurin'
     - name: Cache Gradle packages
-      uses: actions/cache@v1
+      uses: actions/cache@v3
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}

build.gradle

@@ -1,6 +1,8 @@
 plugins {
 	id 'com.jfrog.artifactory' version '4.21.0' apply false
-	id 'io.spring.dependency-management' version '1.0.11.RELEASE'
+	id 'io.spring.dependency-management' version '1.1.0'
+	id 'java'
+    id 'maven-publish'
 }
 
 
@@ -11,7 +13,7 @@ subprojects {
 	apply plugin: 'com.jfrog.artifactory'
 	apply plugin: 'signing'
 
-	sourceCompatibility = '1.8'
+	sourceCompatibility = '17'
 
 	repositories {
 		mavenCentral()
@@ -37,26 +39,14 @@ subprojects {
 		}
 	}
 
-	plugins.withType(JavaLibraryPlugin) {
-		task sourcesJar(type: Jar) {
-			classifier 'sources'
-			from sourceSets.main.allJava
-		}
-
-		task javadocJar(type: Jar, dependsOn: javadoc) {
-			classifier 'javadoc'
-			from javadoc.destinationDir
-		}
-
-		plugins.withType(MavenPublishPlugin) {
-			publishing {
-				publications {
-					maven(MavenPublication) {
-						from components.java
-						artifact sourcesJar
-						artifact javadocJar
-					}
-				}
+	java {
+		withSourcesJar()
+		withJavadocJar()
+	}
+	publishing {
+		publications {
+			mavenJava(MavenPublication) {
+				from components.java
 			}
 		}
 	}

gradle.properties

@@ -1,11 +1,10 @@
 group=io.rsocket.broker
-version=0.3.0-SNAPSHOT
-
-assertjVersion=3.21.0
-junitJupiterVersion=5.8.2
-reactorBomVersion=2020.0.13
-rsocketVersion=1.1.1
-springBootVersion=2.6.1
+version=0.4.0-SNAPSHOT
 
+assertjVersion=3.24.0
+junitJupiterVersion=5.9.2
+reactorBomVersion=2022.0.4
+rsocketVersion=1.1.3
+springBootVersion=3.1.5
 
 

gradle/wrapper/gradle-wrapper.properties

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

rsocket-broker-client-spring/src/main/java/io/rsocket/broker/client/spring/BrokerRSocketRequester.java

@@ -34,6 +34,7 @@
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.lang.Nullable;
 import org.springframework.messaging.rsocket.RSocketRequester;
+import org.springframework.messaging.rsocket.RSocketStrategies;
 import org.springframework.util.Assert;
 import org.springframework.util.MimeType;
 import org.springframework.util.ObjectUtils;
@@ -72,6 +73,11 @@ public MimeType dataMimeType() {
 		return delegate.dataMimeType();
 	}
 
+	@Override
+	public RSocketStrategies strategies(){
+		return delegate.strategies();
+	}
+
 	@Override
 	public MimeType metadataMimeType() {
 		return delegate.metadataMimeType();

rsocket-broker-client-spring/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -0,0 +1,2 @@
+io.rsocket.broker.client.spring.BrokerClientRSocketStrategiesAutoConfiguration
+io.rsocket.broker.client.spring.BrokerClientAutoConfiguration