Author: desruisseaux Date: Thu Oct 5 23:21:19 2023 New Revision: 1912760 URL: http://svn.apache.org/viewvc?rev=1912760&view=rev Log: Upgrade to Apache SIS 1.4.
Removed: sis/data/non-free/sis-embedded-data/src/test/java/org/apache/sis/resources/embedded/EmbeddedDataTestSuite.java sis/data/non-free/sis-epsg/src/test/java/org/apache/sis/referencing/factory/sql/epsg/EpsgTestSuite.java Modified: sis/data/non-free/pom.xml sis/data/non-free/sis-embedded-data/pom.xml sis/data/non-free/sis-embedded-data/src/main/java/org/apache/sis/resources/embedded/EmbeddedResources.java sis/data/non-free/sis-embedded-data/src/main/java/org/apache/sis/resources/embedded/Generator.java sis/data/non-free/sis-embedded-data/src/test/java/org/apache/sis/resources/embedded/EmbeddedResourcesTest.java sis/data/non-free/sis-epsg/pom.xml sis/data/non-free/sis-epsg/src/main/java/org/apache/sis/referencing/factory/sql/epsg/ScriptProvider.java sis/data/non-free/sis-epsg/src/test/java/org/apache/sis/referencing/factory/sql/epsg/ScriptProviderTest.java Modified: sis/data/non-free/pom.xml URL: http://svn.apache.org/viewvc/sis/data/non-free/pom.xml?rev=1912760&r1=1912759&r2=1912760&view=diff ============================================================================== --- sis/data/non-free/pom.xml (original) +++ sis/data/non-free/pom.xml Thu Oct 5 23:21:19 2023 @@ -27,7 +27,7 @@ <parent> <groupId>org.apache.sis</groupId> <artifactId>parent</artifactId> - <version>1.3</version> + <version>1.4</version> </parent> @@ -95,12 +95,7 @@ The "non-free" modules contain data that <dependency> <groupId>org.opengis</groupId> <artifactId>geoapi-conformance</artifactId> - </dependency> - <dependency> - <groupId>org.apache.sis.core</groupId> - <artifactId>sis-utility</artifactId> - <version>${project.version}</version> - <type>test-jar</type> + <version>3.0.2</version> <scope>test</scope> </dependency> </dependencies> Modified: sis/data/non-free/sis-embedded-data/pom.xml URL: http://svn.apache.org/viewvc/sis/data/non-free/sis-embedded-data/pom.xml?rev=1912760&r1=1912759&r2=1912760&view=diff ============================================================================== --- sis/data/non-free/sis-embedded-data/pom.xml (original) +++ sis/data/non-free/sis-embedded-data/pom.xml Thu Oct 5 23:21:19 2023 @@ -27,7 +27,7 @@ <parent> <groupId>org.apache.sis</groupId> <artifactId>non-free</artifactId> - <version>1.3</version> + <version>1.4</version> </parent> @@ -84,6 +84,13 @@ Provides non-free data, including the EP <dependency> <groupId>org.apache.derby</groupId> <artifactId>derby</artifactId> + <version>10.15.2.0</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.derby</groupId> + <artifactId>derbytools</artifactId> + <version>10.15.2.0</version> <scope>compile</scope> </dependency> </dependencies> Modified: sis/data/non-free/sis-embedded-data/src/main/java/org/apache/sis/resources/embedded/EmbeddedResources.java URL: http://svn.apache.org/viewvc/sis/data/non-free/sis-embedded-data/src/main/java/org/apache/sis/resources/embedded/EmbeddedResources.java?rev=1912760&r1=1912759&r2=1912760&view=diff ============================================================================== --- sis/data/non-free/sis-embedded-data/src/main/java/org/apache/sis/resources/embedded/EmbeddedResources.java [UTF-8] (original) +++ sis/data/non-free/sis-embedded-data/src/main/java/org/apache/sis/resources/embedded/EmbeddedResources.java [UTF-8] Thu Oct 5 23:21:19 2023 @@ -24,8 +24,8 @@ import java.io.InputStreamReader; import java.io.IOException; import javax.sql.DataSource; import org.apache.derby.jdbc.EmbeddedDataSource; -import org.apache.sis.internal.util.MetadataServices; -import org.apache.sis.internal.metadata.sql.Initializer; +import org.apache.sis.util.internal.MetadataServices; +import org.apache.sis.metadata.sql.util.Initializer; import org.apache.sis.setup.InstallationResources; import org.apache.sis.util.resources.Errors; Modified: sis/data/non-free/sis-embedded-data/src/main/java/org/apache/sis/resources/embedded/Generator.java URL: http://svn.apache.org/viewvc/sis/data/non-free/sis-embedded-data/src/main/java/org/apache/sis/resources/embedded/Generator.java?rev=1912760&r1=1912759&r2=1912760&view=diff ============================================================================== --- sis/data/non-free/sis-embedded-data/src/main/java/org/apache/sis/resources/embedded/Generator.java [UTF-8] (original) +++ sis/data/non-free/sis-embedded-data/src/main/java/org/apache/sis/resources/embedded/Generator.java [UTF-8] Thu Oct 5 23:21:19 2023 @@ -37,10 +37,10 @@ import java.sql.SQLException; import org.opengis.util.FactoryException; import org.opengis.referencing.crs.GeographicCRS; import org.apache.derby.jdbc.EmbeddedDataSource; -import org.apache.sis.internal.metadata.sql.Initializer; -import org.apache.sis.internal.metadata.sql.LocalDataSource; -import org.apache.sis.internal.system.Shutdown; -import org.apache.sis.internal.util.Constants; +import org.apache.sis.metadata.sql.util.Initializer; +import org.apache.sis.metadata.sql.util.LocalDataSource; +import org.apache.sis.system.Shutdown; +import org.apache.sis.util.internal.Constants; import org.apache.sis.metadata.MetadataStandard; import org.apache.sis.metadata.sql.MetadataSource; import org.apache.sis.metadata.sql.MetadataStoreException; Modified: sis/data/non-free/sis-embedded-data/src/test/java/org/apache/sis/resources/embedded/EmbeddedResourcesTest.java URL: http://svn.apache.org/viewvc/sis/data/non-free/sis-embedded-data/src/test/java/org/apache/sis/resources/embedded/EmbeddedResourcesTest.java?rev=1912760&r1=1912759&r2=1912760&view=diff ============================================================================== --- sis/data/non-free/sis-embedded-data/src/test/java/org/apache/sis/resources/embedded/EmbeddedResourcesTest.java [UTF-8] (original) +++ sis/data/non-free/sis-embedded-data/src/test/java/org/apache/sis/resources/embedded/EmbeddedResourcesTest.java [UTF-8] Thu Oct 5 23:21:19 2023 @@ -26,14 +26,9 @@ import javax.sql.DataSource; import org.opengis.util.FactoryException; import org.opengis.referencing.crs.CoordinateReferenceSystem; import org.apache.sis.setup.InstallationResources; -import org.apache.sis.internal.metadata.sql.Initializer; -import org.apache.sis.internal.system.DataDirectory; -import org.apache.sis.internal.system.Loggers; +import org.apache.sis.metadata.sql.util.Initializer; +import org.apache.sis.system.DataDirectory; import org.apache.sis.referencing.CRS; -import org.apache.sis.test.DependsOnMethod; -import org.apache.sis.test.LoggingWatcher; -import org.apache.sis.test.TestCase; -import org.junit.Rule; import org.junit.Test; import static org.junit.Assert.*; @@ -46,14 +41,7 @@ import static org.junit.Assert.*; * @version 0.8 * @since 0.8 */ -public final strictfp class EmbeddedResourcesTest extends TestCase { - /** - * A JUnit {@link Rule} for listening to log events. This field is public because JUnit requires us to - * do so, but should be considered as an implementation details (it should have been a private field). - */ - @Rule - public final LoggingWatcher loggings = new LoggingWatcher(Loggers.SYSTEM); - +public final strictfp class EmbeddedResourcesTest { /** * Returns the {@link ScriptProvider} instance declared in the {@code META-INF/services/} directory. */ @@ -74,7 +62,6 @@ public final strictfp class EmbeddedReso final InstallationResources provider = getInstance(); assertTrue(provider.getLicense("Embedded", null, "text/plain").contains("IOGP")); assertTrue(provider.getLicense("Embedded", null, "text/html" ).contains("IOGP")); - loggings.assertNoUnexpectedLog(); } /** @@ -98,16 +85,6 @@ public final strictfp class EmbeddedReso } } } - /* - * Ignore the warning message about SIS_DATA environment variable not being defined. - * This warning occurs because we can not unset SIS_DATA with maven-surefire-plugin; - * we can only override it with an empty value. So Apache SIS assumes that the user - * wanted to provide a SIS_DATA value but the actual value is missing. - */ - if (dir != null) { - loggings.assertNextLogContains(DataDirectory.ENV); - } - loggings.assertNoUnexpectedLog(); } /** @@ -118,7 +95,6 @@ public final strictfp class EmbeddedReso * @throws FactoryException if an error occurred while creating the CRS. */ @Test - @DependsOnMethod("testConnection") public void testCrsforCode() throws FactoryException { CoordinateReferenceSystem crs = CRS.forCode("EPSG:6676"); String area = crs.getDomainOfValidity().getDescription().toString(); Modified: sis/data/non-free/sis-epsg/pom.xml URL: http://svn.apache.org/viewvc/sis/data/non-free/sis-epsg/pom.xml?rev=1912760&r1=1912759&r2=1912760&view=diff ============================================================================== --- sis/data/non-free/sis-epsg/pom.xml (original) +++ sis/data/non-free/sis-epsg/pom.xml Thu Oct 5 23:21:19 2023 @@ -27,7 +27,7 @@ <parent> <groupId>org.apache.sis</groupId> <artifactId>non-free</artifactId> - <version>1.3</version> + <version>1.4</version> </parent> Modified: sis/data/non-free/sis-epsg/src/main/java/org/apache/sis/referencing/factory/sql/epsg/ScriptProvider.java URL: http://svn.apache.org/viewvc/sis/data/non-free/sis-epsg/src/main/java/org/apache/sis/referencing/factory/sql/epsg/ScriptProvider.java?rev=1912760&r1=1912759&r2=1912760&view=diff ============================================================================== --- sis/data/non-free/sis-epsg/src/main/java/org/apache/sis/referencing/factory/sql/epsg/ScriptProvider.java [UTF-8] (original) +++ sis/data/non-free/sis-epsg/src/main/java/org/apache/sis/referencing/factory/sql/epsg/ScriptProvider.java [UTF-8] Thu Oct 5 23:21:19 2023 @@ -22,7 +22,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import org.apache.sis.util.resources.Errors; -import org.apache.sis.internal.util.Constants; +import org.apache.sis.util.internal.Constants; import org.apache.sis.referencing.factory.sql.InstallationScriptProvider; Modified: sis/data/non-free/sis-epsg/src/test/java/org/apache/sis/referencing/factory/sql/epsg/ScriptProviderTest.java URL: http://svn.apache.org/viewvc/sis/data/non-free/sis-epsg/src/test/java/org/apache/sis/referencing/factory/sql/epsg/ScriptProviderTest.java?rev=1912760&r1=1912759&r2=1912760&view=diff ============================================================================== --- sis/data/non-free/sis-epsg/src/test/java/org/apache/sis/referencing/factory/sql/epsg/ScriptProviderTest.java [UTF-8] (original) +++ sis/data/non-free/sis-epsg/src/test/java/org/apache/sis/referencing/factory/sql/epsg/ScriptProviderTest.java [UTF-8] Thu Oct 5 23:21:19 2023 @@ -21,7 +21,6 @@ import java.io.IOException; import java.io.BufferedReader; import java.util.ServiceLoader; import org.apache.sis.setup.InstallationResources; -import org.apache.sis.test.TestCase; import org.junit.Test; import static org.junit.Assert.*; @@ -34,7 +33,7 @@ import static org.junit.Assert.*; * @version 0.7 * @since 0.7 */ -public final strictfp class ScriptProviderTest extends TestCase { +public final strictfp class ScriptProviderTest { /** * Returns the {@link ScriptProvider} instance declared in the {@code META-INF/services/} directory. */