chore(deps): bump dependencies

BREAKING CHANGE: require APIM 4.4.x
gravitee-io · Jul 31, 2024 · 124d55a · 124d55a
1 parent cd788bd
commit 124d55a
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 14 deletions.
diff --git a/README.adoc b/README.adoc
@@ -29,7 +29,8 @@ Some authorization servers use OAuth2 protocol to provide access tokens. These a
 |1.20.x to 1.21.x    | 3.10.x to 3.14.x
 |1.22.x              | 3.15.x to 3.17.x
 |2.x                 | 3.18.x to 3.20
-|4.x                 | 4.0.x to latest
+|4.x                 | 4.0.x to 4.3.x
+|5.x                 | 4.4.x to latest
 |===
 
 === JWT

diff --git a/pom.xml b/pom.xml
@@ -22,24 +22,25 @@
 
     <groupId>io.gravitee.policy</groupId>
     <artifactId>gravitee-policy-jwt</artifactId>
-    <version>4.1.5</version>
+    <version>5.0.0</version>
 
     <name>Gravitee.io APIM - Policy - JWT</name>
     <description>Validate the token signature and expiration date before sending the API call to the target backend</description>
 
     <parent>
         <groupId>io.gravitee</groupId>
         <artifactId>gravitee-parent</artifactId>
-        <version>22.0.2</version>
+        <version>22.1.0</version>
     </parent>
 
     <properties>
-        <gravitee-bom.version>6.0.3</gravitee-bom.version>
-        <gravitee-gateway-api.version>3.0.0</gravitee-gateway-api.version>
+        <gravitee-bom.version>7.0.23</gravitee-bom.version>
+        <gravitee-common.version>4.4.0</gravitee-common.version>
+        <gravitee-gateway-api.version>3.5.0</gravitee-gateway-api.version>
+        <gravitee-node.version>5.18.3</gravitee-node.version>
+        <gravitee-apim.version>4.4.0</gravitee-apim.version>
+
         <gravitee-policy-api.version>1.11.0</gravitee-policy-api.version>
-        <gravitee-node.version>3.1.0</gravitee-node.version>
-        <gravitee-common.version>3.3.3</gravitee-common.version>
-        <gravitee-apim.version>4.1.0-SNAPSHOT</gravitee-apim.version>
 
         <nimbus-jose-jwt.version>9.15.2</nimbus-jose-jwt.version>
         <sshj.version>0.35.0</sshj.version>
@@ -77,6 +78,13 @@
                 <artifactId>gravitee-common</artifactId>
                 <version>${gravitee-common.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.gravitee.node</groupId>
+                <artifactId>gravitee-node</artifactId>
+                <version>${gravitee-node.version}</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -97,6 +105,16 @@
             <artifactId>gravitee-common</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>io.gravitee.node</groupId>
+            <artifactId>gravitee-node-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.gravitee.node</groupId>
+            <artifactId>gravitee-node-vertx</artifactId>
+            <scope>provided</scope>
+        </dependency>
 
         <dependency>
             <groupId>com.nimbusds</groupId>

diff --git a/src/main/java/io/gravitee/policy/jwt/jwk/source/VertxResourceRetriever.java b/src/main/java/io/gravitee/policy/jwt/jwk/source/VertxResourceRetriever.java
@@ -16,8 +16,8 @@
 package io.gravitee.policy.jwt.jwk.source;
 
 import com.nimbusds.jose.util.Resource;
-import io.gravitee.common.util.VertxProxyOptionsUtils;
 import io.gravitee.node.api.configuration.Configuration;
+import io.gravitee.node.vertx.proxy.VertxProxyOptionsUtils;
 import io.reactivex.rxjava3.core.Single;
 import io.vertx.core.http.HttpClientOptions;
 import io.vertx.core.http.HttpHeaders;
@@ -84,7 +84,7 @@ private HttpClient buildHttpClient(URL url) {
 
         if (useSystemProxy) {
             try {
-                VertxProxyOptionsUtils.setSystemProxy(options, configuration);
+                options.setProxyOptions(VertxProxyOptionsUtils.buildProxyOptions(configuration));
             } catch (Exception e) {
                 log.warn(
                     "JWTPlugin requires a system proxy to be defined to retrieve resource [{}] but some configurations are missing or not well defined: {}",

diff --git a/src/main/java/io/gravitee/policy/v3/jwt/jwks/retriever/VertxResourceRetriever.java b/src/main/java/io/gravitee/policy/v3/jwt/jwks/retriever/VertxResourceRetriever.java
@@ -15,10 +15,9 @@
  */
 package io.gravitee.policy.v3.jwt.jwks.retriever;
 
-import static io.gravitee.common.util.VertxProxyOptionsUtils.setSystemProxy;
-
 import com.nimbusds.jose.util.Resource;
 import io.gravitee.node.api.configuration.Configuration;
+import io.gravitee.node.vertx.proxy.VertxProxyOptionsUtils;
 import io.vertx.core.Future;
 import io.vertx.core.Promise;
 import io.vertx.core.Vertx;
@@ -58,7 +57,7 @@ public CompletableFuture<Resource> retrieve(URL url) {
 
         if (useSystemProxy) {
             try {
-                setSystemProxy(options, configuration);
+                options.setProxyOptions(VertxProxyOptionsUtils.buildProxyOptions(configuration));
             } catch (Exception e) {
                 LOGGER.warn(
                     "JWTPlugin requires a system proxy to be defined to retrieve resource [{}] but some configurations are missing or not well defined: {}",

diff --git a/src/test/java/io/gravitee/policy/jwt/jwk/AbstractJWKTest.java b/src/test/java/io/gravitee/policy/jwt/jwk/AbstractJWKTest.java
@@ -36,8 +36,8 @@
 import java.util.Date;
 import java.util.stream.Stream;
 import net.schmizz.sshj.common.Buffer;
-import org.apache.commons.lang3.RandomStringUtils;
 import org.junit.jupiter.params.provider.Arguments;
+import wiremock.org.apache.commons.lang3.RandomStringUtils;
 
 /**
  * @author Jeoffrey HAEYAERT (jeoffrey.haeyaert at graviteesource.com)