This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit b6643734bdf2afe0ae4916f558393c9bba0a20fe Author: jcouteau <couteau@codelutin.com> Date: Fri Jul 8 11:06:30 2022 +0200 Build with jdk11. Quick test using tomcat7:run shows that it seems ok running (build is ok with jdk17 but run is buggy) --- .gitlab-ci.yml | 10 +++++----- echobase-domain/pom.xml | 2 +- .../persistence/EchoBasePersistenceHelper.java | 5 +++++ echobase-ui/pom.xml | 1 - pom.xml | 21 ++++++++++++++------- 5 files changed, 25 insertions(+), 14 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 98a7d242..455fd8c3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,14 +14,14 @@ stages: - cloudpages build:compile-only: - image: registry.nuiton.org/codelutin/dockerfiles:maven-release + image: registry.nuiton.org/codelutin/dockerfiles:maven-release-mvn3-6-3-openjdk11 stage: build when: manual script: - mvn clean package -Dmaven.test.skip build:with-tests: - image: registry.nuiton.org/codelutin/dockerfiles:maven-release + image: registry.nuiton.org/codelutin/dockerfiles:maven-release-mvn3-6-3-openjdk11 stage: build script: - mvn clean package @@ -36,7 +36,7 @@ build:with-tests: when: always check-releasable: - image: registry.nuiton.org/codelutin/dockerfiles:maven-release + image: registry.nuiton.org/codelutin/dockerfiles:maven-release-mvn3-6-3-openjdk11 stage: check-releasable script: - mvn clean verify -e -U -DperformRelease -Dredmine.skipGenerateChanges -Dmaven.javadoc.skip @@ -48,7 +48,7 @@ check-releasable: when: always sonar_job: - image: registry.nuiton.org/codelutin/dockerfiles:maven-release + image: registry.nuiton.org/codelutin/dockerfiles:maven-release-mvn3-6-3-openjdk11 stage: sonar script: - mvn -e -U clean verify -DskipRelease org.sonarsource.scanner.maven:sonar-maven-plugin:3.4.0.905:sonar -Dsonar.host.url=https://qa.codelutin.com -Dsonar.projectKey=fr.ifremer:echobase -Dsonar.binaries='**/target/classes' -Dsonar.exclusions='**/js/libs/*','**/target/*','**/generated*/*' @@ -58,7 +58,7 @@ sonar_job: - when: never pages: - image: registry.nuiton.org/codelutin/dockerfiles:maven-release + image: registry.nuiton.org/codelutin/dockerfiles:maven-release-mvn3-6-3-openjdk11 stage: pages artifacts: paths: diff --git a/echobase-domain/pom.xml b/echobase-domain/pom.xml index 7c9ebf4a..f327e64f 100644 --- a/echobase-domain/pom.xml +++ b/echobase-domain/pom.xml @@ -68,7 +68,7 @@ <resolver>org.nuiton.util.FasterCachedResourceResolver</resolver> <templates> org.nuiton.eugene.java.JavaInterfaceTransformer, - org.nuiton.eugene.java.JavaBeanTransformer, + org.nuiton.eugene.java.BeanTransformer, org.nuiton.topia.templates.TopiaMetaTransformer </templates> <failIfUnsafe>true</failIfUnsafe> diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBasePersistenceHelper.java b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBasePersistenceHelper.java index 428e2ffb..8bb05b25 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBasePersistenceHelper.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBasePersistenceHelper.java @@ -39,4 +39,9 @@ public class EchoBasePersistenceHelper implements TopiaEntityEnumProvider<EchoBa return EchoBaseUserEntityEnum.valueOf(type); } + @Override + public EchoBaseUserEntityEnum getEntityEnum(String enumName) { + return EchoBaseUserEntityEnum.valueOf(enumName); + } + } diff --git a/echobase-ui/pom.xml b/echobase-ui/pom.xml index 83aac25c..ddfc97ab 100644 --- a/echobase-ui/pom.xml +++ b/echobase-ui/pom.xml @@ -455,7 +455,6 @@ <webXmlFragment> ${embeddedTmpWarDir}/WEB-INF/webfrag.xml </webXmlFragment> - <packageRoot>org.apache.jsp</packageRoot> </configuration> </execution> diff --git a/pom.xml b/pom.xml index a2ddf637..13996349 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>pom</artifactId> - <version>11.9</version> + <version>11.12</version> </parent> <groupId>fr.ifremer</groupId> @@ -150,9 +150,9 @@ <!-- libraries version --> - <topiaVersion>3.1.1</topiaVersion> + <topiaVersion>3.8.1</topiaVersion> <nuitonUtilsVersion>3.0</nuitonUtilsVersion> - <nuitonI18nVersion>3.7</nuitonI18nVersion> + <nuitonI18nVersion>4.2-SNAPSHOT</nuitonI18nVersion> <nuitonWebVersion>1.20</nuitonWebVersion> <!-- JC 180208 - Do not update Struts 2 - Breaks forms --> @@ -162,9 +162,9 @@ <h2Version>1.3.175</h2Version> <postgresqlVersion>9.4.1211</postgresqlVersion> <slf4jVersion>1.7.25</slf4jVersion> - <coserVersion>1.5.6</coserVersion> + <coserVersion>1.6.1-SNAPSHOT</coserVersion> <!-- /!\ http://bengreen.eu/fancyhtml/quickreference/jettyjsp9error.html --> - <jettyPluginVersion>9.1.6.v20160112</jettyPluginVersion> + <jettyPluginVersion>9.2.30.v20200428</jettyPluginVersion> <jrstPluginVersion>2.3</jrstPluginVersion> <!-- JC 190117 - Do not update Reflections, breaks lots of tests --> @@ -349,7 +349,14 @@ <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> - <version>4.3.11.Final</version> + <version>5.4.22.Final</version> + </dependency> + + <dependency> + <groupId>javax.annotation</groupId> + <artifactId>javax.annotation-api</artifactId> + <version>1.3.2</version> + <scope>provided</scope> </dependency> <!-- base postgres --> @@ -496,7 +503,7 @@ <plugin> <groupId>org.nuiton.eugene</groupId> <artifactId>eugene-maven-plugin</artifactId> - <version>3.0-alpha-5</version> + <version>3.0</version> <dependencies> <dependency> <groupId>org.nuiton.topia</groupId> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.