Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

set com.nimbus.josw.jwt version to 8.23 #437

Merged
merged 1 commit into from
Sep 29, 2022
Merged

set com.nimbus.josw.jwt version to 8.23 #437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion edc-extensions/cx-oauth2/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 0 additions & 1 deletion ...ensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/decorator/ExpJwtDecorator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 0 additions & 1 deletion ...ensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/decorator/IatJwtDecorator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 0 additions & 1 deletion ...ions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/decorator/IdsAudJwtDecorator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 0 additions & 1 deletion ...ensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/decorator/IssJwtDecorator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
24 changes: 24 additions & 0 deletions ...xtensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/decorator/JWTClaimNames.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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";
}
1 change: 0 additions & 1 deletion ...ensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/decorator/JtiJwtDecorator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 0 additions & 1 deletion ...ensions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/decorator/SubJwtDecorator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...ions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/validation/AudValidationRule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...ions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/validation/ExpValidationRule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...ions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/validation/IatValidationRule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...ions/cx-oauth2/src/main/java/net/catenax/edc/oauth2/jwt/validation/NbfValidationRule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
1 change: 0 additions & 1 deletion ...ons/cx-oauth2/src/test/java/net/catenax/edc/oauth2/jwt/decorator/ExpJwtDecoratorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 0 additions & 1 deletion ...ons/cx-oauth2/src/test/java/net/catenax/edc/oauth2/jwt/decorator/IatJwtDecoratorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 0 additions & 1 deletion .../cx-oauth2/src/test/java/net/catenax/edc/oauth2/jwt/decorator/IdsAudJwtDecoratorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 0 additions & 1 deletion ...ons/cx-oauth2/src/test/java/net/catenax/edc/oauth2/jwt/decorator/IssJwtDecoratorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 0 additions & 1 deletion ...ons/cx-oauth2/src/test/java/net/catenax/edc/oauth2/jwt/decorator/JtiJwtDecoratorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
1 change: 0 additions & 1 deletion ...ons/cx-oauth2/src/test/java/net/catenax/edc/oauth2/jwt/decorator/SubJwtDecoratorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 6 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down