Mercurial > hg > release > thermostat-1.0

changeset 1293:64d12b250c46

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Specify version properties for both, hc-client and hc-core. Reviewed-by: omajid Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2013-October/008591.html
author Severin Gehwolf <sgehwolf@redhat.com>
date Wed, 30 Oct 2013 14:32:31 +0100
parents e097ed12e41f
children cf49a3a699bd
files client/command/pom.xml distribution/config/commands/agent.properties distribution/config/commands/clean-data.properties distribution/config/commands/connect.properties distribution/config/commands/gui.properties distribution/config/commands/list-vms.properties distribution/config/commands/ping.properties distribution/config/commands/vm-info.properties distribution/config/commands/vm-stat.properties pom.xml vm-heap-analysis/distribution/thermostat-plugin.xml web/client/pom.xml
diffstat 12 files changed, 35 insertions(+), 34 deletions(-) [+]
line wrap: on
line diff
--- a/client/command/pom.xml	Mon Oct 28 15:30:44 2013 +0100
+++ b/client/command/pom.xml	Wed Oct 30 14:32:31 2013 +0100
@@ -112,7 +112,7 @@
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpclient-osgi</artifactId>
-      <version>${httpcomponents.version}</version>
+      <version>${httpcomponents.client.version}</version>
     </dependency>
     
   </dependencies>
--- a/distribution/config/commands/agent.properties	Mon Oct 28 15:30:44 2013 +0100
+++ b/distribution/config/commands/agent.properties	Wed Oct 30 14:32:31 2013 +0100
@@ -1,8 +1,8 @@
 bundles = com.redhat.thermostat.agent.core=${project.version}, \
           com.redhat.thermostat.web.common=${project.version}, \
           com.redhat.thermostat.web.client=${project.version}, \
-          org.apache.httpcomponents.httpcore=${httpcomponents.version}, \
-          org.apache.httpcomponents.httpclient=${httpcomponents.version}, \
+          org.apache.httpcomponents.httpcore=${httpcomponents.core.version}, \
+          org.apache.httpcomponents.httpclient=${httpcomponents.client.version}, \
           com.google.gson=${gson.version}, \
           com.redhat.thermostat.process=${project.version}, \
           com.redhat.thermostat.common.core=${project.version}, \
--- a/distribution/config/commands/clean-data.properties	Mon Oct 28 15:30:44 2013 +0100
+++ b/distribution/config/commands/clean-data.properties	Wed Oct 30 14:32:31 2013 +0100
@@ -2,8 +2,8 @@
           com.redhat.thermostat.storage.mongodb=${project.version}, \
           com.redhat.thermostat.web.common=${project.version}, \
           com.redhat.thermostat.web.client=${project.version}, \
-          org.apache.httpcomponents.httpcore=${httpcomponents.version}, \
-          org.apache.httpcomponents.httpclient=${httpcomponents.version}, \
+          org.apache.httpcomponents.httpcore=${httpcomponents.core.version}, \
+          org.apache.httpcomponents.httpclient=${httpcomponents.client.version}, \
           com.google.gson=${gson.version}, \
           org.mongodb.mongo-java-driver=${mongo-driver.osgi-version}, \
           org.apache.commons.beanutils=${commons-beanutils.version}, \
--- a/distribution/config/commands/connect.properties	Mon Oct 28 15:30:44 2013 +0100
+++ b/distribution/config/commands/connect.properties	Wed Oct 30 14:32:31 2013 +0100
@@ -8,8 +8,8 @@
           org.apache.commons.codec=${commons-codec.osgi-version}, \
           org.apache.commons.collections=${commons-collections.version}, \
           org.apache.commons.logging=${commons-logging.version}, \
-          org.apache.httpcomponents.httpcore=${httpcomponents.version}, \
-          org.apache.httpcomponents.httpclient=${httpcomponents.version}, \
+          org.apache.httpcomponents.httpcore=${httpcomponents.core.version}, \
+          org.apache.httpcomponents.httpclient=${httpcomponents.client.version}, \
           com.google.gson=${gson.version}
 
 description = persistently connect to storage
--- a/distribution/config/commands/gui.properties	Mon Oct 28 15:30:44 2013 +0100
+++ b/distribution/config/commands/gui.properties	Wed Oct 30 14:32:31 2013 +0100
@@ -18,8 +18,8 @@
           com.redhat.thermostat.filter.livingvm.core=${project.version}, \
           com.redhat.thermostat.filter.livingvm.swing=${project.version}, \
           com.redhat.thermostat.process=${project.version}, \
-          org.apache.httpcomponents.httpcore=${httpcomponents.version}, \
-          org.apache.httpcomponents.httpclient=${httpcomponents.version}, \
+          org.apache.httpcomponents.httpcore=${httpcomponents.core.version}, \
+          org.apache.httpcomponents.httpclient=${httpcomponents.client.version}, \
           org.jboss.netty=${netty.version}
 
 description = launches the GUI client
