sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1811234 - in /sis/data/non-free: ./ pom.xml sis-embedded-data/pom.xml sis-epsg/pom.xml
Date Thu, 05 Oct 2017 19:06:11 GMT
Author: desruisseaux
Date: Thu Oct  5 19:06:11 2017
New Revision: 1811234

URL: http://svn.apache.org/viewvc?rev=1811234&view=rev
Log:
Make a multi-modules Maven project.

Added:
    sis/data/non-free/pom.xml
Modified:
    sis/data/non-free/   (props changed)
    sis/data/non-free/sis-embedded-data/pom.xml
    sis/data/non-free/sis-epsg/pom.xml

Propchange: sis/data/non-free/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Oct  5 19:06:11 2017
@@ -0,0 +1,10 @@
+.project
+.settings
+.classpath
+.jetproperties
+.wtpmodules
+target
+bin
+cobertura.ser
+nbproject
+nbactions.xml

Added: sis/data/non-free/pom.xml
URL: http://svn.apache.org/viewvc/sis/data/non-free/pom.xml?rev=1811234&view=auto
==============================================================================
--- sis/data/non-free/pom.xml (added)
+++ sis/data/non-free/pom.xml Thu Oct  5 19:06:11 2017
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+
+<project xmlns              = "http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi          = "http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation = "http://maven.apache.org/POM/4.0.0
+                               http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.sis</groupId>
+    <artifactId>parent</artifactId>
+    <version>0.8-SNAPSHOT</version>
+  </parent>
+
+
+
+  <!-- ==============================================================
+         Project description. <licenses> elements are declared in
+         pom.xml of sub-modules.
+       ============================================================== -->
+  <groupId>org.apache.sis</groupId>
+  <artifactId>non-free</artifactId>
+  <packaging>pom</packaging>
+
+  <name>Non-free resources for Apache SIS</name>
+  <url>http://sis.apache.org/epsg.html</url>
+  <description>
+  <!-- Left alignment because this description will be copied in META-INF/MANIFEST.MF
+       The leading space after the first line is necessary for proper formatting. -->
+The "non-free" modules contain data that may be used, copied and distributed subject to conditions
+ more restrictive than the usual open source licenses. Those data are not included in Apache
releases,
+ but are nevertheless deployed on Maven Central for convenience only. Users who want those
data need
+ to declare a Maven dependency explicitely. Licenses are declared in their respective sub-module.
+  </description>
+
+  <scm>
+    <connection>
+      scm:svn:http://svn.apache.org/repos/asf/sis/data/non-free
+    </connection>
+    <developerConnection>
+      scm:svn:https://svn.apache.org/repos/asf/sis/data/non-free
+    </developerConnection>
+    <url>http://svn.apache.org/viewvc/sis/data/non-free</url>
+  </scm>
+
+
+
+  <!-- ==============================================================
+         Developers and Contributors.
+       ============================================================== -->
+  <developers>
+    <developer>
+      <name>Martin Desruisseaux</name>
+      <id>desruisseaux</id>
+      <email>martin.desruisseaux@geomatys.com</email>
+      <organization>Geomatys</organization>
+      <organizationUrl>http://www.geomatys.com/</organizationUrl>
+      <timezone>+1</timezone>
+      <roles>
+        <role>Module Maintainer</role>
+        <role>Java Developer</role>
+      </roles>
+    </developer>
+  </developers>
+
+
+
+  <!-- ===========================================================
+           Dependencies to be inherited by all modules.
+       =========================================================== -->
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.sis.core</groupId>
+      <artifactId>sis-referencing</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+  </dependencies>
+
+
+
+  <!-- ==============================================================
+         Group of modules to build in approximate dependency order.
+       ============================================================== -->
+  <modules>
+    <module>sis-epsg</module>
+    <module>sis-embedded-data</module>
+  </modules>
+
+</project>

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=1811234&r1=1811233&r2=1811234&view=diff
==============================================================================
--- sis/data/non-free/sis-embedded-data/pom.xml (original)
+++ sis/data/non-free/sis-embedded-data/pom.xml Thu Oct  5 19:06:11 2017
@@ -26,16 +26,20 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.sis</groupId>
-    <artifactId>parent</artifactId>
+    <artifactId>non-free</artifactId>
     <version>0.8-SNAPSHOT</version>
   </parent>
