From 3a07396d3e2aca5bddd7ad54fe26fb90baa582ec Mon Sep 17 00:00:00 2001
From: Joaquín Reñé <jrene@curisit.net>
Date: Mon, 21 Apr 2025 12:18:40 +0000
Subject: [PATCH] #4399 - Fusion of JavaX on Master. Merge branch 'JavaX'
---
securis/pom.xml | 147 +++++++++++++++++++++++++-----------------------
securis/src/main/java/net/curisit/securis/services/helpers/LicenseHelper.java | 3
securis/src/main/java/net/curisit/securis/services/LicenseResource.java | 1
securis/src/main/java/net/curisit/securis/utils/EmailManager.java | 3
4 files changed, 82 insertions(+), 72 deletions(-)
diff --git a/securis/pom.xml b/securis/pom.xml
index 4357086..f70c392 100644
--- a/securis/pom.xml
+++ b/securis/pom.xml
@@ -1,7 +1,7 @@
<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</name>
+ <name>SeCuris-Server</name>
<groupId>net.curisit</groupId>
<artifactId>securis-server</artifactId>
<version>2.0.1</version>
@@ -10,42 +10,44 @@
<description>CurisTEC Server Licenses</description>
<organization>
- <name>CURISTEC</name>
+ <name>CURISTEC</name>
</organization>
-
+
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <lifecycle.version>1.0.0</lifecycle.version>
+ <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>11</maven.compiler.source>
- <maven.compiler.target>11</maven.compiler.target>
+ <maven.compiler.target>11</maven.compiler.target>
<maven-assembly-plugin.version>3.4.2</maven-assembly-plugin.version>
- <ant.version>2.7.7</ant.version>
- <java.version>11</java.version>
-
- <ci.version>0.0.2-SNAPSHOT</ci.version>
- <securis.client.version>1.2.0</securis.client.version>
-
- <lang.version>2.6</lang.version>
- <javax.version>3.1.0</javax.version>
- <resteasy.version>3.0.13.Final</resteasy.version>
- <log4j.version>2.17.2</log4j.version>
- <httpclient.version>4.5.6</httpclient.version>
- <jackson.version>2.4.3</jackson.version>
- <weld.version>2.2.9.Final</weld.version>
- <jandex.version>1.2.2.Final</jandex.version>
- <hibernate.version>4.3.6.Final</hibernate.version>
- <http.version>4.4-beta1</http.version>
- <cdi.version>1.2</cdi.version>
- </properties>
-
+
+ <curistec.internal.version>3.3.0</curistec.internal.version>
+ <securis.version>1.3.1</securis.version>
+
+ <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>
<dependency>
<groupId>net.curisit.integrity</groupId>
<artifactId>commons-curis</artifactId>
- <version>${ci.version}</version>
+ <version>${curistec.internal.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.logging.log4j</groupId>
@@ -64,7 +66,7 @@
<dependency>
<groupId>net.curisit</groupId>
<artifactId>securis-client</artifactId>
- <version>${securis.client.version}</version>
+ <version>${securis.version}</version>
<exclusions>
<exclusion>
<artifactId>jackson-databind</artifactId>
@@ -72,42 +74,68 @@
</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>2.6</version>
+ <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.version}</version>
+ <version>${javax.servlet.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-multipart-provider</artifactId>
- <version>${resteasy.version}</version>
+ <version>${jboss.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jaxrs</artifactId>
- <version>${resteasy.version}</version>
+ <version>${jboss.version}</version>
</dependency>
<dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>resteasy-cdi</artifactId>
- <version>${resteasy.version}</version>
+ <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>${resteasy.version}</version>
+ <version>${jboss.version}</version>
<exclusions>
<exclusion>
<artifactId>jackson-core</artifactId>
@@ -121,36 +149,9 @@
</dependency>
<dependency>
- <groupId>org.jboss.weld.servlet</groupId>
- <artifactId>weld-servlet</artifactId>
- <version>${weld.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jandex</artifactId>
- <version>${jandex.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>${http.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpmime</artifactId>
- <version>${http.version}</version>
- </dependency>
- <dependency>
- <groupId>javax.enterprise</groupId>
- <artifactId>cdi-api</artifactId>
- <version>1.2</version>
- <scope>provided</scope>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>resteasy-cdi</artifactId>
+ <version>${jboss.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
@@ -163,15 +164,20 @@
<version>${jackson.version}</version>
</dependency>
</dependencies>
+
<build>
<plugins>
- <plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>${maven.version}</version>
- <configuration>
- <source>11</source>
- <target>11</target>
+ <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>
@@ -190,6 +196,7 @@
</plugin>
</plugins>
</build>
+
<repositories>
<repository>
<id>internal</id>
diff --git a/securis/src/main/java/net/curisit/securis/services/LicenseResource.java b/securis/src/main/java/net/curisit/securis/services/LicenseResource.java
index b3b3051..1027ee7 100644
--- a/securis/src/main/java/net/curisit/securis/services/LicenseResource.java
+++ b/securis/src/main/java/net/curisit/securis/services/LicenseResource.java
@@ -218,6 +218,7 @@
* @return
* @throws SeCurisServiceException
*/
+ @SuppressWarnings("deprecation")
@PUT
@POST
@Path("/{licId}/send")
diff --git a/securis/src/main/java/net/curisit/securis/services/helpers/LicenseHelper.java b/securis/src/main/java/net/curisit/securis/services/helpers/LicenseHelper.java
index d8d6e20..142a747 100644
--- a/securis/src/main/java/net/curisit/securis/services/helpers/LicenseHelper.java
+++ b/securis/src/main/java/net/curisit/securis/services/helpers/LicenseHelper.java
@@ -2,6 +2,7 @@
import java.io.File;
import java.io.IOException;
+import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.util.Date;
import java.util.HashMap;
@@ -98,7 +99,7 @@
public File createTemporaryLicenseFile(License lic, String licFileName) throws IOException {
File f = Files.createTempDirectory("securis-server").toFile();
f = new File(f, licFileName);
- FileUtils.writeStringToFile(f, lic.getLicenseData());
+ FileUtils.writeStringToFile(f, lic.getLicenseData(), StandardCharsets.UTF_8);
return f;
}
diff --git a/securis/src/main/java/net/curisit/securis/utils/EmailManager.java b/securis/src/main/java/net/curisit/securis/utils/EmailManager.java
index 9fe04a2..1d8641e 100644
--- a/securis/src/main/java/net/curisit/securis/utils/EmailManager.java
+++ b/securis/src/main/java/net/curisit/securis/utils/EmailManager.java
@@ -100,7 +100,8 @@
* @throws SeCurisException
* @throws UnsupportedEncodingException
*/
- public void sendEmail(String subject, String body, String to, String cc, File file) throws SeCurisServiceException, UnsupportedEncodingException {
+ @SuppressWarnings("deprecation")
+ public void sendEmail(String subject, String body, String to, String cc, File file) throws SeCurisServiceException, UnsupportedEncodingException {
HttpPost postRequest = new HttpPost(serverUrl);
MultipartEntityBuilder builder = MultipartEntityBuilder.create();
--
Gitblit v1.3.2