From f09bae8411731832716162d916a1876415be2d84 Mon Sep 17 00:00:00 2001
From: Robert Butora <robert.butora@inaf.it>
Date: Fri, 8 Nov 2024 12:18:30 +0100
Subject: [PATCH] build: downgrades jjwt to 0.11 version to support IA2-token;
disables Neanias and SKA-IAM (IAM needs jjwt 0.12)
---
.../oidc => BACKUP/auth/skaiam}/IamSigningKeyResolver.java | 0
.../oidc/webapi => BACKUP/auth/skaiam}/IamTokenFilter.java | 0
.../webapi => BACKUP/auth/skaiam}/IamTokenSettings.java | 0
.../oidc => BACKUP/auth/skaiam}/IntrospectResponse.java | 0
data-access/servlet/pom.xml | 6 +++---
5 files changed, 3 insertions(+), 3 deletions(-)
rename data-access/{servlet/src/main/java/auth/oidc => BACKUP/auth/skaiam}/IamSigningKeyResolver.java (100%)
rename data-access/{servlet/src/main/java/auth/oidc/webapi => BACKUP/auth/skaiam}/IamTokenFilter.java (100%)
rename data-access/{servlet/src/main/java/auth/oidc/webapi => BACKUP/auth/skaiam}/IamTokenSettings.java (100%)
rename data-access/{servlet/src/main/java/auth/oidc => BACKUP/auth/skaiam}/IntrospectResponse.java (100%)
diff --git a/data-access/servlet/src/main/java/auth/oidc/IamSigningKeyResolver.java b/data-access/BACKUP/auth/skaiam/IamSigningKeyResolver.java
similarity index 100%
rename from data-access/servlet/src/main/java/auth/oidc/IamSigningKeyResolver.java
rename to data-access/BACKUP/auth/skaiam/IamSigningKeyResolver.java
diff --git a/data-access/servlet/src/main/java/auth/oidc/webapi/IamTokenFilter.java b/data-access/BACKUP/auth/skaiam/IamTokenFilter.java
similarity index 100%
rename from data-access/servlet/src/main/java/auth/oidc/webapi/IamTokenFilter.java
rename to data-access/BACKUP/auth/skaiam/IamTokenFilter.java
diff --git a/data-access/servlet/src/main/java/auth/oidc/webapi/IamTokenSettings.java b/data-access/BACKUP/auth/skaiam/IamTokenSettings.java
similarity index 100%
rename from data-access/servlet/src/main/java/auth/oidc/webapi/IamTokenSettings.java
rename to data-access/BACKUP/auth/skaiam/IamTokenSettings.java
diff --git a/data-access/servlet/src/main/java/auth/oidc/IntrospectResponse.java b/data-access/BACKUP/auth/skaiam/IntrospectResponse.java
similarity index 100%
rename from data-access/servlet/src/main/java/auth/oidc/IntrospectResponse.java
rename to data-access/BACKUP/auth/skaiam/IntrospectResponse.java
diff --git a/data-access/servlet/pom.xml b/data-access/servlet/pom.xml
index 3e7c2a4..e8d6bba 100644
--- a/data-access/servlet/pom.xml
+++ b/data-access/servlet/pom.xml
@@ -101,13 +101,13 @@
<dependency>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt-api</artifactId>
- <version>0.12.3</version>
+ <version>0.11.2</version>
</dependency>
<!-- https://mvnrepository.com/artifact/io.jsonwebtoken/jjwt-api -->
<dependency>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt-impl</artifactId>
- <version>0.12.3</version>
+ <version>0.11.2</version>
<scope>runtime</scope>
</dependency>
@@ -115,7 +115,7 @@
<dependency>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt-jackson</artifactId>
- <version>0.12.3</version>
+ <version>0.11.2</version>
<scope>runtime</scope>
</dependency>
--
GitLab