Merge pull request #287 from georchestra/georchestra23-gn4.2.8

Geonetwork 4.2.8
georchestra · Jan 30, 2024 · d2aba56 · d2aba56
2 parents baf7ef4 + d63ac49
commit d2aba56
Show file tree

Hide file tree

Showing 374 changed files with 5,473 additions and 2,664 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -43,7 +43,7 @@ jobs:
         show-progress: 'false'
 
     - name: Setup Java JDK
-      uses: actions/setup-java@v3.12.0
+      uses: actions/setup-java@v4.0.0
       with:
         java-version: 8
         # Java distribution. See the list of supported distributions in README file
@@ -85,6 +85,3 @@ jobs:
     - name: Remove SNAPSHOT jars from repository
       run: |
         find ~/.m2/repository -name "*SNAPSHOT*" -type d | xargs rm -rf {}
-    - name: Remove Schema 3.8 jars from repository
-      run: |
-        find ~/.m2/repository -name "*3.8*" -type d | xargs rm -rf {}
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -22,7 +22,7 @@ jobs:
         with:
           fetch-depth: 0
       - name: Install Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: 3.x
       - name: mkdocs install
@@ -33,9 +33,9 @@ jobs:
         if: ${{ github.event_name == 'pull_request' }}
         working-directory: docs/manual
         run: |
-          mike deploy --title "4.2 Stable" --no-redirect --update-aliases 4.2 stable
+          mike deploy --title "4.2 Stable" --alias-type=copy --update-aliases 4.2 stable
       - name: deploy 4.2 docs to gh-pages branch
         if: ${{ github.event_name != 'pull_request' }}
         working-directory: docs/manual
         run: |
-          mike deploy --push --title "4.2 Stable" --no-redirect --update-aliases 4.2 stable
+          mike deploy --push --title "4.2 Stable" --alias-type=copy --update-aliases 4.2 stable
diff --git a/.gitignore b/.gitignore
@@ -72,6 +72,7 @@ web/src/main/webapp/WEB-INF/data/data/metadata_data
 web/src/main/webapp/WEB-INF/data/data/metadata_subversion
 web/src/main/webapp/WEB-INF/data/data/resources/htmlcache
 web/src/main/webapp/WEB-INF/data/data/resources/images
+web/src/main/webapp/WEB-INF/data/data/resources/schemapublication
 web/src/main/webapp/WEB-INF/data/data/resources/xml
 web/src/main/webapp/WEB-INF/data/data/upload/
 web/src/main/webapp/WEB-INF/data/harvester_*

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -14,8 +14,8 @@ Thank you for contributing to GeoNetwork:
 * Before merging a pull request, should be defined the following properties:
 
   - Milestone to include the change.
-  - Add the label `changelog` when  the change is relevant to be added to the release changelog file .
-  - Add the label(s) to the backport to previous branch(es), when the change is a bug fix or if it is a small improvement that may be relevant to the backport.
+  - Add the label `changelog` when  the change is relevant to be added to the release changelog file.
+  - Add `backport <branch>` to indicate when change is a bug fix or is a small improvement that may be relevant to the backport.
 
 * Good housekeeping: Anytime you commit, try and clean the code around it to latest style guide. If you improve a function without comments: add comments. If you modify functionality that does not have tests: write a test. If you fix functionality without documentation: add documentation.
 

diff --git a/README.md b/README.md
@@ -19,11 +19,11 @@
 
 User documentation is managed in the [geonetwork/doc](https://github.com/geonetwork/doc) repository covering all releases of GeoNetwork.
 
-The `docs` folder includes [geonetwork/doc](https://github.com/geonetwork/doc) as a git submodule. This documentation is compiled into html pages during a release for publishing on the [geonetwork-opensource.org](http://geonetwork-opensource.org) website.
+The `docs` folder includes [geonetwork/doc](https://github.com/geonetwork/doc) as a git submodule. This documentation is compiled into html pages during a release for publishing on the [geonetwork-opensource.org](https://www.geonetwork-opensource.org) website.
 
 Developer documentation located in README.md files in the code-base:
 
 * General documentation for the project as a whole is in this README.md
-* [Software Development Documentation](/software_development/) provides instructions for setting up a development environment, building Geonetwork, compiling user documentation, and making a releases
+* [Software Development Documentation](/software_development/) provides instructions for setting up a development environment, building GeoNetwork, compiling user documentation, and making a releases
 * Module specific documentation can be found in each module (assuming there is module specific documentation required)
 
diff --git a/SECURITY.md b/SECURITY.md
@@ -2,17 +2,17 @@
 
 The GeoNetwork community takes the security of the software and all services based on the software product seriously. On this page you can find the versions for which the community provides security patches. 
 
-If you believe you have found a security vulnerability in the software or an implementation of the software, please report it to [email protected] as described below. Do not publish the vulnerability in any public forums (such as twitter, email list or issue tracker).
+If you believe you have found a security vulnerability in the software or an implementation of the software, please report it to [email protected] as described below. Do not publish the vulnerability in any public forums (such as Twitter/X, email list or issue tracker).
 
 ## Supported Versions
 
 Each GeoNetwork release is supported with bug fixes for a limited period, with patch releases made approximately every three to six  months. 
 
-- We recommend to update to latest incremental release as soon as possible to address security vulnarabilities.
+- We recommend to update to latest incremental release as soon as possible to address security vulnerabilities.
 - Some overlap is provided when major versions are announced with both a current version and a maintenance version being made available to provide time for organizations to upgrade.
 
 | Version     | Supported          | Comment                 |
-| ----------- | ------------------ |------------------------ |
+|-------------|--------------------|-------------------------|
 | 4.2.x       | :white_check_mark: | Current version         |
 | 4.0.x       | :white_check_mark: | Maintenance version     |
 | 3.12.x      | :white_check_mark: | Maintenance version     |

diff --git a/cachingxslt/pom.xml b/cachingxslt/pom.xml
@@ -31,7 +31,7 @@
   <parent>
     <groupId>org.geonetwork-opensource</groupId>
     <artifactId>geonetwork</artifactId>
-    <version>4.2.7-georchestra</version>
+    <version>4.2.8-georchestra</version>
   </parent>
 
 

diff --git a/common/pom.xml b/common/pom.xml
@@ -31,7 +31,7 @@
   <parent>
     <groupId>org.geonetwork-opensource</groupId>
     <artifactId>geonetwork</artifactId>
-    <version>4.2.7-georchestra</version>
+    <version>4.2.8-georchestra</version>
   </parent>
 
 

diff --git a/core/pom.xml b/core/pom.xml
@@ -27,13 +27,13 @@
   <parent>
     <artifactId>geonetwork</artifactId>
     <groupId>org.geonetwork-opensource</groupId>
-    <version>4.2.7-georchestra</version>
+    <version>4.2.8-georchestra</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
   <artifactId>gn-core</artifactId>
   <name>GeoNetwork core</name>
-  <version>4.2.7-georchestra</version>
+  <version>4.2.8-georchestra</version>
 
   <dependencies>
     <dependency>

diff --git a/core/src/main/java/jeeves/guiservices/profiles/Get.java b/core/src/main/java/jeeves/guiservices/profiles/Get.java
diff --git a/core/src/main/java/jeeves/services/Ping.java b/core/src/main/java/jeeves/services/Ping.java
diff --git a/core/src/main/java/jeeves/services/RegExpReplace.java b/core/src/main/java/jeeves/services/RegExpReplace.java