Merge commit '261c07cf'

.gitignore

@@ -6,4 +6,89 @@
 /.classpath
 /.project
 /jenkins_release
-/src_new
\ No newline at end of file
+/src_new
+
+##############################
+## Java
+##############################
+.mtj.tmp/
+*.class
+*.jar
+*.war
+*.ear
+*.nar
+hs_err_pid*
+
+##############################
+## Maven
+##############################
+target/
+pom.xml.tag
+pom.xml.releaseBackup
+pom.xml.versionsBackup
+pom.xml.next
+pom.xml.bak
+release.properties
+dependency-reduced-pom.xml
+buildNumber.properties
+.mvn/timing.properties
+.mvn/wrapper/maven-wrapper.jar
+
+##############################
+## Gradle
+##############################
+bin/
+build/
+.gradle
+.gradletasknamecache
+gradle-app.setting
+!gradle-wrapper.jar
+
+##############################
+## IntelliJ
+##############################
+out/
+.idea/
+.idea_modules/
+*.iml
+*.ipr
+*.iws
+
+##############################
+## Eclipse
+##############################
+.settings/
+bin/
+tmp/
+.metadata
+.classpath
+.project
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.loadpath
+.factorypath
+
+##############################
+## NetBeans
+##############################
+nbproject/private/
+build/
+nbbuild/
+dist/
+nbdist/
+nbactions.xml
+nb-configuration.xml
+
+##############################
+## Visual Studio Code
+##############################
+.vscode/
+.code-workspace
+
+##############################
+## OS X
+##############################
+.DS_Store

cicd/dev/docker-compose_with_release.yml

+version: '3.5'
+
+networks:
+  prodige:
+    name: prodige
+    external: true
+
+services:
+  jpr_prodige_geonetwork_web:
+    image: jpr_prodige_geonetwork_web
+    build: ./web
+    container_name: jpr_prodige_geonetwork_web
+    environment:
+      - JAVA_OPTS="-Djavax.net.ssl.keyStore=/etc/ssl/keystore.jks" "-Djavax.net.ssl.keyStorePassword=secret" "-Djavax.net.ssl.trustStore=/etc/ssl/truststore.jks" "-Djavax.net.ssl.trustStorePassword=secret"
+      #- JAVA_OPTS="-Djavax.net.ssl.trustStore=/etc/ssl/keystore.jks" "-Djavax.net.ssl.trustStorePassword=secret" "-Djavax.net.debug=ssl,handshake"
+    volumes:
+#      - ./../../target/geosource-overlay-3.4.1-0.war:/usr/local/tomcat/webapps/geonetwork.war
+      - ./../../target/geosource-overlay-3.4.1-0/:/usr/local/tomcat/webapps/geonetwork/
+      - ./../../../pr_prodige/docker/data/cas/keystore/keystore.jks:/etc/ssl/keystore.jks
+      - ./../../../pr_prodige/docker/data/cas/keystore/truststore.jks:/etc/ssl/truststore.jks
+      - ./../../../pr_prodige/docker/data/geonetwork/conf/server.xml:/usr/local/tomcat/conf/server.xml
+      - ./../../../pr_prodige/docker/data/geonetwork/WEB-INF/config-overrides-prod.xml:/usr/local/tomcat/webapps/geonetwork/WEB-INF/config-overrides-prod.xml
+      - ./../../../pr_prodige/docker/data/geonetwork/WEB-INF/config-overrides.properties:/usr/local/tomcat/webapps/geonetwork/WEB-INF/config-overrides.properties
+      - ./../../../pr_prodige/docker/data/geonetwork/WEB-INF/config-spring-geonetwork.xml:/usr/local/tomcat/webapps/geonetwork/WEB-INF/config-spring-geonetwork.xml
+      - ./../../../pr_prodige/docker/data/geonetwork/WEB-INF/config-security/config-security-cas.xml:/usr/local/tomcat/webapps/geonetwork/WEB-INF/config-security/config-securityconfig-security-cas.xml
+      - ./../../../pr_prodige/docker/data/geonetwork/WEB-INF/config-security/config-security.properties:/usr/local/tomcat/webapps/geonetwork/WEB-INF/config-security/config-securityconfig-security.properties
+      - ./../../../pr_prodige/docker/data/geonetwork/data/codelist:/usr/local/tomcat/webapps/geonetwork/WEB-INF/data/config/codelist   # Persistence data
+      - ./../../../pr_prodige/docker/data/geonetwork/data/data:/usr/local/tomcat/webapps/geonetwork/WEB-INF/data/data # Persistence data
+    networks:
+      prodige:
+        aliases:
+          - prodige-geonetwork

pom.xml

@@ -13,6 +13,7 @@
             <groupId>org.geonetwork-opensource</groupId>
             <artifactId>geonetwork</artifactId>
             <version>3.4.1-0</version>
+<!--            <version>3.10.4-0</version>-->
             <type>war</type>
             <scope>runtime</scope>
         </dependency>

src/main/webapp/WEB-INF/classes/log4j.xml

@@ -7,20 +7,20 @@
   <appender name="consoleAppender" class="org.apache.log4j.ConsoleAppender">
     <param name="Threshold" value="ALL"/>
     <layout class="org.apache.log4j.PatternLayout">
-      <param name="ConversionPattern" value="%d{ISO8601} %-5p [%c] - %m%n"/>
+      <param name="ConversionPattern" value="%d{ISO8601} %-5p [%c] - %m{nolookups}%n"/>
     </layout>
   </appender>
   <appender name="allConsoleAppender" class="org.apache.log4j.ConsoleAppender">
     <param name="Threshold" value="ALL"/>
     <layout class="org.apache.log4j.PatternLayout">
-      <param name="ConversionPattern" value="%d{ISO8601} %-5p [%c] - %m%n"/>
+      <param name="ConversionPattern" value="%d{ISO8601} %-5p [%c] - %m{nolookups}%n"/>
     </layout>
   </appender>
   <appender name="fileAppender" class="org.apache.log4j.RollingFileAppender">
     <param name="Threshold" value="ALL"/>
     <param name="File" value="logs/geonetwork.log"/>
     <layout class="org.apache.log4j.PatternLayout">
-      <param name="ConversionPattern" value="%d{ISO8601} %-5p [%c] - %m%n"/>
+      <param name="ConversionPattern" value="%d{ISO8601} %-5p [%c] - %m{nolookups}%n"/>
     </layout>
   </appender>