Skip to content

Commit 6a512d7

Browse files
juanluisrpjuanluisrp
committed
Align with GN 4.2.11
1 parent 2a3b199 commit 6a512d7

File tree

32 files changed

+68
-68
lines changed

32 files changed

+68
-68
lines changed

‎.env

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# docker-compose default environment variable values
22
COMPOSE_PROJECT_NAME=gncloud
3-
TAG=4.2.10-0
3+
TAG=4.2.11-0
44
EUREKA_SERVER_URL=http://discovery:8761/eureka
55

66
# gn metadta postgres environment variables

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Those components are created with the following requirements:
2020
* Java 11 JDK
2121
* Maven 3.6.3
2222
* Docker (optional)
23-
* [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?
23+
* [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?
2424

2525
### Building
2626
To build the services:

‎docker-compose.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ services:
1515
# Rationale is to lower the barrier for developers to get started with this project, and to have the indexing-service
1616
# services dependencies in the same network
1717
geonetwork:
18-
image: geonetwork:4.0.0
18+
image: geonetwork:4.2.11
1919
restart: always
2020
ports:
2121
- 8080:8080
@@ -52,7 +52,7 @@ services:
5252
- gn-cloud-network
5353

5454
elasticsearch:
55-
image: elasticsearch:7.9.2
55+
image: elasticsearch:7.17.15
5656
ulimits:
5757
memlock:
5858
soft: -1
@@ -71,7 +71,7 @@ services:
7171
- "9200:9200"
7272

7373
kibana:
74-
image: kibana:7.9.2
74+
image: kibana:7.17.15
7575
environment:
7676
SERVER_NAME: 'kibana'
7777
ELASTICSEARCH_URL: http://elasticsearch:9200/

‎modules/library/common-error/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>gn-cloud-lib</artifactId>
55
<groupId>org.geonetwork-opensource.cloud</groupId>
6-
<version>4.2.10-0</version>
6+
<version>4.2.11-0</version>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>gn-cloud-lib</artifactId>
55
<groupId>org.geonetwork-opensource.cloud</groupId>
6-
<version>4.2.10-0</version>
6+
<version>4.2.11-0</version>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99

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

+8-8
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,15 @@ public abstract class Base {
3838
String about;
3939

4040
@XmlElement(namespace = DCT_URI)
41-
List<String> title = new ArrayList();
41+
List<String> title = new ArrayList<>();
4242

4343
@XmlElement(namespace = DCT_URI)
44-
List<String> description = new ArrayList();
44+
List<String> description = new ArrayList<>();
4545
/**
4646
* A unique identifier of the item.
4747
*/
4848
@XmlElement(namespace = DCT_URI)
49-
List<String> identifier = new ArrayList();
49+
List<String> identifier = new ArrayList<>();
5050

5151
/**
5252
* An established standard to which the described resource conforms.
@@ -86,21 +86,21 @@ public abstract class Base {
8686
List<Language> language = new ArrayList<>();
8787

8888
@XmlElement(namespace = PROV_URI)
89-
List<DcatQualifiedAttribution> qualifiedAttribution = new ArrayList();
89+
List<DcatQualifiedAttribution> qualifiedAttribution = new ArrayList<>();
9090

9191

9292
@XmlElement(namespace = DCAT_URI)
93-
List<DcatContactPoint> contactPoint = new ArrayList();
93+
List<DcatContactPoint> contactPoint = new ArrayList<>();
9494

9595
@XmlElement(namespace = DCT_URI)
96-
List<FoafOrganization> creator = new ArrayList();
96+
List<FoafOrganization> creator = new ArrayList<>();
9797

9898
@XmlElement(namespace = DCT_URI)
99-
List<FoafOrganization> rightsHolder = new ArrayList();
99+
List<FoafOrganization> rightsHolder = new ArrayList<>();
100100

101101
/**
102102
* A type of organisation that acts as a publisher.
103103
*/
104104
@XmlElement(namespace = DCT_URI)
105-
List<FoafOrganization> publisher = new ArrayList();
105+
List<FoafOrganization> publisher = new ArrayList<>();
106106
}

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -74,15 +74,15 @@ public class Dataset extends Resource {
7474
// * identifier scheme; an optional identifier for the agency that manages the identifier scheme
7575
// */
7676
// @XmlElement(name = "identifier", namespace = ADMS_URI)
77-
// List<AdmsIdentifier> admsIdentifier = new ArrayList();
77+
// List<AdmsIdentifier> admsIdentifier = new ArrayList<>();
7878
// TODO: adms:identifier, adms:sample
7979

8080
/**
8181
* This property contains a description of the differences between this version and a previous
8282
* version of the Dataset.
8383
*/
8484
@XmlElement(namespace = ADMS_URI)
85-
List<String> versionNotes = new ArrayList();
85+
List<String> versionNotes = new ArrayList<>();
8686

8787
@XmlElement(namespace = FOAF_URI)
8888
List<DcatDocument> page;
@@ -91,7 +91,7 @@ public class Dataset extends Resource {
9191
* An available distribution of the dataset.
9292
*/
9393
@XmlElement(namespace = DCAT_URI)
94-
List<DcatDistributionContainer> distribution = new ArrayList();
94+
List<DcatDistributionContainer> distribution = new ArrayList<>();
9595

9696

9797
@XmlElement(namespace = DCT_URI)
@@ -129,6 +129,6 @@ public class Dataset extends Resource {
129129
* An activity that generated, or provides the business context for, the creation of the dataset.
130130
*/
131131
@XmlElement(namespace = PROV_URI)
132-
List<DcatActivity> wasGeneratedBy = new ArrayList();
132+
List<DcatActivity> wasGeneratedBy = new ArrayList<>();
133133

134134
}

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

+13-13
Original file line numberDiff line numberDiff line change
@@ -54,25 +54,25 @@ public class DcatDistribution {
5454
* indicated by the distribution's dct:format and/or dcat:mediaType
5555
*/
5656
@XmlElement(name = "downloadURL", namespace = DCAT_URI)
57-
List<String> downloadUrl = new ArrayList();
57+
List<String> downloadUrl = new ArrayList<>();
5858

5959
/**
6060
* A data service that gives access to the distribution of the dataset.
6161
*/
6262
@XmlElement(name = "accessService", namespace = DCAT_URI)
63-
List<RdfResource> accessService = new ArrayList();
63+
List<RdfResource> accessService = new ArrayList<>();
6464

6565
/**
6666
* A name given to the distribution.
6767
*/
6868
@XmlElement(namespace = DCT_URI)
69-
List<String> title = new ArrayList();
69+
List<String> title = new ArrayList<>();
7070

7171
/**
7272
* A free-text account of the distribution.
7373
*/
7474
@XmlElement(namespace = DCT_URI)
75-
List<String> description = new ArrayList();
75+
List<String> description = new ArrayList<>();
7676

7777
@XmlElement(namespace = ADMS_URI)
7878
Subject representationTechnique;
@@ -91,7 +91,7 @@ public class DcatDistribution {
9191
BigInteger byteSize;
9292

9393
@XmlElement(namespace = DCAT_URI)
94-
List<RdfResource> compressFormat = new ArrayList();
94+
List<RdfResource> compressFormat = new ArrayList<>();
9595

9696
/**
9797
* A value that allows the contents of a file to be authenticated. This class allows the results
@@ -113,28 +113,28 @@ public class DcatDistribution {
113113

114114
// TODO
115115
@XmlElement(namespace = DCAT_URI)
116-
List<String> packageFormat = new ArrayList();
116+
List<String> packageFormat = new ArrayList<>();
117117

118118
/**
119119
* The file format of the distribution.
120120
*/
121121
@XmlElement(namespace = DCAT_URI)
122-
List<RdfResource> format = new ArrayList();
122+
List<RdfResource> format = new ArrayList<>();
123123

124124

125125
@XmlElement(namespace = DCAT_URI)
126-
List<BigDecimal> spatialResolutionInMeters = new ArrayList();
126+
List<BigDecimal> spatialResolutionInMeters = new ArrayList<>();
127127

128128
// TODO: Adapter
129129
@XmlElement(namespace = DCAT_URI)
130-
List<Duration> temporalResolution = new ArrayList();
130+
List<Duration> temporalResolution = new ArrayList<>();
131131

132132

133133
/**
134134
* A rights statement that concerns how the distribution is accessed.
135135
*/
136136
@XmlElement(namespace = DCAT_URI)
137-
List<DcatAccessRights> accessRights = new ArrayList();
137+
List<DcatAccessRights> accessRights = new ArrayList<>();
138138

139139

140140
/**
@@ -166,14 +166,14 @@ public class DcatDistribution {
166166
* Information about rights held in and over the distribution.
167167
*/
168168
@XmlElement(namespace = DCAT_URI)
169-
List<DcatAccessRights> rights = new ArrayList();
169+
List<DcatAccessRights> rights = new ArrayList<>();
170170

171171
@XmlElement(namespace = RDFS_URI)
172-
List<String> comment = new ArrayList();
172+
List<String> comment = new ArrayList<>();
173173

174174
// TODO
175175
// @XmlElement(namespace = DQV_URI)
176-
// QualityMeasurement hasQualityMeasurement = new ArrayList();
176+
// QualityMeasurement hasQualityMeasurement = new ArrayList<>();
177177

178178
@XmlElement(namespace = FOAF_URI)
179179
List<DcatDocument> page;

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

+11-11
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@ public class Resource extends Base {
3535
// "Replaced by dcat:theme."
3636
@Deprecated
3737
@XmlElement(namespace = DCT_URI)
38-
List<Subject> subject = new ArrayList();
38+
List<Subject> subject = new ArrayList<>();
3939

4040
@XmlElement(namespace = DCAT_URI)
41-
List<Subject> keyword = new ArrayList();
41+
List<Subject> keyword = new ArrayList<>();
4242

4343
@XmlElement(namespace = DCAT_URI)
44-
List<Subject> theme = new ArrayList();
44+
List<Subject> theme = new ArrayList<>();
4545

4646
/**
4747
* 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 {
5858
List<Object> type;
5959

6060
@XmlElement(namespace = DCAT_URI)
61-
List<DcatDocument> landingPage = new ArrayList();
61+
List<DcatDocument> landingPage = new ArrayList<>();
6262

6363
@XmlElement(namespace = DCT_URI)
6464
List<RdfResource> isReferencedBy = new ArrayList<>();
@@ -75,7 +75,7 @@ public class Resource extends Base {
7575
* access" code list operated by the INSPIRE Registry</p>
7676
*/
7777
@XmlElement(namespace = DCAT_URI)
78-
List<DcatAccessRights> accessRights = new ArrayList();
78+
List<DcatAccessRights> accessRights = new ArrayList<>();
7979

8080
@XmlElement(namespace = DCT_URI)
8181
DcatLicenseDocumentContainer license;
@@ -85,7 +85,7 @@ public class Resource extends Base {
8585
* Resources.
8686
*/
8787
@XmlElement(namespace = DCAT_URI)
88-
List<DcatRelationship> qualifiedRelation = new ArrayList();
88+
List<DcatRelationship> qualifiedRelation = new ArrayList<>();
8989

9090

9191
/**
@@ -96,7 +96,7 @@ public class Resource extends Base {
9696
* between items in the dataset.</p>
9797
*/
9898
@XmlElement(namespace = DCAT_URI)
99-
List<BigDecimal> spatialResolutionInMeters = new ArrayList();
99+
List<BigDecimal> spatialResolutionInMeters = new ArrayList<>();
100100

101101
/**
102102
* Minimum time period resolvable in the dataset.
@@ -108,7 +108,7 @@ public class Resource extends Base {
108108
*/
109109
// TODO: Adapter
110110
@XmlElement(namespace = DCAT_URI)
111-
List<Duration> temporalResolution = new ArrayList();
111+
List<Duration> temporalResolution = new ArrayList<>();
112112

113113

114114
/**
@@ -131,11 +131,11 @@ public class Resource extends Base {
131131
// */
132132
// TODO
133133
// @XmlElement(namespace = DQV_URI)
134-
// QualityMeasurement hasQualityMeasurement = new ArrayList();
134+
// QualityMeasurement hasQualityMeasurement = new ArrayList<>();
135135

136136
@XmlElement(namespace = PROV_URI)
137-
List<DcatActivity> wasUsedBy = new ArrayList();
137+
List<DcatActivity> wasUsedBy = new ArrayList<>();
138138

139139
@XmlElement(namespace = RDFS_URI)
140-
List<String> comment = new ArrayList();
140+
List<String> comment = new ArrayList<>();
141141
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ public class IndexRecord extends IndexDocument {
150150
private List<String> geometries = new ArrayList<>();
151151

152152
@JsonProperty(IndexRecordFieldNames.specificationConformance)
153-
private List<SpecificationConformance> specificationConformance = new ArrayList();
153+
private List<SpecificationConformance> specificationConformance = new ArrayList<>();
154154

155155
// @JsonAnyGetter
156156
private Map<String, ArrayList<String>> otherProperties = new HashMap<>();

‎modules/library/common-persistence/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>gn-cloud-lib</artifactId>
55
<groupId>org.geonetwork-opensource.cloud</groupId>
6-
<version>4.2.10-0</version>
6+
<version>4.2.11-0</version>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99

‎modules/library/common-search/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>gn-cloud-lib</artifactId>
55
<groupId>org.geonetwork-opensource.cloud</groupId>
6-
<version>4.2.10-0</version>
6+
<version>4.2.11-0</version>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99

‎modules/library/common-security/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<parent>
1212
<artifactId>gn-cloud-lib</artifactId>
1313
<groupId>org.geonetwork-opensource.cloud</groupId>
14-
<version>4.2.10-0</version>
14+
<version>4.2.11-0</version>
1515
</parent>
1616
<modelVersion>4.0.0</modelVersion>
1717
<artifactId>gn-cloud-common-security</artifactId>

‎modules/library/common-standards/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>gn-cloud-lib</artifactId>
55
<groupId>org.geonetwork-opensource.cloud</groupId>
6-
<version>4.2.10-0</version>
6+
<version>4.2.11-0</version>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99

‎modules/library/common-utility/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<parent>
1212
<artifactId>gn-cloud-lib</artifactId>
1313
<groupId>org.geonetwork-opensource.cloud</groupId>
14-
<version>4.2.10-0</version>
14+
<version>4.2.11-0</version>
1515
</parent>
1616
<modelVersion>4.0.0</modelVersion>
1717
<artifactId>gn-cloud-common-utility</artifactId>

‎modules/library/common-view/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>gn-cloud-lib</artifactId>
55
<groupId>org.geonetwork-opensource.cloud</groupId>
6-
<version>4.2.10-0</version>
6+
<version>4.2.11-0</version>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99

‎modules/library/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<parent>
1414
<artifactId>gn-cloud-parent</artifactId>
1515
<groupId>org.geonetwork-opensource.cloud</groupId>
16-
<version>4.2.10-0</version>
16+
<version>4.2.11-0</version>
1717
</parent>
1818
<artifactId>gn-cloud-lib</artifactId>
1919
<packaging>pom</packaging>

‎modules/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<parent>
1414
<artifactId>gn-cloud-microservices</artifactId>
1515
<groupId>org.geonetwork-opensource.cloud</groupId>
16-
<version>4.2.10-0</version>
16+
<version>4.2.11-0</version>
1717
</parent>
1818
<artifactId>gn-cloud-parent</artifactId>
1919
<packaging>pom</packaging>

0 commit comments

Comments
 (0)