Geonetwork 4.4

.github/workflows/codeql-analysis.yml

@@ -13,10 +13,10 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ main ]
+    branches: [ 4.2.x ]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [ main ]
+    branches: [ 4.2.x ]
   schedule:
     - cron: '44 20 * * 5'
 
@@ -38,12 +38,14 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
-
+      uses: actions/checkout@v4
+      with:
+        show-progress: 'false'
+
     - name: Setup Java JDK
-      uses: actions/setup-java@v3.5.1
+      uses: actions/setup-java@v3.12.0
       with:
-        java-version: 8
+        java-version: 11
         # Java distribution. See the list of supported distributions in README file
         distribution: temurin
         # The package type (jdk, jre, jdk+fx, jre+fx)

.gitignore

@@ -12,8 +12,9 @@ git*.properties
 */*/.*
 */*/target/
 */target/
-.*/
-GeoNetwork*
+**/.idea
+**/.settings
+#GeoNetwork*
 /geonetwork*
 camel-harvesters/wfsfeature-harvester/logs
 changes-*
@@ -81,6 +82,7 @@ web/src/main/webapp/WEB-INF/data/wro4j-cache*
 web/src/main/webapp/WEB-INF/data_*
 web/src/main/webapp/WEB-INF/metadata_subversion/
 web/src/main/webapp/WEB-INF/server.prop
+web/src/main/webapp/WEB-INF/prebuilt
 web/src/main/webapp/data/
 web/src/main/webapp/doc/en
 web/src/main/webapp/doc/fr

.gitmodules

@@ -7,6 +7,3 @@
 [submodule "web-ui/src/main/resources/catalog/lib/bootstrap-table"]
 	path = web-ui/src/main/resources/catalog/lib/bootstrap-table
 	url = https://github.com/wenzhixin/bootstrap-table.git
-[submodule "docs/manuals"]
-	path = docs/manuals
-	url = https://github.com/geonetwork/doc.git

CNAME

@@ -0,0 +1 @@
+docs.geonetwork-opensource.org

SECURITY.md

@@ -11,11 +11,11 @@ Each GeoNetwork release is supported with bug fixes for a limited period, with p
 - We recommend to update to latest incremental release as soon as possible to address security vulnarabilities.
 - 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     |
