diff --git a/.env b/.env index 79b8446a..37b33c2b 100644 --- a/.env +++ b/.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 diff --git a/README.md b/README.md index 9d8ab2fa..240fa1a6 100644 --- a/README.md +++ b/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: diff --git a/docker-compose.yml b/docker-compose.yml index 4d614e70..7f394d44 100644 --- a/docker-compose.yml +++ b/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/ diff --git a/modules/library/common-error/pom.xml b/modules/library/common-error/pom.xml index f6084fdf..ab68d6ab 100644 --- a/modules/library/common-error/pom.xml +++ b/modules/library/common-error/pom.xml @@ -3,7 +3,7 @@ gn-cloud-lib org.geonetwork-opensource.cloud - 4.2.10-0 + 4.2.11-0 4.0.0 diff --git a/modules/library/common-index-model/pom.xml b/modules/library/common-index-model/pom.xml index b9a58a7e..c2ab0eef 100644 --- a/modules/library/common-index-model/pom.xml +++ b/modules/library/common-index-model/pom.xml @@ -3,7 +3,7 @@ gn-cloud-lib org.geonetwork-opensource.cloud - 4.2.10-0 + 4.2.11-0 4.0.0 diff --git a/modules/library/common-index-model/src/main/java/org/fao/geonet/index/model/dcat2/Base.java b/modules/library/common-index-model/src/main/java/org/fao/geonet/index/model/dcat2/Base.java index 065a7a39..540c3662 100644 --- a/modules/library/common-index-model/src/main/java/org/fao/geonet/index/model/dcat2/Base.java +++ b/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 title = new ArrayList(); + List title = new ArrayList<>(); @XmlElement(namespace = DCT_URI) - List description = new ArrayList(); + List description = new ArrayList<>(); /** * A unique identifier of the item. */ @XmlElement(namespace = DCT_URI) - List identifier = new ArrayList(); + List identifier = new ArrayList<>(); /** * An established standard to which the described resource conforms. @@ -86,21 +86,21 @@ public abstract class Base { List language = new ArrayList<>(); @XmlElement(namespace = PROV_URI) - List qualifiedAttribution = new ArrayList(); + List qualifiedAttribution = new ArrayList<>(); @XmlElement(namespace = DCAT_URI) - List contactPoint = new ArrayList(); + List contactPoint = new ArrayList<>(); @XmlElement(namespace = DCT_URI) - List creator = new ArrayList(); + List creator = new ArrayList<>(); @XmlElement(namespace = DCT_URI) - List rightsHolder = new ArrayList(); + List rightsHolder = new ArrayList<>(); /** * A type of organisation that acts as a publisher. */ @XmlElement(namespace = DCT_URI) - List publisher = new ArrayList(); + List publisher = new ArrayList<>(); } diff --git a/modules/library/common-index-model/src/main/java/org/fao/geonet/index/model/dcat2/Dataset.java b/modules/library/common-index-model/src/main/java/org/fao/geonet/index/model/dcat2/Dataset.java index d50258b6..bddb00b8 100644 --- a/modules/library/common-index-model/src/main/java/org/fao/geonet/index/model/dcat2/Dataset.java +++ b/modules/library/common-index-model/src/main/java/org/fao/geonet/index/model/dcat2/Dataset.java @@ -74,7 +74,7 @@ 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 = new ArrayList(); + // List admsIdentifier = new ArrayList<>(); // TODO: adms:identifier, adms:sample /** @@ -82,7 +82,7 @@ public class Dataset extends Resource { * version of the Dataset. */ @XmlElement(namespace = ADMS_URI) - List versionNotes = new ArrayList(); + List versionNotes = new ArrayList<>(); @XmlElement(namespace = FOAF_URI) List page; @@ -91,7 +91,7 @@ public class Dataset extends Resource { * An available distribution of the dataset. */ @XmlElement(namespace = DCAT_URI) - List distribution = new ArrayList(); + List 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 wasGeneratedBy = new ArrayList(); + List wasGeneratedBy = new ArrayList<>(); } diff --git a/modules/library/common-index-model/src/main/java/org/fao/geonet/index/model/dcat2/DcatDistribution.java b/modules/library/common-index-model/src/main/java/org/fao/geonet/index/model/dcat2/DcatDistribution.java index 53202caf..d50d06eb 100644 --- a/modules/library/common-index-model/src/main/java/org/fao/geonet/index/model/dcat2/DcatDistribution.java +++ b/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 downloadUrl = new ArrayList(); + List downloadUrl = new ArrayList<>(); /** * A data service that gives access to the distribution of the dataset. */ @XmlElement(name = "accessService", namespace = DCAT_URI) - List accessService = new ArrayList(); + List accessService = new ArrayList<>(); /** * A name given to the distribution. */ @XmlElement(namespace = DCT_URI) - List title = new ArrayList(); + List title = new ArrayList<>(); /** * A free-text account of the distribution. */ @XmlElement(namespace = DCT_URI) - List description = new ArrayList(); + List description = new ArrayList<>(); @XmlElement(namespace = ADMS_URI) Subject representationTechnique; @@ -91,7 +91,7 @@ public class DcatDistribution { BigInteger byteSize; @XmlElement(namespace = DCAT_URI) - List compressFormat = new ArrayList(); + List 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 packageFormat = new ArrayList(); + List packageFormat = new ArrayList<>(); /** * The file format of the distribution. */ @XmlElement(namespace = DCAT_URI) - List format = new ArrayList(); + List format = new ArrayList<>(); @XmlElement(namespace = DCAT_URI) - List spatialResolutionInMeters = new ArrayList(); + List spatialResolutionInMeters = new ArrayList<>(); // TODO: Adapter @XmlElement(namespace = DCAT_URI) - List temporalResolution = new ArrayList(); + List temporalResolution = new ArrayList<>(); /** * A rights statement that concerns how the distribution is accessed. */ @XmlElement(namespace = DCAT_URI) - List accessRights = new ArrayList(); + List accessRights = new ArrayList<>(); /** @@ -166,14 +166,14 @@ public class DcatDistribution { * Information about rights held in and over the distribution. */ @XmlElement(namespace = DCAT_URI) - List rights = new ArrayList(); + List rights = new ArrayList<>(); @XmlElement(namespace = RDFS_URI) - List comment = new ArrayList(); + List comment = new ArrayList<>(); // TODO // @XmlElement(namespace = DQV_URI) - // QualityMeasurement hasQualityMeasurement = new ArrayList(); + // QualityMeasurement hasQualityMeasurement = new ArrayList<>(); @XmlElement(namespace = FOAF_URI) List page; diff --git a/modules/library/common-index-model/src/main/java/org/fao/geonet/index/model/dcat2/Resource.java b/modules/library/common-index-model/src/main/java/org/fao/geonet/index/model/dcat2/Resource.java index 37f687b9..407bec31 100644 --- a/modules/library/common-index-model/src/main/java/org/fao/geonet/index/model/dcat2/Resource.java +++ b/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 = new ArrayList(); + List subject = new ArrayList<>(); @XmlElement(namespace = DCAT_URI) - List keyword = new ArrayList(); + List keyword = new ArrayList<>(); @XmlElement(namespace = DCAT_URI) - List theme = new ArrayList(); + List 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 type; @XmlElement(namespace = DCAT_URI) - List landingPage = new ArrayList(); + List landingPage = new ArrayList<>(); @XmlElement(namespace = DCT_URI) List isReferencedBy = new ArrayList<>(); @@ -75,7 +75,7 @@ public class Resource extends Base { * access" code list operated by the INSPIRE Registry

