sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1482628 - in /sis/branches/JDK7: ./ application/sis-webapp/ application/sis-webapp/src/main/java/org/apache/sis/storage/ core/sis-referencing/ core/sis-referencing/src/main/java/org/apache/sis/storage/
Date Tue, 14 May 2013 22:16:00 GMT
Author: desruisseaux
Date: Tue May 14 22:16:00 2013
New Revision: 1482628

URL: http://svn.apache.org/r1482628
Log:
Avoid "georss" dependency in sis-referencing. This implies moving GeoRSSData and
QuadTreeReader (which depends on GeoRSSData) to an other module, for now sis-webapp.

Added:
    sis/branches/JDK7/application/sis-webapp/src/main/java/org/apache/sis/storage/
    sis/branches/JDK7/application/sis-webapp/src/main/java/org/apache/sis/storage/GeoRSSData.java
      - copied unchanged from r1482562, sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/storage/GeoRSSData.java
    sis/branches/JDK7/application/sis-webapp/src/main/java/org/apache/sis/storage/QuadTreeReader.java
      - copied unchanged from r1482562, sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/storage/QuadTreeReader.java
Removed:
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/storage/GeoRSSData.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/storage/QuadTreeReader.java
Modified:
    sis/branches/JDK7/application/sis-webapp/pom.xml
    sis/branches/JDK7/core/sis-referencing/pom.xml
    sis/branches/JDK7/pom.xml

Modified: sis/branches/JDK7/application/sis-webapp/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/application/sis-webapp/pom.xml?rev=1482628&r1=1482627&r2=1482628&view=diff
==============================================================================
--- sis/branches/JDK7/application/sis-webapp/pom.xml (original)
+++ sis/branches/JDK7/application/sis-webapp/pom.xml Tue May 14 22:16:00 2013
@@ -44,6 +44,13 @@
     <dependency>
       <groupId>org.geonames</groupId>
       <artifactId>georss-rome</artifactId>
+      <version>0.9.8</version>
+      <!-- We have to specify the version here because georss-rome is intentionally excluded
from
+           the dependency management of the root pom.xml. The problem is that the artefact
filename
+           is "georss-rome", but the <artefactId> element in its pom.xml declares "georss"
without
+           the "-rome" suffix, which causes some environments to complain about this inconsistency.
+           Omitting the declaration from the root pom.xml limits the inconvenience to this
"sis-webapp"
+           module only. -->
     </dependency>
     <dependency>
       <groupId>org.apache.sis</groupId>

Modified: sis/branches/JDK7/core/sis-referencing/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/pom.xml?rev=1482628&r1=1482627&r2=1482628&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/pom.xml (original)
+++ sis/branches/JDK7/core/sis-referencing/pom.xml Tue May 14 22:16:00 2013
@@ -58,10 +58,6 @@
       <groupId>net.jcip</groupId>
       <artifactId>jcip-annotations</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.geonames</groupId>
-      <artifactId>georss-rome</artifactId>
-    </dependency>
 
     <!-- Test dependencies -->
     <dependency>

Modified: sis/branches/JDK7/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/pom.xml?rev=1482628&r1=1482627&r2=1482628&view=diff
==============================================================================
--- sis/branches/JDK7/pom.xml (original)
+++ sis/branches/JDK7/pom.xml Tue May 14 22:16:00 2013
@@ -322,11 +322,6 @@ Apache SIS is a toolkit for describing l
         <scope>provided</scope>
       </dependency>
       <dependency>
-        <groupId>org.geonames</groupId>
-        <artifactId>georss-rome</artifactId>
-        <version>0.9.8</version>
-      </dependency>
-      <dependency>
         <groupId>net.jcip</groupId>
         <artifactId>jcip-annotations</artifactId>
         <version>1.0</version>



Mime
View raw message