This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/sis.git
commit 30ee87be8857801971910b82e64fb48b009671ec
Merge: 2b68043fb0 4b753152a6
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Mon Aug 28 16:29:41 2023 +0200
Merge branch 'geoapi-3.1'
.../sis/buildtools/coding/ReorganizeImports.java | 521 +++++++++++++++++++++
.../apache/sis/buildtools/coding/package-info.java | 10 +-
.../main/org/apache/sis/feature/PropertyView.java | 2 +-
.../metadata/simple/SimpleIdentifiedObject.java | 4 +-
.../org/apache/sis/xml/bind/gco/package-info.java | 2 +-
.../org/apache/sis/xml/bind/lan/LanguageCode.java | 4 +-
.../main/org/apache/sis/openoffice/CalcAddins.java | 2 +-
.../main/org/apache/sis/parameter/Verifier.java | 2 +-
.../main/org/apache/sis/referencing/CommonCRS.java | 16 +-
.../referencing/factory/CommonAuthorityCode.java | 2 +-
.../operation/matrix/AffineTransforms2D.java | 2 +-
.../operation/transform/ConcatenatedTransform.java | 2 +-
.../apache/sis/storage/netcdf/AttributeNames.java | 8 +-
.../apache/sis/storage/netcdf/MetadataReader.java | 18 +-
.../org/apache/sis/storage/netcdf/NetcdfStore.java | 16 +-
.../org/apache/sis/storage/netcdf/base/Axis.java | 14 +-
.../apache/sis/storage/netcdf/base/AxisType.java | 2 +-
.../apache/sis/storage/netcdf/base/Convention.java | 6 +-
.../apache/sis/storage/netcdf/base/Decoder.java | 6 +-
.../apache/sis/storage/netcdf/base/FeatureSet.java | 14 +-
.../sis/storage/netcdf/base/GridMapping.java | 4 +-
.../apache/sis/storage/netcdf/base/Variable.java | 8 +-
.../sis/storage/netcdf/classic/GridInfo.java | 2 +-
.../sis/storage/netcdf/classic/VariableInfo.java | 4 +-
.../test/module-info.java | 1 +
.../apache/sis/util/collection/CacheEntries.java | 4 +-
.../apache/sis/util/internal/CollectionsExt.java | 12 +-
netbeans-project/README.md | 3 +-
netbeans-project/build.xml | 2 +-
netbeans-project/nbproject/build-impl.xml | 38 +-
netbeans-project/nbproject/genfiles.properties | 4 +-
netbeans-project/nbproject/project.properties | 36 +-
netbeans-project/nbproject/project.xml | 1 -
netbeans-project/src-local/.gitignore | 5 -
.../test/module-info.java | 32 --
.../apache/sis/test/uncommitted/package-info.java | 6 -
36 files changed, 635 insertions(+), 180 deletions(-)
diff --cc
endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/Decoder.java
index 03f4b625e5,2b0a369054..fbe424244d
---
a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/Decoder.java
+++
b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/Decoder.java
@@@ -44,11 -45,13 +45,10 @@@ import org.apache.sis.util.logging.Logg
import org.apache.sis.util.logging.PerformanceLevel;
import org.apache.sis.util.collection.TreeTable;
import org.apache.sis.util.internal.StandardDateFormat;
- import org.apache.sis.system.Modules;
- import org.apache.sis.referencing.util.ReferencingFactoryContainer;
import org.apache.sis.util.iso.DefaultNameFactory;
- import ucar.nc2.constants.CF;
+ import org.apache.sis.referencing.util.ReferencingFactoryContainer;
+ import ucar.nc2.constants.CF; // String constants are copied by the
compiler with no UCAR reference left.
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.util.NameFactory;
-
/**
* The API used internally by Apache SIS for fetching variables and attribute
values from a netCDF file.
diff --cc
endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/FeatureSet.java
index afdf9be320,9a214554b2..f0779b20c3
---
a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/FeatureSet.java
+++
b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/FeatureSet.java
@@@ -42,19 -41,20 +41,20 @@@ import org.apache.sis.feature.internal.
import org.apache.sis.feature.builder.AttributeRole;
import org.apache.sis.feature.builder.FeatureTypeBuilder;
import org.apache.sis.feature.builder.AttributeTypeBuilder;
+ import org.apache.sis.coverage.grid.GridExtent;
+ import org.apache.sis.storage.DataStore;
+ import org.apache.sis.storage.DataStoreException;
import org.apache.sis.storage.netcdf.internal.Resources;
+ import org.apache.sis.util.Characters;
+ import org.apache.sis.util.internal.Strings;
import org.apache.sis.util.collection.BackingStoreException;
import org.apache.sis.math.Vector;
- import ucar.nc2.constants.CF;
+ import ucar.nc2.constants.CF; // String constants are copied by the
compiler with no UCAR reference left.
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.feature.Feature;
-import org.opengis.feature.FeatureType;
-import org.opengis.feature.Attribute;
+// Specific to the main branch:
+import org.apache.sis.feature.AbstractFeature;
+import org.apache.sis.feature.DefaultFeatureType;
+import org.apache.sis.feature.AbstractAttribute;
/**
diff --cc
endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/GridMapping.java
index b3e462e20a,0aeaf8bedd..fa7b0011c6
---
a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/GridMapping.java
+++
b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/GridMapping.java
@@@ -74,10 -74,10 +74,10 @@@ import org.apache.sis.util.resources.Er
import org.apache.sis.io.wkt.WKTFormat;
import org.apache.sis.io.wkt.Warnings;
import org.apache.sis.measure.Units;
- import ucar.nc2.constants.CF;
+ import ucar.nc2.constants.CF; // String constants are copied by the
compiler with no UCAR reference left.
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.referencing.operation.CoordinateOperationFactory;
+// Specific to the main branch:
+import org.apache.sis.referencing.operation.DefaultCoordinateOperationFactory;
/**
diff --cc netbeans-project/build.xml
index 4ce2b57b9e,8407dd5b74..137875ed44
--- a/netbeans-project/build.xml
+++ b/netbeans-project/build.xml
@@@ -28,9 -28,13 +28,9 @@@
<target name="-pre-compile">
<ivy:settings file="ivy-settings.xml"/>
<ivy:retrieve pattern="build/dependencies/[artifact].[ext]"
symlink="true" sync="true"/>
- <symlink link="${basedir}/build/dependencies/geoapi-pending.jar"
-
resource="../../../geoapi/snapshot/geoapi-pending/target/geoapi-pending-3.1-SNAPSHOT.jar"/>
- <symlink link="${basedir}/build/dependencies/geoapi-conformance.jar"
-
resource="../../../geoapi/snapshot/geoapi-conformance/target/geoapi-conformance-3.1-SNAPSHOT.jar"/>
</target>
<!--
- Called after compilation. Copies the "*.utf" resources files created
by GRadle.
+ Called after compilation. Copies the "*.utf" resources files created
by Gradle.
Note that the Apache SIS project must have been build by Gradle at
least once
before it can be built by the NetBeans IDE.
-->
diff --cc netbeans-project/nbproject/build-impl.xml
index 18fd96e267,c68a938d25..51639b45c2
--- a/netbeans-project/nbproject/build-impl.xml
+++ b/netbeans-project/nbproject/build-impl.xml
@@@ -795,12 -776,9 +776,9 @@@ public class ModuleInfoSelector extend
<fileset dir="${incubator.test.dir}"
excludes="@{excludes},**/*.xml,${excludes}" includes="@{includes}">
<filename name="@{testincludes}"/>
</fileset>
- <fileset dir="${local.test.dir}"
excludes="@{excludes},**/*.xml,${excludes}" includes="@{includes}">
- <filename name="@{testincludes}"/>
- </fileset>
</union>
<taskdef classname="org.testng.TestNGAntTask"
classpath="${run.test.classpath}" name="testng"/>
- <testng classfilesetref="test.set"
failureProperty="tests.failed" listeners="org.testng.reporters.VerboseReporter"
methods="${testng.methods.arg}" mode="${testng.mode}"
outputdir="${build.test.results.dir}" suitename="Apache_SIS_on_GeoAPI_3.1"
testname="TestNG tests" workingDir="${work.dir}">
+ <testng classfilesetref="test.set"
failureProperty="tests.failed" listeners="org.testng.reporters.VerboseReporter"
methods="${testng.methods.arg}" mode="${testng.mode}"
outputdir="${build.test.results.dir}" suitename="Apache_SIS_on_GeoAPI_3.0"
testname="TestNG tests" workingDir="${work.dir}">
<xmlfileset dir="${build.test.classes.dir}"
includes="@{testincludes}"/>
<propertyset>
<propertyref prefix="test-sys-prop."/>
diff --cc netbeans-project/nbproject/genfiles.properties
index f9d4ee2e07,b5d9e58bb5..f2d42fea13
--- a/netbeans-project/nbproject/genfiles.properties
+++ b/netbeans-project/nbproject/genfiles.properties
@@@ -3,6 -3,6 +3,6 @@@
build.xml.data.CRC32=d82237a1
build.xml.script.CRC32=9a509f0a
build.xml.stylesheet.CRC32=32069288@1.22
- nbproject/build-impl.xml.data.CRC32=34d89540
- nbproject/build-impl.xml.script.CRC32=3c783bf9
-nbproject/build-impl.xml.data.CRC32=e365e8d0
-nbproject/build-impl.xml.script.CRC32=3c96dd2f
++nbproject/build-impl.xml.data.CRC32=0e40efdb
++nbproject/build-impl.xml.script.CRC32=c509535a
nbproject/build-impl.xml.stylesheet.CRC32=d1ebcf0f@1.22
