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 2019/09/20 18:39:16 UTC
[sis] 01/01: Merge branch 'geoapi-3.1': port fixes from Apache SIS
1.0-RC1.
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sis.git
commit 71f1c7d5f037f4bff8ca97bd6498059306aa3cf0
Merge: ba0a5b3 7d1c6db
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Fri Sep 20 20:38:40 2019 +0200
Merge branch 'geoapi-3.1': port fixes from Apache SIS 1.0-RC1.
application/sis-console/pom.xml | 4 +
application/sis-console/src/main/artifact/README | 4 +-
.../sis-console/src/main/artifact/lib/README | 1 +
.../src/main/ant/prepare-release.xml | 26 +----
.../org/apache/sis/internal/doclet/Doclet.java | 37 +++----
.../org/apache/sis/internal/doclet/Taglet.java | 23 +----
.../java/org/apache/sis/image/SequenceType.java | 7 +-
core/sis-referencing-by-identifiers/pom.xml | 4 +
.../sis/referencing/operation/matrix/Matrices.java | 2 +-
.../sis/referencing/factory/sql/epsg/package.html | 32 +++---
.../sis/referencing/report/package-info.java | 2 +-
.../org/apache/sis/measure/AbstractConverter.java | 2 +-
.../apache/sis/measure/ConcatenatedConverter.java | 2 +-
.../org/apache/sis/measure/ConventionalUnit.java | 4 +-
.../org/apache/sis/measure/IdentityConverter.java | 109 +++++++++++++++++++++
.../org/apache/sis/measure/LinearConverter.java | 49 +++++----
.../java/org/apache/sis/measure/SystemUnit.java | 4 +-
.../main/java/org/apache/sis/measure/Units.java | 2 +-
.../java/org/apache/sis/setup/Configuration.java | 24 ++++-
.../apache/sis/measure/LinearConverterTest.java | 14 +--
.../org/apache/sis/measure/QuantitiesTest.java | 17 ++++
ide-project/NetBeans/nbproject/project.properties | 2 +-
pom.xml | 9 +-
.../apache/sis/profile/japan/JapaneseProfile.java | 21 +++-
.../sis/storage/WritableGridCoverageResource.java | 4 +-
25 files changed, 272 insertions(+), 133 deletions(-)
diff --cc core/sis-feature/src/main/java/org/apache/sis/image/SequenceType.java
index 8e42823,22783ba..241d372
--- a/core/sis-feature/src/main/java/org/apache/sis/image/SequenceType.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/image/SequenceType.java
@@@ -14,17 -14,22 +14,20 @@@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+package org.apache.sis.image;
+
/**
- * Filters features according their properties.
- * A <cite>filter expression</cite> is a construct used to constraint a feature set to a subset.
- *
- * <p>All filter and expression implementations provided by Apache SIS are thread-safe.
- * They are not necessarily stateless however; for example a filter may remember which
- * warnings have been reported in order to avoid to report the same warning twice.</p>
+ * Placeholder for {@code org.opengis.coverage.grid.SequenceType}.
*
- * @author Johann Sorel (Geomatys)
* @author Martin Desruisseaux (Geomatys)
- * @version 1.0
- * @since 1.0
+ * @version 1.1
+ *
+ * @see <a href="http://docs.opengeospatial.org/is/09-026r2/09-026r2.html">OGC® Filter Encoding 2.0 Encoding Standard</a>
+ *
+ * @since 1.1
* @module
*/
-package org.apache.sis.filter;
+enum SequenceType {
+ LINEAR
+}
diff --cc pom.xml
index f73ce66,dfc1590..44eaa62
--- a/pom.xml
+++ b/pom.xml
@@@ -560,8 -560,8 +560,8 @@@
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
<sis.plugin.version>${project.version}</sis.plugin.version>
- <sis.non-free.version>1.0-M1</sis.non-free.version> <!-- Used only if "non-free" profile is enabled. -->
+ <sis.non-free.version>1.0</sis.non-free.version> <!-- Used only if "non-free" profile is enabled. -->
- <geoapi.version>3.1-SNAPSHOT</geoapi.version>
+ <geoapi.version>3.0.1</geoapi.version>
<jaxb.version>2.3.2</jaxb.version>
</properties>