From 8624a5f58150b2c8d7b31f1cc34a91189558b2e6 Mon Sep 17 00:00:00 2001
From: Koman Rudden <komanrudden@gmail.com>
Date: Thu, 19 Jun 2025 11:57:09 +0200
Subject: [PATCH 1/4] fix: Synk spring security web/crypto

---
 kinde-springboot/kinde-springboot-starter/pom.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/kinde-springboot/kinde-springboot-starter/pom.xml b/kinde-springboot/kinde-springboot-starter/pom.xml
index 974a454d..ea686b94 100644
--- a/kinde-springboot/kinde-springboot-starter/pom.xml
+++ b/kinde-springboot/kinde-springboot-starter/pom.xml
@@ -23,6 +23,16 @@
       <artifactId>kinde-core</artifactId>
       <version>2.0.1</version>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-web</artifactId>
+      <version>6.4.6</version>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-crypto</artifactId>
+      <version>6.4.6</version>
+    </dependency>
   </dependencies>
 
   <build>

From 34a005fd38f782ddef5e3167e0b43c033ecdac40 Mon Sep 17 00:00:00 2001
From: Koman Rudden <komanrudden@gmail.com>
Date: Thu, 19 Jun 2025 12:16:39 +0200
Subject: [PATCH 2/4] fix: Synk spring dependency upgrades

---
 kinde-management/pom.xml                          |  6 ++----
 kinde-springboot/kinde-springboot-core/pom.xml    | 14 +++++++-------
 playground/springboot-pkce-client-example/pom.xml |  6 +++---
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/kinde-management/pom.xml b/kinde-management/pom.xml
index 0d638958..f439f2a1 100644
--- a/kinde-management/pom.xml
+++ b/kinde-management/pom.xml
@@ -12,7 +12,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <swagger-annotations-version>2.2.28</swagger-annotations-version>
         <jersey-version>4.0.0-M2</jersey-version>
-        <jackson-version>2.18.3</jackson-version>
+        <jackson-version>2.19.0</jackson-version>
         <jackson-databind-version>2.18.3</jackson-databind-version>
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
         <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
@@ -193,9 +193,7 @@
                         <configuration>
                             <target>
                                 <echo>Fixing syntax error in generated OpenAPI code</echo>
-                                <replace file="target/generated-sources/openapi/src/gen/java/main/org/openapitools/client/model/UpdateApplicationsPropertyRequestValue.java"
-                                         token="(token == JsonToken.VALUE_FALSE || token == JsonToken.VALUE_TRUE));"
-                                         value="(token == JsonToken.VALUE_FALSE || token == JsonToken.VALUE_TRUE);"/>
+                                <replace file="target/generated-sources/openapi/src/gen/java/main/org/openapitools/client/model/UpdateApplicationsPropertyRequestValue.java" token="(token == JsonToken.VALUE_FALSE || token == JsonToken.VALUE_TRUE));" value="(token == JsonToken.VALUE_FALSE || token == JsonToken.VALUE_TRUE);"/>
                             </target>
                         </configuration>
                         <goals>
diff --git a/kinde-springboot/kinde-springboot-core/pom.xml b/kinde-springboot/kinde-springboot-core/pom.xml
index d2f766dc..509a6b7d 100644
--- a/kinde-springboot/kinde-springboot-core/pom.xml
+++ b/kinde-springboot/kinde-springboot-core/pom.xml
@@ -30,7 +30,7 @@
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter</artifactId>
       <optional>true</optional>
-      <version>3.4.4</version>
+      <version>3.4.6</version>
     </dependency>
 
     <dependency>
@@ -50,34 +50,34 @@
     <dependency>
       <groupId>org.springframework.security</groupId>
       <artifactId>spring-security-config</artifactId>
-      <version>6.4.4</version>
+      <version>6.4.6</version>
     </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-security</artifactId>
-      <version>3.4.4</version>
+      <version>3.4.6</version>
     </dependency>
     <dependency>
       <groupId>org.springframework.security</groupId>
       <artifactId>spring-security-oauth2-client</artifactId>
-      <version>6.4.4</version>
+      <version>6.4.6</version>
     </dependency>
     <dependency>
       <groupId>org.springframework.security</groupId>
       <artifactId>spring-security-oauth2-jose</artifactId>
-      <version>6.4.4</version>
+      <version>6.4.6</version>
     </dependency>
     <dependency>
       <groupId>org.springframework.security</groupId>
       <artifactId>spring-security-oauth2-resource-server</artifactId>
-      <version>6.4.4</version>
+      <version>6.4.6</version>
     </dependency>
 
     <!-- Spring deps-->
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-security</artifactId>
-      <version>3.4.4</version>
+      <version>3.4.6</version>
     </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
