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 2026/10/09 12:39:38 UTC
(sis) 01/01: Merge branch 'geoapi-3.1'
This is an automated email from the ASF dual-hosted git repository.
asf-gitbox-commits pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/sis.git
commit 30a76894d246aebc7977e072ddd74f5e57a1a311
Merge: 98a67510b9 2fae730759
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Fri Oct 9 14:39:04 2026 +0200
Merge branch 'geoapi-3.1'
SECURITY.md | 41 ++++
buildSrc/build.gradle.kts | 2 +-
.../sis/coverage/grid/ValuesAtPointIterator.java | 23 +-
.../org/apache/sis/style/filter/Expression_Add.xml | 6 +
.../org/apache/sis/style/filter/Expression_Div.xml | 5 +
.../sis/style/filter/Expression_Function.xml | 5 +
.../apache/sis/style/filter/Expression_Literal.xml | 4 +
.../sis/style/filter/Expression_LiteralColor.xml | 4 +
.../org/apache/sis/style/filter/Expression_Mul.xml | 5 +
.../sis/style/filter/Expression_PropertyName.xml | 4 +
.../org/apache/sis/style/filter/Expression_Sub.xml | 5 +
.../filter/Filter_Comparison_PropertyIsBetween.xml | 8 +
.../filter/Filter_Comparison_PropertyIsEqualTo.xml | 9 +
.../Filter_Comparison_PropertyIsGreaterThan.xml | 8 +
...r_Comparison_PropertyIsGreaterThanOrEqualTo.xml | 7 +
.../Filter_Comparison_PropertyIsLessThan.xml | 9 +
...lter_Comparison_PropertyIsLessThanOrEqualTo.xml | 8 +
.../Filter_Comparison_PropertyIsLike_v100.xml | 9 +
.../Filter_Comparison_PropertyIsLike_v110.xml | 9 +
.../Filter_Comparison_PropertyIsNotEqualTo.xml | 8 +
.../filter/Filter_Comparison_PropertyIsNull.xml | 7 +
.../style/filter/Filter_Comparison_matchCase.xml | 18 ++
.../apache/sis/style/filter/Filter_Id_feature.xml | 8 +
.../org/apache/sis/style/filter/Filter_Id_gml.xml | 8 +
.../apache/sis/style/filter/Filter_Logical_And.xml | 14 ++
.../sis/style/filter/Filter_Logical_Nested.xml | 27 +++
.../apache/sis/style/filter/Filter_Logical_Not.xml | 11 +
.../apache/sis/style/filter/Filter_Logical_Or.xml | 14 ++
.../org/apache/sis/style/filter/Filter_Sortby.xml | 7 +
.../sis/style/filter/Filter_Spatial_BBOX.xml | 11 +
.../sis/style/filter/Filter_Spatial_BBOX_v100.xml | 11 +
.../sis/style/filter/Filter_Spatial_Beyond.xml | 10 +
.../sis/style/filter/Filter_Spatial_Contains.xml | 13 +
.../sis/style/filter/Filter_Spatial_Crosses.xml | 9 +
.../sis/style/filter/Filter_Spatial_DWithin.xml | 10 +
.../sis/style/filter/Filter_Spatial_Disjoint.xml | 10 +
.../sis/style/filter/Filter_Spatial_Equals.xml | 13 +
.../sis/style/filter/Filter_Spatial_Intersects.xml | 13 +
.../sis/style/filter/Filter_Spatial_Overlaps.xml | 16 ++
.../sis/style/filter/Filter_Spatial_Overlaps2.xml | 9 +
.../sis/style/filter/Filter_Spatial_Touches.xml | 13 +
.../sis/style/filter/Filter_Spatial_Within.xml | 10 +
.../sis/style/filter/Filter_Temporal_After.xml | 9 +
.../sis/style/filter/Filter_Temporal_Before.xml | 9 +
.../sis/style/filter/Filter_Temporal_Begins.xml | 10 +
.../sis/style/filter/Filter_Temporal_BegunBy.xml | 10 +
.../sis/style/filter/Filter_Temporal_Contains.xml | 10 +
.../sis/style/filter/Filter_Temporal_During.xml | 10 +
.../sis/style/filter/Filter_Temporal_EndedBy.xml | 10 +
.../sis/style/filter/Filter_Temporal_Ends.xml | 10 +
.../sis/style/filter/Filter_Temporal_Equals.xml | 9 +
.../sis/style/filter/Filter_Temporal_Meets.xml | 10 +
.../sis/style/filter/Filter_Temporal_MetBy.xml | 10 +
.../sis/style/filter/Filter_Temporal_Overalps.xml | 11 +
.../style/filter/Filter_Temporal_OverlappedBy.xml | 10 +
.../SE_ChannelSelection_ContrastEnhancement.xml | 19 ++
.../org/apache/sis/style/se1/SE_ColorMap_Ramp.xml | 8 +
.../style/se1/SE_ExternalGraphic_InlineContent.xml | 10 +
.../se1/SE_ExternalGraphic_OnlineResource.xml | 20 ++
.../apache/sis/style/se1/SE_Fill_GraphicFill.xml | 17 ++
.../sis/style/se1/SE_Function_Categorize.xml | 25 ++
.../apache/sis/style/se1/SE_Mark_TrueTypeFont.xml | 9 +
.../sis/style/se1/SE_Stroke_GraphicStroke.xml | 19 ++
.../sis/style/se1/SE_SvgParameter_Interpolate.xml | 23 ++
.../apache/sis/style/se1/SE_coveragestyle_v110.xml | 29 +++
.../test/org/apache/sis/style/se1/SE_fts_v100.xml | 20 ++
.../test/org/apache/sis/style/se1/SE_fts_v110.xml | 22 ++
.../apache/sis/style/se1/SE_lineplacement_v110.xml | 24 ++
.../sis/style/se1/SE_rule_elsefilter_v110.xml | 36 +++
.../test/org/apache/sis/style/se1/SE_rule_v100.xml | 19 ++
.../test/org/apache/sis/style/se1/SE_rule_v110.xml | 21 ++
.../apache/sis/style/se1/SE_symbol_line_v100.xml | 30 +++
.../apache/sis/style/se1/SE_symbol_line_v110.xml | 18 ++
.../apache/sis/style/se1/SE_symbol_point_v100.xml | 30 +++
.../apache/sis/style/se1/SE_symbol_point_v110.xml | 39 +++
.../sis/style/se1/SE_symbol_polygon_v100.xml | 38 +++
.../sis/style/se1/SE_symbol_polygon_v110.xml | 27 +++
.../apache/sis/style/se1/SE_symbol_raster_v100.xml | 58 +++++
.../apache/sis/style/se1/SE_symbol_raster_v110.xml | 44 ++++
.../apache/sis/style/se1/SE_symbol_text_v100.xml | 35 +++
.../apache/sis/style/se1/SE_symbol_text_v110.xml | 41 ++++
.../style/sld1/SLD_FeatureTypeConstraint_v100.xml | 17 ++
.../style/sld1/SLD_FeatureTypeConstraint_v110.xml | 17 ++
.../SLD_LayerCoverageConstraints_RangeAxis.xml | 20 ++
.../SLD_LayerCoverageConstraints_TimePeriod.xml | 13 +
.../style/sld1/SLD_NamedLayer_NamedStyle_v100.xml | 8 +
.../style/sld1/SLD_NamedLayer_NamedStyle_v110.xml | 12 +
.../apache/sis/style/sld1/SLD_UseSLDLibrary.xml | 11 +
.../sis/style/sld1/SLD_UserLayer_InlineFeature.xml | 14 ++
.../style/sld1/SLD_UserLayer_RemoteOWS_v100.xml | 9 +
.../style/sld1/SLD_UserLayer_RemoteOWS_v110.xml | 9 +
.../sis/style/sld1/SLD_UserStyle_CoverageStyle.xml | 13 +
.../style/sld1/SLD_UserStyle_OnlineResource.xml | 6 +
.../apache/sis/style/sld1/SLD_UserStyle_v100.xml | 17 ++
.../apache/sis/style/sld1/SLD_UserStyle_v110.xml | 21 ++
.../operation/builder/LocalizationGridBuilder.java | 140 +++++++----
.../operation/builder/package-info.java | 2 +-
.../builder/LocalizationGridBuilderTest.java | 42 +++-
.../sis/storage/geotiff/ImageFileDirectory.java | 6 +-
.../apache/sis/storage/geotiff/NativeMetadata.java | 14 +-
.../org/apache/sis/storage/geotiff/Writer.java | 33 +--
.../sis/storage/geotiff/reader/ColorMap.java | 110 +++++++++
.../geotiff/reader/GridGeometryBuilder.java | 6 +-
.../{Localization.java => ModelTiePoints.java} | 102 ++++++--
.../apache/sis/storage/geotiff/reader/Type.java | 18 +-
.../org/apache/sis/storage/geotiff/WriterTest.java | 24 +-
.../storage/geotiff/reader/ModelTiePointsTest.java | 270 +++++++++++++++++++++
.../sis/storage/netcdf/NetcdfStoreProvider.java | 8 +-
.../main/module-info.java | 10 +-
.../org/apache/sis/storage/DataStoreRegistry.java | 1 -
.../main/org/apache/sis/math/ArrayVector.java | 17 ++
.../main/org/apache/sis/math/DecimalFunctions.java | 2 +-
.../main/org/apache/sis/math/RepeatedVector.java | 12 +
.../main/org/apache/sis/math/Vector.java | 63 ++++-
.../main/org/apache/sis/util/Exceptions.java | 22 +-
.../main/org/apache/sis/util/Localized.java | 9 +-
.../org/apache/sis/util/LocalizedException.java | 5 +-
.../apache/sis/util/internal/shared/Numerics.java | 2 +-
.../sis/util/internal/shared/PropertyFormat.java | 66 +++--
.../sis/util/internal/shared/TableRowList.java | 104 ++++++++
.../test/org/apache/sis/math/VectorTest.java | 4 +
netbeans-project/ivy.xml | 20 +-
.../sis/gui/controls/FormatTableCellFactory.java | 117 +++++++++
.../sis/gui/coverage/ImagePropertyExplorer.java | 16 +-
.../org/apache/sis/gui/internal/PropertyView.java | 44 +++-
.../sis/referencing/factory/sql/epsg/README.md | 4 +-
settings.gradle.kts | 24 +-
127 files changed, 2579 insertions(+), 175 deletions(-)
diff --cc netbeans-project/ivy.xml
index 4a261c7473,8d772cd9af..1ed0662f6a
--- a/netbeans-project/ivy.xml
+++ b/netbeans-project/ivy.xml
@@@ -11,21 -11,20 +11,21 @@@
<ivy-module version="2.0">
<info organisation="org.apache" module="sis"/>
<dependencies defaultconf="default">
+ <dependency org="org.opengis" name="geoapi" rev="3.0.2"/>
+ <dependency org="org.opengis" name="geoapi-conformance" rev="3.0.2"/>
<dependency org="javax.measure" name="unit-api" rev="2.1.3"/>
- <dependency org="org.glassfish.jaxb" name="jaxb-runtime" rev="4.0.5"/>
- <dependency org="org.eclipse" name="yasson" rev="3.0.4"/>
+ <dependency org="org.glassfish.jaxb" name="jaxb-runtime" rev="4.0.9"/>
+ <dependency org="org.eclipse" name="yasson" rev="3.0.5"/>
<dependency org="com.esri.geometry" name="esri-geometry-api" rev="2.2.4"/>
<dependency org="org.locationtech.jts" name="jts-core" rev="1.20.0"/>
- <dependency org="org.postgresql" name="postgresql" rev="42.7.7"/>
- <dependency org="edu.ucar" name="cdm-core" rev="5.9.1"/>
- <dependency org="edu.ucar" name="udunits" rev="5.9.1"/>
- <dependency org="com.google.geometry" name="s2-geometry" rev="2.0.0"/>
+ <dependency org="org.postgresql" name="postgresql" rev="42.7.9"/>
+ <dependency org="edu.ucar" name="cdm-core" rev="5.11.0"/>
+ <dependency org="edu.ucar" name="udunits" rev="5.11.0"/>
<dependency org="org.jdom" name="jdom2" rev="2.0.6.1"/>
<dependency org="joda-time" name="joda-time" rev="2.12.7"/>
- <dependency org="com.google.guava" name="guava" rev="33.4.8-jre"/>
- <dependency org="org.libreoffice" name="libreoffice" rev="24.8.4"/>
- <dependency org="software.amazon.awssdk" name="s3" rev="2.33.4"/>
+ <dependency org="com.google.guava" name="guava" rev="33.7.2-jre"/>
+ <dependency org="org.libreoffice" name="libreoffice" rev="26.2.2"/>
+ <dependency org="software.amazon.awssdk" name="s3" rev="2.55.9"/>
<dependency org="org.antlr" name="antlr4-maven-plugin" rev="4.13.2"/>
<dependency org="jakarta.servlet" name="jakarta.servlet-api" rev="6.1.0"/>
<dependency org="org.osgi" name="osgi.core" rev="8.0.0"/>
diff --cc optional/src/org.apache.sis.referencing.epsg/test/org/apache/sis/referencing/factory/sql/epsg/README.md
index 02e1f8b202,8aad462fac..37cc28dc81
--- a/optional/src/org.apache.sis.referencing.epsg/test/org/apache/sis/referencing/factory/sql/epsg/README.md
+++ b/optional/src/org.apache.sis.referencing.epsg/test/org/apache/sis/referencing/factory/sql/epsg/README.md
@@@ -67,10 -67,10 +67,10 @@@ export NON_FREE_DIR=$PW
cd _<path to SIS project directory>_
gradle clean test jar
export CLASSPATH=~/.m2/repository/org/hsqldb/hsqldb/2.7.4/hsqldb-2.7.4.jar
- export CLASSPATH=~/.m2/repository/org/postgresql/postgresql/42.7.7/postgresql-42.7.7.jar:$CLASSPATH
+ export CLASSPATH=~/.m2/repository/org/postgresql/postgresql/42.7.9/postgresql-42.7.9.jar:$CLASSPATH
export CLASSPATH=~/.m2/repository/javax/measure/unit-api/2.1.3/unit-api-2.1.3.jar:$CLASSPATH
- export CLASSPATH=~/.m2/repository/jakarta/xml/bind/jakarta.xml.bind-api/4.0.4/jakarta.xml.bind-api-4.0.4.jar:$CLASSPATH
+ export CLASSPATH=~/.m2/repository/jakarta/xml/bind/jakarta.xml.bind-api/4.0.5/jakarta.xml.bind-api-4.0.5.jar:$CLASSPATH
-export CLASSPATH=$PWD/geoapi/snapshot/geoapi/target/geoapi-3.1-SNAPSHOT.jar:$CLASSPATH
+export CLASSPATH=$PWD/geoapi/snapshot/geoapi/target/geoapi-3.0.2.jar:$CLASSPATH
export CLASSPATH=$PWD/endorsed/build/libs/org.apache.sis.referencing.jar:$CLASSPATH
export CLASSPATH=$PWD/endorsed/build/libs/org.apache.sis.metadata.jar:$CLASSPATH
export CLASSPATH=$PWD/endorsed/build/libs/org.apache.sis.util.jar:$CLASSPATH
diff --cc settings.gradle.kts
index f104a3ce6f,2a41e21fe9..bb41ac7251
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@@ -58,18 -59,19 +58,18 @@@ dependencyResolutionManagement
*/
versionCatalogs {
create("libs") {
- library("geoapi", "org.opengis", "geoapi-pending") .version {strictly(geoapiVersion)}
+ library("geoapi", "org.opengis", "geoapi") .version {strictly(geoapiVersion)}
library("units", "javax.measure", "unit-api") .version {strictly("[2.1, 3.0["); prefer("2.1.3")}
- library("jaxb.api", "jakarta.xml.bind", "jakarta.xml.bind-api").version {strictly("[4.0, 5.0["); prefer("4.0.2")}
- library("jaxb.impl", "org.glassfish.jaxb", "jaxb-runtime") .version {strictly("[4.0, 5.0["); prefer("4.0.5")}
- library("yasson", "org.eclipse", "yasson") .version {strictly("[3.0, 4.0["); prefer("3.0.4")}
+ library("jaxb.api", "jakarta.xml.bind", "jakarta.xml.bind-api").version {strictly("[4.0, 5.0["); prefer("4.0.5")}
+ library("jaxb.impl", "org.glassfish.jaxb", "jaxb-runtime") .version {strictly("[4.0, 5.0["); prefer("4.0.9")}
+ library("yasson", "org.eclipse", "yasson") .version {strictly("[3.0, 4.0["); prefer("3.0.5")}
library("jts.core", "org.locationtech.jts", "jts-core") .version {strictly("[1.15, 2.0["); prefer("1.20.0")}
library("esri.geometry", "com.esri.geometry", "esri-geometry-api") .version {strictly("[2.0, 3.0["); prefer("2.2.4")}
- library("libreoffice", "org.libreoffice", "libreoffice") .version {strictly("[7.0, 8.0["); prefer("24.8.4")}
- library("ucar", "edu.ucar", "cdm-core") .version {strictly("[5.0, 6.0["); prefer("5.9.1")}
- library("udunits", "edu.ucar", "udunits") .version {strictly("[5.0, 6.0["); prefer("5.9.1")}
- library("guava", "com.google.guava", "guava") .version { prefer("33.4.8-jre")}
- library("aws.s3", "software.amazon.awssdk", "s3") .version {strictly("[2.0, 3.0["); prefer("2.33.4")}
- library("s2.geometry", "com.google.geometry", "s2-geometry") .version { prefer("2.0.0")}
+ library("libreoffice", "org.libreoffice", "libreoffice") .version { prefer("26.2.2")}
+ library("ucar", "edu.ucar", "cdm-core") .version {strictly("[5.0, 6.0["); prefer("5.11.0")}
+ library("udunits", "edu.ucar", "udunits") .version {strictly("[5.0, 6.0["); prefer("5.11.0")}
+ library("guava", "com.google.guava", "guava") .version { prefer("33.7.2-jre")}
+ library("aws.s3", "software.amazon.awssdk", "s3") .version {strictly("[2.0, 3.0["); prefer("2.55.9")}
}
create("tests") {
library("geoapi", "org.opengis", "geoapi-conformance") .version {strictly(geoapiVersion)}