From a0c4937f4483e356de99d1f0527c6ed0b7324f5d Mon Sep 17 00:00:00 2001
From: Dominik Pinsel <dominik.pinsel@daimler.com>
Date: Thu, 29 Sep 2022 14:47:44 +0200
Subject: [PATCH] set com.nimbus.josw.jwt version to 8.23

Signed-off-by: Dominik Pinsel <dominik.pinsel@daimler.com>
---
 edc-extensions/cx-oauth2/pom.xml              |  1 -
 .../oauth2/jwt/decorator/ExpJwtDecorator.java |  1 -
 .../oauth2/jwt/decorator/IatJwtDecorator.java |  1 -
 .../jwt/decorator/IdsAudJwtDecorator.java     |  1 -
 .../oauth2/jwt/decorator/IssJwtDecorator.java |  1 -
 .../oauth2/jwt/decorator/JWTClaimNames.java   | 24 +++++++++++++++++++
 .../oauth2/jwt/decorator/JtiJwtDecorator.java |  1 -
 .../oauth2/jwt/decorator/SubJwtDecorator.java |  1 -
 .../jwt/validation/AudValidationRule.java     |  2 +-
 .../jwt/validation/ExpValidationRule.java     |  2 +-
 .../jwt/validation/IatValidationRule.java     |  2 +-
 .../jwt/validation/NbfValidationRule.java     |  2 +-
 .../jwt/decorator/ExpJwtDecoratorTest.java    |  1 -
 .../jwt/decorator/IatJwtDecoratorTest.java    |  1 -
 .../jwt/decorator/IdsAudJwtDecoratorTest.java |  1 -
 .../jwt/decorator/IssJwtDecoratorTest.java    |  1 -
 .../jwt/decorator/JtiJwtDecoratorTest.java    |  1 -
 .../jwt/decorator/SubJwtDecoratorTest.java    |  1 -
 pom.xml                                       |  6 +++++
 19 files changed, 34 insertions(+), 17 deletions(-)
 create mode 100644 edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/decorator/JWTClaimNames.java

diff --git a/edc-extensions/cx-oauth2/pom.xml b/edc-extensions/cx-oauth2/pom.xml
index 8ac7cf40e..d3180a69d 100644
--- a/edc-extensions/cx-oauth2/pom.xml
+++ b/edc-extensions/cx-oauth2/pom.xml
@@ -122,7 +122,6 @@
         <dependency>
             <groupId>com.nimbusds</groupId>
             <artifactId>nimbus-jose-jwt</artifactId>
-            <version>9.24.3</version>
         </dependency>
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
diff --git a/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/decorator/ExpJwtDecorator.java b/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/decorator/ExpJwtDecorator.java
index 296881d04..4168f7e63 100644
--- a/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/decorator/ExpJwtDecorator.java
+++ b/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/decorator/ExpJwtDecorator.java
@@ -13,7 +13,6 @@
  */
 package net.catenax.edc.oauth2.jwt.decorator;
 
-import com.nimbusds.jwt.JWTClaimNames;
 import java.time.Clock;
 import java.time.Duration;
 import java.util.Date;
diff --git a/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/decorator/IatJwtDecorator.java b/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/decorator/IatJwtDecorator.java
index 0c18aebd7..d8d34d7bb 100644
--- a/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/decorator/IatJwtDecorator.java
+++ b/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/decorator/IatJwtDecorator.java
@@ -13,7 +13,6 @@
  */
 package net.catenax.edc.oauth2.jwt.decorator;
 
-import com.nimbusds.jwt.JWTClaimNames;
 import java.time.Clock;
 import java.util.Date;
 import java.util.Map;
diff --git a/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/decorator/IdsAudJwtDecorator.java b/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/decorator/IdsAudJwtDecorator.java
index f5af085f1..673ca7372 100644
--- a/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/decorator/IdsAudJwtDecorator.java
+++ b/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/decorator/IdsAudJwtDecorator.java
@@ -13,7 +13,6 @@
  */
 package net.catenax.edc.oauth2.jwt.decorator;
 
-import com.nimbusds.jwt.JWTClaimNames;
 import java.util.Collections;
 import java.util.Map;
 import lombok.RequiredArgsConstructor;