--- a/distribution/config/commands/list-vms.properties	Mon Oct 28 15:30:44 2013 +0100
+++ b/distribution/config/commands/list-vms.properties	Wed Oct 30 14:32:31 2013 +0100
@@ -2,8 +2,8 @@
           com.redhat.thermostat.storage.mongodb=${project.version}, \
           com.redhat.thermostat.web.common=${project.version}, \
           com.redhat.thermostat.web.client=${project.version}, \
-          org.apache.httpcomponents.httpcore=${httpcomponents.version}, \
-          org.apache.httpcomponents.httpclient=${httpcomponents.version}, \
+          org.apache.httpcomponents.httpcore=${httpcomponents.core.version}, \
+          org.apache.httpcomponents.httpclient=${httpcomponents.client.version}, \
           com.google.gson=${gson.version}, \
           org.mongodb.mongo-java-driver=${mongo-driver.osgi-version}, \
           org.apache.commons.beanutils=${commons-beanutils.version}, \
--- a/distribution/config/commands/ping.properties	Mon Oct 28 15:30:44 2013 +0100
+++ b/distribution/config/commands/ping.properties	Wed Oct 30 14:32:31 2013 +0100
@@ -3,8 +3,8 @@
           com.redhat.thermostat.storage.mongodb=${project.version}, \
           com.redhat.thermostat.web.common=${project.version}, \
           com.redhat.thermostat.web.client=${project.version}, \
-          org.apache.httpcomponents.httpcore=${httpcomponents.version}, \
-          org.apache.httpcomponents.httpclient=${httpcomponents.version}, \
+          org.apache.httpcomponents.httpcore=${httpcomponents.core.version}, \
+          org.apache.httpcomponents.httpclient=${httpcomponents.client.version}, \
           com.google.gson=${gson.version}, \
           org.mongodb.mongo-java-driver=${mongo-driver.osgi-version}, \
           org.apache.commons.beanutils=${commons-beanutils.version}, \
--- a/distribution/config/commands/vm-info.properties	Mon Oct 28 15:30:44 2013 +0100
+++ b/distribution/config/commands/vm-info.properties	Wed Oct 30 14:32:31 2013 +0100
@@ -2,8 +2,8 @@
           com.redhat.thermostat.storage.mongodb=${project.version}, \
           com.redhat.thermostat.web.common=${project.version}, \
           com.redhat.thermostat.web.client=${project.version}, \
-          org.apache.httpcomponents.httpcore=${httpcomponents.version}, \
-          org.apache.httpcomponents.httpclient=${httpcomponents.version}, \
+          org.apache.httpcomponents.httpcore=${httpcomponents.core.version}, \
+          org.apache.httpcomponents.httpclient=${httpcomponents.client.version}, \
           com.google.gson=${gson.version}, \
           org.mongodb.mongo-java-driver=${mongo-driver.osgi-version}, \
           org.apache.commons.beanutils=${commons-beanutils.version}, \
--- a/distribution/config/commands/vm-stat.properties	Mon Oct 28 15:30:44 2013 +0100
+++ b/distribution/config/commands/vm-stat.properties	Wed Oct 30 14:32:31 2013 +0100
@@ -2,8 +2,8 @@
           com.redhat.thermostat.storage.mongodb=${project.version}, \
           com.redhat.thermostat.web.common=${project.version}, \
           com.redhat.thermostat.web.client=${project.version}, \
-          org.apache.httpcomponents.httpcore=${httpcomponents.version}, \
-          org.apache.httpcomponents.httpclient=${httpcomponents.version}, \
+          org.apache.httpcomponents.httpcore=${httpcomponents.core.version}, \
+          org.apache.httpcomponents.httpclient=${httpcomponents.client.version}, \
           com.google.gson=${gson.version}, \
           org.mongodb.mongo-java-driver=${mongo-driver.osgi-version}, \
           org.apache.commons.beanutils=${commons-beanutils.version}, \
--- a/pom.xml	Mon Oct 28 15:30:44 2013 +0100
+++ b/pom.xml	Wed Oct 30 14:32:31 2013 +0100
@@ -192,7 +192,8 @@
     <felix.framework.version>4.2.0</felix.framework.version>
 
     <netty.version>3.2.4.Final</netty.version>
-    <httpcomponents.version>4.1.2</httpcomponents.version>
+    <httpcomponents.core.version>4.1.2</httpcomponents.core.version>
+    <httpcomponents.client.version>4.1.2</httpcomponents.client.version>
     <gson.version>2.2.2</gson.version>
     <jetty.version>8.1.5.v20120716</jetty.version>
     <javax.servlet.version>2.5</javax.servlet.version>
