From 871e17af7ae83be351c69dda62d36c567122dffd Mon Sep 17 00:00:00 2001
From: Olivier Maury <Olivier.Maury@inrae.fr>
Date: Fri, 25 Oct 2024 16:49:19 +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
---
pom.xml | 46 ++++---------------
www-client/pom.xml | 2 +-
.../www/client/ui/map/ControlSuppliers.java | 8 ++--
www-server/pom.xml | 1 -
.../www/shared/dto/QuantileType.java | 2 +-
.../www/shared/service/GeometryService.java | 2 +-
6 files changed, 15 insertions(+), 46 deletions(-)
diff --git a/pom.xml b/pom.xml
index 602cb75..f9a966c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,9 +69,9 @@
<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>
+ <jersey.version>3.1.8</jersey.version>
<junit.version>5.10.3</junit.version>
- <log4j.version>2.23.1</log4j.version>
+ <log4j.version>2.24.1</log4j.version>
<lombok.version>1.18.30</lombok.version>
<weld.version>4.0.3.Final</weld.version>
<!-- Maven environment values -->
@@ -89,11 +89,11 @@
<checkstyle.includeTestResources>false</checkstyle.includeTestResources>
<checkstyle.includeTestSourceDirectory>true</checkstyle.includeTestSourceDirectory>
<checkstyle.version>3.3.1</checkstyle.version>
- <compiler-plugin.version>3.12.1</compiler-plugin.version>
+ <compiler-plugin.version>3.13.0</compiler-plugin.version>
<jacoco.version>0.8.11</jacoco.version>
<javadoc.version>3.6.2</javadoc.version>
<javase.api.link>https://docs.oracle.com/en/java/javase/17/docs/api/</javase.api.link>
- <pmd.version>3.21.2</pmd.version>
+ <pmd.version>3.25.0</pmd.version>
<sloccount.path>bin/sloccount.sh</sloccount.path>
<spotbugs.version>4.8.2.0</spotbugs.version>
<!-- Text format -->
@@ -417,36 +417,6 @@
</configuration>
</plugin>
- <!-- Generate PlantUML diagrams -->
- <!-- https://github.com/davidmoten/plantuml-maven-plugin -->
- <!-- http://mvnrepository.com/artifact/com.github.davidmoten/plantuml-maven-plugin -->
- <!-- mvn clean com.github.davidmoten:plantuml-maven-plugin:generate -->
- <plugin>
- <groupId>com.github.davidmoten</groupId>
- <artifactId>plantuml-maven-plugin</artifactId>
- <version>0.2.3</version>
- <executions>
- <execution>
- <id>generate-diagrams</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>generate</goal>
- </goals>
- <configuration>
- <sources>
- <directory>${basedir}/src/site/resources/images</directory>
- <includes>
- <include>**/*.puml</include>
- </includes>
- </sources>
- <outputDirectory>${project.build.directory}/site/images</outputDirectory>
- <formats>
- <format>svg</format>
- </formats>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
<pluginManagement>
<plugins>
@@ -498,7 +468,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>3.3.0</version>
+ <version>3.3.1</version>
<executions>
<execution>
<id>attach-sources</id>
@@ -549,12 +519,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>3.5.0</version>
+ <version>3.7.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>3.12.1</version>
+ <version>3.20.0</version>
</plugin>
<plugin>
<groupId>com.github.spotbugs</groupId>
@@ -596,7 +566,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
- <version>3.3.2</version>
+ <version>3.5.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/www-client/pom.xml b/www-client/pom.xml
index 9788bc5..ca3b207 100644
--- a/www-client/pom.xml
+++ b/www-client/pom.xml
@@ -77,7 +77,7 @@
<dependency>
<groupId>com.github.tdesjardins</groupId>
<artifactId>gwt-ol3</artifactId>
- <version>8.4.1</version>
+ <version>8.5.0</version>
</dependency>
</dependencies>
diff --git a/www-client/src/main/java/fr/agrometinfo/www/client/ui/map/ControlSuppliers.java b/www-client/src/main/java/fr/agrometinfo/www/client/ui/map/ControlSuppliers.java
index 6d201fc..fad117e 100644
--- a/www-client/src/main/java/fr/agrometinfo/www/client/ui/map/ControlSuppliers.java
+++ b/www-client/src/main/java/fr/agrometinfo/www/client/ui/map/ControlSuppliers.java
@@ -36,10 +36,10 @@ public abstract class ControlSuppliers {
*/
public static Collection<Control> createAllControls() {
final Collection<Control> controls = new Collection<>();
- controls.insertAt(0, ControlSuppliers.createZoom());
- controls.insertAt(0, ControlSuppliers.createDownloadButton());
- controls.insertAt(0, ControlSuppliers.createFullScreen());
- controls.insertAt(0, ControlSuppliers.createLayerSwitcher());
+ controls.insertAt(0, createZoom());
+ controls.insertAt(0, createDownloadButton());
+ controls.insertAt(0, createFullScreen());
+ controls.insertAt(0, createLayerSwitcher());
return controls;
}
diff --git a/www-server/pom.xml b/www-server/pom.xml
index 617c3f1..b6dc0cf 100644
--- a/www-server/pom.xml
+++ b/www-server/pom.xml
@@ -171,7 +171,6 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
- <version>2.17.1</version>
</dependency>
<dependency>
<groupId>de.ruedigermoeller</groupId>
diff --git a/www-shared/src/main/java/fr/agrometinfo/www/shared/dto/QuantileType.java b/www-shared/src/main/java/fr/agrometinfo/www/shared/dto/QuantileType.java
index af34c78..720aa1d 100644
--- a/www-shared/src/main/java/fr/agrometinfo/www/shared/dto/QuantileType.java
+++ b/www-shared/src/main/java/fr/agrometinfo/www/shared/dto/QuantileType.java
@@ -39,7 +39,7 @@ public enum QuantileType {
* @return the quantile for the number of classes
*/
public static QuantileType valueOf(final int nbOfClasses) {
- for (final QuantileType q : QuantileType.values()) {
+ for (final QuantileType q : values()) {
if (q.getNbOfClasses() == nbOfClasses) {
return q;
}
diff --git a/www-shared/src/main/java/fr/agrometinfo/www/shared/service/GeometryService.java b/www-shared/src/main/java/fr/agrometinfo/www/shared/service/GeometryService.java
index 3c90c4a..100e174 100644
--- a/www-shared/src/main/java/fr/agrometinfo/www/shared/service/GeometryService.java
+++ b/www-shared/src/main/java/fr/agrometinfo/www/shared/service/GeometryService.java
@@ -36,7 +36,7 @@ public interface GeometryService {
* @return PRA id ⮕ PRA name
*/
@GET
- @Path(GeometryService.PATH_PRA_NAMES)
+ @Path(PATH_PRA_NAMES)
@Produces(MediaType.APPLICATION_JSON)
Map<String, String> getPraAsJSON();
}
--
GitLab