From 132b79a57b0595430cfa245590e3b1a5d61891c5 Mon Sep 17 00:00:00 2001
From: Joaquín Reñé <jrene@curisit.net>
Date: Fri, 17 Apr 2026 07:13:56 +0000
Subject: [PATCH] #4479 - upgrade SecurisServer to Java 21
---
securis/src/main/resources/META-INF/persistence.xml | 8 ++++----
securis/pom.xml | 23 +++++++++++++++++++++++
securis/src/main/webapp/WEB-INF/web.xml | 2 +-
securis/src/main/java/net/curisit/securis/ioc/EntityManagerProvider.java | 2 +-
securis/src/main/webapp/WEB-INF/beans.xml | 14 +++++++-------
securis/src/main/webapp/package.json | 2 +-
6 files changed, 37 insertions(+), 14 deletions(-)
diff --git a/securis/pom.xml b/securis/pom.xml
index bf7229f..b070e95 100644
--- a/securis/pom.xml
+++ b/securis/pom.xml
@@ -24,7 +24,9 @@
<jakarta.cdi.version>4.0.1</jakarta.cdi.version>
<jackson.version>2.17.2</jackson.version>
<beanutils.version>1.9.4</beanutils.version>
+ <weld.version>5.1.2.Final</weld.version>
<log4j.version>2.18.0</log4j.version>
+
</properties>
<dependencies>
@@ -64,6 +66,12 @@
</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>
<version>3.12.0</version>
@@ -87,6 +95,11 @@
<version>${jakarta.cdi.version}</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
+ <version>2.0.1</version>
+ </dependency>
<!-- Hibernate 5 compatible con Jakarta Persistence -->
<!--
@@ -172,6 +185,16 @@
<artifactId>jackson-datatype-hibernate6</artifactId>
<version>${jackson.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.jboss.weld.servlet</groupId>
+ <artifactId>weld-servlet-core</artifactId>
+ <version>${weld.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.mysql</groupId>
+ <artifactId>mysql-connector-j</artifactId>
+ <version>9.6.0</version>
+ </dependency>
</dependencies>
diff --git a/securis/src/main/java/net/curisit/securis/ioc/EntityManagerProvider.java b/securis/src/main/java/net/curisit/securis/ioc/EntityManagerProvider.java
index 2add6fc..19bdfc8 100644
--- a/securis/src/main/java/net/curisit/securis/ioc/EntityManagerProvider.java
+++ b/securis/src/main/java/net/curisit/securis/ioc/EntityManagerProvider.java
@@ -27,7 +27,7 @@
*/
@ApplicationScoped
public class EntityManagerProvider {
-
+
private static final Logger log = LogManager.getLogger(EntityManagerProvider.class);
/**
diff --git a/securis/src/main/resources/META-INF/persistence.xml b/securis/src/main/resources/META-INF/persistence.xml
index dcfc8a8..fa1bf4a 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="3.0"
- xmlns="https://jakarta.ee/xml/ns/persistence"
+<persistence version="2.2"
+ xmlns="http://xmlns.jcp.org/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">
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_2.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.MySQLDialect"/>
+ <property name="hibernate.dialect" value="org.hibernate.dialect.MySQL5Dialect"/>
<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/beans.xml b/securis/src/main/webapp/WEB-INF/beans.xml
index 7b1fd28..24fb02c 100644
--- a/securis/src/main/webapp/WEB-INF/beans.xml
+++ b/securis/src/main/webapp/WEB-INF/beans.xml
@@ -1,7 +1,7 @@
-<beans xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_1.xsd">
-<interceptors>
- <!-- <class>net.curisit.securis.ioc.TransactionsManager</class> -->
- </interceptors>
-</beans>
-
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="https://jakarta.ee/xml/ns/jakartaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_4_0.xsd"
+ version="4.0"
+ bean-discovery-mode="annotated">
+</beans>
\ No newline at end of file
diff --git a/securis/src/main/webapp/WEB-INF/web.xml b/securis/src/main/webapp/WEB-INF/web.xml
index be1f5fa..61cb287 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>jakarta.sql.DataSource</res-type>
+ <res-type>javax.sql.DataSource</res-type>
<res-auth>Container</res-auth>
</resource-ref>
diff --git a/securis/src/main/webapp/package.json b/securis/src/main/webapp/package.json
index b8397cc..a544700 100644
--- a/securis/src/main/webapp/package.json
+++ b/securis/src/main/webapp/package.json
@@ -95,7 +95,7 @@
"typescript": "npm:typescript@^2.2.2"
},
"peerDependencies": {
- "@angular/common": "npm:@angular/common@^4.0.0",
+ "@angular/common": "npm:@angular/common@4.2.0",
"@angular/compiler": "npm:@angular/compiler@^4.2.0",
"@angular/core": "npm:@angular/core@4.2.0",
"@angular/forms": "npm:@angular/forms@^4.2.0",
--
Gitblit v1.3.2