update nimbus-jose-jwt dependency to 2.26 and fix the affected files

Author: Kristina Sahlmann

openid-connect-client/src/test/java/org/mitre/openid/connect/client/service/impl/TestSignedAuthRequestUrlBuilder.java

@@ -45,7 +45,7 @@
 import com.nimbusds.jose.Algorithm;
 import com.nimbusds.jose.jwk.JWK;
 import com.nimbusds.jose.jwk.RSAKey;
-import com.nimbusds.jose.jwk.Use;
+import com.nimbusds.jose.jwk.KeyUse;
 import com.nimbusds.jose.util.Base64URL;
 import com.nimbusds.jwt.ReadOnlyJWTClaimsSet;
 import com.nimbusds.jwt.SignedJWT;
@@ -90,7 +90,7 @@ public class TestSignedAuthRequestUrlBuilder {
 @Before
 public void prepare() throws NoSuchAlgorithmException, InvalidKeySpecException {
 
-RSAKey key = new RSAKey(new Base64URL(n), new Base64URL(e), new Base64URL(d), Use.SIGNATURE, new Algorithm(alg), kid, null, null, null);
+RSAKey key = new RSAKey(new Base64URL(n), new Base64URL(e), new Base64URL(d), KeyUse.SIGNATURE, null, new Algorithm(alg), kid, null, null, null);
 Map<String, JWK> keys = Maps.newHashMap();
 keys.put("client", key);
 

openid-connect-common/pom.xml

@@ -66,7 +66,7 @@
  <dependency>
 	<groupId>com.nimbusds</groupId>
 	<artifactId>nimbus-jose-jwt</artifactId>
-	<version>2.22.1</version>
+	<version>2.26</version>
  </dependency>
  <dependency>
  <groupId>org.eclipse.persistence</groupId>

openid-connect-common/src/main/java/org/mitre/jwt/signer/service/impl/SymmetricCacheService.java

@@ -22,6 +22,7 @@
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 
+import com.nimbusds.jose.Algorithm;
 import org.mitre.jwt.signer.service.JwtSigningAndValidationService;
 import org.mitre.oauth2.model.ClientDetailsEntity;
 import org.slf4j.Logger;
@@ -36,7 +37,7 @@
 import com.google.common.util.concurrent.UncheckedExecutionException;
 import com.nimbusds.jose.jwk.JWK;
 import com.nimbusds.jose.jwk.OctetSequenceKey;
-import com.nimbusds.jose.jwk.Use;
+import com.nimbusds.jose.jwk.KeyUse;
 import com.nimbusds.jose.util.Base64URL;
 
 /**
@@ -98,7 +99,7 @@ public JwtSigningAndValidationService load(String key) throws Exception {
 
 String id = "SYMMETRIC-KEY";
 
-JWK jwk = new OctetSequenceKey(Base64URL.encode(key), Use.SIGNATURE, null, id, null, null, null);
+JWK jwk = new OctetSequenceKey(Base64URL.encode(key), KeyUse.SIGNATURE, null, new Algorithm(id), null, null, null, null);
 Map<String, JWK> keys = ImmutableMap.of(id, jwk);
 JwtSigningAndValidationService service = new DefaultJwtSigningAndValidationService(keys);
 

openid-connect-common/src/test/java/org/mitre/jwt/encryption/service/impl/TestDefaultJwtEncryptionAndDecryptionService.java

@@ -36,7 +36,7 @@
 import com.nimbusds.jose.JWEObject;
 import com.nimbusds.jose.jwk.JWK;
 import com.nimbusds.jose.jwk.RSAKey;
-import com.nimbusds.jose.jwk.Use;
+import com.nimbusds.jose.jwk.KeyUse;
 import com.nimbusds.jose.util.Base64URL;
 import com.nimbusds.jwt.EncryptedJWT;
 import com.nimbusds.jwt.JWTClaimsSet;
@@ -81,7 +81,7 @@ public class TestDefaultJwtEncryptionAndDecryptionService {
 "qDp0Vqj3kbSCz1XyfCs6_LehBwtxHIyh8Ripy40p24moOAbgxVw3rxT_vl" +
 "t3UVe4WO3JkJOzlpUf-KTVI2Ptgm-dARxTEtE-id-4OJr0h-K-VFs3VSnd" +
 "VTIznSxfyrj8ILL6MG_Uv8YAu7VILSB3lOW085-4qE3DzgrTjgyQ"), // d
-Use.ENCRYPTION, JWEAlgorithm.RSA_OAEP, RSAkid, null, null, null);
+KeyUse.ENCRYPTION, null, JWEAlgorithm.RSA_OAEP, RSAkid, null, null, null);
 
 // AES key wrap not yet tested
 //	private String AESkid = "aes123";