sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1831980 - in /sis/data/non-free: pom.xml sis-embedded-data/pom.xml sis-embedded-data/src/test/java/org/apache/sis/resources/embedded/EmbeddedResourcesTest.java sis-epsg/pom.xml
Date Mon, 21 May 2018 17:23:40 GMT
Author: desruisseaux
Date: Mon May 21 17:23:40 2018
New Revision: 1831980

URL: http://svn.apache.org/viewvc?rev=1831980&view=rev
Log:
Align version number on 1.0-SNAPSHOT.

Modified:
    sis/data/non-free/pom.xml
    sis/data/non-free/sis-embedded-data/pom.xml
    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

Modified: sis/data/non-free/pom.xml
URL: http://svn.apache.org/viewvc/sis/data/non-free/pom.xml?rev=1831980&r1=1831979&r2=1831980&view=diff
==============================================================================
--- sis/data/non-free/pom.xml (original)
+++ sis/data/non-free/pom.xml Mon May 21 17:23:40 2018
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.apache.sis</groupId>
     <artifactId>parent</artifactId>
-    <version>0.8</version>
+    <version>1.0-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=1831980&r1=1831979&r2=1831980&view=diff
==============================================================================
--- sis/data/non-free/sis-embedded-data/pom.xml (original)
+++ sis/data/non-free/sis-embedded-data/pom.xml Mon May 21 17:23:40 2018
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.apache.sis</groupId>
     <artifactId>non-free</artifactId>
-    <version>0.8</version>
+    <version>1.0-SNAPSHOT</version>
   </parent>
 
 
@@ -36,7 +36,6 @@
        =========================================================== -->
   <groupId>org.apache.sis.non-free</groupId>
   <artifactId>sis-embedded-data</artifactId>
-  <packaging>jar</packaging>
 
   <name>Data in embedded environment</name>
   <url>http://sis.apache.org/epsg</url>
@@ -90,6 +89,7 @@ Provides non-free data, including the EP
     <dependency>
       <groupId>org.apache.derby</groupId>
       <artifactId>derby</artifactId>
+      <scope>compile</scope>
     </dependency>
   </dependencies>
 
@@ -138,6 +138,14 @@ Provides non-free data, including the EP
           <excludes>
             <include>**/Generator*</include>
           </excludes>
+          <!-- Anticipation for Java 9 -->
+          <archive>
+            <manifestEntries>
+              <Automatic-Module-Name>
+                org.apache.sis.referencing.database
+              </Automatic-Module-Name>
+            </manifestEntries>
+          </archive>
         </configuration>
       </plugin>
 

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=1831980&r1=1831979&r2=1831980&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] Mon May 21 17:23:40 2018
@@ -89,6 +89,7 @@ public final strictfp class EmbeddedReso
         final DataSource ds = Initializer.getDataSource();
         assertNotNull("Can not find the data source.", ds);
         try (Connection c = ds.getConnection()) {
+            assertEquals("URL", "jdbc:derby:classpath:SIS_DATA/Databases/SpatialMetadata",
c.getMetaData().getURL());
             try (Statement s = c.createStatement()) {
                 try (ResultSet r = s.executeQuery("SELECT COORD_REF_SYS_NAME FROM EPSG.\"Coordinate
Reference System\" WHERE COORD_REF_SYS_CODE = 4326")) {
                     assertTrue("ResultSet.next()", r.next());

Modified: sis/data/non-free/sis-epsg/pom.xml
URL: http://svn.apache.org/viewvc/sis/data/non-free/sis-epsg/pom.xml?rev=1831980&r1=1831979&r2=1831980&view=diff
==============================================================================
--- sis/data/non-free/sis-epsg/pom.xml (original)
+++ sis/data/non-free/sis-epsg/pom.xml Mon May 21 17:23:40 2018
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.apache.sis</groupId>
     <artifactId>non-free</artifactId>
-    <version>0.8</version>
+    <version>1.0-SNAPSHOT</version>
   </parent>
 
 
@@ -36,7 +36,6 @@
        =========================================================== -->
   <groupId>org.apache.sis.non-free</groupId>
   <artifactId>sis-epsg</artifactId>
-  <packaging>bundle</packaging>
 
   <name>EPSG dataset for Apache SIS</name>
   <url>http://www.epsg.org</url>
@@ -86,17 +85,18 @@ The EPSG geodetic dataset provides defin
        =========================================================== -->
   <build>
     <plugins>
+      <!-- Anticipation for Java 9 -->
       <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
         <configuration>
-          <instructions>
-            <Bundle-SymbolicName>org.apache.sis.referencing.epsg</Bundle-SymbolicName>
-            <Require-Capability>osgi.extender;
-            filter:="(osgi.extender=osgi.serviceloader.registrar)"</Require-Capability>
-            <Provide-Capability>osgi.serviceloader;
-            osgi.serviceloader=org.apache.sis.setup.InstallationResources</Provide-Capability>
-          </instructions>
+          <archive>
+            <manifestEntries>
+              <Automatic-Module-Name>
+                org.apache.sis.referencing.epsg
+              </Automatic-Module-Name>
+            </manifestEntries>
+          </archive>
         </configuration>
       </plugin>
     </plugins>



Mime
View raw message