From 93635eef5ea5561f556d1cc0980f0ea83631a839 Mon Sep 17 00:00:00 2001
From: Joaquín Reñé <jrene@curisit.net>
Date: Fri, 17 Apr 2026 08:07:25 +0000
Subject: [PATCH] #4479 - upgrade SecurisServer to Java 21
---
securis/src/main/resources/META-INF/persistence.xml | 8 ++++----
securis/pom.xml | 14 +-------------
securis/src/main/webapp/WEB-INF/web.xml | 2 +-
3 files changed, 6 insertions(+), 18 deletions(-)
diff --git a/securis/pom.xml b/securis/pom.xml
index b070e95..cc62f8a 100644
--- a/securis/pom.xml
+++ b/securis/pom.xml
@@ -64,13 +64,7 @@
<artifactId>httpmime</artifactId>
<version>4.5.13</version>
</dependency>
-
- <dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>javax.persistence-api</artifactId>
- <version>2.2</version>
- </dependency>
-
+
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
@@ -93,7 +87,6 @@
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
<version>${jakarta.cdi.version}</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.inject</groupId>
@@ -178,11 +171,6 @@
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-cbor</artifactId>
- <version>${jackson.version}</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.datatype</groupId>
- <artifactId>jackson-datatype-hibernate6</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
diff --git a/securis/src/main/resources/META-INF/persistence.xml b/securis/src/main/resources/META-INF/persistence.xml
index fa1bf4a..dcfc8a8 100644
--- a/securis/src/main/resources/META-INF/persistence.xml
+++ b/securis/src/main/resources/META-INF/persistence.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<persistence version="2.2"
- xmlns="http://xmlns.jcp.org/xml/ns/persistence"
+<persistence version="3.0"
+ xmlns="https://jakarta.ee/xml/ns/persistence"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_2.xsd">
+ xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd">
<persistence-unit name="localdb" transaction-type="RESOURCE_LOCAL">
<description>SeCuris LocalDB</description>
@@ -12,7 +12,7 @@
<properties>
<property name="hibernate.cache.region.factory_class" value="org.hibernate.cache.internal.NoCachingRegionFactory"/>
- <property name="hibernate.dialect" value="org.hibernate.dialect.MySQL5Dialect"/>
+ <property name="hibernate.dialect" value="org.hibernate.dialect.MySQLDialect"/>
<property name="hibernate.cache.use_second_level_cache" value="false"/>
<property name="hibernate.format_sql" value="false"/>
</properties>
diff --git a/securis/src/main/webapp/WEB-INF/web.xml b/securis/src/main/webapp/WEB-INF/web.xml
index 61cb287..be1f5fa 100644
--- a/securis/src/main/webapp/WEB-INF/web.xml
+++ b/securis/src/main/webapp/WEB-INF/web.xml
@@ -108,7 +108,7 @@
<resource-ref>
<description>SeCuris DataSource</description>
<res-ref-name>SeCurisDS</res-ref-name>
- <res-type>javax.sql.DataSource</res-type>
+ <res-type>jakarta.sql.DataSource</res-type>
<res-auth>Container</res-auth>
</resource-ref>
--
Gitblit v1.3.2