--- a/vm-heap-analysis/distribution/thermostat-plugin.xml	Mon Oct 28 15:30:44 2013 +0100
+++ b/vm-heap-analysis/distribution/thermostat-plugin.xml	Wed Oct 30 14:32:31 2013 +0100
@@ -84,8 +84,8 @@
         <bundle><symbolic-name>org.apache.commons.codec</symbolic-name><version>${commons-codec.osgi-version}</version></bundle>
         <bundle><symbolic-name>org.apache.commons.collections</symbolic-name><version>${commons-collections.version}</version></bundle>
         <bundle><symbolic-name>org.apache.commons.logging</symbolic-name><version>${commons-logging.version}</version></bundle>
-        <bundle><symbolic-name>org.apache.httpcomponents.httpcore</symbolic-name><version>${httpcomponents.version}</version></bundle>
-        <bundle><symbolic-name>org.apache.httpcomponents.httpclient</symbolic-name><version>${httpcomponents.version}</version></bundle>
+        <bundle><symbolic-name>org.apache.httpcomponents.httpcore</symbolic-name><version>${httpcomponents.core.version}</version></bundle>
+        <bundle><symbolic-name>org.apache.httpcomponents.httpclient</symbolic-name><version>${httpcomponents.client.version}</version></bundle>
         <bundle><symbolic-name>com.google.gson</symbolic-name><version>${gson.version}</version></bundle>
         <bundle><symbolic-name>org.jboss.netty</symbolic-name><version>${netty.version}</version></bundle>
       </bundles>
@@ -137,8 +137,8 @@
         <bundle><symbolic-name>org.apache.commons.codec</symbolic-name><version>${commons-codec.osgi-version}</version></bundle>
         <bundle><symbolic-name>org.apache.commons.collections</symbolic-name><version>${commons-collections.version}</version></bundle>
         <bundle><symbolic-name>org.apache.commons.logging</symbolic-name><version>${commons-logging.version}</version></bundle>
-        <bundle><symbolic-name>org.apache.httpcomponents.httpcore</symbolic-name><version>${httpcomponents.version}</version></bundle>
-        <bundle><symbolic-name>org.apache.httpcomponents.httpclient</symbolic-name><version>${httpcomponents.version}</version></bundle>
+        <bundle><symbolic-name>org.apache.httpcomponents.httpcore</symbolic-name><version>${httpcomponents.core.version}</version></bundle>
+        <bundle><symbolic-name>org.apache.httpcomponents.httpclient</symbolic-name><version>${httpcomponents.client.version}</version></bundle>
         <bundle><symbolic-name>com.google.gson</symbolic-name><version>${gson.version}</version></bundle>
         <bundle><symbolic-name>org.jboss.netty</symbolic-name><version>${netty.version}</version></bundle>
       </bundles>
@@ -193,8 +193,8 @@
         <bundle><symbolic-name>org.apache.commons.codec</symbolic-name><version>${commons-codec.osgi-version}</version></bundle>
         <bundle><symbolic-name>org.apache.commons.collections</symbolic-name><version>${commons-collections.version}</version></bundle>
         <bundle><symbolic-name>org.apache.commons.logging</symbolic-name><version>${commons-logging.version}</version></bundle>
-        <bundle><symbolic-name>org.apache.httpcomponents.httpcore</symbolic-name><version>${httpcomponents.version}</version></bundle>
-        <bundle><symbolic-name>org.apache.httpcomponents.httpclient</symbolic-name><version>${httpcomponents.version}</version></bundle>
+        <bundle><symbolic-name>org.apache.httpcomponents.httpcore</symbolic-name><version>${httpcomponents.core.version}</version></bundle>
+        <bundle><symbolic-name>org.apache.httpcomponents.httpclient</symbolic-name><version>${httpcomponents.client.version}</version></bundle>
         <bundle><symbolic-name>com.google.gson</symbolic-name><version>${gson.version}</version></bundle>
         <bundle><symbolic-name>org.jboss.netty</symbolic-name><version>${netty.version}</version></bundle>
       </bundles>
@@ -243,8 +243,8 @@
         <bundle><symbolic-name>org.apache.commons.codec</symbolic-name><version>${commons-codec.osgi-version}</version></bundle>
         <bundle><symbolic-name>org.apache.commons.collections</symbolic-name><version>${commons-collections.version}</version></bundle>
         <bundle><symbolic-name>org.apache.commons.logging</symbolic-name><version>${commons-logging.version}</version></bundle>
