Author: desruisseaux Date: Thu Mar 7 18:14:15 2024 New Revision: 1916166 URL: http://svn.apache.org/viewvc?rev=1916166&view=rev Log: Set version to 1.5-SNAPSHOT and adapt for change in SIS API. https://issues.apache.org/jira/browse/SIS-596
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 Modified: sis/data/non-free/pom.xml URL: http://svn.apache.org/viewvc/sis/data/non-free/pom.xml?rev=1916166&r1=1916165&r2=1916166&view=diff ============================================================================== --- sis/data/non-free/pom.xml (original) +++ sis/data/non-free/pom.xml Thu Mar 7 18:14:15 2024 @@ -27,7 +27,7 @@ <parent> <groupId>org.apache.sis</groupId> <artifactId>parent</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> </parent> 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=1916166&r1=1916165&r2=1916166&view=diff ============================================================================== --- sis/data/non-free/sis-embedded-data/pom.xml (original) +++ sis/data/non-free/sis-embedded-data/pom.xml Thu Mar 7 18:14:15 2024 @@ -27,7 +27,7 @@ <parent> <groupId>org.apache.sis</groupId> <artifactId>non-free</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> </parent> 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=1916166&r1=1916165&r2=1916166&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 Mar 7 18:14:15 2024 @@ -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.util.internal.MetadataServices; -import org.apache.sis.metadata.sql.util.Initializer; +import org.apache.sis.util.privy.MetadataServices; +import org.apache.sis.metadata.sql.privy.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=1916166&r1=1916165&r2=1916166&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 Mar 7 18:14:15 2024 @@ -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.metadata.sql.util.Initializer; -import org.apache.sis.metadata.sql.util.LocalDataSource; +import org.apache.sis.metadata.sql.privy.Initializer; +import org.apache.sis.metadata.sql.privy.LocalDataSource; import org.apache.sis.system.Shutdown; -import org.apache.sis.util.internal.Constants; +import org.apache.sis.util.privy.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=1916166&r1=1916165&r2=1916166&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 Mar 7 18:14:15 2024 @@ -26,7 +26,7 @@ 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.metadata.sql.util.Initializer; +import org.apache.sis.metadata.sql.privy.Initializer; import org.apache.sis.system.DataDirectory; import org.apache.sis.referencing.CRS; import org.junit.Test; Modified: sis/data/non-free/sis-epsg/pom.xml URL: http://svn.apache.org/viewvc/sis/data/non-free/sis-epsg/pom.xml?rev=1916166&r1=1916165&r2=1916166&view=diff ============================================================================== --- sis/data/non-free/sis-epsg/pom.xml (original) +++ sis/data/non-free/sis-epsg/pom.xml Thu Mar 7 18:14:15 2024 @@ -27,7 +27,7 @@ <parent> <groupId>org.apache.sis</groupId> <artifactId>non-free</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</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=1916166&r1=1916165&r2=1916166&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 Mar 7 18:14:15 2024 @@ -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.util.internal.Constants; +import org.apache.sis.util.privy.Constants; import org.apache.sis.referencing.factory.sql.InstallationScriptProvider;