You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2022/11/28 16:38:10 UTC
[sis] branch geoapi-4.0 updated (ce4e984838 -> 87f7778d56)
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a change to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git
from ce4e984838 Clarify the name of `Record` and `RecordType` objects created at XML unmarshalling time. The previous "CharacterSequence" name was misleading because it suggested a field name, while it was used for a record containing a single field of type text. The "Single text" name is a better description.
add 93cf288665 Bump postgresql from 42.5.0 to 42.5.1 https://github.com/apache/sis/pull/31
new 87f7778d56 More dependency upgrades. Minor bug fix in metadata copy constructor.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
application/sis-openoffice/pom.xml | 2 +-
cloud/sis-cloud-aws/pom.xml | 2 +-
core/sis-build-helper/pom.xml | 7 +++----
core/sis-cql/pom.xml | 4 ++--
.../sis/metadata/iso/quality/DefaultSampleBasedInspection.java | 8 ++++----
.../sis/metadata/iso/spatial/AbstractSpatialRepresentation.java | 3 +++
ide-project/NetBeans/nbproject/project.properties | 2 +-
pom.xml | 4 ++--
8 files changed, 17 insertions(+), 15 deletions(-)
[sis] 01/01: More dependency upgrades. Minor bug fix in metadata copy constructor.
Posted by de...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git
commit 87f7778d56d5ad1c9850cb44f3cc3ec9495e991d
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Mon Nov 28 16:03:17 2022 +0100
More dependency upgrades. Minor bug fix in metadata copy constructor.
---
application/sis-openoffice/pom.xml | 2 +-
cloud/sis-cloud-aws/pom.xml | 2 +-
core/sis-build-helper/pom.xml | 7 +++----
core/sis-cql/pom.xml | 4 ++--
.../sis/metadata/iso/quality/DefaultSampleBasedInspection.java | 8 ++++----
.../sis/metadata/iso/spatial/AbstractSpatialRepresentation.java | 3 +++
pom.xml | 2 +-
7 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/application/sis-openoffice/pom.xml b/application/sis-openoffice/pom.xml
index 30ac919837..b588a5d4ea 100644
--- a/application/sis-openoffice/pom.xml
+++ b/application/sis-openoffice/pom.xml
@@ -105,7 +105,7 @@
<dependency>
<groupId>org.libreoffice</groupId>
<artifactId>libreoffice</artifactId>
- <version>7.3.3</version>
+ <version>7.3.6</version>
<scope>provided</scope>
</dependency>
</dependencies>
diff --git a/cloud/sis-cloud-aws/pom.xml b/cloud/sis-cloud-aws/pom.xml
index 21af1ab1bd..3daa4a0340 100644
--- a/cloud/sis-cloud-aws/pom.xml
+++ b/cloud/sis-cloud-aws/pom.xml
@@ -90,7 +90,7 @@
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>s3</artifactId>
- <version>2.17.185</version>
+ <version>2.18.25</version>
</dependency>
</dependencies>
diff --git a/core/sis-build-helper/pom.xml b/core/sis-build-helper/pom.xml
index 4f6828c87b..5cd3ef6ee7 100644
--- a/core/sis-build-helper/pom.xml
+++ b/core/sis-build-helper/pom.xml
@@ -102,7 +102,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
- <version>3.6.4</version>
+ <version>3.7.0</version>
<executions>
<execution>
<id>default-descriptor</id>
@@ -121,19 +121,18 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
- <version>3.8.5</version>
+ <version>3.8.6</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
- <version>3.8.5</version>
+ <version>3.8.6</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
- <version>3.6.4</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/core/sis-cql/pom.xml b/core/sis-cql/pom.xml
index 6674905482..11adde30f0 100644
--- a/core/sis-cql/pom.xml
+++ b/core/sis-cql/pom.xml
@@ -82,7 +82,7 @@
<plugin>
<groupId>org.antlr</groupId>
<artifactId>antlr4-maven-plugin</artifactId>
- <version>4.10.1</version>
+ <version>4.11.1</version>
<executions>
<execution>
<id>run antlr</id>
@@ -128,7 +128,7 @@
<dependency>
<groupId>org.antlr</groupId>
<artifactId>antlr4-runtime</artifactId>
- <version>4.10.1</version>
+ <version>4.11.1</version>
<scope>compile</scope>
</dependency>
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultSampleBasedInspection.java b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultSampleBasedInspection.java
index eeb2268fc9..f39b3157df 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultSampleBasedInspection.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultSampleBasedInspection.java
@@ -83,7 +83,7 @@ public class DefaultSampleBasedInspection extends AbstractDataEvaluation impleme
public DefaultSampleBasedInspection() {
}
- /**
+ /**
* Constructs a new instance initialized with the values from the specified metadata object.
* This is a <em>shallow</em> copy constructor, because the other metadata contained in the
* given object are not recursively copied.
@@ -126,7 +126,7 @@ public class DefaultSampleBasedInspection extends AbstractDataEvaluation impleme
return new DefaultSampleBasedInspection(object);
}
- /**
+ /**
* Returns the information of the type of sampling scheme and description of the sampling procedure.
*
* @return sampling scheme and sampling procedure.
@@ -147,7 +147,7 @@ public class DefaultSampleBasedInspection extends AbstractDataEvaluation impleme
samplingScheme = newValue;
}
- /**
+ /**
* Returns the information of how lots are defined.
*
* @return information on lots.
@@ -168,7 +168,7 @@ public class DefaultSampleBasedInspection extends AbstractDataEvaluation impleme
lotDescription = newValue;
}
- /**
+ /**
* Returns the information on how many samples on average are extracted for inspection from each lot of population.
*
* @return average number of samples extracted for inspection.
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/AbstractSpatialRepresentation.java b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/AbstractSpatialRepresentation.java
index 6ac5fbe269..c6f709780e 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/AbstractSpatialRepresentation.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/AbstractSpatialRepresentation.java
@@ -83,6 +83,9 @@ public class AbstractSpatialRepresentation extends ISOMetadata implements Spatia
*/
public AbstractSpatialRepresentation(final SpatialRepresentation object) {
super(object);
+ if (object != null) {
+ scope = object.getScope();
+ }
}
/**
diff --git a/pom.xml b/pom.xml
index 36881e02da..aaed720b9d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,7 +39,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>27</version>
+ <version>28</version>
</parent>