Merge pull request #9 from abes-esr/develop

MAJ conf + heure serveur
abes-esr · Feb 6, 2024 · 3c622e5 · 3c622e5
2 parents c70c42c + 94c1aec
commit 3c622e5
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 14 deletions.
diff --git a/batch/src/main/resources/application-dev.properties b/batch/src/main/resources/application-dev.properties
@@ -18,7 +18,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

diff --git a/batch/src/main/resources/log4j2-dev.xml b/batch/src/main/resources/log4j2-dev.xml
@@ -9,10 +9,10 @@
         <Property name="debugFileName">${bundle:application:application.name}_debug</Property>
 
         <!-- Politique de gestion des fichiers -->
-        <Property name="sizeTriggerPolicy">100 MB</Property>
-        <Property name="deleteAgeFile">1d</Property>
-        <Property name="keepMostRecentFile">1</Property>
-        <Property name="keepMostRecentSize">10 MB</Property>
+        <Property name="sizeTriggerPolicy">200 MB</Property>
+        <Property name="deleteAgeFile">15d</Property>
+        <Property name="keepMostRecentFile">10</Property>
+        <Property name="keepMostRecentSize">100 MB</Property>
     </Properties>
     <Appenders>
 
@@ -130,4 +130,4 @@
         </Root>
     </Loggers>
 
-</Configuration>
+</Configuration>
diff --git a/core/pom.xml b/core/pom.xml
@@ -36,10 +36,12 @@
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
+            <version>42.5.1</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
+            <version>2.14.0-rc1</version>
         </dependency>
         <!--encoding detector library-->
         <dependency>

diff --git a/web/src/main/resources/application-dev.properties b/web/src/main/resources/application-dev.properties
@@ -4,10 +4,10 @@ spring.datasource.item.username=
 spring.datasource.item.password=
 spring.datasource.item.driver-class-name=org.postgresql.Driver
 
-spring.jpa.item.generate-ddl=true
+spring.jpa.item.generate-ddl=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.hibernate.ddl-auto=none
 spring.jpa.item.database-platform=org.hibernate.dialect.PostgreSQLDialect
 spring.sql.item.init.mode=never
 spring.hibernate.item.enable_lazy_load_no_trans=true

diff --git a/web/src/main/resources/application-test.properties b/web/src/main/resources/application-test.properties
@@ -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=true
+spring.jpa.basexml.show-sql=false
 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

diff --git a/web/src/main/resources/application.properties b/web/src/main/resources/application.properties
@@ -1,5 +1,5 @@
 ##########################################
-# Propriétés communes à tous les profils #
+# Proprietes communes a tous les profils
 ##########################################
 
 # Configuration du projet (depuis pom.xml)

diff --git a/web/src/main/resources/log4j2-dev.xml b/web/src/main/resources/log4j2-dev.xml
@@ -9,10 +9,10 @@
         <Property name="debugFileName">${bundle:application:application.name}_debug</Property>
 
         <!-- Politique de gestion des fichiers -->
-        <Property name="sizeTriggerPolicy">100 MB</Property>
-        <Property name="deleteAgeFile">1d</Property>
-        <Property name="keepMostRecentFile">1</Property>
-        <Property name="keepMostRecentSize">10 MB</Property>
+        <Property name="sizeTriggerPolicy">200 MB</Property>
+        <Property name="deleteAgeFile">15d</Property>
+        <Property name="keepMostRecentFile">10</Property>
+        <Property name="keepMostRecentSize">100 MB</Property>
     </Properties>
     <Appenders>