-        <bundle><symbolic-name>org.apache.httpcomponents.httpcore</symbolic-name><version>${httpcomponents.version}</version></bundle>
-        <bundle><symbolic-name>org.apache.httpcomponents.httpclient</symbolic-name><version>${httpcomponents.version}</version></bundle>
+        <bundle><symbolic-name>org.apache.httpcomponents.httpcore</symbolic-name><version>${httpcomponents.core.version}</version></bundle>
+        <bundle><symbolic-name>org.apache.httpcomponents.httpclient</symbolic-name><version>${httpcomponents.client.version}</version></bundle>
         <bundle><symbolic-name>com.google.gson</symbolic-name><version>${gson.version}</version></bundle>
         <bundle><symbolic-name>org.jboss.netty</symbolic-name><version>${netty.version}</version></bundle>
       </bundles>
@@ -293,8 +293,8 @@
         <bundle><symbolic-name>org.apache.commons.codec</symbolic-name><version>${commons-codec.osgi-version}</version></bundle>
         <bundle><symbolic-name>org.apache.commons.collections</symbolic-name><version>${commons-collections.version}</version></bundle>
         <bundle><symbolic-name>org.apache.commons.logging</symbolic-name><version>${commons-logging.version}</version></bundle>
-        <bundle><symbolic-name>org.apache.httpcomponents.httpcore</symbolic-name><version>${httpcomponents.version}</version></bundle>
-        <bundle><symbolic-name>org.apache.httpcomponents.httpclient</symbolic-name><version>${httpcomponents.version}</version></bundle>
+        <bundle><symbolic-name>org.apache.httpcomponents.httpcore</symbolic-name><version>${httpcomponents.core.version}</version></bundle>
+        <bundle><symbolic-name>org.apache.httpcomponents.httpclient</symbolic-name><version>${httpcomponents.client.version}</version></bundle>
         <bundle><symbolic-name>com.google.gson</symbolic-name><version>${gson.version}</version></bundle>
         <bundle><symbolic-name>org.jboss.netty</symbolic-name><version>${netty.version}</version></bundle>
       </bundles>
@@ -343,8 +343,8 @@
         <bundle><symbolic-name>org.apache.commons.codec</symbolic-name><version>${commons-codec.osgi-version}</version></bundle>
         <bundle><symbolic-name>org.apache.commons.collections</symbolic-name><version>${commons-collections.version}</version></bundle>
         <bundle><symbolic-name>org.apache.commons.logging</symbolic-name><version>${commons-logging.version}</version></bundle>
-        <bundle><symbolic-name>org.apache.httpcomponents.httpcore</symbolic-name><version>${httpcomponents.version}</version></bundle>
-        <bundle><symbolic-name>org.apache.httpcomponents.httpclient</symbolic-name><version>${httpcomponents.version}</version></bundle>
+        <bundle><symbolic-name>org.apache.httpcomponents.httpcore</symbolic-name><version>${httpcomponents.core.version}</version></bundle>
+        <bundle><symbolic-name>org.apache.httpcomponents.httpclient</symbolic-name><version>${httpcomponents.client.version}</version></bundle>
         <bundle><symbolic-name>com.google.gson</symbolic-name><version>${gson.version}</version></bundle>
         <bundle><symbolic-name>org.jboss.netty</symbolic-name><version>${netty.version}</version></bundle>
       </bundles>
@@ -386,8 +386,8 @@
         <bundle><symbolic-name>org.apache.commons.codec</symbolic-name><version>${commons-codec.osgi-version}</version></bundle>
         <bundle><symbolic-name>org.apache.commons.collections</symbolic-name><version>${commons-collections.version}</version></bundle>
         <bundle><symbolic-name>org.apache.commons.logging</symbolic-name><version>${commons-logging.version}</version></bundle>
-        <bundle><symbolic-name>org.apache.httpcomponents.httpcore</symbolic-name><version>${httpcomponents.version}</version></bundle>
-        <bundle><symbolic-name>org.apache.httpcomponents.httpclient</symbolic-name><version>${httpcomponents.version}</version></bundle>
+        <bundle><symbolic-name>org.apache.httpcomponents.httpcore</symbolic-name><version>${httpcomponents.core.version}</version></bundle>
+        <bundle><symbolic-name>org.apache.httpcomponents.httpclient</symbolic-name><version>${httpcomponents.client.version}</version></bundle>
         <bundle><symbolic-name>com.google.gson</symbolic-name><version>${gson.version}</version></bundle>
         <bundle><symbolic-name>org.jboss.netty</symbolic-name><version>${netty.version}</version></bundle>
       </bundles>
--- a/web/client/pom.xml	Mon Oct 28 15:30:44 2013 +0100
+++ b/web/client/pom.xml	Wed Oct 30 14:32:31 2013 +0100
@@ -102,12 +102,12 @@
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpclient-osgi</artifactId>
-      <version>${httpcomponents.version}</version>
+      <version>${httpcomponents.client.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpcore-osgi</artifactId>
-      <version>${httpcomponents.version}</version>
+      <version>${httpcomponents.core.version}</version>
     </dependency>
 
     <dependency>