From e89e5e7c5469890f035ef12a2c56da561f9007e5 Mon Sep 17 00:00:00 2001
From: theghost5800 <kristian0001@gmail.com>
Date: Mon, 27 Oct 2025 16:37:23 +0200
Subject: [PATCH 1/3] Remove usage of derby dependency for tests

JIRA:LMCROSSITXSADEPLOY-3259
---
 multiapps-controller-persistence/pom.xml      | 15 -------------
 .../model/PersistenceMetadata.java            |  3 ++-
 .../test/resources/META-INF/persistence.xml   |  4 ++--
 .../test/resources/META-INF/persistence.xml   | 18 ---------------
 pom.xml                                       | 22 -------------------
 5 files changed, 4 insertions(+), 58 deletions(-)
 delete mode 100644 multiapps-controller-process/src/test/resources/META-INF/persistence.xml

diff --git a/multiapps-controller-persistence/pom.xml b/multiapps-controller-persistence/pom.xml
index 14e98441da..08498147bd 100644
--- a/multiapps-controller-persistence/pom.xml
+++ b/multiapps-controller-persistence/pom.xml
@@ -85,21 +85,6 @@
             <groupId>org.glassfish.jaxb</groupId>
             <artifactId>jaxb-runtime</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.apache.derby</groupId>
