Merge pull request #134 from gravitee-io/alpha

Merge 'alpha' into master
gravitee-io · Dec 30, 2024 · b09be5e · b09be5e
2 parents 4087658 + 583cb39
commit b09be5e
Show file tree

Hide file tree

Showing 28 changed files with 574 additions and 414 deletions.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -1,13 +1,9 @@
-**Issue**
+## Issue
 
-https://gravitee.atlassian.net/browse/APIM-XXXX
+https://gravitee.atlassian.net/browse/XXXXX
 
-**Description**
+## Description
 
 A small description of what you did in that PR.
 
-**Additional context**
-
-<!-- Add any other context about the PR here -->
-<!-- It can be links to other PRs or docs or drawing -->
-<!-- Or reproduction steps in case of bug fix -->
+## Additional context
diff --git a/.github/renovate.json b/.github/renovate.json
@@ -1,25 +1,3 @@
 {
-    "extends": ["config:base", ":label(dependencies)"],
-    "rebaseWhen": "conflicted",
-    "packageRules": [
-        {
-            "matchDatasources": ["orb"],
-            "matchUpdateTypes": ["patch", "minor"],
-            "automerge": true,
-            "automergeType": "branch",
-            "semanticCommitType": "ci"
-        },
-        {
-            "matchDepTypes": ["provided", "test", "build", "import", "parent"],
-            "matchUpdateTypes": ["patch", "minor"],
-            "automerge": true,
-            "automergeType": "branch",
-            "semanticCommitType": "chore"
-        },
-        {
-            "matchDepTypes": ["provided", "test", "build", "import", "parent"],
-            "matchUpdateTypes": ["major"],
-            "semanticCommitType": "chore"
-        }
-    ]
+    "extends": ["github>gravitee-io/renovate-config:policy"]
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,59 @@
-# [5.2.0](https://github.com/gravitee-io/gravitee-policy-jwt/compare/5.1.0...5.2.0) (2024-11-07)
+# [6.0.0-alpha.5](https://github.com/gravitee-io/gravitee-policy-jwt/compare/6.0.0-alpha.4...6.0.0-alpha.5) (2024-12-30)
+
+
+### Bug Fixes
+
+* **deps:** bump apim version ([7999be1](https://github.com/gravitee-io/gravitee-policy-jwt/commit/7999be10ad558c09feda4c2446ba72de081afaa5))
+
+
+### Features
+
+* support custom token type header ([47e1918](https://github.com/gravitee-io/gravitee-policy-jwt/commit/47e19180b7cf95ca01172e0a844171c2a6ae141a))
+
+# [6.0.0-alpha.4](https://github.com/gravitee-io/gravitee-policy-jwt/compare/6.0.0-alpha.3...6.0.0-alpha.4) (2024-11-29)
+
+
+### Features
+
+* set a max value for kafka token lifetime ([9195623](https://github.com/gravitee-io/gravitee-policy-jwt/commit/9195623d3e7d3a0f2863ad0837f8cfcdb6295ea3))
+
+# [6.0.0-alpha.3](https://github.com/gravitee-io/gravitee-policy-jwt/compare/6.0.0-alpha.2...6.0.0-alpha.3) (2024-11-22)
+
+
+### Bug Fixes
+
+* invoke callback and complete on auth failure ([3f64243](https://github.com/gravitee-io/gravitee-policy-jwt/commit/3f64243e2455609057d4b947c11c623c2cefdf07))
+
+# [6.0.0-alpha.2](https://github.com/gravitee-io/gravitee-policy-jwt/compare/6.0.0-alpha.1...6.0.0-alpha.2) (2024-11-13)
+
 
+### Features
+
+* support custom token type header ([d08e658](https://github.com/gravitee-io/gravitee-policy-jwt/commit/d08e65834b2eaf111dc9bdeeaa54223160a10fa4))
+
+# [6.0.0-alpha.1](https://github.com/gravitee-io/gravitee-policy-jwt/compare/5.1.0...6.0.0-alpha.1) (2024-11-12)
+
+
+### Bug Fixes
+
+* use provided version of nimbus lib ([7063db4](https://github.com/gravitee-io/gravitee-policy-jwt/commit/7063db42c55cd6bd8a3021502f0bfaf03ce02f12))
+
+
+### Code Refactoring
+
+* use new HttpSecurityPolicy and BaseExecutionContext interface ([8f6270f](https://github.com/gravitee-io/gravitee-policy-jwt/commit/8f6270f8f22e06c972c141d12c28433b5da2f34e))
+
+
+### Features
+
+* implement kafka security policy ([f1db2f1](https://github.com/gravitee-io/gravitee-policy-jwt/commit/f1db2f1818a8cc60f8dfeace66a2c5a8d57bd600))
+
+
+### BREAKING CHANGES
+
+* requires APIM 4.6+
+
+# [5.2.0](https://github.com/gravitee-io/gravitee-policy-jwt/compare/5.1.0...5.2.0) (2024-11-07)
 
 ### Features
 

diff --git a/README.adoc b/README.adoc
@@ -25,12 +25,13 @@ Some authorization servers use OAuth2 protocol to provide access tokens. These a
 |===
 |Plugin version | APIM version
 
-|Up to 1.19.x        | Up to 3.9.x
-|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
+|6.x                 | 4.6.x to latest
+|5.x                 | 4.4.x to 4.5.x
 |4.x                 | 4.0.x to 4.3.x
-|5.x                 | 4.4.x to latest
+|2.x                 | 3.18.x to 3.20
+|1.22.x              | 3.15.x to 3.17.x
+|1.20.x to 1.21.x    | 3.10.x to 3.14.x
+|Up to 1.19.x        | Up to 3.9.x
 |===
 
 === JWT

diff --git a/README.md b/README.md
diff --git a/pom.xml b/pom.xml
@@ -22,7 +22,7 @@
 
     <groupId>io.gravitee.policy</groupId>
     <artifactId>gravitee-policy-jwt</artifactId>
-    <version>5.2.0</version>
+    <version>6.0.0-alpha.5</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>
@@ -34,18 +34,9 @@
     </parent>
 
     <properties>
-        <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.20.0</gravitee-node.version>
-        <gravitee-apim.version>4.4.0</gravitee-apim.version>
+        <gravitee-apim.version>4.6.0-alpha.3</gravitee-apim.version>
 
-        <gravitee-policy-api.version>1.11.0</gravitee-policy-api.version>
-
-        <nimbus-jose-jwt.version>9.15.2</nimbus-jose-jwt.version>
         <sshj.version>0.39.0</sshj.version>
-        <guava.version>31.1-jre</guava.version>
-
         <maven-plugin-assembly.version>3.7.1</maven-plugin-assembly.version>
         <maven-plugin-properties.version>1.2.1</maven-plugin-properties.version>
 
@@ -57,31 +48,9 @@
         <dependencies>
             <!-- Import bom to properly inherit all dependencies -->
             <dependency>
-                <groupId>io.gravitee</groupId>
-                <artifactId>gravitee-bom</artifactId>
-                <version>${gravitee-bom.version}</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
-            <dependency>
-                <groupId>io.gravitee.policy</groupId>
-                <artifactId>gravitee-policy-api</artifactId>
-                <version>${gravitee-policy-api.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.gravitee.gateway</groupId>
-                <artifactId>gravitee-gateway-api</artifactId>
-                <version>${gravitee-gateway-api.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.gravitee.common</groupId>
-                <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>
+                <groupId>io.gravitee.apim</groupId>
+                <artifactId>gravitee-apim-bom</artifactId>
+                <version>${gravitee-apim.version}</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
@@ -119,7 +88,13 @@
         <dependency>
             <groupId>com.nimbusds</groupId>
             <artifactId>nimbus-jose-jwt</artifactId>
-            <version>${nimbus-jose-jwt.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
@@ -163,6 +138,12 @@
             <scope>provided</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.kafka</groupId>
+            <artifactId>kafka-clients</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
         <!-- Test scope -->
         <dependency>
             <groupId>io.gravitee.apim.gateway</groupId>
@@ -251,15 +232,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>${maven-javadoc-plugin.version}</version>
-                <configuration>
-                    <additionalJOption>-Xdoclint:none</additionalJOption>
-                    <source>8</source>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 </project>