diff --git a/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/decorator/IssJwtDecorator.java b/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/decorator/IssJwtDecorator.java
index 621e4a244..32303d14a 100644
--- a/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/decorator/IssJwtDecorator.java
+++ b/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/decorator/IssJwtDecorator.java
@@ -13,7 +13,6 @@
  */
 package net.catenax.edc.oauth2.jwt.decorator;
 
-import com.nimbusds.jwt.JWTClaimNames;
 import java.util.Map;
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
diff --git a/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/decorator/JWTClaimNames.java b/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/decorator/JWTClaimNames.java
new file mode 100644
index 000000000..f1649b8c0
--- /dev/null
+++ b/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/decorator/JWTClaimNames.java
@@ -0,0 +1,24 @@
+/*
+ *  Copyright (c) 2022 Mercedes-Benz Tech Innovation GmbH
+ *
+ *  This program and the accompanying materials are made available under the
+ *  terms of the Apache License, Version 2.0 which is available at
+ *  https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  SPDX-License-Identifier: Apache-2.0
+ *
+ *  Contributors:
+ *       Mercedes-Benz Tech Innovation GmbH - Initial API and Implementation
+ *
+ */
+package net.catenax.edc.oauth2.jwt.decorator;
+
+public final class JWTClaimNames {
+  public static final String ISSUER = "iss";
+  public static final String SUBJECT = "sub";
+  public static final String AUDIENCE = "aud";
+  public static final String EXPIRATION_TIME = "exp";
+  public static final String NOT_BEFORE = "nbf";
+  public static final String ISSUED_AT = "iat";
+  public static final String JWT_ID = "jti";
+}
diff --git a/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/decorator/JtiJwtDecorator.java b/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/decorator/JtiJwtDecorator.java
index bcf7d34bc..39590d1a6 100644
--- a/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/decorator/JtiJwtDecorator.java
+++ b/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/decorator/JtiJwtDecorator.java
@@ -13,7 +13,6 @@
  */
 package net.catenax.edc.oauth2.jwt.decorator;
 
-import com.nimbusds.jwt.JWTClaimNames;
 import java.util.Map;
 import java.util.UUID;
 import org.eclipse.dataspaceconnector.spi.jwt.JwtDecorator;
diff --git a/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/decorator/SubJwtDecorator.java b/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/decorator/SubJwtDecorator.java
index d6e18c207..951fd8791 100644
--- a/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/decorator/SubJwtDecorator.java
+++ b/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/decorator/SubJwtDecorator.java
@@ -13,7 +13,6 @@
  */
 package net.catenax.edc.oauth2.jwt.decorator;
 
-import com.nimbusds.jwt.JWTClaimNames;
 import java.util.Map;
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
diff --git a/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/validation/AudValidationRule.java b/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/validation/AudValidationRule.java
index 60e75f865..3f46930ff 100644
--- a/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/validation/AudValidationRule.java
+++ b/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/validation/AudValidationRule.java
@@ -13,13 +13,13 @@
  */
 package net.catenax.edc.oauth2.jwt.validation;
 
-import com.nimbusds.jwt.JWTClaimNames;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
+import net.catenax.edc.oauth2.jwt.decorator.JWTClaimNames;
 import org.eclipse.dataspaceconnector.spi.iam.ClaimToken;
 import org.eclipse.dataspaceconnector.spi.jwt.TokenValidationRule;
 import org.eclipse.dataspaceconnector.spi.monitor.Monitor;
diff --git a/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/validation/ExpValidationRule.java b/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/validation/ExpValidationRule.java
index dac9fc6b9..36abd84bf 100644
--- a/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/validation/ExpValidationRule.java
+++ b/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/validation/ExpValidationRule.java
@@ -15,7 +15,6 @@
 
 import static java.time.ZoneOffset.UTC;
 
-import com.nimbusds.jwt.JWTClaimNames;
 import java.time.Clock;
 import java.time.Instant;
 import java.time.ZonedDateTime;