+| Version | Supported          | Comment                 |
+|---------| ------------------ |------------------------ |
+| 4.4.x   | :white_check_mark: | Current version         |
+| 4.2.x   | :white_check_mark: | Maintenance version     |
+| 3.12.x  | :white_check_mark: | Maintenance version     |
 
 If your organisation is making use of a GeoNetwork version that is no longer in use by the community all is not lost. You can volunteer on the developer list to make additional releases, or engage with one of our [Commercial Support](https://www.osgeo.org/service-providers/?p=geonetwork) providers. 
 

cachingxslt/pom.xml

@@ -31,7 +31,7 @@
   <parent>
     <groupId>org.geonetwork-opensource</groupId>
     <artifactId>geonetwork</artifactId>
-    <version>4.2.2-georchestra</version>
+    <version>4.4.0-georchestra</version>
   </parent>
 
 

code_quality/findbugs-excludes.xml

@@ -230,15 +230,6 @@
     <Bug pattern="DC_DOUBLECHECK"/>
     <Method name="getSupportedExts"/>
   </Match>
-  <Match>
-    <Class name="org.fao.geonet.api.records.formatters.groovy.util.AssociatedLink"/>
-    <Bug pattern="EQ_DOESNT_OVERRIDE_EQUALS"/>
-    <Method name="equals"/>
-  </Match>
-  <Match>
-    <Class name="org.fao.geonet.api.records.formatters.groovy.util.LinkType"/>
-    <Bug pattern="URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD"/>
-  </Match>
   <Match>
     <Class name="org.fao.geonet.api.regions.ListRegionsResponse"/>
     <Bug pattern="URF_UNREAD_FIELD"/>

common/pom.xml

@@ -31,7 +31,7 @@
   <parent>
     <groupId>org.geonetwork-opensource</groupId>
     <artifactId>geonetwork</artifactId>
-    <version>4.2.2-georchestra</version>
+    <version>4.4.0-georchestra</version>
   </parent>
 
 
@@ -85,6 +85,10 @@
       <groupId>org.apache.jcs</groupId>
       <artifactId>jcs</artifactId>
     </dependency>
+    <dependency>
+      <groupId>xalan</groupId>
+      <artifactId>serializer</artifactId>
+    </dependency>
     <dependency>
       <groupId>net.sf.saxon</groupId>
       <artifactId>saxon</artifactId>
@@ -178,6 +182,14 @@
       <groupId>org.bitbucket.cowwoc</groupId>
       <artifactId>diff-match-patch</artifactId>
     </dependency>
+    <dependency>
+      <groupId>javax.annotation</groupId>
+      <artifactId>javax.annotation-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>javax.xml.bind</groupId>
+      <artifactId>jaxb-api</artifactId>
+    </dependency>
   </dependencies>
 
   <build>
@@ -207,25 +219,6 @@
         </plugins>
       </build>
     </profile>
-    <profile>
-      <id>jdk11+</id>
-      <activation>
-        <jdk>[11,)</jdk>
-      </activation>
-      <properties>
-        <java.version>11</java.version>
-      </properties>
-        <dependencies>
-          <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
-          </dependency>
-          <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-          </dependency>
-        </dependencies>
-    </profile>
   </profiles>
   <properties>
     <rootProjectDir>${basedir}/..</rootProjectDir>

common/src/main/java/org/fao/geonet/utils/AbstractHttpRequest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001-2016 Food and Agriculture Organization of the
+ * Copyright (C) 2001-2023 Food and Agriculture Organization of the
  * United Nations (FAO-UN), United Nations World Food Programme (WFP)
  * and United Nations Environment Programme (UNEP)
  *
@@ -83,7 +83,7 @@ public class AbstractHttpRequest {
     private boolean useProxy;
     private String proxyHost;
     private int proxyPort;
-    private ArrayList<NameValuePair> alSimpleParams = new ArrayList<NameValuePair>();
+    private ArrayList<NameValuePair> alSimpleParams = new ArrayList<>();
     private String postData;
     private boolean preemptiveBasicAuth;
     private HttpClientContext httpClientContext;
@@ -303,9 +303,9 @@ protected HttpRequestBase setupHttpMethod() throws IOException {
         }
 
         if (host == null || protocol == null) {
-            throw new IllegalStateException(String.format(getClass().getSimpleName() + " is not ready to be executed: \n\tprotocol: '%s' " +
+            throw new IllegalStateException(String.format("%s is not ready to be executed: \n\tprotocol: '%s' " +
                 "\n\tuserinfo: '%s'\n\thost: '%s' \n\tport: '%s' \n\taddress: '%s'\n\tquery '%s'" +
-                "\n\tfragment: '%s'", protocol, userInfo, host, port, address, query, fragment));
+                "\n\tfragment: '%s'", getClass().getSimpleName(), protocol, userInfo, host, port, address, query, fragment));
         }
 
         HttpRequestBase httpMethod;
@@ -352,25 +352,25 @@ protected HttpRequestBase setupHttpMethod() throws IOException {
 
     protected String getSentData(HttpRequestBase httpMethod) {
         URI uri = httpMethod.getURI();
-        StringBuilder sentData = new StringBuilder(httpMethod.getMethod()).append(" ").append(uri.getPath());
+        StringBuilder sentDataValue = new StringBuilder(httpMethod.getMethod()).append(" ").append(uri.getPath());
 
         if (uri.getQuery() != null) {
-            sentData.append("?" + uri.getQuery());
+            sentDataValue.append("?" + uri.getQuery());
         }
 
-        sentData.append("\r\n");
+        sentDataValue.append("\r\n");
 
         for (Header h : httpMethod.getAllHeaders()) {
-            sentData.append(h);
+            sentDataValue.append(h);
         }
 
-        sentData.append("\r\n");
+        sentDataValue.append("\r\n");
 
         if (httpMethod instanceof HttpPost) {
-            sentData.append(postData);
+            sentDataValue.append(postData);
         }
 
-        return sentData.toString();
+        return sentDataValue.toString();
     }
 
     private Element soapEmbed(Element elem) {
@@ -393,7 +393,7 @@ protected Element soapUnembed(Element envelope) throws BadSoapResponseEx {
 
         List<Element> list = body.getChildren();
 
-        if (list.size() == 0)
+        if (list.isEmpty())
             throw new BadSoapResponseEx(envelope);
 
         return list.get(0);

common/src/main/java/org/fao/geonet/utils/Env.java

@@ -0,0 +1,56 @@
+//=============================================================================
+//===	Copyright (C) 2001-2023 Food and Agriculture Organization of the
+//===	United Nations (FAO-UN), United Nations World Food Programme (WFP)
+//===	and United Nations Environment Programme (UNEP)
+//===
+//===	This program is free software; you can redistribute it and/or modify
+//===	it under the terms of the GNU General Public License as published by
+//===	the Free Software Foundation; either version 2 of the License, or (at
+//===	your option) any later version.
+//===
+//===	This program is distributed in the hope that it will be useful, but
+//===	WITHOUT ANY WARRANTY; without even the implied warranty of
+//===	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+//===	General Public License for more details.
+//===
+//===	You should have received a copy of the GNU General Public License
+//===	along with this program; if not, write to the Free Software
+//===	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//===
+//===	Contact: Jeroen Ticheler - FAO - Viale delle Terme di Caracalla 2,
+//===	Rome - Italy. email: [email protected]
+//==============================================================================
+
+package org.fao.geonet.utils;
+
+import org.apache.commons.lang.StringUtils;
+
+public final class Env {
+
+    /**
+     * Retrieves an environment variable with this priority:
+     * - Java environment variable.
+     * - System environment variable.
+     * - Default value provided as parameter.
+     *
+     * @param propertyName
+     * @param defaultValue
+     * @return
+     */
+    public static String getPropertyFromEnv(String propertyName, String defaultValue) {
+        // Check if provided in Java environment variable
+        String propertyValue = System.getProperty(propertyName);
+
+        if (StringUtils.isEmpty(propertyValue)) {
+            // System environment variable
+            propertyValue = System.getenv(propertyName.toUpperCase().replace('.', '_'));
+        }
+
+        if (StringUtils.isEmpty(propertyValue)) {
+            propertyValue = defaultValue;
+        }
+
+        return propertyValue;
+    }
+
+}

common/src/main/java/org/fao/geonet/utils/GeonetHttpRequestFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001-2016 Food and Agriculture Organization of the
+ * Copyright (C) 2001-2023 Food and Agriculture Organization of the
  * United Nations (FAO-UN), United Nations World Food Programme (WFP)
  * and United Nations Environment Programme (UNEP)
  *
@@ -200,6 +200,7 @@ public HttpClientBuilder getDefaultHttpClientBuilder() {
         final HttpClientBuilder builder = HttpClientBuilder.create();
         builder.setRedirectStrategy(new LaxRedirectStrategy());
         builder.disableContentCompression();
+        builder.useSystemProperties();
 
         synchronized (this) {
             if (connectionManager == null) {
@@ -249,40 +250,40 @@ public void closeIdleConnections(long idleTimeout, TimeUnit tunit) {
 
     private static class AdaptingResponse extends AbstractClientHttpResponse {
 
-        private final CloseableHttpResponse _response;
-        private final CloseableHttpClient _client;
+        private final CloseableHttpResponse response;
+        private final CloseableHttpClient client;
 
         public AdaptingResponse(CloseableHttpClient client, CloseableHttpResponse response) {
-            this._response = response;
-            this._client = client;
+            this.response = response;
+            this.client = client;
         }
 
         @Override
         public int getRawStatusCode() throws IOException {
-            return _response.getStatusLine().getStatusCode();
+            return response.getStatusLine().getStatusCode();
         }
 
         @Override
         public String getStatusText() throws IOException {
-            return _response.getStatusLine().getReasonPhrase();
+            return response.getStatusLine().getReasonPhrase();
         }
 
         @Override
         public void close() {
-            IOUtils.closeQuietly(_response);
-            IOUtils.closeQuietly(_client);
+            IOUtils.closeQuietly(response);
+            IOUtils.closeQuietly(client);
         }
 
         @Override
         public InputStream getBody() throws IOException {
-            return _response.getEntity().getContent();
+            return response.getEntity().getContent();
         }
 
         @Override
         public HttpHeaders getHeaders() {
             final HttpHeaders httpHeaders = new HttpHeaders();
 
-            final Header[] headers = _response.getAllHeaders();
+            final Header[] headers = response.getAllHeaders();
 
             for (Header header : headers) {
                 final HeaderElement[] elements = header.getElements();