diff --git a/data-access/servlet/src/main/java/auth/oidc/NeaSigningKeyResolver.java b/data-access/BACKUP/auth/neanias/NeaSigningKeyResolver.java similarity index 100% rename from data-access/servlet/src/main/java/auth/oidc/NeaSigningKeyResolver.java rename to data-access/BACKUP/auth/neanias/NeaSigningKeyResolver.java diff --git a/data-access/servlet/src/main/java/auth/oidc/webapi/NeaTokenFilter.java b/data-access/BACKUP/auth/neanias/NeaTokenFilter.java similarity index 100% rename from data-access/servlet/src/main/java/auth/oidc/webapi/NeaTokenFilter.java rename to data-access/BACKUP/auth/neanias/NeaTokenFilter.java diff --git a/data-access/servlet/src/main/java/auth/oidc/webapi/NeaTokenSettings.java b/data-access/BACKUP/auth/neanias/NeaTokenSettings.java similarity index 100% rename from data-access/servlet/src/main/java/auth/oidc/webapi/NeaTokenSettings.java rename to data-access/BACKUP/auth/neanias/NeaTokenSettings.java diff --git a/data-access/servlet/pom.xml b/data-access/servlet/pom.xml index 3b31ed0ace81cac7406b44d2b994c6bec92503dd..3e7c2a4b554e0bd67ed3881aa9628c91cb30816c 100644 --- a/data-access/servlet/pom.xml +++ b/data-access/servlet/pom.xml @@ -97,24 +97,26 @@ <!-- auth dependencies (mostly caused by jjwt lib) --> - <!-- https://mvnrepository.com/artifact/io.jsonwebtoken/jjwt-jackson --> + <!-- https://mvnrepository.com/artifact/io.jsonwebtoken/jjwt-api --> <dependency> <groupId>io.jsonwebtoken</groupId> - <artifactId>jjwt-jackson</artifactId> + <artifactId>jjwt-api</artifactId> <version>0.12.3</version> - <scope>runtime</scope> </dependency> <!-- https://mvnrepository.com/artifact/io.jsonwebtoken/jjwt-api --> <dependency> <groupId>io.jsonwebtoken</groupId> - <artifactId>jjwt-api</artifactId> + <artifactId>jjwt-impl</artifactId> <version>0.12.3</version> + <scope>runtime</scope> </dependency> - <!-- https://mvnrepository.com/artifact/io.jsonwebtoken/jjwt-api --> + + <!-- https://mvnrepository.com/artifact/io.jsonwebtoken/jjwt-jackson --> <dependency> <groupId>io.jsonwebtoken</groupId> - <artifactId>jjwt-impl</artifactId> + <artifactId>jjwt-jackson</artifactId> <version>0.12.3</version> + <scope>runtime</scope> </dependency> <dependency> @@ -152,9 +154,8 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-simple</artifactId> <version>1.7.36</version> - <scope>test</scope> </dependency> - + <!-- https://mvnrepository.com/artifact/ch.qos.logback/logback-classic --> <!-- dependency> <groupId>ch.qos.logback</groupId> diff --git a/docker/Dockerfile.soda b/docker/Dockerfile.soda index f83f34b38ad86bae054a897fa4c72a16b67c543e..08819206a994b7bf8917ebee02eba1b10021ba36 100644 --- a/docker/Dockerfile.soda +++ b/docker/Dockerfile.soda @@ -33,9 +33,7 @@ ARG VLKB_VERSION COPY vlkb-${VLKB_VERSION}.deb ./ COPY vlkb-soda-${VLKB_VERSION}.war ${WEBAPP_DIR}/ RUN dpkg -i vlkb-${VLKB_VERSION}.deb \ - && cd ${WEBAPP_DIR} && unzip vlkb-soda-${VLKB_VERSION}.war \ - && rm -f $WEBAPP_DIR/WEB-INF/lib/jjwt-*0.11*.jar -# remove jjwt used by IA2 (IA2 and IAM token filters used different ver of jjwt) + && cd ${WEBAPP_DIR} && unzip vlkb-soda-${VLKB_VERSION}.war # configure instance