From 07fa15814f0c826e57bd7bd33be901fb46a00bf3 Mon Sep 17 00:00:00 2001
From: Olivier Maury <Olivier.Maury@inrae.fr>
Date: Tue, 25 Jun 2024 17:42:18 +0200
Subject: [PATCH] Utiliser Jakarta et season-core-1.3.0
---
pom.xml | 18 ++++++++++++++----
.../seasonhandler/cmd/MainCommand.java | 7 ++++---
.../jms/IntegrationDoneProducer.java | 6 +++---
.../jms/IntegrationDoneReceiver.java | 14 +++++++-------
.../seasonhandler/jms/SafranReceiver.java | 12 ++++++------
.../jms/SimulationDoneReceiver.java | 12 ++++++------
src/site/markdown/usage.md | 8 ++++----
.../config-good-with-stages.properties | 8 ++++----
src/test/resources/config-good.properties | 8 ++++----
9 files changed, 52 insertions(+), 41 deletions(-)
diff --git a/pom.xml b/pom.xml
index eacc0af..da39c20 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>fr.agrometinfo</groupId>
<artifactId>season-handler</artifactId>
- <version>2.0.0-alpha-4</version>
+ <version>2.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>AgroMetInfo SEASON handler</name>
<description>SEASON handler for AgroMetInfo</description>
@@ -36,12 +36,12 @@
</ciManagement>
<properties>
<!-- Dependencies versions -->
- <hibernate.version>5.6.15.Final</hibernate.version>
+ <hibernate.version>6.5.2.Final</hibernate.version>
<junit.version>5.10.1</junit.version>
<log4j.version>2.23.1</log4j.version>
<lombok.version>1.18.30</lombok.version>
<picoli.version>4.7.5</picoli.version>
- <season.version>1.2.6</season.version>
+ <season.version>1.3.0-SNAPSHOT</season.version>
<!-- Maven environment values -->
<build.date>${maven.build.timestamp}</build.date>
<maven.build.timestamp.format>yyyy-MM-dd HH:mm:ss</maven.build.timestamp.format>
@@ -97,7 +97,7 @@
<version>${season.version}</version>
</dependency>
<dependency>
- <groupId>org.hibernate</groupId>
+ <groupId>org.hibernate.orm</groupId>
<artifactId>hibernate-hikaricp</artifactId>
<version>${hibernate.version}</version>
</dependency>
@@ -244,6 +244,16 @@
</executions>
<configuration>
<finalName>agrometinfo-season-handler-${project.version}</finalName>
+ <filters>
+ <filter>
+ <artifact>*:*</artifact>
+ <excludes>
+ <exclude>META-INF/*.SF</exclude>
+ <exclude>META-INF/*.DSA</exclude>
+ <exclude>META-INF/*.RSA</exclude>
+ </excludes>
+ </filter>
+ </filters>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>${exec.mainClass}</mainClass>
diff --git a/src/main/java/fr/agrometinfo/seasonhandler/cmd/MainCommand.java b/src/main/java/fr/agrometinfo/seasonhandler/cmd/MainCommand.java
index abf42d1..df5fc1e 100644
--- a/src/main/java/fr/agrometinfo/seasonhandler/cmd/MainCommand.java
+++ b/src/main/java/fr/agrometinfo/seasonhandler/cmd/MainCommand.java
@@ -25,9 +25,10 @@ import java.util.Optional;
import java.util.Properties;
import java.util.concurrent.Callable;
-import javax.jms.ConnectionFactory;
-import javax.jms.Destination;
-import javax.jms.JMSContext;
+import jakarta.jms.ConnectionFactory;
+import jakarta.jms.Destination;
+import jakarta.jms.JMSContext;
+
import javax.naming.InitialContext;
import javax.naming.NamingException;
diff --git a/src/main/java/fr/agrometinfo/seasonhandler/jms/IntegrationDoneProducer.java b/src/main/java/fr/agrometinfo/seasonhandler/jms/IntegrationDoneProducer.java
index 6fbb1fc..8709e55 100644
--- a/src/main/java/fr/agrometinfo/seasonhandler/jms/IntegrationDoneProducer.java
+++ b/src/main/java/fr/agrometinfo/seasonhandler/jms/IntegrationDoneProducer.java
@@ -3,9 +3,9 @@ package fr.agrometinfo.seasonhandler.jms;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
-import javax.jms.Destination;
-import javax.jms.JMSContext;
-import javax.jms.JMSProducer;
+import jakarta.jms.Destination;
+import jakarta.jms.JMSContext;
+import jakarta.jms.JMSProducer;
import lombok.extern.log4j.Log4j2;
diff --git a/src/main/java/fr/agrometinfo/seasonhandler/jms/IntegrationDoneReceiver.java b/src/main/java/fr/agrometinfo/seasonhandler/jms/IntegrationDoneReceiver.java
index f86b4f9..cbeae3e 100644
--- a/src/main/java/fr/agrometinfo/seasonhandler/jms/IntegrationDoneReceiver.java
+++ b/src/main/java/fr/agrometinfo/seasonhandler/jms/IntegrationDoneReceiver.java
@@ -7,13 +7,13 @@ import java.net.http.HttpRequest;
import java.net.http.HttpResponse;
import java.time.LocalDateTime;
-import javax.jms.Destination;
-import javax.jms.JMSConsumer;
-import javax.jms.JMSContext;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageListener;
-import javax.ws.rs.core.Response;
+import jakarta.jms.Destination;
+import jakarta.jms.JMSConsumer;
+import jakarta.jms.JMSContext;
+import jakarta.jms.JMSException;
+import jakarta.jms.Message;
+import jakarta.jms.MessageListener;
+import jakarta.ws.rs.core.Response;
import org.apache.activemq.artemis.jms.client.ActiveMQMessage;
diff --git a/src/main/java/fr/agrometinfo/seasonhandler/jms/SafranReceiver.java b/src/main/java/fr/agrometinfo/seasonhandler/jms/SafranReceiver.java
index bb030e0..dce0ac9 100644
--- a/src/main/java/fr/agrometinfo/seasonhandler/jms/SafranReceiver.java
+++ b/src/main/java/fr/agrometinfo/seasonhandler/jms/SafranReceiver.java
@@ -24,12 +24,12 @@ import java.util.Objects;
import java.util.Optional;
import java.util.stream.Collectors;
-import javax.jms.Destination;
-import javax.jms.JMSConsumer;
-import javax.jms.JMSContext;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageListener;
+import jakarta.jms.Destination;
+import jakarta.jms.JMSConsumer;
+import jakarta.jms.JMSContext;
+import jakarta.jms.JMSException;
+import jakarta.jms.Message;
+import jakarta.jms.MessageListener;
import org.apache.activemq.artemis.jms.client.ActiveMQMessage;
diff --git a/src/main/java/fr/agrometinfo/seasonhandler/jms/SimulationDoneReceiver.java b/src/main/java/fr/agrometinfo/seasonhandler/jms/SimulationDoneReceiver.java
index 34a2d47..acb91c3 100644
--- a/src/main/java/fr/agrometinfo/seasonhandler/jms/SimulationDoneReceiver.java
+++ b/src/main/java/fr/agrometinfo/seasonhandler/jms/SimulationDoneReceiver.java
@@ -2,12 +2,12 @@ package fr.agrometinfo.seasonhandler.jms;
import java.util.Objects;
-import javax.jms.Destination;
-import javax.jms.JMSConsumer;
-import javax.jms.JMSContext;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageListener;
+import jakarta.jms.Destination;
+import jakarta.jms.JMSConsumer;
+import jakarta.jms.JMSContext;
+import jakarta.jms.JMSException;
+import jakarta.jms.Message;
+import jakarta.jms.MessageListener;
import org.apache.activemq.artemis.jms.client.ActiveMQMessage;
diff --git a/src/site/markdown/usage.md b/src/site/markdown/usage.md
index 7bf7276..a2e2b18 100644
--- a/src/site/markdown/usage.md
+++ b/src/site/markdown/usage.md
@@ -66,10 +66,10 @@ season.results.table.reader = season-read
## Persistence unit "simulation"
-simulation.javax.persistence.jdbc.driver = org.postgresql.Driver
-simulation.javax.persistence.jdbc.url = jdbc:postgresql://localhost/season?ApplicationName=agrometinfo-season-cli-dev
-simulation.javax.persistence.jdbc.user = season
-simulation.javax.persistence.jdbc.password = season
+simulation.jakarta.persistence.jdbc.driver = org.postgresql.Driver
+simulation.jakarta.persistence.jdbc.url = jdbc:postgresql://localhost/season?ApplicationName=agrometinfo-season-cli-dev
+simulation.jakarta.persistence.jdbc.user = season
+simulation.jakarta.persistence.jdbc.password = season
simulation.hibernate.dialect = org.hibernate.dialect.PostgreSQLDialect
simulation.hibernate.show_sql = false
# Configuring Connection Pool
diff --git a/src/test/resources/config-good-with-stages.properties b/src/test/resources/config-good-with-stages.properties
index 138d8cf..2067d98 100644
--- a/src/test/resources/config-good-with-stages.properties
+++ b/src/test/resources/config-good-with-stages.properties
@@ -26,10 +26,10 @@ season.results.table.reader = season-read
## Persistence unit "simulation"
-simulation.javax.persistence.jdbc.driver = org.postgresql.Driver
-simulation.javax.persistence.jdbc.url = jdbc:postgresql://localhost/season?ApplicationName=season-cli-simulation-dev
-simulation.javax.persistence.jdbc.user = season
-simulation.javax.persistence.jdbc.password = season
+simulation.jakarta.persistence.jdbc.driver = org.postgresql.Driver
+simulation.jakarta.persistence.jdbc.url = jdbc:postgresql://localhost/season?ApplicationName=season-cli-simulation-dev
+simulation.jakarta.persistence.jdbc.user = season
+simulation.jakarta.persistence.jdbc.password = season
simulation.hibernate.dialect = org.hibernate.dialect.PostgreSQLDialect
simulation.hibernate.show_sql = false
# Configuring Connection Pool
diff --git a/src/test/resources/config-good.properties b/src/test/resources/config-good.properties
index 1169af9..bd2f6c7 100644
--- a/src/test/resources/config-good.properties
+++ b/src/test/resources/config-good.properties
@@ -26,10 +26,10 @@ season.results.table.reader = season-read
## Persistence unit "simulation"
-simulation.javax.persistence.jdbc.driver = org.postgresql.Driver
-simulation.javax.persistence.jdbc.url = jdbc:postgresql://localhost/season?ApplicationName=season-cli-simulation-dev
-simulation.javax.persistence.jdbc.user = season
-simulation.javax.persistence.jdbc.password = season
+simulation.jakarta.persistence.jdbc.driver = org.postgresql.Driver
+simulation.jakarta.persistence.jdbc.url = jdbc:postgresql://localhost/season?ApplicationName=season-cli-simulation-dev
+simulation.jakarta.persistence.jdbc.user = season
+simulation.jakarta.persistence.jdbc.password = season
simulation.hibernate.dialect = org.hibernate.dialect.PostgreSQLDialect
simulation.hibernate.show_sql = false
# Configuring Connection Pool
--
GitLab