Merge branch 'geonetwork:main' into main

.github/workflows/docs.yml

@@ -0,0 +1,41 @@
+name: Documentation
+
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - "docs/manual/**"
+  pull_request:
+    branches:
+      - main
+    paths:
+      - "docs/manual/**"
+  workflow_dispatch:
+
+jobs:
+  deploy-docs:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout GeoNetwork
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Install Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: 3.x
+      - name: mkdocs install
+        run: pip install --upgrade pip && pip install -r docs/manual/requirements.txt
+      - name: git configuration
+        run: git config user.name 'github-actions[bot]' && git config user.email 'github-actions[bot]@users.noreply.github.com'
+      - name: build docs without publishing them
+        if: ${{ github.event_name == 'pull_request' }}
+        working-directory: docs/manual
+        run: |
+          mike deploy --title "4.4 Latest" --no-redirect --update-aliases 4.4 latest
+      - name: deploy latest docs to gh-pages branch
+        if: ${{ github.event_name != 'pull_request' }}
+        working-directory: docs/manual
+        run: |
+          mike deploy --push --title "4.4 Latest" --no-redirect --update-aliases 4.4 latest

.github/workflows/linux.yml

@@ -3,7 +3,7 @@ name: Linux GitHub CI
 on: [pull_request,push,workflow_dispatch]
 
 env:
-  MAVEN_OPTS: -Dmaven.wagon.httpconnectionManager.ttlSeconds=25 -Dmaven.wagon.http.retryHandler.count=3 -Xmx512m -Dorg.slf4j.simpleLogger.showDateTime=true -Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss,SSS
+  MAVEN_OPTS: -Dmaven.wagon.httpconnectionManager.ttlSeconds=25 -Dmaven.wagon.http.retryHandler.count=3 -Xmx512m -Dorg.slf4j.simpleLogger.showDateTime=true -Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss,SSS -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
   TAKARI_SMART_BUILDER_VERSION: 0.6.1
 
 jobs:
@@ -27,12 +27,20 @@ jobs:
         distribution: 'temurin'
         java-version: ${{ matrix.jdk }}
         cache: 'maven'
+    - name: Setup Python
+      uses: actions/setup-python@v4
+      with:
+        python-version: 3.x
+    - name: mkdocs install
+      working-directory: docs/manual
+      run: pip install --upgrade pip && pip install -r requirements.txt
     - name: Set up Maven
       uses: stCarolas/setup-maven@v4
       with:
         maven-version: 3.6.3
     - name: Build with Maven
-      run: mvn -B -V install -DskipTests=true -Dmaven.javadoc.skip=true
+      run: |
+        mvn -B -ntp -V install -DskipTests=true -Dmaven.javadoc.skip=true -Pwith-doc
     - name: Remove SNAPSHOT jars from repository
       run: |
         find ~/.m2/repository -name "*SNAPSHOT*" -type d | xargs rm -rf {}
@@ -62,7 +70,7 @@ jobs:
     - name: Test with maven
       run: |
         mvn -B resources:resources@copy-index-schema-to-source -f web
-        mvn -B -V -fae verify -Pit
+        mvn -B -ntp -V -fae verify -Pit
     - name: Remove SNAPSHOT jars from repository
       run: |
         find ~/.m2/repository -name "*SNAPSHOT*" -type d | xargs rm -rf {}

docs/manual/docs/index.fr.md

@@ -3,7 +3,7 @@ hide:
   - navigation
 ---
 
-# GeoNetwork {#toc}
+# GeoNetwork 4.4 {#toc}
 
 Bienvenue à GeoNetwork. Cette documentation est organisée en guides spécifiques destinés à différents publics.
 

docs/manual/docs/index.md

@@ -3,7 +3,7 @@ hide:
   - navigation
 ---
 
-# GeoNetwork {#toc}
+# GeoNetwork 4.4 {#toc}
 
 Welcome to GeoNetwork. This documentation is organized into specific guides targeting different audience. 
 

docs/manual/mkdocs.yml

@@ -126,7 +126,7 @@ markdown_extensions:
 
 # Page tree
 nav:
-  - index.md
+  - 'GeoNetwork': index.md
   - 'Overview':
     - overview/index.md
     - overview/about.md

index/src/main/java/org/fao/geonet/index/es/EsRestClient.java

@@ -38,6 +38,7 @@
 import org.apache.http.nio.conn.ssl.SSLIOSessionStrategy;
 import org.apache.http.ssl.SSLContextBuilder;
 import org.apache.lucene.search.TotalHits;
+import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.ElasticsearchStatusException;
 import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequest;
 import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse;
@@ -504,7 +505,7 @@ public String getServerStatus() throws IOException {
 //        return getClient().ping(RequestOptions.DEFAULT);
     }
 
-    public String getServerVersion() throws IOException {
+    public String getServerVersion() throws IOException, ElasticsearchException {
         MainResponse.Version version = client.info(RequestOptions.DEFAULT).getVersion();
 
         return version.getNumber();

services/src/main/java/org/fao/geonet/api/site/SiteInformation.java

@@ -28,6 +28,7 @@
 import jeeves.server.context.ServiceContext;
 import org.apache.commons.dbcp2.BasicDataSource;
 import org.apache.commons.lang.StringUtils;
+import org.elasticsearch.ElasticsearchException;
 import org.fao.geonet.GeonetContext;
 import org.fao.geonet.constants.Geonet;
 import org.fao.geonet.kernel.search.EsSearchManager;
@@ -65,7 +66,7 @@ public SiteInformation(final ServiceContext context, final GeonetContext gc) {
             }
             try {
                 loadIndexInfo(context);
-            } catch (IOException e) {
+            } catch (IOException | ElasticsearchException e) {
                 Log.error(Geonet.GEONETWORK, e.getMessage(), e);
             }
             loadEnvInfo();

web-ui/src/main/resources/catalog/templates/admin/usergroup/users.html

@@ -545,6 +545,7 @@ <h3 data-translate="">UserAdmin</h3>
           <form id="gn-password-reset" class="form-horizontal" name="gnPasswordReset">
             <input type="hidden" name="_csrf" value="{{csrf}}" />
             <div
+              data-ng-if="!user.isAdministratorOrMore()"
               class="form-group"
               data-ng-class="gnPasswordReset.passwordOld.$error.required ? 'has-error' : ''"
             >