release 4.4.2

Author: Alexander Furer

README.adoc

@@ -18,7 +18,7 @@ Best viewed with image:https://www.octotree.io/_nuxt/img/03e72a3.svg["Octoree",w
 Auto-configures and runs the embedded gRPC server with @GRpcService-enabled beans as part of spring-boot application. +
 
 [IMPORTANT]
-Starting from release `4.0.0` the starter is compiled and tested against Spring Boot *2.3.X* only, +
+Starting from release `4.0.0` the starter is compiled and tested against Spring Boot *2.X.X* only, +
 *1.5.X* Spring boot version support is dropped to allow tight Spring Boot Security framework integration.
 
 == Setup
@@ -31,7 +31,7 @@ repositories {
 
 }
 dependencies {
-    compile 'io.github.lognet:grpc-spring-boot-starter:4.4.1'
+    compile 'io.github.lognet:grpc-spring-boot-starter:4.4.2'
 }
 
 

ReleaseNotes.adoc

@@ -1,3 +1,7 @@
+== Version 4.4.2
+* Spring Boot `2.4.1`
+* Spring Cloud `2020.0.0`
+
 == Version 4.4.1
 * If more than 1 port is exposed, add `address` tag to Micrometer's `timer`
 

gradle.properties

@@ -1,8 +1,8 @@
 grpcVersion=1.34.1
-springBootVersion=2.3.4.RELEASE
-springCloudVersion=Hoxton.SR6
+springBootVersion=2.4.1
+springCloudVersion=2020.0.0
 
-version=4.4.2-SNAPSHOT
+version=4.4.2
 group=io.github.lognet
 description=Spring Boot starter for Google RPC.
 gitHubUrl=https\://github.com/LogNet/grpc-spring-boot-starter

grpc-spring-boot-starter-demo/build.gradle

@@ -41,10 +41,12 @@ dependencies {
     testCompile 'com.pszymczyk.consul:embedded-consul:2.1.4'
     testCompile 'org.awaitility:awaitility:4.0.3'
 
-    testCompile "org.springframework.cloud:spring-cloud-config-server:2.1.1.RELEASE"
-    testCompile "org.springframework.cloud:spring-cloud-config-client:2.1.1.RELEASE"
+
+
+    testCompile "org.springframework.cloud:spring-cloud-config-server"
+    testCompile "org.springframework.cloud:spring-cloud-config-client"
     testCompile "com.playtika.testcontainers:embedded-keycloak:1.76"
-    testRuntime "org.springframework.cloud:spring-cloud-starter"
+    testCompile "org.springframework.cloud:spring-cloud-starter-bootstrap"
 
 
     testImplementation 'org.hamcrest:hamcrest:2.1'

grpc-spring-boot-starter/build.gradle

@@ -17,6 +17,12 @@ apply plugin: 'signing'
 apply plugin: "de.marcphilipp.nexus-publish"
 apply plugin: 'io.franzbecker.gradle-lombok'
 
+dependencyManagement {
+    imports {
+        mavenBom "org.springframework.boot:spring-boot-starter-parent:${springBootVersion}"
+        mavenBom "org.springframework.cloud:spring-cloud-dependencies:${springCloudVersion}"
+    }
+}
 task delombok(type: io.franzbecker.gradle.lombok.task.DelombokTask) {
     def outputDir = file("$buildDir/delombok")
     outputs.dir(outputDir)
@@ -132,7 +138,7 @@ dependencies {
     compileOnly "org.springframework.security:spring-security-oauth2-jose"
     compileOnly 'org.springframework.boot:spring-boot-starter-validation'
     compileOnly "org.springframework.boot:spring-boot-starter-actuator"
-    compileOnly group: 'org.springframework.cloud', name: 'spring-cloud-starter-consul-discovery', version: '2.1.1.RELEASE'
+    compileOnly 'org.springframework.cloud:spring-cloud-starter-consul-discovery'
 
 
 }

grpc-spring-boot-starter/src/main/java/org/lognet/springboot/grpc/autoconfigure/consul/GrpcConsulRegistrar.java

@@ -12,7 +12,6 @@
 import org.springframework.context.event.EventListener;
 
 import java.util.Objects;
-import java.util.stream.Collectors;
 
 public class GrpcConsulRegistrar implements SmartLifecycle {
 
@@ -45,12 +44,7 @@ private ConsulRegistration getRegistration(GRpcServerInitializedEvent event) {
         String appName = "grpc-" + ConsulAutoRegistration.getAppName(consulProperties, applicationContext.getEnvironment());
         grpcService.setName(ConsulAutoRegistration.normalizeForDns(appName));
         grpcService.setId("grpc-" + ConsulAutoRegistration.getInstanceId(consulProperties, applicationContext));
-        grpcService.setTags(ConsulAutoRegistration.createTags(consulProperties)
-                .stream()
-                .filter(t->!t.startsWith("secure="))
-                .collect(Collectors.toList())
-        );
-
+        grpcService.setTags(consulProperties.getTags());
 
         if(consulProperties.isRegisterHealthCheck()) {
             GRpcConsulHealthCheck health = GRpcConsulHealthCheck.builder()

grpc-spring-boot-starter/src/main/java/org/lognet/springboot/grpc/security/jwt/JwtAuthProviderFactory.java

@@ -1,7 +1,8 @@
 package org.lognet.springboot.grpc.security.jwt;
 
-import net.minidev.json.JSONNavi;
-import net.minidev.json.JSONObject;
+
+import com.nimbusds.jose.shaded.json.JSONNavi;
+import com.nimbusds.jose.shaded.json.JSONObject;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.oauth2.jwt.JwtDecoder;
@@ -24,7 +25,8 @@ public static JwtAuthenticationProvider forRoles(JwtDecoder jwtDecoder){
         authenticationConverter.setJwtGrantedAuthoritiesConverter(jwt -> {
             final String claim = Optional.ofNullable(jwt.getClaimAsString("aud"))
                     .orElse(jwt.getClaimAsString("azp"));
-            Assert.hasText(claim,"Neither aud nor azp claims exist");
+            Assert.hasText(claim,"Neither 'aud' nor 'azp' claims exist");
+
             JSONObject resourceAccess = jwt.getClaim("resource_access");
 
             final JSONNavi<?> roles = JSONNavi.newInstanceArray()