+
+
+  <!-- ===========================================================
+           Module description, including licenses information
+       =========================================================== -->
   <groupId>org.apache.sis.non-free</groupId>
   <artifactId>sis-embedded-data</artifactId>
-  <version>0.8-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>Data in embedded environment</name>
-  <url>http://sis.apache.org</url>
+  <url>http://sis.apache.org/epsg</url>
   <description>
 Provides non-free data, including the EPSG geodetic dataset, in a single read-only JAR file.
  This 'sis-embedded-data' module contains a copy of EPSG geodetic dataset in an embedded
Apache Derby database.
@@ -58,16 +62,10 @@ Provides non-free data, including the EP
     </license>
   </licenses>
 
-  <scm>
-    <connection>
-      scm:svn:http://svn.apache.org/repos/asf/sis/data/non-free/sis-embedded-data
-    </connection>
-    <developerConnection>
-      scm:svn:https://svn.apache.org/repos/asf/sis/data/non-free/sis-embedded-data
-    </developerConnection>
-    <url>http://svn.apache.org/viewvc/sis/data/non-free/sis-embedded-data</url>
-  </scm>
 
+  <!-- ===========================================================
+           Developers and Contributors
+       =========================================================== -->
   <developers>
     <developer>
       <name>Martin Desruisseaux</name>
@@ -95,14 +93,18 @@ Provides non-free data, including the EP
     </dependency>
   </dependencies>
 
-  <!--
-    Launches the database generator program at build time, after compilation.
-    This program needs the 'sis-epsg' module to be checked out together with
-    this 'sis-embedded-data' module. The database will be created directly in
-    the 'target/classes' directory, and license files will be copied there.
-  -->
+
+  <!-- ===========================================================
+           Build configuration
+       =========================================================== -->
   <build>
     <plugins>
+      <!--
+        Launches the database generator program at build time, after compilation.
+        This program needs the 'sis-epsg' module to be checked out together with
+        this 'sis-embedded-data' module. The database will be created directly in
+        the 'target/classes' directory, and license files will be copied there.
+      -->
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>exec-maven-plugin</artifactId>

Modified: sis/data/non-free/sis-epsg/pom.xml
URL: http://svn.apache.org/viewvc/sis/data/non-free/sis-epsg/pom.xml?rev=1811234&r1=1811233&r2=1811234&view=diff
==============================================================================
--- sis/data/non-free/sis-epsg/pom.xml (original)
+++ sis/data/non-free/sis-epsg/pom.xml Thu Oct  5 19:06:11 2017
@@ -26,13 +26,17 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.sis</groupId>
-    <artifactId>parent</artifactId>
+    <artifactId>non-free</artifactId>
     <version>0.8-SNAPSHOT</version>
   </parent>
+
+
+  <!-- ===========================================================
+           Module description, including licenses information
+       =========================================================== -->
   <groupId>org.apache.sis.non-free</groupId>
   <artifactId>sis-epsg</artifactId>
-  <version>0.8-SNAPSHOT</version>
-  <packaging>jar</packaging>
+  <packaging>bundle</packaging>
 
   <name>EPSG dataset for Apache SIS</name>
   <url>http://www.epsg.org</url>
@@ -57,16 +61,10 @@ The EPSG geodetic dataset provides defin
     </license>
   </licenses>
 
-  <scm>
-    <connection>
-      scm:svn:http://svn.apache.org/repos/asf/sis/data/non-free/sis-epsg
-    </connection>
-    <developerConnection>
-      scm:svn:https://svn.apache.org/repos/asf/sis/data/non-free/sis-epsg
-    </developerConnection>
-    <url>http://svn.apache.org/viewvc/sis/data/non-free/sis-epsg</url>
-  </scm>
 
+  <!-- ===========================================================
+           Developers and Contributors
+       =========================================================== -->
   <developers>
     <developer>
       <name>Martin Desruisseaux</name>
@@ -82,6 +80,10 @@ The EPSG geodetic dataset provides defin
     </developer>
   </developers>
 
+
+  <!-- ===========================================================
+           Build configuration
+       =========================================================== -->
   <build>
     <plugins>
       <plugin>
@@ -100,11 +102,4 @@ The EPSG geodetic dataset provides defin
     </plugins>
   </build>
 
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.sis.core</groupId>
-      <artifactId>sis-referencing</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-  </dependencies>
 </project>



Mime
View raw message