diff --git a/pom.xml b/pom.xml index 5655bc56eff5bae08f32d9438218d3d67be7d5d3..d7ac646a762e6176a5b46718ce806e4e266f3f3f 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 964b207ea717e8a5c9a126e3b3c98e096bc2697a..be95eeec011ac20cdb0c6b420793e80cf796aa7b 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 da6cc5385824816a984bbf2a0e08560de8edc5ef..29feabf0f10de169166cf660fb0cf61c06d472fe 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 695df5e1d4826db9671887e709f5e6947ce738a9..7b21b6c1c4c7de171c6b5c852935a10fccf9383c 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 e0fec0132ec016426f75d2e223cca0c2547bc596..6d7c3ab81b01bf72edac722a454722ea92059e05 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 b41ab7070ac2253b662fb44ae89cf5dec0d8ac47..beb8e04358226cddcf9161dddc7f9b64e247e679 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;