Mercurial > hg > release > thermostat-0.5

changeset 795:09c2918d8656

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use properties for global version management for servlet/gson/jetty. Version numbers were hard-coded in some sub-modules. This is now recorded in one place, the main pom. Reviewed-by: vanaltj Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2012-November/004150.html
author Severin Gehwolf <sgehwolf@redhat.com>
date Tue, 20 Nov 2012 18:53:27 +0100
parents 7847fa71fe23
children d6145521e208
files pom.xml web/client/pom.xml web/common/pom.xml web/server/pom.xml
diffstat 4 files changed, 11 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/pom.xml	Tue Nov 20 12:59:49 2012 -0500
+++ b/pom.xml	Tue Nov 20 18:53:27 2012 +0100
@@ -88,6 +88,9 @@
     <netty.version>3.2.4.Final</netty.version>
     <httpcomponents.version>4.1.2</httpcomponents.version>
     <fileupload.version>1.2.2</fileupload.version>
+    <gson.version>2.2.2</gson.version>
+    <jetty.version>8.1.5.v20120716</jetty.version>
+    <javax.servlet.version>2.5</javax.servlet.version>
   </properties>
 
   <repositories>
--- a/web/client/pom.xml	Tue Nov 20 12:59:49 2012 -0500
+++ b/web/client/pom.xml	Tue Nov 20 18:53:27 2012 +0100
@@ -77,20 +77,20 @@
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-server</artifactId>
-      <version>8.1.5.v20120716</version>
+      <version>${jetty.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-webapp</artifactId>
-      <version>8.1.5.v20120716</version>
+      <version>${jetty.version}</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
-      <version>2.2.2</version>
+      <version>${gson.version}</version>
     </dependency>
 
     <dependency>
--- a/web/common/pom.xml	Tue Nov 20 12:59:49 2012 -0500
+++ b/web/common/pom.xml	Tue Nov 20 18:53:27 2012 +0100
@@ -61,7 +61,7 @@
     <dependency>
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
-      <version>2.2.2</version>
+      <version>${gson.version}</version>
     </dependency>
 
     <dependency>
--- a/web/server/pom.xml	Tue Nov 20 12:59:49 2012 -0500
+++ b/web/server/pom.xml	Tue Nov 20 18:53:27 2012 +0100
@@ -73,12 +73,12 @@
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-server</artifactId>
-      <version>8.1.5.v20120716</version>
+      <version>${jetty.version}</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-webapp</artifactId>
-      <version>8.1.5.v20120716</version>
+      <version>${jetty.version}</version>
     </dependency>
 
 
@@ -92,14 +92,13 @@
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      <version>2.5</version>
-      <scope>provided</scope>
+      <version>${javax.servlet.version}</version>
     </dependency>
 
     <dependency>
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
-      <version>2.2.2</version>
+      <version>${gson.version}</version>
     </dependency>
 
     <dependency>