This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository coser. See https://gitlab.nuiton.org/codelutin/coser.git commit 5810b7263ba036b8d5e59f43ec21c3ecd5304558 Author: jcouteau <couteau@codelutin.com> Date: Thu Jul 7 17:43:37 2022 +0200 Build coser with jdk17 --- .gitlab-ci.yml | 4 ++-- coser-business/pom.xml | 4 ++-- pom.xml | 12 ++++++++---- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 901dc54..80db96e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,13 +6,13 @@ stages: - report build: - image: registry.nuiton.org/codelutin/dockerfiles:maven-release + image: registry.nuiton.org/codelutin/dockerfiles:maven-release-debian10-openjdk17 stage: build script: - mvn clean verify -e -U sonarqube: - image: registry.nuiton.org/codelutin/dockerfiles:debian-dev-java8 + image: registry.nuiton.org/codelutin/dockerfiles:maven-release-debian10-openjdk17 stage: report script: - mvn -e -U clean verify -DskipRelease org.sonarsource.scanner.maven:sonar-maven-plugin:3.4.0.905:sonar -Dsonar.host.url=$SONAR_URL -Dsonar.projectKey=fr.ifremer:coser -Dsonar.binaries='**/target/classes' -Dsonar.exclusions='**/js/libs/*','**/target/*','**/generated*/*' diff --git a/coser-business/pom.xml b/coser-business/pom.xml index 2cc7f51..c455068 100644 --- a/coser-business/pom.xml +++ b/coser-business/pom.xml @@ -119,10 +119,10 @@ <groupId>org.apache.struts.xwork</groupId> <artifactId>xwork-core</artifactId> </dependency> - <dependency> + <!--dependency> <groupId>org.javassist</groupId> <artifactId>javassist</artifactId> - </dependency> + </dependency--> <dependency> <groupId>org.jfree</groupId> <artifactId>jfreechart</artifactId> diff --git a/pom.xml b/pom.xml index 58c82b3..40425b7 100644 --- a/pom.xml +++ b/pom.xml @@ -26,8 +26,8 @@ <parent> <groupId>org.nuiton</groupId> - <artifactId>codelutinpom</artifactId> - <version>10.5</version> + <artifactId>pom</artifactId> + <version>11.12</version> </parent> <groupId>fr.ifremer</groupId> @@ -92,6 +92,9 @@ <projectId>coser</projectId> + <gitlabGroupName>ifremer</gitlabGroupName> + <gitlabProjectName>coser</gitlabProjectName> + <!-- license configuration --> <license.licenseName>lgpl_v3</license.licenseName> <license.organizationName>Ifremer, Codelutin</license.organizationName> @@ -102,11 +105,12 @@ <coserI18nBundle>coser-i18n</coserI18nBundle> <!-- Versions --> - <jaxxVersion>2.8.6</jaxxVersion> - <nuitonI18nVersion>3.1</nuitonI18nVersion> + <jaxxVersion>2.46</jaxxVersion> + <nuitonI18nVersion>4.2-SNAPSHOT</nuitonI18nVersion> <nuitonMatrixVersion>2.3.3</nuitonMatrixVersion> <strutsVersion>2.3.36</strutsVersion> <nuitonReportPluginVersion>3.0</nuitonReportPluginVersion> + <jrstPluginVersion>2.3</jrstPluginVersion> <!-- Site configuration --> <locales>fr,en</locales> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.