From df164cc3e55d9a74b417ef319d658b3a70ab8d84 Mon Sep 17 00:00:00 2001
From: Olivier Maury <Olivier.Maury@inrae.fr>
Date: Tue, 30 Apr 2024 09:56:38 +0200
Subject: [PATCH] =?UTF-8?q?Mettre=20=C3=A0=20jour=20les=20d=C3=A9pendances?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pom.xml | 28 +++++++++----------
.../seasonhandler/MainConfiguration.java | 2 +-
2 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/pom.xml b/pom.xml
index 82a9cff..17c2ff7 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-2</version>
+ <version>2.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>AgroMetInfo SEASON handler</name>
<description>SEASON handler for AgroMetInfo</description>
@@ -38,10 +38,10 @@
<!-- Dependencies versions -->
<hibernate.version>5.6.15.Final</hibernate.version>
<junit.version>5.10.1</junit.version>
- <log4j.version>2.22.1</log4j.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-SNAPSHOT</season.version>
+ <season.version>1.2.6</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>
@@ -58,14 +58,14 @@
<checkstyle.includeTestResources>false</checkstyle.includeTestResources>
<checkstyle.includeTestSourceDirectory>true</checkstyle.includeTestSourceDirectory>
<checkstyle.version>3.3.1</checkstyle.version>
- <compiler-plugin.version>3.11.0</compiler-plugin.version>
- <jacoco.version>0.8.10</jacoco.version>
+ <compiler-plugin.version>3.12.1</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>
<exec.mainClass>fr.agrometinfo.seasonhandler.Main</exec.mainClass>
- <pmd.version>3.21.0</pmd.version>
+ <pmd.version>3.21.2</pmd.version>
<sloccount.path>bin/sloccount.sh</sloccount.path>
- <spotbugs.version>4.8.1.0</spotbugs.version>
+ <spotbugs.version>4.8.2.0</spotbugs.version>
<!-- Text format -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -135,7 +135,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>3.3.0</version>
+ <version>3.4.1</version>
<executions>
<execution>
<id>enforce-versions</id>
@@ -183,14 +183,14 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>3.1.2</version>
+ <version>3.2.5</version>
</plugin>
<!-- Compute buildNumber -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
- <version>3.1.0</version>
+ <version>3.2.0</version>
<executions>
<execution>
<phase>validate</phase>
@@ -233,7 +233,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>3.5.0</version>
+ <version>3.5.1</version>
<executions>
<execution>
<phase>package</phase>
@@ -259,7 +259,7 @@
<plugin>
<artifactId>exec-maven-plugin</artifactId>
<groupId>org.codehaus.mojo</groupId>
- <version>3.1.0</version>
+ <version>3.2.0</version>
<executions>
<execution>
<phase>package</phase>
@@ -381,7 +381,7 @@
<plugin>
<groupId>com.github.davidmoten</groupId>
<artifactId>plantuml-maven-plugin</artifactId>
- <version>0.2.3</version>
+ <version>0.2.11</version>
<executions>
<execution>
<id>generate-diagrams</id>
@@ -521,7 +521,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
- <version>3.3.0</version>
+ <version>3.3.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/src/main/java/fr/agrometinfo/seasonhandler/MainConfiguration.java b/src/main/java/fr/agrometinfo/seasonhandler/MainConfiguration.java
index c385de3..d7e9ce1 100644
--- a/src/main/java/fr/agrometinfo/seasonhandler/MainConfiguration.java
+++ b/src/main/java/fr/agrometinfo/seasonhandler/MainConfiguration.java
@@ -352,7 +352,7 @@ public class MainConfiguration {
settings.setFilePath(path);
final Evaluation evaluation = new Evaluation(settings.getEvaluation());
evaluation.setSettings(settings);
- if (evaluation.toAggregate(false) && !evaluation.isAggregationValid()) {
+ if (evaluation.isAggregationMissing(false) && !evaluation.isAggregationValid()) {
return Optional.of(i18n.format("error.config.evaluation.missingaggregation", path));
}
evaluations.add(evaluation);
--
GitLab