From 89b1c533d1b48b8b339b9c74a59c2ce73e6431af Mon Sep 17 00:00:00 2001
From: Joaquín Reñé <jrene@curisit.net>
Date: Tue, 27 May 2025 10:27:57 +0000
Subject: [PATCH] #4399 - Fix JPA and Serialization for new JPA versions (new eclipse envs)
---
securis/pom.xml | 334 ++++++++++++++++++++----------------------------------
1 files changed, 125 insertions(+), 209 deletions(-)
diff --git a/securis/pom.xml b/securis/pom.xml
index b01aa2c..45ef01e 100644
--- a/securis/pom.xml
+++ b/securis/pom.xml
@@ -1,220 +1,136 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
- <name>SeCuris-Server</name>
- <groupId>net.curisit</groupId>
- <artifactId>securis-server</artifactId>
- <version>2.0.1</version>
- <modelVersion>4.0.0</modelVersion>
-
- <description>CurisTEC Server Licenses</description>
-
- <organization>
- <name>CURISTEC</name>
- </organization>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>net.curisit</groupId>
+ <artifactId>securis-server</artifactId>
+ <version>2.0.1</version>
+ <name>SeCuris-Server</name>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <curisit.theme>default</curisit.theme>
- <maven.version>3.10.0</maven.version>
- <maven.resources.overwrite>true</maven.resources.overwrite>
- <maven.compiler.debug>true</maven.compiler.debug>
- <maven.compiler.source>21</maven.compiler.source>
- <maven.compiler.target>21</maven.compiler.target>
- <maven-assembly-plugin.version>3.4.2</maven-assembly-plugin.version>
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <maven.compiler.source>21</maven.compiler.source>
+ <maven.compiler.target>21</maven.compiler.target>
+ <resteasy.version>6.2.4.Final</resteasy.version>
+ <hibernate.version>5.6.15.Final</hibernate.version>
+ <jakarta.persistence.version>3.1.0</jakarta.persistence.version>
+ <jakarta.servlet.version>6.0.0</jakarta.servlet.version>
+ <jakarta.cdi.version>4.0.1</jakarta.cdi.version>
+ <log4j.version>2.18.0</log4j.version>
+ </properties>
- <curistec.internal.version>3.3.0</curistec.internal.version>
- <securis.version>1.3.1</securis.version>
+ <dependencies>
+ <!-- Internas -->
+ <dependency>
+ <groupId>net.curisit</groupId>
+ <artifactId>securis-client</artifactId>
+ <version>1.3.1</version>
+ </dependency>
- <log4j.version>2.18.0</log4j.version>
- <hibernate.version>4.3.6.Final</hibernate.version>
-
- <javax.servlet.version>3.1.0</javax.servlet.version>
- <jboss.version>3.0.13.Final</jboss.version>
- <jboss-weld.version>2.2.9.Final</jboss-weld.version>
- <jboss-jandex.version>1.2.2.Final</jboss-jandex.version>
-
- <commons-cli.version>1.2</commons-cli.version>
- <lang.version>2.6</lang.version>
- <lang3.version>3.17.0</lang3.version>
- <io.version>2.17.0</io.version>
- <httpclient.version>4.5.6</httpclient.version>
- <httpmime.version>4.4.1</httpmime.version>
- <jackson.version>2.14.1</jackson.version>
- </properties>
-
- <dependencies>
+ <!-- RESTEasy 6 - Jakarta EE 10 -->
+ <dependency>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>resteasy-core</artifactId>
+ <version>${resteasy.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>resteasy-servlet-initializer</artifactId>
+ <version>${resteasy.version}</version>
+ </dependency>
<dependency>
- <groupId>net.curisit.integrity</groupId>
- <artifactId>commons-curis</artifactId>
- <version>${curistec.internal.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- </exclusion>
- <exclusion>
- <artifactId>jackson-core</artifactId>
- <groupId>com.fasterxml.jackson.core</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jackson-databind</artifactId>
- <groupId>com.fasterxml.jackson.core</groupId>
- </exclusion>
- </exclusions>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>resteasy-multipart-provider</artifactId>
+ <version>${resteasy.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>resteasy-jackson2-provider</artifactId>
+ <version>${resteasy.version}</version>
+ </dependency>
<dependency>
- <groupId>net.curisit</groupId>
- <artifactId>securis-client</artifactId>
- <version>${securis.version}</version>
- <exclusions>
- <exclusion>
- <artifactId>jackson-databind</artifactId>
- <groupId>com.fasterxml.jackson.core</groupId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-web</artifactId>
- <version>${log4j.version}</version>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-entitymanager</artifactId>
- <version>${hibernate.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>${httpclient.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpmime</artifactId>
- <version>${httpmime.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>${lang.version}</version>
- </dependency>
- <dependency>
- <groupId>javax.enterprise</groupId>
- <artifactId>cdi-api</artifactId>
- <version>1.2</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>${javax.servlet.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>resteasy-multipart-provider</artifactId>
- <version>${jboss.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>resteasy-jaxrs</artifactId>
- <version>${jboss.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.weld.servlet</groupId>
- <artifactId>weld-servlet</artifactId>
- <version>${jboss-weld.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jandex</artifactId>
- <version>${jboss-jandex.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>resteasy-jackson2-provider</artifactId>
- <version>${jboss.version}</version>
- <exclusions>
- <exclusion>
- <artifactId>jackson-core</artifactId>
- <groupId>com.fasterxml.jackson.core</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jackson-databind</artifactId>
- <groupId>com.fasterxml.jackson.core</groupId>
- </exclusion>
- </exclusions>
- </dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpmime</artifactId>
+ <version>4.5.13</version>
+ </dependency>
<dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>resteasy-cdi</artifactId>
- <version>${jboss.version}</version>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.12.0</version>
</dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.jaxrs</groupId>
- <artifactId>jackson-jaxrs-json-provider</artifactId>
- <version>${jackson.version}</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- <version>${jackson.version}</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>${maven.version}</version>
- <configuration>
- <source>${maven.compiler.source}</source>
- <target>${maven.compiler.target}</target>
- <encoding>${project.build.sourceEncoding}</encoding>
- <debug>true</debug>
- <showDeprecation>true</showDeprecation>
- <showWarnings>true</showWarnings>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>${maven-assembly-plugin.version}</version>
- <configuration>
- <formats>
- <format>zip</format>
- <format>tar.gz</format>
- </formats>
- <descriptors>
- <descriptor>etc/build/pro/mvn_descriptor.xml</descriptor>
- </descriptors>
- <appendAssemblyId>false</appendAssemblyId>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <repositories>
- <repository>
- <id>internal</id>
- <name>CurisIT Repository</name>
- <url>http://archiva.curisit.net/archiva/repository/internal</url>
- </repository>
- <repository>
- <id>curistec</id>
- <name>CurisTec Corporate Repository</name>
- <url>http://archiva.curisit.net/archiva/repository/internal/</url>
- <layout>default</layout>
- </repository>
- <repository>
- <id>curistecSnapshot</id>
- <name>CurisTec Snapshots</name>
- <url>http://archiva.curisit.net/archiva/repository/snapshots/</url>
- <layout>default</layout>
- </repository>
- </repositories>
+ <!-- Jakarta EE APIs -->
+ <dependency>
+ <groupId>jakarta.persistence</groupId>
+ <artifactId>jakarta.persistence-api</artifactId>
+ <version>${jakarta.persistence.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <version>${jakarta.servlet.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.enterprise</groupId>
+ <artifactId>jakarta.enterprise.cdi-api</artifactId>
+ <version>${jakarta.cdi.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- Hibernate 5 compatible con Jakarta Persistence -->
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>${hibernate.version}</version>
+ </dependency>
+
+ <!-- Logging -->
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <version>${log4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ <version>${log4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-web</artifactId>
+ <version>${log4j.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.google.inject</groupId>
+ <artifactId>guice</artifactId>
+ <version>5.1.0</version>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.10.0</version>
+ <configuration>
+ <source>${maven.compiler.source}</source>
+ <target>${maven.compiler.target}</target>
+ <encoding>${project.build.sourceEncoding}</encoding>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <repositories>
+ <repository>
+ <id>central</id>
+ <url>https://repo.maven.apache.org/maven2</url>
+ </repository>
+ </repositories>
</project>
\ No newline at end of file
--
Gitblit v1.3.2