diff --git a/.github/workflows/georchestra-gn4.yml b/.github/workflows/georchestra-gn4.yml index 23d338ef97..2aa7a701c1 100644 --- a/.github/workflows/georchestra-gn4.yml +++ b/.github/workflows/georchestra-gn4.yml @@ -4,6 +4,8 @@ on: push: branches: - georchestra-gn4.2.x + pull_request: + workflow_dispatch: env: DOCKER_TAG: 4.2.x @@ -60,22 +62,26 @@ jobs: -DdockerImageName=georchestra/geonetwork:${DOCKER_TAG} -DskipTests - name: "publish the webapp as artifact" + if: github.repository == 'georchestra/geonetwork' && github.actor != 'dependabot[bot]' && github.ref == 'refs/heads/georchestra-gn4.2.x' && github.event_name != 'pull_request' uses: actions/upload-artifact@v1 with: 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 diff --git a/csw-server/src/main/java/org/fao/geonet/kernel/csw/services/getrecords/es/CswFilter2Es.java b/csw-server/src/main/java/org/fao/geonet/kernel/csw/services/getrecords/es/CswFilter2Es.java index 77086330f6..7cb7034cbe 100644 --- a/csw-server/src/main/java/org/fao/geonet/kernel/csw/services/getrecords/es/CswFilter2Es.java +++ b/csw-server/src/main/java/org/fao/geonet/kernel/csw/services/getrecords/es/CswFilter2Es.java @@ -201,19 +201,17 @@ protected static String escapeLikeLiteral(String text) { protected static String convertLikePattern(PropertyIsLike filter) { String result = filter.getLiteral(); if (!filter.getWildCard().equals("*")) { - final String wildcardRe = - StringUtils.isNotEmpty(filter.getEscape()) - ? Pattern.quote(filter.getEscape() + filter.getWildCard()) - : filter.getWildCard(); + final String wildcardRe = "(? + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger - %msg%n + + + + + + + + + + + + + diff --git a/georchestra-integration/georchestra-authnz/src/test/resources/logback.xml b/georchestra-integration/georchestra-authnz/src/test/resources/logback.xml new file mode 100644 index 0000000000..40ee1ab076 --- /dev/null +++ b/georchestra-integration/georchestra-authnz/src/test/resources/logback.xml @@ -0,0 +1,17 @@ + + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger - %msg%n + + + + + + + + + + + + +