From a1200d5d14e242b7e9d2e4155e11fb8014462114 Mon Sep 17 00:00:00 2001
From: Olivier Maury <Olivier.Maury@inrae.fr>
Date: Wed, 4 Sep 2024 18:14:14 +0200
Subject: [PATCH] =?UTF-8?q?build(deps):=20:arrow=5Fup:=20Mettre=20=C3=A0?=
=?UTF-8?q?=20jour=20les=20d=C3=A9pendances?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Passer à domino-ui-1.0.7 et domino-rest-2.0.0-RC1
fixes #107
---
pom.xml | 28 +++++++++++++++----
www-server/pom.xml | 2 +-
www-shared/pom.xml | 5 ----
.../shared/service/ApplicationService.java | 6 ++--
.../www/shared/service/IndicatorService.java | 6 ++--
.../www/shared/service/SurveyFormService.java | 6 ++--
6 files changed, 33 insertions(+), 20 deletions(-)
diff --git a/pom.xml b/pom.xml
index 5655bc56..d7ac646a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,14 +40,15 @@
</ciManagement>
<properties>
<!-- Dependencies versions -->
- <domino.rest.version>1.0.0</domino.rest.version>
- <domino.ui.version>1.0.5</domino.ui.version>
+ <domino.rest.version>2.0.0-RC1</domino.rest.version>
+ <domino.ui.version>1.0.7</domino.ui.version>
<domino.jackson.version>1.0.3</domino.jackson.version>
<domino.mvp.version>1.0.1</domino.mvp.version>
<gwt.version>2.11.0</gwt.version>
<hibernate.version>6.2.22.Final</hibernate.version>
+ <jax.rs.version>3.1.0</jax.rs.version>
<jersey.version>3.1.5</jersey.version>
- <junit.version>5.10.2</junit.version>
+ <junit.version>5.10.3</junit.version>
<log4j.version>2.23.1</log4j.version>
<lombok.version>1.18.30</lombok.version>
<weld.version>4.0.3.Final</weld.version>
@@ -124,7 +125,7 @@
<dependency>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
- <version>3.1.0</version>
+ <version>${jax.rs.version}</version>
</dependency>
<!-- Jersey -->
<dependency>
@@ -170,17 +171,34 @@
<version>${domino.jackson.version}</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.dominokit</groupId>
+ <artifactId>domino-rest</artifactId>
+ <version>${domino.rest.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
<dependency>
<groupId>org.dominokit</groupId>
<artifactId>domino-rest-client</artifactId>
<version>${domino.rest.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.dominokit</groupId>
+ <artifactId>domino-rest-jaxrs</artifactId>
+ <version>${domino.rest.version}</version>
+ </dependency>
<dependency>
<groupId>org.dominokit</groupId>
<artifactId>domino-rest-processor</artifactId>
<version>${domino.rest.version}</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.dominokit</groupId>
+ <artifactId>domino-rest-shared</artifactId>
+ <version>${domino.rest.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
@@ -414,7 +432,7 @@
<plugin>
<groupId>net.ltgt.gwt.maven</groupId>
<artifactId>gwt-maven-plugin</artifactId>
- <version>1.0.1</version>
+ <version>1.1.0</version>
<extensions>true</extensions>
<configuration>
<sourceLevel>1.11</sourceLevel>
diff --git a/www-server/pom.xml b/www-server/pom.xml
index 964b207e..be95eeec 100644
--- a/www-server/pom.xml
+++ b/www-server/pom.xml
@@ -15,7 +15,7 @@
<name>AgroMetInfo web app - server</name>
<properties>
- <mockito-core.version>5.11.0</mockito-core.version>
+ <mockito-core.version>5.12.0</mockito-core.version>
<sava.version>1.0.0</sava.version>
<swagger.version>2.2.20</swagger.version>
<checkstyle.config.location>file://${basedir}/../config/sun_checks.xml</checkstyle.config.location>
diff --git a/www-shared/pom.xml b/www-shared/pom.xml
index da6cc538..29feabf0 100644
--- a/www-shared/pom.xml
+++ b/www-shared/pom.xml
@@ -30,11 +30,6 @@
<artifactId>jakarta.ws.rs-api</artifactId>
</dependency>
<!-- Domino-REST -->
- <dependency>
- <groupId>javax.ws.rs</groupId>
- <artifactId>javax.ws.rs-api</artifactId>
- <version>2.1.1</version>
- </dependency>
<dependency>
<groupId>org.dominokit</groupId>
<artifactId>domino-jackson</artifactId>
diff --git a/www-shared/src/main/java/fr/agrometinfo/www/shared/service/ApplicationService.java b/www-shared/src/main/java/fr/agrometinfo/www/shared/service/ApplicationService.java
index 695df5e1..7b21b6c1 100644
--- a/www-shared/src/main/java/fr/agrometinfo/www/shared/service/ApplicationService.java
+++ b/www-shared/src/main/java/fr/agrometinfo/www/shared/service/ApplicationService.java
@@ -2,9 +2,9 @@ package fr.agrometinfo.www.shared.service;
import java.util.Date;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
import org.dominokit.rest.shared.request.service.annotations.RequestBody;
import org.dominokit.rest.shared.request.service.annotations.RequestFactory;
diff --git a/www-shared/src/main/java/fr/agrometinfo/www/shared/service/IndicatorService.java b/www-shared/src/main/java/fr/agrometinfo/www/shared/service/IndicatorService.java
index e0fec013..6d7c3ab8 100644
--- a/www-shared/src/main/java/fr/agrometinfo/www/shared/service/IndicatorService.java
+++ b/www-shared/src/main/java/fr/agrometinfo/www/shared/service/IndicatorService.java
@@ -4,9 +4,9 @@ import java.util.Date;
import java.util.List;
import java.util.Map;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.QueryParam;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.QueryParam;
import org.dominokit.rest.shared.request.service.annotations.RequestFactory;
import org.geojson.FeatureCollection;
diff --git a/www-shared/src/main/java/fr/agrometinfo/www/shared/service/SurveyFormService.java b/www-shared/src/main/java/fr/agrometinfo/www/shared/service/SurveyFormService.java
index b41ab707..beb8e043 100644
--- a/www-shared/src/main/java/fr/agrometinfo/www/shared/service/SurveyFormService.java
+++ b/www-shared/src/main/java/fr/agrometinfo/www/shared/service/SurveyFormService.java
@@ -2,9 +2,9 @@ package fr.agrometinfo.www.shared.service;
import java.util.List;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
import org.dominokit.rest.shared.request.service.annotations.RequestFactory;
import org.dominokit.rest.shared.request.service.annotations.RequestBody;
--
GitLab