Author: desruisseaux
Date: Wed Sep 22 16:27:26 2021
New Revision: 1893515
URL: http://svn.apache.org/viewvc?rev=1893515&view=rev
Log:
Prepare for upgrade to 1.1 release.
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/Generator.java
sis/data/non-free/sis-epsg/pom.xml
Modified: sis/data/non-free/pom.xml
URL:
http://svn.apache.org/viewvc/sis/data/non-free/pom.xml?rev=1893515&r1=1893514&r2=1893515&view=diff
==============================================================================
--- sis/data/non-free/pom.xml (original)
+++ sis/data/non-free/pom.xml Wed Sep 22 16:27:26 2021
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.sis</groupId>
<artifactId>parent</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
@@ -105,7 +105,11 @@ The "non-free" modules contain data that
</dependency>
</dependencies>
- <!-- Build configuration: disable tests packaging. -->
+
+
+ <!-- ===========================================================
+ Build configuration.
+ =========================================================== -->
<build>
<plugins>
<plugin>
@@ -121,10 +125,26 @@ The "non-free" modules contain data that
</execution>
</executions>
</plugin>
+ <plugin>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <!--
+ Needs an older plugin version because of change in the way symbolic
links are handled.
+ https://issues.apache.org/jira/browse/MRESOURCES-237
+ -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.7</version>
+ </plugin>
</plugins>
</build>
+
<!-- ==============================================================
Group of modules to build in approximate dependency order.
============================================================== -->
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=1893515&r1=1893514&r2=1893515&view=diff
==============================================================================
--- sis/data/non-free/sis-embedded-data/pom.xml (original)
+++ sis/data/non-free/sis-embedded-data/pom.xml Wed Sep 22 16:27:26 2021
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.sis</groupId>
<artifactId>non-free</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
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=1893515&r1=1893514&r2=1893515&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] Wed Sep 22 16:27:26 2021
@@ -38,6 +38,7 @@ 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.MetadataStandard;
@@ -223,7 +224,7 @@ final class Generator {
try {
dataSource.getConnection().close();
} catch (SQLException e) {
- if (Initializer.isSuccessfulShutdown(e)) {
+ if (LocalDataSource.isSuccessfulShutdown(e)) {
return;
}
throw e;
Modified: sis/data/non-free/sis-epsg/pom.xml
URL:
http://svn.apache.org/viewvc/sis/data/non-free/sis-epsg/pom.xml?rev=1893515&r1=1893514&r2=1893515&view=diff
==============================================================================
--- sis/data/non-free/sis-epsg/pom.xml (original)
+++ sis/data/non-free/sis-epsg/pom.xml Wed Sep 22 16:27:26 2021
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.sis</groupId>
<artifactId>non-free</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