@@ -25,6 +24,7 @@
 import java.util.Map;
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
+import net.catenax.edc.oauth2.jwt.decorator.JWTClaimNames;
 import org.eclipse.dataspaceconnector.spi.iam.ClaimToken;
 import org.eclipse.dataspaceconnector.spi.jwt.TokenValidationRule;
 import org.eclipse.dataspaceconnector.spi.result.Result;
diff --git a/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/validation/IatValidationRule.java b/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/validation/IatValidationRule.java
index de20c1517..a5185e559 100644
--- a/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/validation/IatValidationRule.java
+++ b/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/validation/IatValidationRule.java
@@ -15,7 +15,6 @@
 
 import static java.time.ZoneOffset.UTC;
 
-import com.nimbusds.jwt.JWTClaimNames;
 import java.time.Clock;
 import java.time.Instant;
 import java.time.ZonedDateTime;
@@ -25,6 +24,7 @@
 import java.util.Map;
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
+import net.catenax.edc.oauth2.jwt.decorator.JWTClaimNames;
 import org.eclipse.dataspaceconnector.spi.iam.ClaimToken;
 import org.eclipse.dataspaceconnector.spi.jwt.TokenValidationRule;
 import org.eclipse.dataspaceconnector.spi.result.Result;
diff --git a/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/validation/NbfValidationRule.java b/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/validation/NbfValidationRule.java
index 84cc100b8..88672b8cb 100644
--- a/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/validation/NbfValidationRule.java
+++ b/edc-extensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/validation/NbfValidationRule.java
@@ -15,7 +15,6 @@
 
 import static java.time.ZoneOffset.UTC;
 
-import com.nimbusds.jwt.JWTClaimNames;
 import java.time.Clock;
 import java.time.Duration;
 import java.time.Instant;
@@ -26,6 +25,7 @@
 import java.util.Map;
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
+import net.catenax.edc.oauth2.jwt.decorator.JWTClaimNames;
 import org.eclipse.dataspaceconnector.spi.iam.ClaimToken;
 import org.eclipse.dataspaceconnector.spi.jwt.TokenValidationRule;
 import org.eclipse.dataspaceconnector.spi.result.Result;
diff --git a/edc-extensions/cx-oauth2/src/test/java/net/catenax/edc/oauth2/jwt/decorator/ExpJwtDecoratorTest.java b/edc-extensions/cx-oauth2/src/test/java/net/catenax/edc/oauth2/jwt/decorator/ExpJwtDecoratorTest.java
index 81b040d77..fe5a3e903 100644
--- a/edc-extensions/cx-oauth2/src/test/java/net/catenax/edc/oauth2/jwt/decorator/ExpJwtDecoratorTest.java
+++ b/edc-extensions/cx-oauth2/src/test/java/net/catenax/edc/oauth2/jwt/decorator/ExpJwtDecoratorTest.java
@@ -13,7 +13,6 @@
  */
 package net.catenax.edc.oauth2.jwt.decorator;
 
-import com.nimbusds.jwt.JWTClaimNames;
 import java.time.Clock;
 import java.time.Duration;
 import java.time.Instant;
diff --git a/edc-extensions/cx-oauth2/src/test/java/net/catenax/edc/oauth2/jwt/decorator/IatJwtDecoratorTest.java b/edc-extensions/cx-oauth2/src/test/java/net/catenax/edc/oauth2/jwt/decorator/IatJwtDecoratorTest.java
index 15a201722..898903e62 100644
--- a/edc-extensions/cx-oauth2/src/test/java/net/catenax/edc/oauth2/jwt/decorator/IatJwtDecoratorTest.java
+++ b/edc-extensions/cx-oauth2/src/test/java/net/catenax/edc/oauth2/jwt/decorator/IatJwtDecoratorTest.java
@@ -13,7 +13,6 @@
  */
 package net.catenax.edc.oauth2.jwt.decorator;
 
-import com.nimbusds.jwt.JWTClaimNames;
 import java.time.Clock;
 import java.time.Instant;
 import java.util.Date;