-            <artifactId>derby</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.derby</groupId>
-            <artifactId>derbyclient</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.derby</groupId>
-            <artifactId>derbynet</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
diff --git a/multiapps-controller-persistence/src/main/java/org/cloudfoundry/multiapps/controller/persistence/model/PersistenceMetadata.java b/multiapps-controller-persistence/src/main/java/org/cloudfoundry/multiapps/controller/persistence/model/PersistenceMetadata.java
index e5c17112a1..7862074462 100644
--- a/multiapps-controller-persistence/src/main/java/org/cloudfoundry/multiapps/controller/persistence/model/PersistenceMetadata.java
+++ b/multiapps-controller-persistence/src/main/java/org/cloudfoundry/multiapps/controller/persistence/model/PersistenceMetadata.java
@@ -80,7 +80,8 @@ private TableColumnNames() {
         public static final String HISTORIC_OPERATION_EVENT_TIMESTAMP = "timestamp";
 
         public static final String ACCESS_TOKEN_ID = "id";
-        public static final String ACCESS_TOKEN_VALUE = "value";
+        // Add escaping quotes due to reserved word in some DBMS(h2).
+        public static final String ACCESS_TOKEN_VALUE = "\"value\"";
         public static final String ACCESS_TOKEN_USERNAME = "username";
         public static final String ACCESS_TOKEN_EXPIRES_AT = "expires_at";
         public static final String ACCESS_TOKEN_USER_GUID = "user_guid";
diff --git a/multiapps-controller-persistence/src/test/resources/META-INF/persistence.xml b/multiapps-controller-persistence/src/test/resources/META-INF/persistence.xml
index 3a11939a1a..c3a8d536d4 100644
--- a/multiapps-controller-persistence/src/test/resources/META-INF/persistence.xml
+++ b/multiapps-controller-persistence/src/test/resources/META-INF/persistence.xml
@@ -14,9 +14,9 @@
         <class>org.cloudfoundry.multiapps.controller.persistence.dto.BackupDescriptorDto</class>
         <exclude-unlisted-classes>true</exclude-unlisted-classes>
         <properties>
-            <property name="jakarta.persistence.jdbc.driver" value="org.apache.derby.jdbc.EmbeddedDriver" />
+            <property name="jakarta.persistence.jdbc.driver" value="org.h2.Driver" />
             <property name="jakarta.persistence.jdbc.url"
-                value="jdbc:derby:memory:configuration-subscriptions;create=true" />
+                value="jdbc:h2:mem:configuration-subscriptions:DB_CLOSE_DELAY=-1" />
             <property name="jakarta.persistence.jdbc.user" value="root" />
             <property name="jakarta.persistence.jdbc.password" value="root" />
 
diff --git a/multiapps-controller-process/src/test/resources/META-INF/persistence.xml b/multiapps-controller-process/src/test/resources/META-INF/persistence.xml
deleted file mode 100644
index cda667cd28..0000000000
--- a/multiapps-controller-process/src/test/resources/META-INF/persistence.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence version="3.0" xmlns="https://jakarta.ee/xml/ns/persistence"
-             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-             xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd">
-    <persistence-unit name="TestDefault" transaction-type="RESOURCE_LOCAL">
-        <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
-        <properties>
-            <property name="jakarta.persistence.jdbc.driver" value="org.apache.derby.jdbc.EmbeddedDriver"/>
-            <property name="jakarta.persistence.jdbc.url"
-                      value="jdbc:derby:memory:configuration-subscriptions;create=true"/>
-            <property name="jakarta.persistence.jdbc.user" value="root"/>
-            <property name="jakarta.persistence.jdbc.password" value="root"/>
-
-            <property name="eclipselink.ddl-generation" value="create-tables"/>
-            <property name="eclipselink.ddl-generation.output-mode" value="database"/>
-        </properties>
-    </persistence-unit>
-</persistence>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 56b28e3697..ed38b817ca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,6 @@
         <junit.version>5.13.4</junit.version>
         <junit-platform.version>1.13.2</junit-platform.version>
         <mockito.version>5.18.0</mockito.version>
-        <derby.version>10.16.1.1</derby.version> <!-- Upper versions of Derby(10.17.1.0) are not compatible with Java 17 -->
         <h2.version>2.2.224</h2.version>
         <servlet-api.version>6.1.0</servlet-api.version>
         <log4j.version>2.25.1</log4j.version>
@@ -384,27 +383,6 @@
                 <artifactId>swagger-annotations</artifactId>
                 <version>${swagger.version}</version>
             </dependency>
-            <!-- https://mvnrepository.com/artifact/org.apache.derby/derby -->
-            <dependency>
-                <groupId>org.apache.derby</groupId>
-                <artifactId>derby</artifactId>
-                <version>${derby.version}</version>
-                <scope>test</scope>
-            </dependency>
-            <!-- https://mvnrepository.com/artifact/org.apache.derby/derbyclient -->
-            <dependency>
-                <groupId>org.apache.derby</groupId>
-                <artifactId>derbyclient</artifactId>
-                <version>${derby.version}</version>
-                <scope>test</scope>
-            </dependency>
-            <!-- https://mvnrepository.com/artifact/org.apache.derby/derbynet -->
-            <dependency>
-                <groupId>org.apache.derby</groupId>
-                <artifactId>derbynet</artifactId>
-                <version>${derby.version}</version>
-                <scope>test</scope>
-            </dependency>
             <!-- https://mvnrepository.com/artifact/com.h2database/h2 -->
             <dependency>
                 <groupId>com.h2database</groupId>

From a6c803fd77504feb8845ba2b3430889744ba1471 Mon Sep 17 00:00:00 2001
From: theghost5800 <kristian0001@gmail.com>
Date: Mon, 27 Oct 2025 17:23:25 +0200
Subject: [PATCH 2/3] Remove explicit set of mybatis dependency

JIRA:LMCROSSITXSADEPLOY-3259
---
 pom.xml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index ed38b817ca..31f68af816 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,6 @@
         <httpcore.version>5.3.4</httpcore.version>
         <eclipselink.version>4.0.7</eclipselink.version>
         <flowable.version>7.2.0</flowable.version>
-        <mybatis.version>3.5.19</mybatis.version>
         <spring.version>6.2.11</spring.version>
         <spring-security.version>6.5.4</spring-security.version>
         <json-smart.version>2.5.2</json-smart.version>
@@ -553,12 +552,6 @@
                 <artifactId>flowable-spring-common</artifactId>
                 <version>${flowable.version}</version>
             </dependency>
-            <!-- https://mvnrepository.com/artifact/org.mybatis/mybatis -->
-            <dependency>
-                <groupId>org.mybatis</groupId>
-                <artifactId>mybatis</artifactId>
-                <version>${mybatis.version}</version>
-            </dependency>
             <!-- https://mvnrepository.com/artifact/org.springframework/spring-core -->
             <dependency>
                 <groupId>org.springframework</groupId>

From 8ff046166f32904a37b9f589eb0bf9caf2faae8c Mon Sep 17 00:00:00 2001
From: theghost5800 <kristian0001@gmail.com>
Date: Mon, 27 Oct 2025 17:33:46 +0200
Subject: [PATCH 3/3] Remove explicit set of json-smart dependency

JIRA:LMCROSSITXSADEPLOY-3259
---
 pom.xml | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index 31f68af816..3be1fe5536 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,6 @@
         <flowable.version>7.2.0</flowable.version>
         <spring.version>6.2.11</spring.version>
         <spring-security.version>6.5.4</spring-security.version>
-        <json-smart.version>2.5.2</json-smart.version>
         <hikari.version>6.3.0</hikari.version>
         <jackson.version>2.19.2</jackson.version>
         <liquibase.version>4.33.0</liquibase.version>
@@ -762,14 +761,6 @@
                 <artifactId>commons-codec</artifactId>
                 <version>${commons-codec.version}</version>
             </dependency>
-            <!-- Transitive dependency from spring-security-oauth2-client. They're using an old version with security vulnerabilities.
-                 In order to avoid the vulnerabilities explicit versioning is required. -->
-            <!-- https://mvnrepository.com/artifact/net.minidev/json-smart -->
-            <dependency>
-                <groupId>net.minidev</groupId>
-                <artifactId>json-smart</artifactId>
-                <version>${json-smart.version}</version>
-            </dependency>
             <!-- https://mvnrepository.com/artifact/io.github.resilience4j/resilience4j-ratelimiter -->
             <dependency>
                 <groupId>io.github.resilience4j</groupId>