diff --git a/pom.xml b/pom.xml
index 8b1f91f9cec4043fa9001f82dfc216ed707af5b9..170d2ed404d87da7b0c8ef7bc8e5186b951c4604 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,87 +25,105 @@
<modelVersion>4.0.0</modelVersion>
<groupId>fr.soeretempo</groupId>
<artifactId>sido</artifactId>
- <version>1.1.9-SNAPSHOT</version>
- <name>SIDO</name>
- <description>SIDO is a phenological data submission and verification tool.</description>
+ <version>1.1.9-SNAPSHOT</version>
+ <name>SIDO</name>
+ <description>SIDO is a phenological data submission and verification tool.</description>
<packaging>pom</packaging>
<inceptionYear>2018</inceptionYear>
- <scm>
- <connection>scm:git:https://forgemia.inra.fr/tempo/sido</connection>
- <url>https://forgemia.inra.fr/tempo/sido</url>
- </scm>
<url>https://sido.pheno.fr/</url>
- <ciManagement>
- <url>http://agroclimvm45:8080/job/sido/</url>
- <system>Jenkins</system>
- </ciManagement>
- <issueManagement>
- <system>Redmine</system>
- <url>https://w3.avignon.inrae.fr/forge/projects/sioo</url>
- </issueManagement>
- <licenses>
- <license>
- <name>GNU General Public License</name>
- <url>https://www.gnu.org/licenses/gpl-3.0.txt</url>
- </license>
- </licenses>
<developers>
- <developer>
- <name>Louis Tromel</name>
- <organization>INRAE AgroClim</organization>
- <organizationUrl>https://agroclim.inrae.fr/</organizationUrl>
- <properties>
- <metadata.gitlab-id>@louis.tromel</metadata.gitlab-id>
- <metadata.gitlab>https://forgemia.inra.fr/louis.tromel</metadata.gitlab>
- <metadata.orcid>https://orcid.org/0000-0002-8915-8386</metadata.orcid>
- <metadata.github>https://github.com/Ash84</metadata.github>
- </properties>
- </developer>
- <developer>
- <name>Olivier Maury</name>
- <organization>INRAE AgroClim</organization>
- <organizationUrl>https://agroclim.inrae.fr/</organizationUrl>
- <properties>
- <metadata.gitlab-id>@olivier.maury</metadata.gitlab-id>
- <metadata.gitlab>https://forgemia.inra.fr/olivier.maury</metadata.gitlab>
- <metadata.orcid>https://orcid.org/0000-0001-9016-9720</metadata.orcid>
- </properties>
- </developer>
- <developer>
- <name>Mohamed El Hasnaoui</name>
- <organization>INRAE AgroClim</organization>
- <organizationUrl>https://agroclim.inrae.fr/</organizationUrl>
- </developer>
+ <developer>
+ <name>Louis Tromel</name>
+ <organization>INRAE AgroClim</organization>
+ <organizationUrl>https://agroclim.inrae.fr/</organizationUrl>
+ <properties>
+ <metadata.gitlab-id>@louis.tromel</metadata.gitlab-id>
+ <metadata.gitlab>https://forgemia.inra.fr/louis.tromel</metadata.gitlab>
+ <metadata.orcid>https://orcid.org/0000-0002-8915-8386</metadata.orcid>
+ <metadata.github>https://github.com/Ash84</metadata.github>
+ </properties>
+ </developer>
+ <developer>
+ <name>Olivier Maury</name>
+ <organization>INRAE AgroClim</organization>
+ <organizationUrl>https://agroclim.inrae.fr/</organizationUrl>
+ <properties>
+ <metadata.gitlab-id>@olivier.maury</metadata.gitlab-id>
+ <metadata.gitlab>https://forgemia.inra.fr/olivier.maury</metadata.gitlab>
+ <metadata.orcid>https://orcid.org/0000-0001-9016-9720</metadata.orcid>
+ </properties>
+ </developer>
+ <developer>
+ <name>Mohamed El Hasnaoui</name>
+ <organization>INRAE AgroClim</organization>
+ <organizationUrl>https://agroclim.inrae.fr/</organizationUrl>
+ </developer>
</developers>
<organization>
<url>https://tempo.pheno.fr/</url>
<name>TEMPO</name>
</organization>
+ <licenses>
+ <license>
+ <name>GNU General Public License</name>
+ <url>https://www.gnu.org/licenses/gpl-3.0.txt</url>
+ </license>
+ </licenses>
+ <scm>
+ <url>https://forgemia.inra.fr/tempo/sido.git</url>
+ <connection>scm:git:https://forgemia.inra.fr/tempo/sido.git</connection>
+ </scm>
+ <issueManagement>
+ <system>GitLab</system>
+ <url>https://forgemia.inra.fr/tempo/sido/-/issues</url>
+ </issueManagement>
+ <ciManagement>
+ <system>Jenkins</system>
+ <url>http://jenkins:8080/job/sido/</url>
+ </ciManagement>
<properties>
- <environment>dev</environment>
- <build.date>${maven.build.timestamp}</build.date>
- <checkstyle.version>3.6.0</checkstyle.version>
- <junit.version>4.13.2</junit.version>
- <log4j.version>2.22.1</log4j.version>
- <lombok.version>1.18.30</lombok.version>
+ <!-- Dependencies versions -->
<apache.poi.version>5.4.0</apache.poi.version>
+ <jax-rs-api.version>2.1.1</jax-rs-api.version>
+ <junit.version>4.13.2</junit.version>
+ <log4j.version>2.24.2</log4j.version>
+ <lombok.version>1.18.36</lombok.version>
+ <swagger.version>2.2.21</swagger.version>
+
+ <!-- Maven environment values -->
+ <build.date>${maven.build.timestamp}</build.date>
+ <environment>dev</environment>
+ <maven.build.timestamp.format>yyyy-MM-dd HH:mm:ss</maven.build.timestamp.format>
+ <maven.compiler.source>11</maven.compiler.source>
+ <maven.compiler.target>11</maven.compiler.target>
+ <maven.compiler.testSource>11</maven.compiler.testSource>
+ <maven.compiler.testTarget>11</maven.compiler.testTarget>
+
+ <!-- Tools -->
<checkstyle.config.location>file://${basedir}/config/sun_checks.xml</checkstyle.config.location>
<checkstyle.failsOnError>false</checkstyle.failsOnError>
<checkstyle.includeResources>false</checkstyle.includeResources>
<checkstyle.includeTestResources>false</checkstyle.includeTestResources>
<checkstyle.includeTestSourceDirectory>true</checkstyle.includeTestSourceDirectory>
- <maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
- <maven.compiler.source>11</maven.compiler.source>
- <maven.compiler.target>11</maven.compiler.target>
- <maven.compiler.testSource>11</maven.compiler.testSource>
- <maven.compiler.testTarget>11</maven.compiler.testTarget>
- <!-- Don't let your Mac use a crazy non-standard encoding -->
+ <checkstyle.version>3.6.0</checkstyle.version>
+ <compiler-plugin.version>3.13.0</compiler-plugin.version>
+ <jacoco.version>0.8.12</jacoco.version>
+ <javadoc.version>3.11.1</javadoc.version>
+ <javase.api.link>https://docs.oracle.com/en/java/javase/11/docs/api</javase.api.link>
+ <pmd.version>3.21.2</pmd.version>
+ <sloccount.path>bin/sloccount.sh</sloccount.path>
+ <spotbugs.version>4.8.2.0</spotbugs.version>
+ <surefire.version>3.5.2</surefire.version>
+
+ <!-- Text format -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <metadata.description xml:lang="en">SIDO is a phenological data submission and verification tool.</metadata.description>
- <metadata.description xml:lang="fr">SIDO est un outil de soumission et de vérification de données phénologiques.</metadata.description>
- <metadata.long-description xml:lang="en"><![CDATA[SIDO is a phenological data submission and verification tool. The web application exports mainly to the TEMPO portal, and allows authenticated users to manage and publish their datasets in the data portal and/or ERDG, under the supervision of manager accounts.]]></metadata.long-description>
- <metadata.long-description xml:lang="fr"><![CDATA[SIDO est un outil de soumission et de vérification de données phénologiques. L'application web exporte principalement vers le portail TEMPO, et permet à des utilisateurs authentifiés de gérer et publier leurs jeux de données dans le portail de données et/ou ERDG, sous la supervision de comptes de responsables.]]></metadata.long-description>
+
+ <!-- Metadata -->
+ <metadata.description xml:lang="en">SIDO is a phenological data submission and verification tool.</metadata.description>
+ <metadata.description xml:lang="fr">SIDO est un outil de soumission et de vérification de données phénologiques.</metadata.description>
+ <metadata.long-description xml:lang="en"><![CDATA[SIDO is a phenological data submission and verification tool. The web application exports mainly to the TEMPO portal, and allows authenticated users to manage and publish their datasets in the data portal and/or ERDG, under the supervision of manager accounts.]]></metadata.long-description>
+ <metadata.long-description xml:lang="fr"><![CDATA[SIDO est un outil de soumission et de vérification de données phénologiques. L'application web exporte principalement vers le portail TEMPO, et permet à des utilisateurs authentifiés de gérer et publier leurs jeux de données dans le portail de données et/ou ERDG, sous la supervision de comptes de responsables.]]></metadata.long-description>
</properties>
<modules>
<module>verification</module>
@@ -117,74 +135,74 @@
</modules>
<dependencyManagement>
- <dependencies>
- <!-- Log4J -->
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- <version>${log4j.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- <version>${log4j.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-web</artifactId>
- <version>${log4j.version}</version>
- </dependency>
- <!-- Fixed problem SLF4J: Failed to load class "org.slf4j.impl.StaticLoggerBinder".
- SLF4J: Defaulting to no-operation (NOP) logger implementation SLF4J: See
- http://www.slf4j.org/codes.html#StaticLoggerBinder for further details. -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- <version>1.7.25</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
- <version>${log4j.version}</version>
- </dependency>
+ <dependencies>
+ <!-- Log4J -->
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ <version>${log4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <version>${log4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-web</artifactId>
+ <version>${log4j.version}</version>
+ </dependency>
+ <!-- Fixed problem SLF4J: Failed to load class "org.slf4j.impl.StaticLoggerBinder".
+ SLF4J: Defaulting to no-operation (NOP) logger implementation SLF4J: See
+ http://www.slf4j.org/codes.html#StaticLoggerBinder for further details. -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ <version>1.7.25</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ <version>${log4j.version}</version>
+ </dependency>
- <!-- Lombok -->
- <dependency>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- <version>${lombok.version}</version>
- <type>jar</type>
- </dependency>
- <!-- Tests -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- <scope>test</scope>
- </dependency>
- <!-- POI -->
- <dependency>
- <groupId>org.apache.poi</groupId>
- <artifactId>poi</artifactId>
- <version>${apache.poi.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.poi</groupId>
- <artifactId>poi-ooxml</artifactId>
- <version>${apache.poi.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.poi</groupId>
- <artifactId>poi-ooxml-lite</artifactId>
- <version>${apache.poi.version}</version>
- </dependency>
- <!-- Dependency for POI, will be missing in sido-verification if not present -->
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>2.18.0</version>
- </dependency>
- </dependencies>
+ <!-- Lombok -->
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <version>${lombok.version}</version>
+ <type>jar</type>
+ </dependency>
+ <!-- Tests -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <!-- POI -->
+ <dependency>
+ <groupId>org.apache.poi</groupId>
+ <artifactId>poi</artifactId>
+ <version>${apache.poi.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.poi</groupId>
+ <artifactId>poi-ooxml</artifactId>
+ <version>${apache.poi.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.poi</groupId>
+ <artifactId>poi-ooxml-lite</artifactId>
+ <version>${apache.poi.version}</version>
+ </dependency>
+ <!-- Dependency for POI, will be missing in sido-verification if not present -->
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>2.18.0</version>
+ </dependency>
+ </dependencies>
</dependencyManagement>
<profiles>
@@ -263,14 +281,14 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.3</version>
+ <version>${surefire.version}</version>
</plugin>
<!-- Compute buildNumber -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
- <version>3.2.0</version>
+ <version>3.2.1</version>
<executions>
<execution>
<phase>validate</phase>
@@ -294,7 +312,7 @@
<plugin>
<artifactId>exec-maven-plugin</artifactId>
<groupId>org.codehaus.mojo</groupId>
- <version>1.4.0</version>
+ <version>3.5.0</version>
<executions>
<execution>
<phase>package</phase>
@@ -302,7 +320,7 @@
<goal>exec</goal>
</goals>
<configuration>
- <executable>bin/sloccount.sh</executable>
+ <executable>${sloccount.path}</executable>
</configuration>
</execution>
</executions>
@@ -313,7 +331,7 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
- <version>0.8.7</version>
+ <version>${jacoco.version}</version>
<executions>
<execution>
<id>jacoco-initialize</id>
@@ -345,7 +363,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
- <version>3.25.0</version>
+ <version>3.26.0</version>
<configuration>
<excludes>
<exclude>target/generated-sources/*.java</exclude>
@@ -380,7 +398,7 @@
<plugin>
<groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId>
- <version>4.0.rc1</version>
+ <version>4.2</version>
<configuration>
<licenseSets>
<licenseSet>
@@ -410,24 +428,29 @@
</plugins>
<pluginManagement>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>3.4.1</version>
+ </plugin>
<!-- To ensure deployment properties are loaded from settings.xml, maven-deploy-plugin >= 2.8 is needed -->
<!-- maven-deploy-plugin-3.0.0-M1 is broken with classifiers and needs changes in .m2/settings.xml -->
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
- <version>2.8.2</version>
+ <version>3.1.3</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>${checkstyle.version}</version>
+ <configuration>
+ <excludes>**/module-info.java</excludes>
+ <includeResources>false</includeResources>
+ <includeTestResources>false</includeTestResources>
+ <includeTestSourceDirectory>true</includeTestSourceDirectory>
+ <propertyExpansion>basedir=${basedir}</propertyExpansion>
+ </configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>${checkstyle.version}</version>
- <configuration>
- <excludes>**/module-info.java</excludes>
- <includeResources>false</includeResources>
- <includeTestResources>false</includeTestResources>
- <includeTestSourceDirectory>true</includeTestSourceDirectory>
- <propertyExpansion>basedir=${basedir}</propertyExpansion>
- </configuration>
- </plugin>
</plugins>
</pluginManagement>
</build>
@@ -438,7 +461,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.4.3</version>
+ <version>${surefire.version}</version>
</plugin>
<!-- Formatted metrics report -->
@@ -446,7 +469,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jdepend-maven-plugin</artifactId>
- <version>2.0</version>
+ <version>2.1</version>
</plugin>
<!-- Generates a report regarding the code style used by the developers. -->
@@ -455,7 +478,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.17</version>
+ <version>${checkstyle.version}</version>
</plugin>
<!-- Generates a cross-reference of the project's sources. -->
@@ -464,7 +487,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
- <version>2.5</version>
+ <version>3.6.0</version>
</plugin>
<!-- Generates API JavaDoc. -->
@@ -472,10 +495,10 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>3.0.0</version>
+ <version>${javadoc.version}</version>
<configuration>
<links>
- <link>http://docs.oracle.com/javase/8/docs/api</link>
+ <link>${javase.api.link}</link>
</links>
<!-- DocLint is a new feature in Java 8, which is summarized as: -->
<!-- Provide a means to detect errors in Javadoc comments early in the
@@ -491,7 +514,7 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
- <version>0.7.9</version>
+ <version>${jacoco.version}</version>
<reportSets>
<reportSet>
<reports>
@@ -506,7 +529,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pdf-plugin</artifactId>
- <version>1.4</version>
+ <version>1.6.1</version>
<configuration>
<locales>fr</locales>
</configuration>
diff --git a/sido-cli/pom.xml b/sido-cli/pom.xml
index c030803ac0ff3c38927d6a6da64235ccc54a4f4d..fe5cf3802596025f51ded82718e43e3ecdee4dd1 100644
--- a/sido-cli/pom.xml
+++ b/sido-cli/pom.xml
@@ -87,7 +87,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.6</version>
<configuration>
<archive>
<manifest>
diff --git a/sido-createSchemaTable/pom.xml b/sido-createSchemaTable/pom.xml
index 52ef57f497b5b78fd5c98e8c0f9925d504d0320b..64bfc20a2a948e43265926ccc66145cbc2a7febb 100644
--- a/sido-createSchemaTable/pom.xml
+++ b/sido-createSchemaTable/pom.xml
@@ -79,7 +79,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.6</version>
<configuration>
<archive>
<manifest>
diff --git a/sido-eml/pom.xml b/sido-eml/pom.xml
index 6bc5c824b1eb5dbffe1ab6d3a6cb3dba2079de8e..08b4c27e0d486084de0e71d6e361a432a8fb9331 100644
--- a/sido-eml/pom.xml
+++ b/sido-eml/pom.xml
@@ -20,19 +20,4 @@
<version>2.3.1</version>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- <version>3.13.0</version>
- <configuration>
- <failOnViolation>false</failOnViolation>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
\ No newline at end of file
diff --git a/sido-gwt/pom.xml b/sido-gwt/pom.xml
index cdecea17b1dc97bc2487fe54668acc3e35a9fdb8..400ff0cfc3565a4e40ed7f291477eeb5e5fbb7c4 100644
--- a/sido-gwt/pom.xml
+++ b/sido-gwt/pom.xml
@@ -36,9 +36,7 @@
<build.date>${maven.build.timestamp}</build.date>
<gwt.version>2.11.0</gwt.version>
<hibernate.version>5.6.15.Final</hibernate.version>
- <jersey.version>2.28</jersey.version>
- <junit.version>4.13.2</junit.version>
- <swagger.version>2.2.20</swagger.version>
+ <jersey.version>2.46</jersey.version>
<jackson.version>2.16.1</jackson.version>
<checkstyle.config.location>file://${basedir}/config/sun_checks.xml</checkstyle.config.location>
<checkstyle.failsOnError>false</checkstyle.failsOnError>
@@ -46,8 +44,8 @@
<checkstyle.includeTestResources>false</checkstyle.includeTestResources>
<checkstyle.includeTestSourceDirectory>true</checkstyle.includeTestSourceDirectory>
<maven.build.timestamp.format>yyyy-MM-dd HH:mm:ss</maven.build.timestamp.format>
- <!-- Setting maven.compiler.source to something different to 1.8 needs
- that you configure the sourceLevel in gwt-maven-plugin since GWT compiler
+ <!-- Setting maven.compiler.source to something different to 1.8 needs
+ that you configure the sourceLevel in gwt-maven-plugin since GWT compiler
2.8 requires 1.8 (see gwt-maven-plugin block below) -->
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
@@ -60,7 +58,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>
-
+
<profiles>
<profile>
<id>preprod</id>
@@ -104,8 +102,8 @@
<dependencies>
<!-- ensure all GWT deps use the same version (unless overridden) -->
<dependency>
- <groupId>org.gwtproject</groupId>
- <artifactId>gwt</artifactId>
+ <groupId>org.gwtproject</groupId>
+ <artifactId>gwt</artifactId>
<version>${gwt.version}</version>
<type>pom</type>
<scope>import</scope>
@@ -157,7 +155,7 @@
<artifactId>gwtbootstrap3-extras</artifactId>
<version>0.9.4</version>
</dependency>
-
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -180,7 +178,7 @@
<!-- JAXB -->
<!-- XML-api corrige erreur java.lang.NoClassDefFoundError: org/w3c/dom/ElementTraversal -->
-
+
<!-- Log4J -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
@@ -215,16 +213,16 @@
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
- <version>42.7.1</version>
+ <version>42.7.4</version>
</dependency>
<!-- https://mvnrepository.com/artifact/com.h2database/h2 -->
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
- <version>2.2.224</version>
+ <version>2.3.232</version>
<scope>test</scope>
</dependency>
- <!-- CDI - JSR-299 = JSR-330 (DI) + JSR-341 (EL) + JSR-318 (Interceptors)
+ <!-- CDI - JSR-299 = JSR-330 (DI) + JSR-341 (EL) + JSR-318 (Interceptors)
+ More (scopes etc) -->
<dependency>
<groupId>javax.enterprise</groupId>
@@ -250,8 +248,8 @@
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
- <version>2.1</version>
- <!-- There is somewhere a bug in the Jersey distribution ... for now I
+ <version>${jax-rs-api.version}</version>
+ <!-- There is somewhere a bug in the Jersey distribution ... for now I
need to include this api as compile (or default). -->
<!--scope>provided</scope -->
</dependency>
@@ -271,9 +269,9 @@
<artifactId>jersey-entity-filtering</artifactId>
<version>${jersey.version}</version>
</dependency>
-
+
<!-- Required only when you are using JAX-RS Client -->
- <!--dependency> <groupId>org.glassfish.jersey.core</groupId> <artifactId>jersey-client</artifactId>
+ <!--dependency> <groupId>org.glassfish.jersey.core</groupId> <artifactId>jersey-client</artifactId>
<version>2.25</version> </dependency -->
<!-- Required to bind Weld and Jersey -->
<!-- https://jersey.java.net/documentation/latest/cdi.support.html -->
@@ -308,19 +306,19 @@
<version>${swagger.version}</version>
</dependency>
<dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- <version>${jackson.version}</version>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ <version>${jackson.version}</version>
</dependency>
<dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- <version>${jackson.version}</version>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>${jackson.version}</version>
</dependency>
<dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- <version>${jackson.version}</version>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ <version>${jackson.version}</version>
</dependency>
<!-- JWT -->
<dependency>
@@ -330,9 +328,9 @@
</dependency>
<!-- https://mvnrepository.com/artifact/com.nimbusds/oauth2-oidc-sdk -->
<dependency>
- <groupId>com.nimbusds</groupId>
- <artifactId>oauth2-oidc-sdk</artifactId>
- <version>11.9.1</version>
+ <groupId>com.nimbusds</groupId>
+ <artifactId>oauth2-oidc-sdk</artifactId>
+ <version>11.9.1</version>
</dependency>
<!-- Tests for Jersey -->
<dependency>
@@ -369,16 +367,17 @@
<artifactId>flexmark-all</artifactId>
<version>0.36.8</version>
</dependency>
+ <!-- ERDG -->
<dependency>
- <groupId>com.researchspace</groupId>
- <artifactId>dataverse-client-java</artifactId>
- <version>1.0.3</version>
+ <groupId>com.researchspace</groupId>
+ <artifactId>dataverse-client-java</artifactId>
+ <version>1.0.3</version>
</dependency>
<dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
</dependency>
-
+
<!-- SAVA -->
<dependency>
<groupId>fr.inrae.agroclim</groupId>
@@ -386,11 +385,11 @@
<version>1.0.0</version>
</dependency>
</dependencies>
-
+
<build>
<sourceDirectory>src/main/java</sourceDirectory>
<testSourceDirectory>src/test/java</testSourceDirectory>
- <!-- Output classes directly into the webapp, so that IDEs and "mvn process-classes"
+ <!-- Output classes directly into the webapp, so that IDEs and "mvn process-classes"
update them in DevMode -->
<outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</outputDirectory>
<resources>
@@ -413,33 +412,33 @@
</resources>
<plugins>
- <!-- Dans Maven, on peut configurer le plugin Surefire pour lui dire de
- lancer un thread de test unitaire par processeur/coeur de la machine Résultat
- : sur certains projets, avec une machine avec 4 coeurs, on gagne 30 Ã 50
+ <!-- Dans Maven, on peut configurer le plugin Surefire pour lui dire de
+ lancer un thread de test unitaire par processeur/coeur de la machine Résultat
+ : sur certains projets, avec une machine avec 4 coeurs, on gagne 30 Ã 50
% de temps (2min 21s). Avec 6 coeurs, on gagne 60 Ã 70 % (1min 32s) -->
<!-- Running JUnit tests -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.3</version>
+ <version>${surefire.version}</version>
<configuration>
<reuseForks>false</reuseForks>
<forkCount>1C</forkCount>
</configuration>
- <dependencies>
- <dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- <version>1.1.1</version>
- </dependency>
- </dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+ </dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <version>3.2.3</version>
+ <version>3.4.0</version>
<configuration>
<warSourceDirectory>src/main/webapp</warSourceDirectory>
<webXml>src/main/webapp/WEB-INF/web.xml</webXml>
@@ -518,7 +517,7 @@
<plugin>
<artifactId>exec-maven-plugin</artifactId>
<groupId>org.codehaus.mojo</groupId>
- <version>1.4.0</version>
+ <version>3.5.0</version>
<executions>
<execution>
<phase>package</phase>
@@ -526,7 +525,7 @@
<goal>exec</goal>
</goals>
<configuration>
- <executable>bin/sloccount.sh</executable>
+ <executable>${sloccount.path}</executable>
</configuration>
</execution>
</executions>
@@ -537,7 +536,6 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
- <version>0.8.7</version>
<executions>
<execution>
<id>jacoco-initialize</id>
@@ -570,9 +568,8 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
- <version>3.13.0</version>
<configuration>
- <failOnViolation>false</failOnViolation>
+ <failOnViolation>false</failOnViolation>
<excludes>
<exclude>target/generated-sources/*.java</exclude>
</excludes>
@@ -623,7 +620,7 @@
<moduleShortName>sido</moduleShortName>
<failOnError>true</failOnError>
<sourceLevel>11</sourceLevel>
-
+
<!-- Compiler configuration -->
<compilerArgs>
<!-- Ask GWT to create the Story of Your Compile (SOYC) (gwt:compile) -->
@@ -643,7 +640,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.4.3</version>
</plugin>
<!-- Formatted metrics report -->
@@ -651,7 +647,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jdepend-maven-plugin</artifactId>
- <version>2.0</version>
</plugin>
<!-- Generates a report regarding the code style used by the developers. -->
@@ -660,7 +655,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.17</version>
</plugin>
<!-- Generates a cross-reference of the project's sources. -->
@@ -669,7 +663,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
- <version>2.5</version>
</plugin>
<!-- Generates API JavaDoc. -->
<!-- mvn javadoc:javadoc -->
diff --git a/sido-rs/pom.xml b/sido-rs/pom.xml
index 4846c1e57c6cff01bd9f4477a2bc82d21ccbd80a..51e11cff9b1c037713d0fe1c742620c71af4a102 100644
--- a/sido-rs/pom.xml
+++ b/sido-rs/pom.xml
@@ -29,11 +29,11 @@
<version>1.1.9-SNAPSHOT</version>
</parent>
<artifactId>sido-rs</artifactId>
- <description>POJO of SIDO web services</description>
<packaging>jar</packaging>
<name>sido-rs</name>
-
+ <description>POJO of SIDO web services</description>
+
<properties>
<build.date>${maven.build.timestamp}</build.date>
<maven.compiler.source>11</maven.compiler.source>
@@ -44,19 +44,19 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>
-
+
<dependencies>
<!-- JAX-RS -->
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
- <version>2.1.1</version>
+ <version>${jax-rs-api.version}</version>
</dependency>
<!-- Swagger for Jersey -->
<dependency>
<groupId>io.swagger.core.v3</groupId>
<artifactId>swagger-jaxrs2</artifactId>
- <version>2.2.8</version>
+ <version>${swagger.version}</version>
</dependency>
<!-- Lombok -->
<dependency>
@@ -65,7 +65,7 @@
<type>jar</type>
</dependency>
</dependencies>
-
+
<build>
<sourceDirectory>src/main/java</sourceDirectory>
<plugins>
@@ -73,7 +73,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>3.3.0</version>
<configuration>
<archive>
<manifest>
@@ -90,45 +89,48 @@
</archive>
</configuration>
</plugin>
- <!-- Attach source and javadoc artifacts -->
- <!-- https://maven.apache.org/plugin-developers/cookbook/attach-source-javadoc-artifacts.html -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <version>3.2.1</version>
- <executions>
- <execution>
- <id>attach-sources</id>
- <goals>
- <goal>jar-no-fork</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>3.5.0</version>
- <configuration>
- <links>
- <link>https://docs.oracle.com/en/java/javase/11/docs/api</link>
- </links>
- <!-- DocLint is a new feature in Java 8, which is summarized as: -->
- <!-- Provide a means to detect errors in Javadoc comments early in the development cycle and in a way that is easily linked back to the source code. This is enabled by default, and will run a whole lot of checks before generating Javadocs. You need to turn this off for Java 8 -->
- <additionalparam>-Xdoclint:none</additionalparam>
- <doclint>none</doclint>
- <javadocExecutable>${java.home}/bin/javadoc</javadocExecutable>
- </configuration>
- <executions>
- <execution>
- <id>attach-javadocs</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
+ <!-- Attach source and javadoc artifacts -->
+ <!-- https://maven.apache.org/plugin-developers/cookbook/attach-source-javadoc-artifacts.html -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>3.3.1</version>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <goals>
+ <goal>jar-no-fork</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>${javadoc.version}</version>
+ <configuration>
+ <links>
+ <link>${javase.api.link}</link>
+ </links>
+ <!-- DocLint is a new feature in Java 8, which is summarized as: -->
+ <!-- Provide a means to detect errors in Javadoc comments early in the development cycle and -->
+ <!-- in a way that is easily linked back to the source code. -->
+ <!-- This is enabled by default, and will run a whole lot of checks before generating Javadocs. -->
+ <!-- You need to turn this off for Java 8. -->
+ <additionalparam>-Xdoclint:none</additionalparam>
+ <doclint>none</doclint>
+ <javadocExecutable>${java.home}/bin/javadoc</javadocExecutable>
+ </configuration>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
-</project>
-
+</project>
+