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 2024/10/06 17:18:59 UTC
(sis) branch geoapi-3.1 updated (9ca2b16af0 -> 52303614bb)
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a change to branch geoapi-3.1
in repository https://gitbox.apache.org/repos/asf/sis.git
discard 9ca2b16af0 Merge of automatic reorganization of imports order.
add 9e3ec5335f Post-merge automatic import order.
new 52303614bb Merge of automatic reorganization of imports order.
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (9ca2b16af0)
\
N -- N -- N refs/heads/geoapi-3.1 (52303614bb)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
(sis) 01/01: Merge of automatic reorganization of imports order.
Posted by de...@apache.org.
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 52303614bb57cb7f6571e08be7d574faa7a97dca
Merge: 1f1a9766c0 9e3ec5335f
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Sun Oct 6 19:18:35 2024 +0200
Merge of automatic reorganization of imports order.
.../test/org/apache/sis/cloud/aws/s3/KeyPathMatcherTest.java | 3 ++-
.../main/org/apache/sis/util/iso/AbstractFactory.java | 2 +-
.../test/org/apache/sis/xml/bind/gco/PropertyTypeTest.java | 2 +-
.../apache/sis/referencing/factory/ConcurrentAuthorityFactory.java | 2 +-
.../org/apache/sis/referencing/internal/ServicesForMetadata.java | 6 +++---
.../sis/referencing/operation/transform/MathTransformBuilder.java | 2 +-
.../test/org/apache/sis/io/wkt/WKTFormatTest.java | 2 +-
.../test/org/apache/sis/referencing/StandardDefinitionsTest.java | 2 +-
.../test/org/apache/sis/referencing/crs/HardCodedCRS.java | 2 +-
.../sis/referencing/operation/projection/EquirectangularTest.java | 2 +-
.../operation/projection/LambertAzimuthalEqualAreaTest.java | 2 +-
.../sis/referencing/operation/projection/MapProjectionTestCase.java | 4 ++--
.../apache/sis/referencing/operation/projection/MercatorTest.java | 2 +-
.../test/org/apache/sis/referencing/operation/projection/NoOp.java | 4 +++-
.../referencing/operation/projection/PolarStereographicTest.java | 2 +-
.../sis/referencing/operation/projection/ProjectionBenchmark.java | 2 +-
.../sis/referencing/operation/projection/SatelliteTrackingTest.java | 2 +-
.../sis/referencing/operation/projection/ZonedGridSystemTest.java | 2 +-
.../sis/referencing/operation/transform/CoordinateDomain.java | 4 +++-
.../test/org/apache/sis/storage/netcdf/MetadataReaderTest.java | 4 ++--
.../test/org/apache/sis/storage/netcdf/NetcdfStoreProviderTest.java | 2 +-
.../test/org/apache/sis/storage/netcdf/base/TestCase.java | 2 +-
.../test/org/apache/sis/storage/sql/feature/InfoStatementsTest.java | 2 +-
.../test/org/apache/sis/storage/event/StoreListenersTest.java | 2 +-
.../main/org/apache/sis/storage/gimi/GimiProvider.java | 2 +-
.../main/org/apache/sis/storage/gimi/Group.java | 3 ++-
.../main/org/apache/sis/storage/gimi/ResourceGrid.java | 2 +-
.../main/org/apache/sis/storage/gimi/ResourceImageUncompressed.java | 2 +-
.../main/org/apache/sis/storage/gimi/ResourcePyramid.java | 4 ++--
.../main/org/apache/sis/storage/gimi/ResourceUnknown.java | 2 +-
.../sis/storage/gimi/isobmff/gimi/ModelTransformationProperty.java | 2 +-
.../sis/storage/gimi/isobmff/gimi/TiledImageConfigurationBox.java | 1 +
.../sis/storage/gimi/isobmff/gimi/WellKnownText2Property.java | 4 ++--
.../main/org/apache/sis/storage/gsf/GSF.java | 1 +
.../main/org/apache/sis/storage/gsf/GSFException.java | 1 +
.../main/org/apache/sis/storage/gsf/GSFStore.java | 5 +++--
.../main/org/apache/sis/storage/gdal/Driver.java | 2 +-
.../main/org/apache/sis/storage/gdal/Subdataset.java | 2 +-
.../main/org/apache/sis/storage/gdal/TiledResource.java | 2 +-
.../test/org/apache/sis/storage/gdal/GDALStoreTest.java | 3 ++-
40 files changed, 55 insertions(+), 44 deletions(-)
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/AbstractFactory.java
index 8fc3bb9356,cdab28291a..68b8d9d007
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/AbstractFactory.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/AbstractFactory.java
@@@ -21,8 -21,8 +21,8 @@@ import org.opengis.metadata.citation.Ci
import org.apache.sis.metadata.simple.SimpleCitation;
import org.apache.sis.util.privy.Strings;
- // Specific to the geoapi-3.1 and master branches:
-// Specific to the geoapi-4.0 branch:
-import org.opengis.util.FactoryException;
++// Specific to the main and geoapi-3.1 branches:
+import org.apache.sis.util.collection.BackingStoreException;
/**
diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/ConcurrentAuthorityFactory.java
index 9194cb888e,3e675a5408..9342e7c10c
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/ConcurrentAuthorityFactory.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/ConcurrentAuthorityFactory.java
@@@ -62,9 -62,6 +62,9 @@@ import org.apache.sis.system.DelayedRun
import org.apache.sis.system.Configuration;
import org.apache.sis.system.Shutdown;
- // Specific to the geoapi-3.1 and master branches:
++// Specific to the main and geoapi-3.1 branches:
+import org.apache.sis.util.collection.BackingStoreException;
+
/**
* A concurrent authority factory that caches all objects created by another factory.
diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/ServicesForMetadata.java
index 593283717c,9ff0ed9f21..367b7508d5
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/ServicesForMetadata.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/ServicesForMetadata.java
@@@ -69,6 -69,6 +69,9 @@@ import org.apache.sis.util.privy.Consta
import org.apache.sis.util.resources.Vocabulary;
import org.apache.sis.util.logging.Logging;
++// Specific to the main and geoapi-3.1 branches:
++import org.apache.sis.util.collection.BackingStoreException;
++
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.metadata.Identifier;
diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/HardCodedCRS.java
index c330375024,a1151b90e3..fe0a120af7
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/HardCodedCRS.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/HardCodedCRS.java
@@@ -24,14 -24,11 +24,14 @@@ import org.apache.sis.metadata.iso.exte
import static org.apache.sis.referencing.IdentifiedObjects.getProperties;
// Test dependencies
+import org.apache.sis.referencing.cs.HardCodedCS;
+ import org.apache.sis.referencing.datum.GeodeticDatumMock;
import org.apache.sis.referencing.datum.HardCodedDatum;
-import org.apache.sis.referencing.cs.HardCodedCS;
import org.apache.sis.metadata.iso.citation.HardCodedCitations;
+// Specific to the main and geoapi-3.1 branches:
+import org.opengis.referencing.datum.PixelInCell;
+
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import static org.opengis.referencing.ObjectDomain.DOMAIN_OF_VALIDITY_KEY;