*/ @XmlElement(namespace = DCAT_URI) - List accessRights = new ArrayList(); + List accessRights = new ArrayList<>(); @XmlElement(namespace = DCT_URI) DcatLicenseDocumentContainer license; @@ -85,7 +85,7 @@ public class Resource extends Base { * Resources. */ @XmlElement(namespace = DCAT_URI) - List qualifiedRelation = new ArrayList(); + List qualifiedRelation = new ArrayList<>(); /** @@ -96,7 +96,7 @@ public class Resource extends Base { * between items in the dataset.

*/ @XmlElement(namespace = DCAT_URI) - List spatialResolutionInMeters = new ArrayList(); + List 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 temporalResolution = new ArrayList(); + List 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 wasUsedBy = new ArrayList(); + List wasUsedBy = new ArrayList<>(); @XmlElement(namespace = RDFS_URI) - List comment = new ArrayList(); + List comment = new ArrayList<>(); } diff --git a/modules/library/common-index-model/src/main/java/org/fao/geonet/index/model/gn/IndexRecord.java b/modules/library/common-index-model/src/main/java/org/fao/geonet/index/model/gn/IndexRecord.java index 0fe1caa4..a6f3fbca 100644 --- a/modules/library/common-index-model/src/main/java/org/fao/geonet/index/model/gn/IndexRecord.java +++ b/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 geometries = new ArrayList<>(); @JsonProperty(IndexRecordFieldNames.specificationConformance) - private List specificationConformance = new ArrayList(); + private List specificationConformance = new ArrayList<>(); // @JsonAnyGetter private Map> otherProperties = new HashMap<>(); diff --git a/modules/library/common-persistence/pom.xml b/modules/library/common-persistence/pom.xml index 51a731bd..2856e1c9 100644 --- a/modules/library/common-persistence/pom.xml +++ b/modules/library/common-persistence/pom.xml @@ -3,7 +3,7 @@ gn-cloud-lib org.geonetwork-opensource.cloud - 4.2.10-0 + 4.2.11-0 4.0.0 diff --git a/modules/library/common-search/pom.xml b/modules/library/common-search/pom.xml index acf7524b..843da474 100644 --- a/modules/library/common-search/pom.xml +++ b/modules/library/common-search/pom.xml @@ -3,7 +3,7 @@ gn-cloud-lib org.geonetwork-opensource.cloud - 4.2.10-0 + 4.2.11-0 4.0.0 diff --git a/modules/library/common-security/pom.xml b/modules/library/common-security/pom.xml index 1db13567..63388cca 100644 --- a/modules/library/common-security/pom.xml +++ b/modules/library/common-security/pom.xml @@ -11,7 +11,7 @@ gn-cloud-lib org.geonetwork-opensource.cloud - 4.2.10-0 + 4.2.11-0 4.0.0 gn-cloud-common-security diff --git a/modules/library/common-standards/pom.xml b/modules/library/common-standards/pom.xml index fc4e27df..63a42160 100644 --- a/modules/library/common-standards/pom.xml +++ b/modules/library/common-standards/pom.xml @@ -3,7 +3,7 @@ gn-cloud-lib org.geonetwork-opensource.cloud - 4.2.10-0 + 4.2.11-0 4.0.0 diff --git a/modules/library/common-utility/pom.xml b/modules/library/common-utility/pom.xml index 8830bd2e..020d59eb 100644 --- a/modules/library/common-utility/pom.xml +++ b/modules/library/common-utility/pom.xml @@ -11,7 +11,7 @@ gn-cloud-lib org.geonetwork-opensource.cloud - 4.2.10-0 + 4.2.11-0 4.0.0 gn-cloud-common-utility diff --git a/modules/library/common-view/pom.xml b/modules/library/common-view/pom.xml index e4f94b9c..734d8f38 100644 --- a/modules/library/common-view/pom.xml +++ b/modules/library/common-view/pom.xml @@ -3,7 +3,7 @@ gn-cloud-lib org.geonetwork-opensource.cloud - 4.2.10-0 + 4.2.11-0 4.0.0 diff --git a/modules/library/pom.xml b/modules/library/pom.xml index 9ec2cf42..5c917cc8 100644 --- a/modules/library/pom.xml +++ b/modules/library/pom.xml @@ -13,7 +13,7 @@ gn-cloud-parent org.geonetwork-opensource.cloud - 4.2.10-0 + 4.2.11-0 gn-cloud-lib pom diff --git a/modules/pom.xml b/modules/pom.xml index 1a38e0be..5a09ec10 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -13,7 +13,7 @@ gn-cloud-microservices org.geonetwork-opensource.cloud - 4.2.10-0 + 4.2.11-0 gn-cloud-parent pom diff --git a/modules/services/authorizing/pom.xml b/modules/services/authorizing/pom.xml index 7f6d71f7..b4018533 100644 --- a/modules/services/authorizing/pom.xml +++ b/modules/services/authorizing/pom.xml @@ -10,7 +10,7 @@ gn-cloud-services org.geonetwork-opensource.cloud - 4.2.10-0 + 4.2.11-0 4.0.0 diff --git a/modules/services/gateway/pom.xml b/modules/services/gateway/pom.xml index 85a06838..66592576 100644 --- a/modules/services/gateway/pom.xml +++ b/modules/services/gateway/pom.xml @@ -11,7 +11,7 @@ gn-cloud-services org.geonetwork-opensource.cloud - 4.2.10-0 + 4.2.11-0 4.0.0 gn-cloud-gateway diff --git a/modules/services/indexing/pom.xml b/modules/services/indexing/pom.xml index 11eef140..de6c74db 100644 --- a/modules/services/indexing/pom.xml +++ b/modules/services/indexing/pom.xml @@ -11,7 +11,7 @@ gn-cloud-services org.geonetwork-opensource.cloud - 4.2.10-0 + 4.2.11-0 4.0.0 gn-cloud-indexing diff --git a/modules/services/indexing/src/main/java/org/fao/geonet/indexing/service/IndexingService.java b/modules/services/indexing/src/main/java/org/fao/geonet/indexing/service/IndexingService.java index ed0f4b29..16f9ec0a 100644 --- a/modules/services/indexing/src/main/java/org/fao/geonet/indexing/service/IndexingService.java +++ b/modules/services/indexing/src/main/java/org/fao/geonet/indexing/service/IndexingService.java @@ -36,7 +36,7 @@ import org.elasticsearch.action.support.master.AcknowledgedResponse; import org.elasticsearch.client.RequestOptions; import org.elasticsearch.client.RestHighLevelClient; -import org.elasticsearch.common.xcontent.XContentType; +import org.elasticsearch.xcontent.XContentType; import org.fao.geonet.common.xml.XsltUtil; import org.fao.geonet.domain.AbstractMetadata; import org.fao.geonet.domain.Metadata; diff --git a/modules/services/ogc-api-records/README.md b/modules/services/ogc-api-records/README.md index 8926c68c..6d59f55f 100644 --- a/modules/services/ogc-api-records/README.md +++ b/modules/services/ogc-api-records/README.md @@ -76,7 +76,7 @@ docker run -it -p8080:8080 \ -e "SPRING_PROFILES_ACTIVE=standalone" \ -e "SPRING_CONFIG_LOCATION=/ogcapiconfig/" \ -e "JAVA_OPTS=-Dfile.encoding=UTF-8" \ - gn-cloud-ogc-api-records-service:4.2.10-0 + gn-cloud-ogc-api-records-service:4.2.11-0 ``` or use a published release (create your configuration first like above): diff --git a/modules/services/ogc-api-records/pom.xml b/modules/services/ogc-api-records/pom.xml index ec2089c1..20f9e809 100644 --- a/modules/services/ogc-api-records/pom.xml +++ b/modules/services/ogc-api-records/pom.xml @@ -10,7 +10,7 @@ org.geonetwork-opensource.cloud gn-cloud-services - 4.2.10-0 + 4.2.11-0 4.0.0 gn-cloud-ogc-api-records-service diff --git a/modules/services/pom.xml b/modules/services/pom.xml index ac6c4401..9f5adc0f 100644 --- a/modules/services/pom.xml +++ b/modules/services/pom.xml @@ -13,7 +13,7 @@ gn-cloud-parent org.geonetwork-opensource.cloud - 4.2.10-0 + 4.2.11-0 gn-cloud-services pom diff --git a/modules/services/searching/pom.xml b/modules/services/searching/pom.xml index 159ae7a1..5e3aac27 100644 --- a/modules/services/searching/pom.xml +++ b/modules/services/searching/pom.xml @@ -11,7 +11,7 @@ org.geonetwork-opensource.cloud gn-cloud-services - 4.2.10-0 + 4.2.11-0 4.0.0 gn-cloud-searching diff --git a/modules/standards/iso19139/pom.xml b/modules/standards/iso19139/pom.xml index 62027bc8..9b98af0f 100644 --- a/modules/standards/iso19139/pom.xml +++ b/modules/standards/iso19139/pom.xml @@ -3,7 +3,7 @@ gn-cloud-standards org.geonetwork-opensource.cloud - 4.2.10-0 + 4.2.11-0 4.0.0 gn-cloud-standard-iso19139 diff --git a/modules/standards/pom.xml b/modules/standards/pom.xml index b2144955..50c7e041 100644 --- a/modules/standards/pom.xml +++ b/modules/standards/pom.xml @@ -4,7 +4,7 @@ gn-cloud-parent org.geonetwork-opensource.cloud - 4.2.10-0 + 4.2.11-0 gn-cloud-standards pom diff --git a/modules/support-services/configuring/pom.xml b/modules/support-services/configuring/pom.xml index f091b2ef..5e08f10a 100644 --- a/modules/support-services/configuring/pom.xml +++ b/modules/support-services/configuring/pom.xml @@ -10,7 +10,7 @@ gn-cloud-support-services org.geonetwork-opensource.cloud - 4.2.10-0 + 4.2.11-0 4.0.0 gn-cloud-configuring diff --git a/modules/support-services/discovery/pom.xml b/modules/support-services/discovery/pom.xml index 4ff74fe2..a74b13c0 100644 --- a/modules/support-services/discovery/pom.xml +++ b/modules/support-services/discovery/pom.xml @@ -10,7 +10,7 @@ gn-cloud-support-services org.geonetwork-opensource.cloud - 4.2.10-0 + 4.2.11-0 4.0.0 gn-cloud-discovery diff --git a/modules/support-services/pom.xml b/modules/support-services/pom.xml index 1051c05e..763d3569 100644 --- a/modules/support-services/pom.xml +++ b/modules/support-services/pom.xml @@ -13,7 +13,7 @@ gn-cloud-parent org.geonetwork-opensource.cloud - 4.2.10-0 + 4.2.11-0 gn-cloud-support-services pom diff --git a/pom.xml b/pom.xml index e41ad54f..a5236ea0 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ 4.0.0 org.geonetwork-opensource.cloud gn-cloud-microservices - 4.2.10-0 + 4.2.11-0 pom GeoNetwork microservices https://geonetwork-opensource.org @@ -28,10 +28,10 @@ Hoxton.SR8 2.3.8.RELEASE 5.3.2.RELEASE - 4.2.10-0 + 4.2.11-0 9.4.27.v20200227 - 7.15.1 + 7.17.15 1.5.5 3.5.0 2.1.2