#4479 - upgrade SecurisServer to Java 21

Joaquín Reñé

10 hours ago 93635eef5ea5561f556d1cc0980f0ea83631a839

#4479 - upgrade SecurisServer to Java 21

 securis/pom.xml
..
..
@@ -64,13 +64,7 @@
64
64
 		  <artifactId>httpmime</artifactId>
65
65
 		  <version>4.5.13</version>
66
66
 		</dependency>        
67
-		
68
-		<dependency>
69
-		    <groupId>javax.persistence</groupId>
70
-		    <artifactId>javax.persistence-api</artifactId>
71
-		    <version>2.2</version>
72
-		</dependency>
73
-		
67
+			
74
68
 		<dependency>
75
69
 		  <groupId>org.apache.commons</groupId>
76
70
 		  <artifactId>commons-lang3</artifactId>
..
..
@@ -93,7 +87,6 @@
93
87
             <groupId>jakarta.enterprise</groupId>
94
88
             <artifactId>jakarta.enterprise.cdi-api</artifactId>
95
89
             <version>${jakarta.cdi.version}</version>
96
-            <scope>provided</scope>
97
90
         </dependency>
98
91
         <dependency>
99
92
 		    <groupId>jakarta.inject</groupId>
..
..
@@ -178,11 +171,6 @@
178
171
         <dependency>
179
172
             <groupId>com.fasterxml.jackson.dataformat</groupId>
180
173
             <artifactId>jackson-dataformat-cbor</artifactId>
181
-            <version>${jackson.version}</version>
182
-        </dependency>
183
-        <dependency>
184
-            <groupId>com.fasterxml.jackson.datatype</groupId>
185
-            <artifactId>jackson-datatype-hibernate6</artifactId>
186
174
             <version>${jackson.version}</version>
187
175
         </dependency>
188
176
         <dependency>
 securis/src/main/resources/META-INF/persistence.xml
..
..
@@ -1,8 +1,8 @@
1
1
 <?xml version="1.0" encoding="UTF-8"?>
2
-<persistence version="2.2"
3
-    xmlns="http://xmlns.jcp.org/xml/ns/persistence"
2
+<persistence version="3.0"
3
+    xmlns="https://jakarta.ee/xml/ns/persistence"
4
4
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5
-    xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_2.xsd">
5
+    xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence https://jakarta.ee/xml/ns/persistence/persistence_3_0.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.MySQL5Dialect"/>
15
+            <property name="hibernate.dialect" value="org.hibernate.dialect.MySQLDialect"/>
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/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>javax.sql.DataSource</res-type>
111
+	    <res-type>jakarta.sql.DataSource</res-type>
112
112
 	    <res-auth>Container</res-auth>
113
113
 	</resource-ref>
114
114