From 05a0730934108578d0b1302c4f74b40076dc7d7f Mon Sep 17 00:00:00 2001 From: Olivier Maury <Olivier.Maury@inrae.fr> Date: Mon, 3 Mar 2025 12:07:47 +0100 Subject: [PATCH] =?UTF-8?q?build(deps):=20:arrow=5Fup:=20mettre=20=C3=A0?= =?UTF-8?q?=20jour=20les=20d=C3=A9pendances=20dont=20GWT-2.12.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fixes #10540 --- pom.xml | 371 +++++++++++++++++++++++++++++--------------------------- 1 file changed, 195 insertions(+), 176 deletions(-) diff --git a/pom.xml b/pom.xml index 5141bb0b8..4c71c16b1 100644 --- a/pom.xml +++ b/pom.xml @@ -27,109 +27,115 @@ <packaging>war</packaging> <name>TEMPO data portal</name> <description>TEMPO provides a centralized access portal to phenological data held in various remote databases.</description> - <inceptionYear>2019</inceptionYear> <url>https://data.pheno.fr/</url> - <ciManagement> - <url>http://agroclimvm45:8080/job/TEMPO/</url> - <system>Jenkins</system> - </ciManagement> - <issueManagement> - <system>Redmine</system> - <url>https://w3.avignon.inrae.fr/forge/projects/tempo</url> - </issueManagement> - <licenses> - <license> - <name>GNU General Public License</name> - <url>https://www.gnu.org/licenses/gpl-3.0.txt</url> - </license> - </licenses> + <inceptionYear>2019</inceptionYear> <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/portail.git</url> <connection>scm:git:https://forgemia.inra.fr/tempo/portail.git</connection> </scm> + <issueManagement> + <system>Redmine</system> + <url>https://w3.avignon.inrae.fr/forge/projects/tempo</url> + </issueManagement> + <ciManagement> + <url>http://agroclimvm45:8080/job/TEMPO/</url> + <system>Jenkins</system> + </ciManagement> <properties> - <license.dir>${basedir}</license.dir> - <application.log.level>FINEST</application.log.level> - <environment>dev</environment> - <!-- versions --> - <checkstyle.version>3.3.1</checkstyle.version> + <!-- Dependencies versions --> <ehcache.version>3.9.11</ehcache.version> <flexmark.version>0.64.8</flexmark.version> - <gwt.version>2.11.0</gwt.version> + <gwt.version>2.12.1</gwt.version> <gwtbootstrap3.version>0.9.4</gwtbootstrap3.version> <hibernate.version>5.6.15.Final</hibernate.version> - <jacoco.version>0.8.11</jacoco.version> <javax.mail.version>1.5.6</javax.mail.version> - <jersey.version>2.42</jersey.version> + <jersey.version>2.45</jersey.version> <junit.version>4.13.2</junit.version> <log4j.version>2.23.1</log4j.version> - <pmd.version>3.21.2</pmd.version> <slf4j.version>1.7.36</slf4j.version> - <postgresql.version>42.7.3</postgresql.version> + <postgresql.version>42.7.5</postgresql.version> + <sava.version>1.0.1</sava.version> <sido.version>1.1.9</sido.version> - <surefire.version>3.2.5</surefire.version> - <spotbugs.version>4.7.0.0</spotbugs.version> - <swagger.version>2.2.20</swagger.version> - <!-- checkStyle --> + <swagger.version>2.2.21</swagger.version> + <swagger-ui.version>5.17.14</swagger-ui.version> + <weld.version>3.1.9.Final</weld.version> + <!-- Maven environment values --> + <application.log.level>FINEST</application.log.level> + <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> - <create-sitemap.path>${session.executionRootDirectory}/bin/create-sitemap.sh</create-sitemap.path> - <maven.build.timestamp.format>yyyy-MM-dd HH:mm:ss</maven.build.timestamp.format> + <checkstyle.version>3.3.1</checkstyle.version> + <create-sitemap.path> + ${session.executionRootDirectory}/bin/create-sitemap.sh</create-sitemap.path> + <jacoco.version>0.8.11</jacoco.version> + <license.dir>${basedir}</license.dir> + <pmd.version>3.21.2</pmd.version> + <spotbugs.version>4.8.2.0</spotbugs.version> + <surefire.version>3.2.5</surefire.version> <include.tests>**/*Test.java</include.tests> <sloccount.path>${session.executionRootDirectory}/bin/sloccount.sh</sloccount.path> - <!-- 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> - <maven.compiler.testSource>11</maven.compiler.testSource> - <maven.compiler.testTarget>11</maven.compiler.testTarget> <!-- deploy to Tomcat --> <maven.tomcat.path>/tempogwt</maven.tomcat.path> <maven.tomcat.server>tempo-localhost</maven.tomcat.server> <maven.tomcat.url>http://localhost:8080/manager/text</maven.tomcat.url> - <!-- Don't let your Mac use a crazy non-standard encoding --> + <!-- Text format --> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - <metadata.description xml:lang="en">TEMPO provides a centralized access portal to phenological data held in various remote databases.</metadata.description> - <metadata.description xml:lang="fr">TEMPO constitue un portail d'accès centralisé aux données phénologiques présentes dans différentes bases de données distantes.</metadata.description> - <metadata.long-description xml:lang="en"><![CDATA[The TEMPO web application, developed and maintained by AgroClim, is a portal for phenological data aggregated from various remote databases. These data are collected at regular intervals, then made available to users, authenticated or not, via an interface equipped with filters, or via a webservice. The application offers logged-in users a history and the possibility of requesting access to non-public data sources from validators, who grant access via the dedicated interface.]]></metadata.long-description> - <metadata.long-description xml:lang="fr"><![CDATA[L'application web TEMPO, développée et maintenue par AgroClim, est un portail de données phénologiques agrégées à partir de différentes bases de données distantes. Ces données sont collectées à intervalles réguliers, puis mises à disposition des utilisateurs, authentifiés ou non, via une interface dotée de filtres, ou via un webservice. L'application offre aux utilisateurs connectés un historique et la possibilité de demande l'accès aux sources de données non publiques, à des validateurs qui le leur accordent dans l'interface dédiée.]]></metadata.long-description> + <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> + <!-- Metadata --> + <metadata.description xml:lang="en">TEMPO provides a centralized access + portal to phenological data held in various remote databases.</metadata.description> + <metadata.description xml:lang="fr">TEMPO constitue un portail d'accès + centralisé aux données phénologiques présentes dans différentes + bases de données distantes.</metadata.description> + <metadata.long-description xml:lang="en"><![CDATA[The TEMPO web application, developed and maintained by AgroClim, is a portal for phenological data aggregated from various remote databases. These data are collected at regular intervals, then made available to users, authenticated or not, via an interface equipped with filters, or via a webservice. The application offers logged-in users a history and the possibility of requesting access to non-public data sources from validators, who grant access via the dedicated interface.]]></metadata.long-description> + <metadata.long-description xml:lang="fr"><![CDATA[L'application web TEMPO, développée et maintenue par AgroClim, est un portail de données phénologiques agrégées à partir de différentes bases de données distantes. Ces données sont collectées à intervalles réguliers, puis mises à disposition des utilisateurs, authentifiés ou non, via une interface dotée de filtres, ou via un webservice. L'application offre aux utilisateurs connectés un historique et la possibilité de demande l'accès aux sources de données non publiques, à des validateurs qui le leur accordent dans l'interface dédiée.]]></metadata.long-description> </properties> <profiles> @@ -203,12 +209,19 @@ <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> </dependency> + <dependency> + <groupId>org.glassfish.jersey</groupId> + <artifactId>jersey-bom</artifactId> + <version>${jersey.version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> </dependencies> </dependencyManagement> @@ -312,31 +325,7 @@ <groupId>fr.soeretempo</groupId> <version>${sido.version}</version> </dependency> - <!-- Tests --> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - <version>${junit.version}</version> - </dependency> - <dependency> - <groupId>org.assertj</groupId> - <artifactId>assertj-core</artifactId> - <version>3.14.0</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>com.github.tomakehurst</groupId> - <artifactId>wiremock-jre8-standalone</artifactId> - <version>2.25.1</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <version>3.6.28</version> - <scope>test</scope> - </dependency> + <!-- Java EE --> <!-- Tomcat does only a partial implementation! --> <!-- for @RequestScoped --> @@ -353,11 +342,11 @@ <artifactId>hibernate-core</artifactId> <version>${hibernate.version}</version> </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-hikaricp</artifactId> - <version>${hibernate.version}</version> - </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-hikaricp</artifactId> + <version>${hibernate.version}</version> + </dependency> <!-- Driver for JPA --> <dependency> <groupId>org.postgresql</groupId> @@ -366,22 +355,15 @@ </dependency> <!-- EHCache Core APIs --> <dependency> - <groupId>org.ehcache</groupId> - <artifactId>ehcache</artifactId> - <version>${ehcache.version}</version> + <groupId>org.ehcache</groupId> + <artifactId>ehcache</artifactId> + <version>${ehcache.version}</version> </dependency> <!-- Hibernate JCache API --> <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-jcache</artifactId> - <version>${hibernate.version}</version> - </dependency> - <!-- https://mvnrepository.com/artifact/com.h2database/h2 --> - <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - <version>2.1.214</version> - <scope>test</scope> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-jcache</artifactId> + <version>${hibernate.version}</version> </dependency> <!-- map Java and SQL arrays with JPA and Hibernate for Query table --> <dependency> @@ -389,7 +371,8 @@ <artifactId>hibernate-types-55</artifactId> <version>2.21.1</version> </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> @@ -401,10 +384,11 @@ <dependency> <groupId>org.jboss.weld.servlet</groupId> <artifactId>weld-servlet-shaded</artifactId> - <version>3.1.9.Final</version> + <version>${weld.version}</version> <scope>runtime</scope> </dependency> - <!-- DI - JSR-330: Inject, Qualifier, Scope, Singleton, Named, and Provider --> + <!-- DI - JSR-330: Inject, Qualifier, Scope, Singleton, Named, and + Provider --> <dependency> <groupId>javax.inject</groupId> <artifactId>javax.inject</artifactId> @@ -423,19 +407,17 @@ <dependency> <groupId>org.glassfish.jersey.core</groupId> <artifactId>jersey-client</artifactId> - <version>${jersey.version}</version> </dependency> <dependency> <groupId>org.glassfish.jersey.inject</groupId> <artifactId>jersey-hk2</artifactId> - <version>${jersey.version}</version> </dependency> <dependency> - <!-- https://jersey.java.net/documentation/latest/media.html#json.jackson --> + <!-- + https://jersey.java.net/documentation/latest/media.html#json.jackson --> <groupId>org.glassfish.jersey.media</groupId> <artifactId>jersey-media-json-jackson</artifactId> - <version>${jersey.version}</version> </dependency> <dependency> <!-- to add HTTP headers for authentication --> @@ -445,27 +427,28 @@ </dependency> <!-- https://mvnrepository.com/artifact/com.nimbusds/oauth2-oidc-sdk --> <dependency> - <groupId>com.nimbusds</groupId> - <artifactId>oauth2-oidc-sdk</artifactId> - <version>10.7.1</version> + <groupId>com.nimbusds</groupId> + <artifactId>oauth2-oidc-sdk</artifactId> + <version>10.7.1</version> </dependency> <!-- Remove Slf4j alert at boot and use the latest version --> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>${slf4j.version}</version> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>${slf4j.version}</version> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - <version>${slf4j.version}</version> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <version>${slf4j.version}</version> </dependency> - <!-- https://mvnrepository.com/artifact/org.xhtmlrenderer/flying-saucer-pdf --> + <!-- + https://mvnrepository.com/artifact/org.xhtmlrenderer/flying-saucer-pdf --> <!-- HTML to PDF --> <dependency> - <groupId>org.xhtmlrenderer</groupId> - <artifactId>flying-saucer-pdf-itext5</artifactId> - <version>9.1.22</version> + <groupId>org.xhtmlrenderer</groupId> + <artifactId>flying-saucer-pdf-itext5</artifactId> + <version>9.1.22</version> </dependency> <!-- Swagger --> @@ -482,30 +465,61 @@ <!-- Swagger UI --> <dependency> - <groupId>org.webjars</groupId> - <artifactId>swagger-ui</artifactId> - <version>5.12.0</version> + <groupId>org.webjars</groupId> + <artifactId>swagger-ui</artifactId> + <version>${swagger-ui.version}</version> </dependency> <!-- Jersey CDI for RS --> - <dependency> + <dependency> <groupId>org.glassfish.jersey.ext.cdi</groupId> <artifactId>jersey-cdi1x-servlet</artifactId> - <version>${jersey.version}</version> </dependency> <!-- Jersey servlet container for RS --> <dependency> <groupId>org.glassfish.jersey.containers</groupId> <artifactId>jersey-container-servlet</artifactId> - <version>${jersey.version}</version> </dependency> <!-- SAVA --> <dependency> <groupId>fr.inrae.agroclim</groupId> <artifactId>sava-core</artifactId> - <version>1.0.0</version> + <version>${sava.version}</version> + </dependency> + + <!-- Tests --> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>${junit.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <version>2.1.214</version> + <scope>test</scope> </dependency> + <dependency> + <groupId>org.assertj</groupId> + <artifactId>assertj-core</artifactId> + <version>3.14.0</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>com.github.tomakehurst</groupId> + <artifactId>wiremock-jre8-standalone</artifactId> + <version>2.25.1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <version>3.6.28</version> + <scope>test</scope> + </dependency> + </dependencies> <build> @@ -600,7 +614,8 @@ </executions> </plugin> <!-- Report on code coverage --> - <!-- https://mvnrepository.com/artifact/org.jacoco/jacoco-maven-plugin --> + <!-- + https://mvnrepository.com/artifact/org.jacoco/jacoco-maven-plugin --> <plugin> <groupId>org.jacoco</groupId> <artifactId>jacoco-maven-plugin</artifactId> @@ -620,7 +635,8 @@ </goals> </execution> <execution> - <!-- Generate coverage report html in target/site/jacoco/ from target/jacoco.exec --> + <!-- Generate coverage report html in + target/site/jacoco/ from target/jacoco.exec --> <id>report</id> <phase>site</phase> <goals> @@ -669,7 +685,8 @@ <goal>cpd-check</goal> </goals> <configuration> - <excludeFromFailureFile>config/cpd-suppressions.properties</excludeFromFailureFile> + <excludeFromFailureFile> + config/cpd-suppressions.properties</excludeFromFailureFile> </configuration> </execution> </executions> @@ -681,13 +698,13 @@ <version>${surefire.version}</version> <configuration> <argLine> ---add-opens=java.base/java.lang=ALL-UNNAMED ---add-opens=java.base/java.math=ALL-UNNAMED ---add-opens=java.base/java.net=ALL-UNNAMED ---add-opens=java.base/java.text=ALL-UNNAMED ---add-opens=java.base/java.util=ALL-UNNAMED ---add-opens=java.base/java.util.concurrent=ALL-UNNAMED ---add-opens=java.sql/java.sql=ALL-UNNAMED + --add-opens=java.base/java.lang=ALL-UNNAMED + --add-opens=java.base/java.math=ALL-UNNAMED + --add-opens=java.base/java.net=ALL-UNNAMED + --add-opens=java.base/java.text=ALL-UNNAMED + --add-opens=java.base/java.util=ALL-UNNAMED + --add-opens=java.base/java.util.concurrent=ALL-UNNAMED + --add-opens=java.sql/java.sql=ALL-UNNAMED </argLine> <excludes> <exclude>${exclude.tests}</exclude> @@ -871,23 +888,25 @@ <groupId>com.mycila</groupId> <artifactId>license-maven-plugin</artifactId> <version>4.2</version> - <configuration> - <licenseSets> - <licenseSet> - <header>com/mycila/maven/plugin/license/templates/GPL-3.txt</header> - <excludes> - <exclude>readme.md</exclude> - <exclude>**/*.csv</exclude> - <exclude>**/lombok.config</exclude> - <exclude>**/*.key</exclude> - <exclude>**/*.txt</exclude> - <exclude>bin/tokei</exclude> - <exclude>config/sun_checks.xml</exclude> - <exclude>src/main/resources/fr/soeretempo/gwt/client/resources/locales/*</exclude> - <exclude>src/main/webapp/sitemap.xml</exclude> - </excludes> - </licenseSet> - </licenseSets> + <configuration> + <licenseSets> + <licenseSet> + <header> + com/mycila/maven/plugin/license/templates/GPL-3.txt</header> + <excludes> + <exclude>readme.md</exclude> + <exclude>**/*.csv</exclude> + <exclude>**/lombok.config</exclude> + <exclude>**/*.key</exclude> + <exclude>**/*.txt</exclude> + <exclude>bin/tokei</exclude> + <exclude>config/sun_checks.xml</exclude> + <exclude> + src/main/resources/fr/soeretempo/gwt/client/resources/locales/*</exclude> + <exclude>src/main/webapp/sitemap.xml</exclude> + </excludes> + </licenseSet> + </licenseSets> <properties> <owner>TEMPO</owner> <email>contact-tempo@inrae.fr</email> @@ -908,12 +927,12 @@ </pluginManagement> </build> <reporting> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jxr-plugin</artifactId> - <version>3.3.0</version> - </plugin> - </plugins> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jxr-plugin</artifactId> + <version>3.3.0</version> + </plugin> + </plugins> </reporting> </project> -- GitLab