This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a commit to branch geoapi-3.1 in repository https://gitbox.apache.org/repos/asf/sis.git
commit af22957697f96b54a32bdd28c5bb5d97ad72ea17 Merge: e0d696a63a 9b4ee69f9d Author: Martin Desruisseaux <[email protected]> AuthorDate: Mon Jan 26 22:23:06 2026 +0100 Merge branch 'geoapi-4.0' into geoapi-3.1: - Optimization of the handling of `java.time` in filters. - Improve separation of math transform when wraparound step is present. .../org/apache/sis/filter/ComparisonFilter.java | 456 ++++------- .../main/org/apache/sis/filter/Optimization.java | 116 ++- .../main/org/apache/sis/filter/TemporalFilter.java | 26 +- .../org/apache/sis/filter/TemporalOperation.java | 131 ++-- .../sis/filter/base/BinaryFunctionWidening.java | 3 +- .../apache/sis/filter/base/ConvertFunction.java | 12 +- .../main/org/apache/sis/filter/base/Node.java | 24 +- .../apache/sis/filter/math/ArithmeticFunction.java | 79 +- .../org/apache/sis/filter/math/BinaryOperator.java | 9 +- .../main/org/apache/sis/filter/math/Function.java | 6 + .../main/org/apache/sis/filter/math/Predicate.java | 3 +- .../org/apache/sis/filter/math/UnaryOperator.java | 3 +- .../filter/{ => math}/ArithmeticFunctionTest.java | 5 +- .../org/apache/sis/temporal/DefaultInstant.java | 14 +- .../main/org/apache/sis/temporal/TimeMethods.java | 843 ++++++++++++++++----- .../operation/transform/PassThroughTransform.java | 10 +- .../operation/transform/TransformJoiner.java | 250 +++++- .../operation/transform/WraparoundTransform.java | 25 +- .../transform/WraparoundTransformTest.java | 72 ++ .../apache/sis/storage/base/MetadataBuilder.java | 4 +- .../org/apache/sis/storage/FeatureQueryTest.java | 41 +- .../main/org/apache/sis/converter/ClassPair.java | 2 +- .../apache/sis/converter/ConverterRegistry.java | 2 +- .../org/apache/sis/converter/DateConverter.java | 14 +- .../org/apache/sis/converter/StringConverter.java | 1 + .../org/apache/sis/converter/SystemRegistry.java | 2 +- .../main/org/apache/sis/system/Loggers.java | 3 +- .../sis/referencing/factory/sql/epsg/README.md | 24 +- 28 files changed, 1482 insertions(+), 698 deletions(-) diff --cc optional/src/org.apache.sis.referencing.epsg/test/org/apache/sis/referencing/factory/sql/epsg/README.md index 965fb1d443,2cc9218469..85ccdef170 --- 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 @@@ -60,10 -60,13 +60,13 @@@ export NON_FREE_DIR=$PW cd _<path to SIS project directory>_ gradle clean test jar - export CLASSPATH=~/.m2/repository/org/apache/derby/derby/10.14.2.0/derby-10.14.2.0.jar + export CLASSPATH=~/.m2/repository/org/apache/derby/derby/10.15.2.0/derby-10.15.2.0.jar + export CLASSPATH=~/.m2/repository/org/apache/derby/derbyshared/10.15.2.0/derbyshared-10.15.2.0.jar:$CLASSPATH + export CLASSPATH=~/.m2/repository/org/apache/derby/derbytools/10.15.2.0/derbytools-10.15.2.0.jar:$CLASSPATH export CLASSPATH=~/.m2/repository/org/postgresql/postgresql/42.7.7/postgresql-42.7.7.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=$PWD/geoapi/snapshot/geoapi/target/geoapi-4.0-SNAPSHOT.jar:$CLASSPATH +export CLASSPATH=$PWD/geoapi/snapshot/geoapi/target/geoapi-3.1-SNAPSHOT.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
