#4479 - upgrade SecurisServer to Java 21

Joaquín Reñé

11 hours ago 132b79a57b0595430cfa245590e3b1a5d61891c5

#4479 - upgrade SecurisServer to Java 21

 securis/pom.xml
..
..
@@ -24,7 +24,9 @@
24
24
         <jakarta.cdi.version>4.0.1</jakarta.cdi.version>
25
25
         <jackson.version>2.17.2</jackson.version>
26
26
         <beanutils.version>1.9.4</beanutils.version>
27
+        <weld.version>5.1.2.Final</weld.version>
27
28
         <log4j.version>2.18.0</log4j.version>
29
+        
28
30
     </properties>
29
31
 
30
32
     <dependencies>
..
..
@@ -64,6 +66,12 @@
64
66
 		</dependency>        
65
67
 		
66
68
 		<dependency>
69
+		    <groupId>javax.persistence</groupId>
70
+		    <artifactId>javax.persistence-api</artifactId>
71
+		    <version>2.2</version>
72
+		</dependency>
73
+		
74
+		<dependency>
67
75
 		  <groupId>org.apache.commons</groupId>
68
76
 		  <artifactId>commons-lang3</artifactId>
69
77
 		  <version>3.12.0</version>
..
..
@@ -87,6 +95,11 @@
87
95
             <version>${jakarta.cdi.version}</version>
88
96
             <scope>provided</scope>
89
97
         </dependency>
98
+        <dependency>
99
+		    <groupId>jakarta.inject</groupId>
100
+		    <artifactId>jakarta.inject-api</artifactId>
101
+		    <version>2.0.1</version>
102
+		</dependency>
90
103
 
91
104
         <!-- Hibernate 5 compatible con Jakarta Persistence -->
92
105
         <!--
..
..
@@ -172,6 +185,16 @@
172
185
             <artifactId>jackson-datatype-hibernate6</artifactId>
173
186
             <version>${jackson.version}</version>
174
187
         </dependency>
188
+        <dependency>
189
+		    <groupId>org.jboss.weld.servlet</groupId>
190
+		    <artifactId>weld-servlet-core</artifactId>
191
+		    <version>${weld.version}</version>
192
+		</dependency>
193
+		<dependency>
194
+		    <groupId>com.mysql</groupId>
195
+		    <artifactId>mysql-connector-j</artifactId>
196
+		    <version>9.6.0</version>
197
+		</dependency>
175
198
         
176
199
     </dependencies>
177
200
 
 securis/src/main/java/net/curisit/securis/ioc/EntityManagerProvider.java
..
..
@@ -27,7 +27,7 @@
27
27
 */
28
28
 @ApplicationScoped
29
29
 public class EntityManagerProvider {
30
-
30
+	
31
31
     private static final Logger log = LogManager.getLogger(EntityManagerProvider.class);
32
32
 
33
33
     /** 
 securis/src/main/resources/META-INF/persistence.xml
..
..
@@ -1,8 +1,8 @@
1
1
 <?xml version="1.0" encoding="UTF-8"?>
2
-<persistence version="3.0"
3
-    xmlns="https://jakarta.ee/xml/ns/persistence"
2
+<persistence version="2.2"
3
+    xmlns="http://xmlns.jcp.org/xml/ns/persistence"
4
4
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5
-    xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd">
5
+    xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_2.xsd">
6
6
 
7
7
     <persistence-unit name="localdb" transaction-type="RESOURCE_LOCAL">
8
8
         <description>SeCuris LocalDB</description>
..
..
@@ -12,7 +12,7 @@
12
12
 
13
13
         <properties>
14
14
             <property name="hibernate.cache.region.factory_class" value="org.hibernate.cache.internal.NoCachingRegionFactory"/>
15
-            <property name="hibernate.dialect" value="org.hibernate.dialect.MySQLDialect"/>
15
+            <property name="hibernate.dialect" value="org.hibernate.dialect.MySQL5Dialect"/>
16
16
             <property name="hibernate.cache.use_second_level_cache" value="false"/>
17
17
             <property name="hibernate.format_sql" value="false"/>
18
18
         </properties>
 securis/src/main/webapp/WEB-INF/beans.xml
..
..
@@ -1,7 +1,7 @@
1
-<beans xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2
-	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_1.xsd">
3
-<interceptors>
4
-  <!--       <class>net.curisit.securis.ioc.TransactionsManager</class>  -->
5
-    </interceptors>
6
-</beans>
7
- 
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<beans xmlns="https://jakarta.ee/xml/ns/jakartaee"
3
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4
+       xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_4_0.xsd"
5
+       version="4.0"
6
+       bean-discovery-mode="annotated">
7
+</beans>
 securis/src/main/webapp/WEB-INF/web.xml
..
..
@@ -108,7 +108,7 @@
108
108
 	<resource-ref>
109
109
 	    <description>SeCuris DataSource</description>
110
110
 	    <res-ref-name>SeCurisDS</res-ref-name>
111
-	    <res-type>jakarta.sql.DataSource</res-type>
111
+	    <res-type>javax.sql.DataSource</res-type>
112
112
 	    <res-auth>Container</res-auth>
113
113
 	</resource-ref>
114
114
 	
 securis/src/main/webapp/package.json
..
..
@@ -95,7 +95,7 @@
95
95
       "typescript": "npm:typescript@^2.2.2"
96
96
     },
97
97
     "peerDependencies": {
98
-      "@angular/common": "npm:@angular/common@^4.0.0",
98
+      "@angular/common": "npm:@angular/common@4.2.0",
99
99
       "@angular/compiler": "npm:@angular/compiler@^4.2.0",
100
100
       "@angular/core": "npm:@angular/core@4.2.0",
101
101
       "@angular/forms": "npm:@angular/forms@^4.2.0",