diff --git a/edc-extensions/cx-oauth2/src/test/java/net/catenax/edc/oauth2/jwt/decorator/IdsAudJwtDecoratorTest.java b/edc-extensions/cx-oauth2/src/test/java/net/catenax/edc/oauth2/jwt/decorator/IdsAudJwtDecoratorTest.java
index 5fc270d38..b9180e5ec 100644
--- a/edc-extensions/cx-oauth2/src/test/java/net/catenax/edc/oauth2/jwt/decorator/IdsAudJwtDecoratorTest.java
+++ b/edc-extensions/cx-oauth2/src/test/java/net/catenax/edc/oauth2/jwt/decorator/IdsAudJwtDecoratorTest.java
@@ -14,7 +14,6 @@
 
 package net.catenax.edc.oauth2.jwt.decorator;
 
-import com.nimbusds.jwt.JWTClaimNames;
 import java.util.List;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/edc-extensions/cx-oauth2/src/test/java/net/catenax/edc/oauth2/jwt/decorator/IssJwtDecoratorTest.java b/edc-extensions/cx-oauth2/src/test/java/net/catenax/edc/oauth2/jwt/decorator/IssJwtDecoratorTest.java
index 7059fc3e2..fba6a1d52 100644
--- a/edc-extensions/cx-oauth2/src/test/java/net/catenax/edc/oauth2/jwt/decorator/IssJwtDecoratorTest.java
+++ b/edc-extensions/cx-oauth2/src/test/java/net/catenax/edc/oauth2/jwt/decorator/IssJwtDecoratorTest.java
@@ -13,7 +13,6 @@
  */
 package net.catenax.edc.oauth2.jwt.decorator;
 
-import com.nimbusds.jwt.JWTClaimNames;
 import java.util.UUID;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/edc-extensions/cx-oauth2/src/test/java/net/catenax/edc/oauth2/jwt/decorator/JtiJwtDecoratorTest.java b/edc-extensions/cx-oauth2/src/test/java/net/catenax/edc/oauth2/jwt/decorator/JtiJwtDecoratorTest.java
index 59d4e6917..681113b38 100644
--- a/edc-extensions/cx-oauth2/src/test/java/net/catenax/edc/oauth2/jwt/decorator/JtiJwtDecoratorTest.java
+++ b/edc-extensions/cx-oauth2/src/test/java/net/catenax/edc/oauth2/jwt/decorator/JtiJwtDecoratorTest.java
@@ -13,7 +13,6 @@
  */
 package net.catenax.edc.oauth2.jwt.decorator;
 
-import com.nimbusds.jwt.JWTClaimNames;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/edc-extensions/cx-oauth2/src/test/java/net/catenax/edc/oauth2/jwt/decorator/SubJwtDecoratorTest.java b/edc-extensions/cx-oauth2/src/test/java/net/catenax/edc/oauth2/jwt/decorator/SubJwtDecoratorTest.java
index 41b638fcd..4dc4f32eb 100644
--- a/edc-extensions/cx-oauth2/src/test/java/net/catenax/edc/oauth2/jwt/decorator/SubJwtDecoratorTest.java
+++ b/edc-extensions/cx-oauth2/src/test/java/net/catenax/edc/oauth2/jwt/decorator/SubJwtDecoratorTest.java
@@ -13,7 +13,6 @@
  */
 package net.catenax.edc.oauth2.jwt.decorator;
 
-import com.nimbusds.jwt.JWTClaimNames;
 import java.util.UUID;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/pom.xml b/pom.xml
index 1223a6562..d6332bb85 100644
--- a/pom.xml
+++ b/pom.xml
@@ -70,6 +70,7 @@
         <com.azure.sdk.bom.version>1.2.2</com.azure.sdk.bom.version>
         <org.postgresql.version>42.5.0</org.postgresql.version>
         <org.flywaydb.version>9.3.1</org.flywaydb.version>
+        <com.nimbus.jose.jwt.version>8.23</com.nimbus.jose.jwt.version>
 
         <!-- test dependency version -->
         <junit.jupiter.version>5.9.1</junit.jupiter.version>
@@ -392,6 +393,11 @@
             </dependency>
 
             <!-- Common Dependencies -->
+            <dependency>
+                <groupId>com.nimbusds</groupId>
+                <artifactId>nimbus-jose-jwt</artifactId>
+                <version>${com.nimbus.jose.jwt.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.postgresql</groupId>
                 <artifactId>postgresql</artifactId>