Merge dans test

Dockerfile

@@ -57,6 +57,11 @@ RUN dnf install -y cronie gettext && \
 COPY ./docker/batch/tasks.tmpl /etc/cron.d/tasks.tmpl
 # Le JAR et le script pour le batch de LN
 RUN dnf install -y java-11-openjdk
+
+RUN dnf install -y tzdata && \
+    ln -fs /usr/share/zoneinfo/Europe/Paris /etc/localtime && \
+    echo "Europe/Paris" > /etc/timezone
+
 COPY ./docker/batch/itemBatchRestartJobs.sh /scripts/itemBatchRestartJobs.sh
 RUN chmod +x /scripts/itemBatchRestartJobs.sh
 COPY ./docker/batch/itemBatchArchiverDemandesPlusDeTroisMois.sh /scripts/itemBatchArchiverDemandesPlusDeTroisMois.sh

batch/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>itembackoffice</artifactId>
         <groupId>fr.abes.item</groupId>
-        <version>2.3.8</version>
+        <version>2.3.9-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>

core/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>itembackoffice</artifactId>
         <groupId>fr.abes.item</groupId>
-        <version>2.3.8</version>
+        <version>2.3.9-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
@@ -70,7 +70,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>22.0</version>
+            <version>32.1.2-jre</version>
         </dependency>
     </dependencies>
 </project>

core/src/main/java/fr/abes/item/components/FichierEnrichiModif.java

@@ -128,7 +128,7 @@ private void checkSubfieldCol4ZoneE(String subfield, String traitement) throws F
         if (subfield.substring(1).matches(regex)) {
                 throw new FileCheckingException(Constant.ERR_FILE_HEAD4TH);
         }
-
+        //TODO : Revoir condition et ajouter TU parce que ça marche pas
         if (traitement.equals("creerNouvelleZone") && ("E856").contains(subfield) || ("E702").contains(subfield) || ("E712").contains(subfield)){
                 throw new FileCheckingException(Constant.ERR_FILE_4COLZONE + subfield.substring(0, 4));
         }

pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>fr.abes.item</groupId>
     <artifactId>itembackoffice</artifactId>
-    <version>2.3.8</version>
+    <version>2.3.9-SNAPSHOT</version>
     <modules>
         <module>core</module>
         <module>web</module>

web/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>itembackoffice</artifactId>
         <groupId>fr.abes.item</groupId>
-        <version>2.3.8</version>
+        <version>2.3.9-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>

web/src/main/resources/application-dev.properties

@@ -5,11 +5,11 @@ spring.datasource.item.password=
 spring.datasource.item.driver-class-name=org.postgresql.Driver
 
 spring.jpa.item.generate-ddl=true
-spring.jpa.item.show-sql=false
+spring.jpa.item.show-sql=true
 spring.jpa.item.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
 spring.jpa.item.hibernate.ddl-auto=create-drop
 spring.jpa.item.database-platform=org.hibernate.dialect.PostgreSQLDialect
-spring.sql.item.init.mode=always
+spring.sql.item.init.mode=never
 spring.hibernate.item.enable_lazy_load_no_trans=true
 
 # base xml de prod

web/src/main/resources/application-prod.properties

@@ -5,7 +5,7 @@ spring.datasource.item.password=
 spring.datasource.item.driver-class-name=org.postgresql.Driver
 
 spring.jpa.item.generate-ddl=false
-spring.jpa.item.show-sql=false
+spring.jpa.item.show-sql=true
 spring.jpa.item.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
 spring.jpa.item.hibernate.ddl-auto=none
 spring.jpa.item.database-platform=org.hibernate.dialect.PostgreSQLDialect

web/src/main/resources/application-test.properties

@@ -5,7 +5,7 @@ spring.datasource.item.password=
 spring.datasource.item.driver-class-name=org.postgresql.Driver
 
 spring.jpa.item.generate-ddl=false
-spring.jpa.item.show-sql=false
+spring.jpa.item.show-sql=true
 spring.jpa.item.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
 spring.jpa.item.hibernate.ddl-auto=none
 spring.jpa.item.database-platform=org.hibernate.dialect.PostgreSQLDialect
@@ -19,7 +19,7 @@ spring.datasource.basexml.password=
 spring.datasource.basexml.driver-class-name=oracle.jdbc.OracleDriver
 
 spring.jpa.basexml.generate-ddl=false
-spring.jpa.basexml.show-sql=false
+spring.jpa.basexml.show-sql=true
 spring.jpa.basexml.properties.hibernate.dialect=fr.abes.item.configuration.OracleCustomDriver
 spring.jpa.basexml.hibernate.ddl-auto=none
 spring.jpa.basexml.database-platform=org.hibernate.dialect.Oracle12cDialect