Merge branch 'cloudfoundry:main' into fix-manifest

Author: schulzh

.github/workflows/ci-java-17-and-21.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ 8, 11 ]
+        java: [ 8, 11, 17, 21 ]
     name: Java ${{ matrix.java }} build
     steps:
       - uses: actions/checkout@v4

.github/workflows/ci-java-8-and-11.yml .github/workflows/ci-java.yml.github/workflows/ci-java-8-and-11.yml renamed to .github/workflows/ci-java.yml

@@ -1,2 +1,19 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.1/apache-maven-3.6.1-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+wrapperVersion=3.3.2
+distributionType=only-script
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip

.mvn/wrapper/MavenWrapperDownloader.java

@@ -312,7 +312,7 @@ Lastly before running the tests, it is strongly recommended that you take a snap
 ## License
 This project is released under version 2.0 of the [Apache License][l].
 
-[a]: https://apidocs.cloudfoundry.org/latest-release/
+[a]: https://apidocs.cloudfoundry.org/
 [c]: https://github.com/cloudfoundry/cli
 [e]: https://github.com/cloudfoundry/java-client/issues
 [g]: https://gradle.org

.mvn/wrapper/maven-wrapper.jar

@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.cloudfoundry</groupId>
         <artifactId>cloudfoundry-java-client</artifactId>
-        <version>5.13.0.BUILD-SNAPSHOT</version>
+        <version>5.14.0.BUILD-SNAPSHOT</version>
     </parent>
 
     <artifactId>cloudfoundry-client-reactor</artifactId>

.mvn/wrapper/maven-wrapper.properties

@@ -25,7 +25,6 @@
 import io.jsonwebtoken.JwtParser;
 import io.jsonwebtoken.Jwts;
 import io.netty.handler.codec.http.HttpHeaders;
-import io.netty.handler.codec.http.HttpResponseStatus;
 import io.netty.util.AsciiString;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
@@ -46,7 +45,6 @@
 import org.cloudfoundry.reactor.util.Operator;
 import org.cloudfoundry.reactor.util.OperatorContext;
 import org.cloudfoundry.reactor.util.UserAgent;
-import org.cloudfoundry.uaa.UaaException;
 import org.immutables.value.Value;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -163,7 +161,7 @@ private static Optional<Claims> parseToken(String token) {
 
         try {
             String jws = token.substring(0, token.lastIndexOf('.') + 1);
-            JwtParser parser = Jwts.parserBuilder().build();
+            JwtParser parser = Jwts.parser().build();
 
             return Optional.of(parser.parseClaimsJwt(jws).getBody());
         } catch (Exception e) {
@@ -253,12 +251,8 @@ private Mono<String> refreshToken(ConnectionContext connectionContext, String re
                         connectionContext,
                         refreshTokenGrantTokenRequestTransformer(refreshToken),
                         tokensExtractor(connectionContext))
-                .onErrorResume(
-                        t ->
-                                t instanceof UaaException
-                                        && ((UaaException) t).getStatusCode()
-                                                == HttpResponseStatus.UNAUTHORIZED.code(),
-                        t -> Mono.empty());
+                .doOnError(t -> LOGGER.error("Refresh token grant error.", t))
+                .onErrorResume(t -> Mono.empty());
     }
 
     private BiConsumer<HttpClientRequest, HttpClientForm> refreshTokenGrantTokenRequestTransformer(

README.md

@@ -58,8 +58,8 @@ public Key resolveSigningKey(JwsHeader header, Claims claims) {
 
     @Override
     @SuppressWarnings("rawtypes")
-    public Key resolveSigningKey(JwsHeader header, String plaintext) {
-        return getKey(header.getKeyId());
+    public Key resolveSigningKey(JwsHeader jwsHeader, byte[] bytes) {
+        return getKey(jwsHeader.getKeyId());
     }
 
     private static byte[] decode(TokenKey tokenKey) {

cloudfoundry-client-reactor/pom.xml

@@ -72,8 +72,7 @@ private static Mono<String> getToken(
     }
 
     private String getUsername(String token) {
-        JwtParser parser =
-                Jwts.parserBuilder().setSigningKeyResolver(this.signingKeyResolver).build();
+        JwtParser parser = Jwts.parser().setSigningKeyResolver(this.signingKeyResolver).build();
 
         Jws<Claims> jws = parser.parseClaimsJws(token);