Author: desruisseaux
Date: Sun Sep 9 11:52:45 2012
New Revision: 1382468
URL: http://svn.apache.org/viewvc?rev=1382468&view=rev
Log:
Moved dependencies and plugins version numbers to the root pom.xml, in order to
ensure that all modules use consistent versions (SIS-56).
Modified:
incubator/sis/trunk/pom.xml
incubator/sis/trunk/sis-core/pom.xml
incubator/sis/trunk/sis-webapp/pom.xml
Modified: incubator/sis/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/sis/trunk/pom.xml?rev=1382468&r1=1382467&r2=1382468&view=diff
==============================================================================
--- incubator/sis/trunk/pom.xml (original)
+++ incubator/sis/trunk/pom.xml Sun Sep 9 11:52:45 2012
@@ -234,6 +234,16 @@ Apache SIS is a toolkit for describing l
<version>${geoapi.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.geonames</groupId>
+ <artifactId>georss-rome</artifactId>
+ <version>0.9.8</version>
+ </dependency>
</dependencies>
</dependencyManagement>
@@ -298,6 +308,17 @@ Apache SIS is a toolkit for describing l
<artifactId>maven-site-plugin</artifactId>
</plugin>
</plugins>
+
+ <!-- Following plugins are used only by some specific modules. -->
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-maven-plugin</artifactId>
+ <version>8.0.0.M2</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
Modified: incubator/sis/trunk/sis-core/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/sis/trunk/sis-core/pom.xml?rev=1382468&r1=1382467&r2=1382468&view=diff
==============================================================================
--- incubator/sis/trunk/sis-core/pom.xml (original)
+++ incubator/sis/trunk/sis-core/pom.xml Sun Sep 9 11:52:45 2012
@@ -37,7 +37,6 @@
<dependency>
<groupId>org.geonames</groupId>
<artifactId>georss-rome</artifactId>
- <version>0.9.8</version>
</dependency>
</dependencies>
Modified: incubator/sis/trunk/sis-webapp/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/sis/trunk/sis-webapp/pom.xml?rev=1382468&r1=1382467&r2=1382468&view=diff
==============================================================================
--- incubator/sis/trunk/sis-webapp/pom.xml (original)
+++ incubator/sis/trunk/sis-webapp/pom.xml Sun Sep 9 11:52:45 2012
@@ -37,17 +37,15 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.4</version>
</dependency>
<dependency>
<groupId>org.geonames</groupId>
<artifactId>georss-rome</artifactId>
- <version>0.9.8</version>
</dependency>
<dependency>
<groupId>org.apache.sis</groupId>
<artifactId>sis-core</artifactId>
- <version>0.3-incubating-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
@@ -56,7 +54,6 @@
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
- <version>8.0.0.M2</version>
<configuration>
<webApp>${basedir}/target/sis-webapp-${project.version}.war</webApp>
</configuration>
