Mercurial > hg > release > thermostat-0.13

changeset 182:70bc509ad120

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Consolidate Maven dependency version management. Reviewed-by: mtorre Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2012-April/000612.html
author Roman Kennke <rkennke@redhat.com>
date Mon, 02 Apr 2012 14:46:36 +0200
parents 2e2cb086b621
children 5d2a538b1020
files agent/pom.xml client/pom.xml common/pom.xml pom.xml tools/pom.xml
diffstat 5 files changed, 92 insertions(+), 28 deletions(-) [+]
line wrap: on
line diff
--- a/agent/pom.xml	Fri Mar 30 21:41:45 2012 +0200
+++ b/agent/pom.xml	Mon Apr 02 14:46:36 2012 +0200
@@ -55,13 +55,11 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.10</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
-      <version>1.9.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -72,7 +70,6 @@
     <dependency>
       <groupId>com.sun</groupId>
       <artifactId>tools</artifactId>
-      <version>1.7.0</version>
       <scope>system</scope>
       <systemPath>${java.home}/../lib/tools.jar</systemPath>
     </dependency>
--- a/client/pom.xml	Fri Mar 30 21:41:45 2012 +0200
+++ b/client/pom.xml	Mon Apr 02 14:46:36 2012 +0200
@@ -55,19 +55,16 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.10</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
-      <version>1.9.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.easytesting</groupId>
       <artifactId>fest-swing</artifactId>
-      <version>1.2.1</version>
       <scope>test</scope>
     </dependency>
   	<dependency>
@@ -78,12 +75,10 @@
     <dependency>
       <groupId>org.jfree</groupId>
       <artifactId>jfreechart</artifactId>
-      <version>1.0.14</version>
     </dependency>
     <dependency>
       <groupId>org.mongodb</groupId>
       <artifactId>mongo-java-driver</artifactId>
-      <version>2.7.3</version>
     </dependency>
   </dependencies>
 
--- a/common/pom.xml	Fri Mar 30 21:41:45 2012 +0200
+++ b/common/pom.xml	Mon Apr 02 14:46:36 2012 +0200
@@ -65,46 +65,43 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.10</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
-      <version>1.9.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.powermock</groupId>
       <artifactId>powermock-api-mockito</artifactId>
-      <version>1.4.11</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.powermock</groupId>
       <artifactId>powermock-module-junit4</artifactId>
-      <version>1.4.11</version>
       <scope>test</scope>
     </dependency>
+
+      <!-- TODO: We should get rid of the following 2 dependencies! -->
+    <dependency>
+      <groupId>org.powermock</groupId>
+      <artifactId>powermock-api-easymock</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.easymock</groupId>
+      <artifactId>easymock</artifactId>
+      <scope>test</scope>
+    </dependency>
+
     <dependency>
       <groupId>org.mongodb</groupId>
       <artifactId>mongo-java-driver</artifactId>
-      <version>2.7.3</version>
-    </dependency>
-    <dependency>
-    	<groupId>org.powermock</groupId>
-    	<artifactId>powermock-api-easymock</artifactId>
-    	<version>1.4.11</version>
     </dependency>
     <dependency>
-    	<groupId>org.easymock</groupId>
-    	<artifactId>easymock</artifactId>
-    	<version>3.1</version>
-    </dependency>
-    <dependency>
-    	<groupId>net.sf.jopt-simple</groupId>
-    	<artifactId>jopt-simple</artifactId>
-    	<version>4.3</version>
+      <groupId>net.sf.jopt-simple</groupId>
+      <artifactId>jopt-simple</artifactId>
     </dependency>
   </dependencies>
 
--- a/pom.xml	Fri Mar 30 21:41:45 2012 +0200
+++ b/pom.xml	Mon Apr 02 14:46:36 2012 +0200
@@ -55,6 +55,18 @@
     <thermostat.build.directory>target</thermostat.build.directory>
     <thermostat.java.version>1.7</thermostat.java.version>
     <java.dir>/usr/share/java</java.dir>
+
+    <junit.version>4.10</junit.version>
+    <mockito.version>1.9.0</mockito.version>
+    <fest.version>1.2.1</fest.version>
+    <powermock.version>1.4.11</powermock.version>
+	<easymock.version>3.1</easymock.version>
+
+    <jdktools.version>1.7.0</jdktools.version>
+    <jfreechart.version>1.0.14</jfreechart.version>
+    <mongo-driver.version>2.7.3</mongo-driver.version>
+    <jopt.version>4.3</jopt.version>
+
   </properties>
 
   <modules>
@@ -106,4 +118,69 @@
       </plugins>
     </pluginManagement>
   </build>
+
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>junit</groupId>
+        <artifactId>junit</artifactId>
+        <version>${junit.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.mockito</groupId>
+        <artifactId>mockito-core</artifactId>
+        <version>${mockito.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.easytesting</groupId>
+        <artifactId>fest-swing</artifactId>
+        <version>${fest.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.powermock</groupId>
+        <artifactId>powermock-api-mockito</artifactId>
+        <version>${powermock.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.powermock</groupId>
+        <artifactId>powermock-module-junit4</artifactId>
+        <version>${powermock.version}</version>
+      </dependency>
+
+      <!-- TODO: We should get rid of the following 2 dependencies! -->
+      <dependency>
+    	<groupId>org.powermock</groupId>
+    	<artifactId>powermock-api-easymock</artifactId>
+    	<version>${powermock.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.easymock</groupId>
+        <artifactId>easymock</artifactId>
+        <version>${easymock.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.jfree</groupId>
+        <artifactId>jfreechart</artifactId>
+        <version>${jfreechart.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.mongodb</groupId>
+        <artifactId>mongo-java-driver</artifactId>
+        <version>${mongo-driver.version}</version>
+      </dependency>
+      <dependency>
+    	<groupId>net.sf.jopt-simple</groupId>
+    	<artifactId>jopt-simple</artifactId>
+    	<version>${jopt.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>com.sun</groupId>
+        <artifactId>tools</artifactId>
+        <version>${jdktools.version}</version>
+      </dependency>
+    
+    </dependencies>
+  </dependencyManagement>
 </project>
--- a/tools/pom.xml	Fri Mar 30 21:41:45 2012 +0200
+++ b/tools/pom.xml	Mon Apr 02 14:46:36 2012 +0200
@@ -56,13 +56,11 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.10</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
-      <version>1.9.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>