diff --git a/.github/workflows/georchestra-gn4.yml b/.github/workflows/georchestra-gn4.yml index 23d338ef97..60f178dec5 100644 --- a/.github/workflows/georchestra-gn4.yml +++ b/.github/workflows/georchestra-gn4.yml @@ -3,10 +3,12 @@ name: Building georchestra-geonetwork4 artifacts on: push: branches: - - georchestra-gn4.2.x + - georchestra-gn4.2.x-23.0.x + pull_request: + workflow_dispatch: env: - DOCKER_TAG: 4.2.x + DOCKER_TAG: 23.0.x jobs: build: @@ -23,6 +25,7 @@ jobs: with: repository: "georchestra/georchestra" path: "georchestra" + ref: "23.0.x" - name: "Setting up Java" uses: actions/setup-java@v2 @@ -60,22 +63,20 @@ 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-23.0.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-23.0.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-23.0.x' && github.event_name != 'pull_request' run: | docker push georchestra/geonetwork:${DOCKER_TAG} - - - name: "Pushing latest image to docker-hub" - run: | - docker tag georchestra/geonetwork:${DOCKER_TAG} georchestra/geonetwork:latest - docker push georchestra/geonetwork:latest diff --git a/.gitignore b/.gitignore index 5a40ff33a1..778a727c9b 100644 --- a/.gitignore +++ b/.gitignore @@ -12,7 +12,8 @@ git*.properties */*/.* */*/target/ */target/ -.*/ +**/.idea +**/.settings GeoNetwork* /geonetwork* camel-harvesters/wfsfeature-harvester/logs 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/data_directory/console/console.properties b/georchestra-integration/georchestra-authnz/src/test/resources/data_directory/console/console.properties index df94ae8f6b..a52d20acb0 100644 --- a/georchestra-integration/georchestra-authnz/src/test/resources/data_directory/console/console.properties +++ b/georchestra-integration/georchestra-authnz/src/test/resources/data_directory/console/console.properties @@ -1,5 +1,5 @@ # set by GeorchestraDatabaseContainer as a System property, -# so bad it looks like console doesn't resolve ${} placeholders +# so bad it looks like console doesn't resolve ${} placeholders #pgsqlHost=${jdbc.host} # set by GeorchestraDatabaseContainer as a System property #pgsqlPort=${jdbc.port} @@ -184,3 +184,9 @@ AreasGroup=INSEE_DEP # Activates or disable GDPR-related endpoints # default: true #gdpr.allowAccountDeletion=true + + +rabbitmqHost=localhost +rabbitmqUser= +rabbitmqPassword= +rabbitmqPort=5672 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 + + + + + + + + + + + + + diff --git a/georchestra-integration/pom.xml b/georchestra-integration/pom.xml index c1d8cd903c..0da15e9254 100644 --- a/georchestra-integration/pom.xml +++ b/georchestra-integration/pom.xml @@ -12,7 +12,7 @@ geOrchestra integration ${basedir}/.. - 23.0.2 + 23.0.3-SNAPSHOT georchestra-utils diff --git a/web/src/main/webapp/WEB-INF/classes/setup/sql/data/data-db-default.sql b/web/src/main/webapp/WEB-INF/classes/setup/sql/data/data-db-default.sql index 6257d9d1a1..bebf24236d 100644 --- a/web/src/main/webapp/WEB-INF/classes/setup/sql/data/data-db-default.sql +++ b/web/src/main/webapp/WEB-INF/classes/setup/sql/data/data-db-default.sql @@ -913,7 +913,7 @@ INSERT INTO settings_ui VALUES ('srv', '{ }, "footer": { "enabled": false, - "showSocialBarInFooter": true + "showSocialBarInFooter": false }, "geocoder": { "appUrl": "https://secure.geonames.org/searchJSON", @@ -953,6 +953,7 @@ INSERT INTO settings_ui VALUES ('srv', '{ "home": { "appUrl": "../../{{node}}/{{lang}}/catalog.search#/home", "enabled": true, + "showMosaic": false, "facetConfig": { "cl_hierarchyLevel.key": { "terms": { @@ -965,12 +966,6 @@ INSERT INTO settings_ui VALUES ('srv', '{ "field": "cl_topic.key", "size": 20 } - }, - "inspireThemeUri": { - "terms": { - "field": "inspireThemeUri", - "size": 34 - } } }, "fluidLayout": true, @@ -1071,7 +1066,7 @@ INSERT INTO settings_ui VALUES ('srv', '{ }, "recordview": { "enabled": true, - "isSocialbarEnabled": true + "isSocialbarEnabled": false }, "search": { "appUrl": "../../{{node}}/{{lang}}/catalog.search#/search", @@ -1262,7 +1257,7 @@ INSERT INTO settings_ui VALUES ('srv', '{ 60, 120 ], - "isFilterTagsDisplayedInSearch": true, + "isFilterTagsDisplayedInSearch": false, "isVegaEnabled": true, "linkTypes": { "downloads": [