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 2023/04/29 16:29:56 UTC
[sis] 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1.
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 8d1d6522c4a1b8b19488a7089a9866ab004d6b36
Merge: 8f68fc28fa 94ed08156b
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Sat Apr 29 14:42:55 2023 +0200
Merge branch 'geoapi-4.0' into geoapi-3.1.
.../{internal => }/coverage/CoverageCombiner.java | 168 +++++++++++----
.../sis/coverage/grid/GridCoverageBuilder.java | 5 +
.../org/apache/sis/coverage/grid/GridExtent.java | 82 +++++++-
.../apache/sis/feature/ExpressionOperation.java | 227 +++++++++++++++++++++
.../org/apache/sis/feature/FeatureOperations.java | 51 ++++-
.../java/org/apache/sis/feature/LinkOperation.java | 2 +-
.../sis/feature/builder/AttributeTypeBuilder.java | 1 +
.../java/org/apache/sis/image/ComputedImage.java | 20 +-
.../java/org/apache/sis/image/ImageCombiner.java | 72 +++----
.../java/org/apache/sis/image/ImageProcessor.java | 8 +-
.../java/org/apache/sis/image/Visualization.java | 2 +-
.../sis/internal/coverage/SampleDimensions.java | 36 ++++
.../sis/internal/coverage/j2d/ImageLayout.java | 62 +++++-
.../sis/internal/feature/FeatureExpression.java | 14 ++
.../apache/sis/coverage/CoverageCombinerTest.java | 70 +++++++
.../apache/sis/coverage/grid/GridExtentTest.java | 22 +-
.../apache/sis/test/suite/FeatureTestSuite.java | 1 +
.../org/apache/sis/portrayal/CanvasFollower.java | 2 +-
.../sis/referencing/operation/matrix/Matrices.java | 8 +-
.../operation/transform/MathTransforms.java | 209 +++++++++----------
.../operation/transform/UnitConversion.java | 145 +++++++++++++
.../operation/transform/MathTransformsTest.java | 71 +++----
.../operation/transform/UnitConversionTest.java | 59 ++++++
.../sis/test/suite/ReferencingTestSuite.java | 1 +
.../org/apache/sis/measure/RangeFormatTest.java | 4 +-
.../java/org/apache/sis/measure/RangeTest.java | 2 +-
ide-project/NetBeans/nbproject/project.properties | 2 +-
pom.xml | 16 +-
.../apache/sis/internal/sql/feature/Column.java | 2 +-
.../internal/storage/WritableResourceSupport.java | 11 +-
.../java/org/apache/sis/storage/FeatureQuery.java | 135 ++++++++++--
.../org/apache/sis/storage/FeatureQueryTest.java | 63 +++++-
32 files changed, 1262 insertions(+), 311 deletions(-)
diff --cc pom.xml
index bd6f1f4426,3f9ab52507..4d4f351707
--- a/pom.xml
+++ b/pom.xml
@@@ -546,8 -546,8 +546,8 @@@
<maven.compiler.target>11</maven.compiler.target>
<sis.plugin.version>${project.version}</sis.plugin.version>
<sis.non-free.version>1.3</sis.non-free.version> <!-- Used only if "non-free" profile is activated. -->
- <javafx.version>19</javafx.version> <!-- Used only if "javafx" profile is activated. -->
+ <javafx.version>20.0.1</javafx.version> <!-- Used only if "javafx" profile is activated. -->
- <geoapi.version>4.0-SNAPSHOT</geoapi.version>
+ <geoapi.version>3.1-SNAPSHOT</geoapi.version>
</properties>
<profiles>