Merge branch 'georchestra-gn4.2.x' into georchestra-gn4.2.x-rebase

.backportrc.json

@@ -0,0 +1,3 @@
+{
+  "autoMerge": true
+}

.github/workflows/backport.yml

@@ -0,0 +1,24 @@
+name: Automatic backport action
+
+on:
+  pull_request_target:
+    types: ["closed"]
+
+jobs:
+  backport:
+    name: Backport PR
+    runs-on: ubuntu-latest
+    steps:
+      - name: Backport Action
+        uses: sqren/[email protected]
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          auto_backport_label_prefix: backport-to-
+
+      - name: Info log
+        if: ${{ success() }}
+        run: cat ~/.backport/backport.info.log
+
+      - name: Debug log
+        if: ${{ failure() }}
+        run: cat ~/.backport/backport.debug.log

.github/workflows/georchestra-gn4.yml

@@ -12,6 +12,7 @@ env:
 
 jobs:
   build:
+    if: "!startsWith(github.event.head_commit.message, '[skip ci] ')"
     runs-on: ubuntu-latest
     timeout-minutes: 40
     steps:
@@ -68,20 +69,3 @@ jobs:
         name: geonetwork.war
         path: web/target/geonetwork.war
 
-    - name: "Login onto docker-hub"
-      if: github.repository == 'georchestra/geonetwork' && github.actor != 'dependabot[bot]' && github.ref == 'refs/heads/georchestra-gn4.2.x' && github.event_name != 'pull_request'
-      uses: docker/login-action@v1
-      with:
-        username: '${{ secrets.DOCKER_HUB_USERNAME }}'
-        password: '${{ secrets.DOCKER_HUB_PASSWORD }}'
-
-    - name: "Pushing branch image to docker-hub"
-      if: github.repository == 'georchestra/geonetwork' && github.actor != 'dependabot[bot]' && github.ref == 'refs/heads/georchestra-gn4.2.x' && github.event_name != 'pull_request'
-      run: |
-        docker push georchestra/geonetwork:${DOCKER_TAG}
-
-    - name: "Pushing latest image to docker-hub"
-      if: github.repository == 'georchestra/geonetwork' && github.actor != 'dependabot[bot]' && github.ref == 'refs/heads/georchestra-gn4.2.x' && github.event_name != 'pull_request'
-      run: |
-        docker tag georchestra/geonetwork:${DOCKER_TAG} georchestra/geonetwork:latest
-        docker push georchestra/geonetwork:latest

csw-server/src/test/java/org/fao/geonet/kernel/csw/services/getrecords/es/CswFilter2EsTest.java

@@ -154,6 +154,23 @@ void testPropertyIsEqualTo() throws IOException {
             bld();
 
         assertFilterEquals(expected, input);
+
+
+        final String input2 =
+            "<Filter xmlns=\"http://www.opengis.net/ogc\">\n" //
+                + "    <PropertyIsLike wildCard=\"%\" singleChar=\"_\" escapeChar=\"\\\">\n" //
+                + "          <PropertyName>AnyText</PropertyName>\n" //
+                + "          <Literal>OGC:WMS\\%</Literal>\n" //
+                + "    </PropertyIsLike>\n" //
+                + "      </Filter>";
+
+        // EXPECTED:
+        final ObjectNode expected2 = EsJsonHelper.boolbdr(). //
+            must(array(queryStringPart("AnyText", "OGC\\:WMS*"))). //
+            filter(queryStringPart()). //
+            bld();
+
+        assertFilterEquals(expected2, input2);
     }
 
     @Test

web-ui/src/main/resources/catalog/components/common/openlayers/olMapDirective.js

@@ -60,7 +60,7 @@
           var map = scope.$eval(prop);
           var target = element[0];
 
-          var resizeObserver = new ResizeObserver(function () {
+          var resizeObserver = new ResizeObserver(function() {
             map.updateSize();
             resizeObserver.unobserve(target);
           });

web/src/docker/Dockerfile

@@ -9,6 +9,8 @@ COPY --chown=jetty:jetty . /
 # Temporary switch to root
 USER root
 
+RUN mkdir -p /docker-entrypoint.d
+RUN chown jetty:jetty /docker-entrypoint.d
 RUN mkdir -p /mnt/geonetwork_datadir && \
     chown jetty:jetty /mnt/geonetwork_datadir
 

web/src/docker/docker-entrypoint.sh

@@ -2,9 +2,19 @@
 
 DIR=/docker-entrypoint.d
 
+# Executing custom scripts located in CUSTOM_SCRIPTS_DIRECTORY if environment variable is set
+if [[ -z "${CUSTOM_SCRIPTS_DIRECTORY}" ]]; then
+  echo "[INFO] No CUSTOM_SCRIPTS_DIRECTORY env variable set"
+else
+  echo "[INFO] CUSTOM_SCRIPTS_DIRECTORY env variable set to ${CUSTOM_SCRIPTS_DIRECTORY}"
+  cp -v "${CUSTOM_SCRIPTS_DIRECTORY}"/* "$DIR"
+  echo "[INFO] End copying custom scripts"
+fi
+
 if [[ -d "$DIR" ]]
 then
-  /bin/run-parts --verbose "$DIR"
+  # Regex is needed to execute all kind of files, including sh files. Warning : --regex not available in alpine images.
+  /bin/run-parts --verbose "$DIR" --regex='.*'
 fi
 
 exec "$@"