Merge branch 'develop_rc' of gitlab.alkante.com:alkante/jpr_prodige_geonetwork into develop_rc

cicd/build/0_fetch-dependencies.sh

@@ -10,7 +10,7 @@ ROOTDIR="$SCRIPTDIR/../.."
 
 
 mkdir -p $ROOTDIR/source
-if [ ! -f $ROOTDIR/source/geonetwork-3.4.1-0.war ]; then
+if [ ! -f $ROOTDIR/source/geonetwork-3.10.4-0.war ]; then
   cd $ROOTDIR/source
-  wget -O geonetwork-3.4.1-0.war https://sourceforge.net/projects/geonetwork/files/GeoNetwork_opensource/v3.4.1/geonetwork.war/download
-fi;
\ No newline at end of file
+  wget -nv -O geonetwork-3.10.4-0.war https://sourceforge.net/projects/geonetwork/files/GeoNetwork_opensource/v3.10.4/geonetwork.war/download
+fi;

cicd/build/1_build_war.sh

@@ -13,6 +13,6 @@ cd $ROOTDIR
 
 
 # Build war
-docker run -u root -w "/usr/local/tomcat/build" --volume "$ROOTDIR:/usr/local/tomcat/build" tomcat:8-jdk8 ./mvnw install:install-file -DgroupId=org.geonetwork-opensource -DartifactId=geonetwork -Dversion=3.4.1-0 -Dpackaging=war -Dfile=./source/geonetwork-3.4.1-0.war clean package
+docker run -u root -w "/usr/local/tomcat/build" --volume "$ROOTDIR:/usr/local/tomcat/build" tomcat:8-jdk8 ./mvnw install:install-file -DgroupId=org.geonetwork-opensource -DartifactId=geonetwork -Dversion=3.10.4-0 -Dpackaging=war -Dfile=./source/geonetwork-3.10.4-0.war clean package
 
 docker run -u root -w "/usr/local/tomcat/build" --volume "$ROOTDIR:/usr/local/tomcat/build" tomcat:8-jdk8 chown -R $(id -u):$(id -g) .
\ No newline at end of file

cicd/build/docker-prod/web/Dockerfile

@@ -3,7 +3,7 @@ FROM tomcat:8-jdk8
 RUN apt update; \
   apt install -y ca-certificates-java
 
-## Not delpoy the geosource-overlay-3.4.1-0.war but the unziped one in docker
-COPY --chown=root:root ./target/geosource-overlay-3.4.1-0 /usr/local/tomcat/webapps/geonetwork
+## Not delpoy the geosource-overlay-3.10.4-0.war but the unziped one in docker
+COPY --chown=root:root ./target/geosource-overlay-3.10.4-0 /usr/local/tomcat/webapps/geonetwork
 
-#COPY --chown=root:root ./etc/geosource-overlay-3.4.1-0 /etc/geosource-overlay-3.4.1-0
\ No newline at end of file
+#COPY --chown=root:root ./etc/geosource-overlay-3.10.4-0 /etc/geosource-overlay-3.10.4-0
\ No newline at end of file