diff --git a/playground/springboot-pkce-client-example/pom.xml b/playground/springboot-pkce-client-example/pom.xml
index 13071571..27b85c1c 100644
--- a/playground/springboot-pkce-client-example/pom.xml
+++ b/playground/springboot-pkce-client-example/pom.xml
@@ -15,12 +15,12 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-webflux</artifactId>
-            <version>3.4.4</version>
+            <version>3.4.6</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-oauth2-client</artifactId>
-            <version>3.4.4</version>
+            <version>3.4.6</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -30,7 +30,7 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-oauth2-resource-server</artifactId>
-            <version>3.4.4</version>
+            <version>3.4.6</version>
         </dependency>
     </dependencies>
 

From 9bac768daca7adb7a0b290dba7a4d56d4be44112 Mon Sep 17 00:00:00 2001
From: Koman Rudden <komanrudden@gmail.com>
Date: Fri, 20 Jun 2025 05:35:14 +0200
Subject: [PATCH 3/4] fix: guava monorepo upgrade

---
 pom.xml | 24 ++----------------------
 1 file changed, 2 insertions(+), 22 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2a39c7d9..e82ed870 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,7 +51,6 @@
 
     <dependencyManagement>
         <dependencies>
-            <!-- https://mvnrepository.com/artifact/com.nimbusds/oauth2-oidc-sdk -->
             <dependency>
                 <groupId>com.nimbusds</groupId>
                 <artifactId>oauth2-oidc-sdk</artifactId>
@@ -68,7 +67,6 @@
                 <version>4.13.2</version>
                 <scope>test</scope>
             </dependency>
-            <!-- JUnit 5 API and Engine -->
             <dependency>
                 <groupId>org.junit.jupiter</groupId>
                 <artifactId>junit-jupiter-api</artifactId>
@@ -81,28 +79,21 @@
                 <version>5.12.0</version>
                 <scope>test</scope>
             </dependency>
-
-            <!-- Optional: For parameterized tests -->
             <dependency>
                 <groupId>org.junit.jupiter</groupId>
                 <artifactId>junit-jupiter-params</artifactId>
                 <version>5.12.0</version>
                 <scope>test</scope>
             </dependency>
-
-            <!-- Mockito (if you are using it for mocking) -->
             <dependency>
                 <groupId>org.mockito</groupId>
                 <artifactId>mockito-core</artifactId>
                 <version>5.17.0</version>
                 <scope>test</scope>
             </dependency>
-
-
             <dependency>
                 <groupId>com.google.inject</groupId>
                 <artifactId>guice</artifactId>
-                <!-- {version} can be 6.0.0, 7.0.0, etc. -->
                 <version>7.0.0</version>
                 <exclusions>
                     <exclusion>
@@ -111,22 +102,17 @@
                     </exclusion>
                 </exclusions>
             </dependency>
-            <!-- https://mvnrepository.com/artifact/com.google.guava/guava -->
             <dependency>
                 <groupId>com.google.guava</groupId>
                 <artifactId>guava</artifactId>
-                <version>32.1.3-jre</version>
+                <version>33.4.8-jre</version>
             </dependency>
-
-
-            <!-- https://mvnrepository.com/artifact/org.projectlombok/lombok -->
             <dependency>
                 <groupId>org.projectlombok</groupId>
                 <artifactId>lombok</artifactId>
                 <version>1.18.36</version>
                 <scope>provided</scope>
             </dependency>
-            <!-- https://mvnrepository.com/artifact/org.slf4j/slf4j-api -->
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-api</artifactId>
@@ -198,7 +184,6 @@
     </distributionManagement>
 
     <build>
-
         <pluginManagement>
             <plugins>
                 <plugin>
@@ -227,7 +212,7 @@
                         <path>
                             <groupId>org.projectlombok</groupId>
                             <artifactId>lombok</artifactId>
-                            <version>1.18.36</version> <!-- Use the version you need -->
+                            <version>1.18.36</version>
                         </path>
                     </annotationProcessorPaths>
                 </configuration>
@@ -257,7 +242,6 @@
                 </executions>
             </plugin>
 
