Align with GN 4.2.11

.env

@@ -1,6 +1,6 @@
 # docker-compose default environment variable values
 COMPOSE_PROJECT_NAME=gncloud
-TAG=4.2.10-0
+TAG=4.2.11-0
 EUREKA_SERVER_URL=http://discovery:8761/eureka
 
 # gn metadta postgres environment variables

README.md

@@ -20,7 +20,7 @@ Those components are created with the following requirements:
 * Java 11 JDK
 * Maven 3.6.3
 * Docker (optional)
-* [core-geonetwork:4.0.0](https://github.com/geonetwork/core-geonetwork/releases/tag/4.0.0), might need a local build, it's not available on any published maven repository?
+* [core-geonetwork:4.2.11](https://github.com/geonetwork/core-geonetwork/releases/tag/4.2.11), might need a local build, it's not available on any published maven repository?
 
 ### Building
 To build the services:

docker-compose.yml

@@ -15,7 +15,7 @@ services:
   # Rationale is to lower the barrier for developers to get started with this project, and to have the indexing-service
   # services dependencies in the same network
   geonetwork:
-    image: geonetwork:4.0.0
+    image: geonetwork:4.2.11
     restart: always
     ports:
       - 8080:8080
@@ -52,7 +52,7 @@ services:
       - gn-cloud-network
 
   elasticsearch:
-    image: elasticsearch:7.9.2
+    image: elasticsearch:7.17.15
     ulimits:
       memlock:
         soft: -1
@@ -71,7 +71,7 @@ services:
       - "9200:9200"
 
   kibana:
-    image: kibana:7.9.2
+    image: kibana:7.17.15
     environment:
       SERVER_NAME: 'kibana'
       ELASTICSEARCH_URL: http://elasticsearch:9200/

modules/library/common-error/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <artifactId>gn-cloud-lib</artifactId>
     <groupId>org.geonetwork-opensource.cloud</groupId>
-    <version>4.2.10-0</version>
+    <version>4.2.11-0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

modules/library/common-index-model/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <artifactId>gn-cloud-lib</artifactId>
     <groupId>org.geonetwork-opensource.cloud</groupId>
-    <version>4.2.10-0</version>
+    <version>4.2.11-0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

modules/library/common-index-model/src/main/java/org/fao/geonet/index/model/dcat2/Base.java

@@ -38,15 +38,15 @@ public abstract class Base {
   String about;
 
   @XmlElement(namespace = DCT_URI)
-  List<String> title = new ArrayList();
+  List<String> title = new ArrayList<>();
 
   @XmlElement(namespace = DCT_URI)
-  List<String> description = new ArrayList();
+  List<String> description = new ArrayList<>();
   /**
    * A unique identifier of the item.
    */
   @XmlElement(namespace = DCT_URI)
-  List<String> identifier = new ArrayList();
+  List<String> identifier = new ArrayList<>();
 
   /**
    * An established standard to which the described resource conforms.
@@ -86,21 +86,21 @@ public abstract class Base {
   List<Language> language = new ArrayList<>();
 
   @XmlElement(namespace = PROV_URI)
-  List<DcatQualifiedAttribution> qualifiedAttribution = new ArrayList();
+  List<DcatQualifiedAttribution> qualifiedAttribution = new ArrayList<>();
 
 
   @XmlElement(namespace = DCAT_URI)
-  List<DcatContactPoint> contactPoint = new ArrayList();
+  List<DcatContactPoint> contactPoint = new ArrayList<>();
 
   @XmlElement(namespace = DCT_URI)
-  List<FoafOrganization> creator = new ArrayList();
+  List<FoafOrganization> creator = new ArrayList<>();
 
   @XmlElement(namespace = DCT_URI)
-  List<FoafOrganization> rightsHolder = new ArrayList();
+  List<FoafOrganization> rightsHolder = new ArrayList<>();
 
   /**
    * A type of organisation that acts as a publisher.
    */
   @XmlElement(namespace = DCT_URI)
-  List<FoafOrganization> publisher = new ArrayList();
+  List<FoafOrganization> publisher = new ArrayList<>();
 }

modules/library/common-index-model/src/main/java/org/fao/geonet/index/model/dcat2/Dataset.java

@@ -74,15 +74,15 @@ public class Dataset extends Resource {
   //   * identifier scheme; an optional identifier for the agency that manages the identifier scheme
   //   */
   //  @XmlElement(name = "identifier", namespace = ADMS_URI)
-  //  List<AdmsIdentifier> admsIdentifier = new ArrayList();
+  //  List<AdmsIdentifier> admsIdentifier = new ArrayList<>();
   // TODO: adms:identifier, adms:sample
 
   /**
    * This property contains a description of the differences between this version and a previous
    * version of the Dataset.
    */
   @XmlElement(namespace = ADMS_URI)
-  List<String> versionNotes = new ArrayList();
+  List<String> versionNotes = new ArrayList<>();
 
   @XmlElement(namespace = FOAF_URI)
   List<DcatDocument> page;
@@ -91,7 +91,7 @@ public class Dataset extends Resource {
    * An available distribution of the dataset.
    */
   @XmlElement(namespace = DCAT_URI)
-  List<DcatDistributionContainer> distribution = new ArrayList();
+  List<DcatDistributionContainer> distribution = new ArrayList<>();
 
 
   @XmlElement(namespace = DCT_URI)
@@ -129,6 +129,6 @@ public class Dataset extends Resource {
    * An activity that generated, or provides the business context for, the creation of the dataset.
    */
   @XmlElement(namespace = PROV_URI)
-  List<DcatActivity> wasGeneratedBy = new ArrayList();
+  List<DcatActivity> wasGeneratedBy = new ArrayList<>();
 
 }

modules/library/common-index-model/src/main/java/org/fao/geonet/index/model/dcat2/DcatDistribution.java

@@ -54,25 +54,25 @@ public class DcatDistribution {
    * indicated by the distribution's dct:format and/or dcat:mediaType
    */
   @XmlElement(name = "downloadURL", namespace = DCAT_URI)
-  List<String> downloadUrl = new ArrayList();
+  List<String> downloadUrl = new ArrayList<>();
 
   /**
    * A data service that gives access to the distribution of the dataset.
    */
   @XmlElement(name = "accessService", namespace = DCAT_URI)
-  List<RdfResource> accessService = new ArrayList();
+  List<RdfResource> accessService = new ArrayList<>();
 
   /**
    * A name given to the distribution.
    */
   @XmlElement(namespace = DCT_URI)
-  List<String> title = new ArrayList();
+  List<String> title = new ArrayList<>();
 
   /**
    * A free-text account of the distribution.
    */
   @XmlElement(namespace = DCT_URI)
-  List<String> description = new ArrayList();
+  List<String> description = new ArrayList<>();
 
   @XmlElement(namespace = ADMS_URI)
   Subject representationTechnique;
@@ -91,7 +91,7 @@ public class DcatDistribution {
   BigInteger byteSize;
 
   @XmlElement(namespace = DCAT_URI)
-  List<RdfResource> compressFormat = new ArrayList();
+  List<RdfResource> compressFormat = new ArrayList<>();
 
   /**
    * A value that allows the contents of a file to be authenticated. This class allows the results
@@ -113,28 +113,28 @@ public class DcatDistribution {
 
   // TODO
   @XmlElement(namespace = DCAT_URI)
-  List<String> packageFormat = new ArrayList();
+  List<String> packageFormat = new ArrayList<>();
 
   /**
    * The file format of the distribution.
    */
   @XmlElement(namespace = DCAT_URI)
-  List<RdfResource> format = new ArrayList();
+  List<RdfResource> format = new ArrayList<>();
 
 
   @XmlElement(namespace = DCAT_URI)
-  List<BigDecimal> spatialResolutionInMeters = new ArrayList();
+  List<BigDecimal> spatialResolutionInMeters = new ArrayList<>();
 
   // TODO: Adapter
   @XmlElement(namespace = DCAT_URI)
-  List<Duration> temporalResolution = new ArrayList();
+  List<Duration> temporalResolution = new ArrayList<>();
 
 
   /**
    * A rights statement that concerns how the distribution is accessed.
    */
   @XmlElement(namespace = DCAT_URI)
-  List<DcatAccessRights> accessRights = new ArrayList();
+  List<DcatAccessRights> accessRights = new ArrayList<>();
 
 
   /**
@@ -166,14 +166,14 @@ public class DcatDistribution {
    * Information about rights held in and over the distribution.
    */
   @XmlElement(namespace = DCAT_URI)
-  List<DcatAccessRights> rights = new ArrayList();
+  List<DcatAccessRights> rights = new ArrayList<>();
 
   @XmlElement(namespace = RDFS_URI)
-  List<String> comment = new ArrayList();
+  List<String> comment = new ArrayList<>();
 
   // TODO
   //  @XmlElement(namespace = DQV_URI)
-  //  QualityMeasurement hasQualityMeasurement = new ArrayList();
+  //  QualityMeasurement hasQualityMeasurement = new ArrayList<>();
 
   @XmlElement(namespace = FOAF_URI)
   List<DcatDocument> page;

modules/library/common-index-model/src/main/java/org/fao/geonet/index/model/dcat2/Resource.java

@@ -35,13 +35,13 @@ public class Resource extends Base {
   // "Replaced by dcat:theme."
   @Deprecated
   @XmlElement(namespace = DCT_URI)
-  List<Subject> subject = new ArrayList();
+  List<Subject> subject = new ArrayList<>();
 
   @XmlElement(namespace = DCAT_URI)
-  List<Subject> keyword = new ArrayList();
+  List<Subject> keyword = new ArrayList<>();
 
   @XmlElement(namespace = DCAT_URI)
-  List<Subject> theme = new ArrayList();
+  List<Subject> theme = new ArrayList<>();
 
   /**
    * This property refers to the type of the Dataset. A controlled vocabulary for the values has not
@@ -58,7 +58,7 @@ public class Resource extends Base {
   List<Object> type;
 
   @XmlElement(namespace = DCAT_URI)
-  List<DcatDocument> landingPage = new ArrayList();
+  List<DcatDocument> landingPage = new ArrayList<>();
 
   @XmlElement(namespace = DCT_URI)
   List<RdfResource> isReferencedBy = new ArrayList<>();
@@ -75,7 +75,7 @@ public class Resource extends Base {
    * access" code list operated by the INSPIRE Registry</p>
    */
   @XmlElement(namespace = DCAT_URI)
-  List<DcatAccessRights> accessRights = new ArrayList();
+  List<DcatAccessRights> accessRights = new ArrayList<>();
 
   @XmlElement(namespace = DCT_URI)
   DcatLicenseDocumentContainer license;
@@ -85,7 +85,7 @@ public class Resource extends Base {
    * Resources.
    */
   @XmlElement(namespace = DCAT_URI)
-  List<DcatRelationship> qualifiedRelation = new ArrayList();
+  List<DcatRelationship> qualifiedRelation = new ArrayList<>();
 
 
   /**
@@ -96,7 +96,7 @@ public class Resource extends Base {
    * between items in the dataset.</p>
    */
   @XmlElement(namespace = DCAT_URI)
-  List<BigDecimal> spatialResolutionInMeters = new ArrayList();
+  List<BigDecimal> spatialResolutionInMeters = new ArrayList<>();
 
   /**
    * Minimum time period resolvable in the dataset.
@@ -108,7 +108,7 @@ public class Resource extends Base {
    */
   // TODO: Adapter
   @XmlElement(namespace = DCAT_URI)
-  List<Duration> temporalResolution = new ArrayList();
+  List<Duration> temporalResolution = new ArrayList<>();
 
 
   /**
@@ -131,11 +131,11 @@ public class Resource extends Base {
   //   */
   // TODO
   //  @XmlElement(namespace = DQV_URI)
-  //  QualityMeasurement hasQualityMeasurement = new ArrayList();
+  //  QualityMeasurement hasQualityMeasurement = new ArrayList<>();
 
   @XmlElement(namespace = PROV_URI)
-  List<DcatActivity> wasUsedBy = new ArrayList();
+  List<DcatActivity> wasUsedBy = new ArrayList<>();
 
   @XmlElement(namespace = RDFS_URI)
-  List<String> comment = new ArrayList();
+  List<String> comment = new ArrayList<>();
 }

modules/library/common-index-model/src/main/java/org/fao/geonet/index/model/gn/IndexRecord.java

@@ -150,7 +150,7 @@ public class IndexRecord extends IndexDocument {
   private List<String> geometries = new ArrayList<>();
 
   @JsonProperty(IndexRecordFieldNames.specificationConformance)
-  private List<SpecificationConformance> specificationConformance = new ArrayList();
+  private List<SpecificationConformance> specificationConformance = new ArrayList<>();
 
   //  @JsonAnyGetter
   private Map<String, ArrayList<String>> otherProperties = new HashMap<>();

modules/library/common-persistence/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <artifactId>gn-cloud-lib</artifactId>
     <groupId>org.geonetwork-opensource.cloud</groupId>
-    <version>4.2.10-0</version>
+    <version>4.2.11-0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

modules/library/common-search/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <artifactId>gn-cloud-lib</artifactId>
     <groupId>org.geonetwork-opensource.cloud</groupId>
-    <version>4.2.10-0</version>
+    <version>4.2.11-0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

modules/library/common-security/pom.xml

@@ -11,7 +11,7 @@
   <parent>
     <artifactId>gn-cloud-lib</artifactId>
     <groupId>org.geonetwork-opensource.cloud</groupId>
-    <version>4.2.10-0</version>
+    <version>4.2.11-0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>gn-cloud-common-security</artifactId>

modules/library/common-standards/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <artifactId>gn-cloud-lib</artifactId>
     <groupId>org.geonetwork-opensource.cloud</groupId>
-    <version>4.2.10-0</version>
+    <version>4.2.11-0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

modules/library/common-utility/pom.xml

@@ -11,7 +11,7 @@
   <parent>
     <artifactId>gn-cloud-lib</artifactId>
     <groupId>org.geonetwork-opensource.cloud</groupId>
-    <version>4.2.10-0</version>
+    <version>4.2.11-0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>gn-cloud-common-utility</artifactId>

modules/library/common-view/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <artifactId>gn-cloud-lib</artifactId>
     <groupId>org.geonetwork-opensource.cloud</groupId>
-    <version>4.2.10-0</version>
+    <version>4.2.11-0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

modules/library/pom.xml

@@ -13,7 +13,7 @@
   <parent>
     <artifactId>gn-cloud-parent</artifactId>
     <groupId>org.geonetwork-opensource.cloud</groupId>
-    <version>4.2.10-0</version>
+    <version>4.2.11-0</version>
   </parent>
   <artifactId>gn-cloud-lib</artifactId>
   <packaging>pom</packaging>

modules/pom.xml

@@ -13,7 +13,7 @@
   <parent>
     <artifactId>gn-cloud-microservices</artifactId>
     <groupId>org.geonetwork-opensource.cloud</groupId>
-    <version>4.2.10-0</version>
+    <version>4.2.11-0</version>
   </parent>
   <artifactId>gn-cloud-parent</artifactId>
   <packaging>pom</packaging>