-            <!-- We must generate a -sources JAR file to publish on Maven Central -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
@@ -314,13 +298,9 @@
                         <exclude>**/generated/**</exclude>
                         <exclude>**/thirdparty/**</exclude>
                         <exclude>**/openapitools/**</exclude>
-                        <!-- Add more excludes if necessary -->
                     </excludes>
                 </configuration>
             </plugin>
         </plugins>
-
-
     </build>
-
 </project>

From ede0c72e73a24d005cc74aa652568e3d8c9608f5 Mon Sep 17 00:00:00 2001
From: Koman Rudden <komanrudden@gmail.com>
Date: Fri, 20 Jun 2025 05:50:49 +0200
Subject: [PATCH 4/4] fix: guava monorepo upgrade

---
 kinde-core/pom.xml                            |  5 +++++
 .../session/KindeClientCodeSessionImpl.java   |  2 +-
 pom.xml                                       | 22 ++++++++++++++++++-
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/kinde-core/pom.xml b/kinde-core/pom.xml
index 341b78ac..3c0f590e 100644
--- a/kinde-core/pom.xml
+++ b/kinde-core/pom.xml
@@ -25,6 +25,11 @@
       <groupId>com.nimbusds</groupId>
       <artifactId>nimbus-jose-jwt</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.checkerframework</groupId>
+      <artifactId>checker-qual</artifactId>
+      <version>3.33.0</version>
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
diff --git a/kinde-core/src/main/java/com/kinde/session/KindeClientCodeSessionImpl.java b/kinde-core/src/main/java/com/kinde/session/KindeClientCodeSessionImpl.java
index 3673bd90..fe1cee60 100644
--- a/kinde-core/src/main/java/com/kinde/session/KindeClientCodeSessionImpl.java
+++ b/kinde-core/src/main/java/com/kinde/session/KindeClientCodeSessionImpl.java
@@ -20,7 +20,7 @@
 import com.nimbusds.openid.connect.sdk.token.OIDCTokens;
 import lombok.SneakyThrows;
 
-import javax.annotation.Nullable;
+import org.checkerframework.checker.nullness.qual.Nullable;
 import java.net.URI;
 import java.util.Arrays;
 import java.util.List;
diff --git a/pom.xml b/pom.xml
index e82ed870..9385cf4c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,6 +51,7 @@
 
     <dependencyManagement>
         <dependencies>
+            <!-- https://mvnrepository.com/artifact/com.nimbusds/oauth2-oidc-sdk -->
             <dependency>
                 <groupId>com.nimbusds</groupId>
                 <artifactId>oauth2-oidc-sdk</artifactId>
@@ -67,6 +68,7 @@
                 <version>4.13.2</version>
                 <scope>test</scope>
             </dependency>
+            <!-- JUnit 5 API and Engine -->
             <dependency>
                 <groupId>org.junit.jupiter</groupId>
                 <artifactId>junit-jupiter-api</artifactId>
@@ -79,21 +81,28 @@
                 <version>5.12.0</version>
                 <scope>test</scope>
             </dependency>
+
+            <!-- Optional: For parameterized tests -->
             <dependency>
                 <groupId>org.junit.jupiter</groupId>
                 <artifactId>junit-jupiter-params</artifactId>
                 <version>5.12.0</version>
                 <scope>test</scope>
             </dependency>
+
+            <!-- Mockito (if you are using it for mocking) -->
             <dependency>
                 <groupId>org.mockito</groupId>
                 <artifactId>mockito-core</artifactId>
                 <version>5.17.0</version>
                 <scope>test</scope>
             </dependency>
+
+
             <dependency>
                 <groupId>com.google.inject</groupId>
                 <artifactId>guice</artifactId>
+                <!-- {version} can be 6.0.0, 7.0.0, etc. -->
                 <version>7.0.0</version>
                 <exclusions>
                     <exclusion>
@@ -102,17 +111,22 @@
                     </exclusion>
                 </exclusions>
             </dependency>
+            <!-- https://mvnrepository.com/artifact/com.google.guava/guava -->
             <dependency>
                 <groupId>com.google.guava</groupId>
                 <artifactId>guava</artifactId>
                 <version>33.4.8-jre</version>
             </dependency>
+
+
+            <!-- https://mvnrepository.com/artifact/org.projectlombok/lombok -->
             <dependency>
                 <groupId>org.projectlombok</groupId>
                 <artifactId>lombok</artifactId>
                 <version>1.18.36</version>
                 <scope>provided</scope>
             </dependency>
+            <!-- https://mvnrepository.com/artifact/org.slf4j/slf4j-api -->
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-api</artifactId>
@@ -184,6 +198,7 @@
     </distributionManagement>
 
     <build>
+
         <pluginManagement>
             <plugins>
                 <plugin>
@@ -212,7 +227,7 @@
                         <path>
                             <groupId>org.projectlombok</groupId>
                             <artifactId>lombok</artifactId>
-                            <version>1.18.36</version>
+                            <version>1.18.36</version> <!-- Use the version you need -->
                         </path>
                     </annotationProcessorPaths>
                 </configuration>
@@ -242,6 +257,7 @@
                 </executions>
             </plugin>
 
+            <!-- We must generate a -sources JAR file to publish on Maven Central -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
@@ -298,9 +314,13 @@
                         <exclude>**/generated/**</exclude>
                         <exclude>**/thirdparty/**</exclude>
                         <exclude>**/openapitools/**</exclude>
+                        <!-- Add more excludes if necessary -->
                     </excludes>
                 </configuration>
             </plugin>
         </plugins>
+
+
     </build>
+
 </project>