Mercurial > hg > thermostat-ng > agent

changeset 2765:ef101bb72531

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Refactor package names, use new thermostat-common package from Maven Central These changes allow the agent to build pulling thermostat-common from Maven Central This patch: - renames the existing thermostat-common package to thermostat-agent- common. - use thermostat-common version 0.1.0 everywhere thermostat-lang- schema package was used - update the Gson package to 2.6.2 to conform with the version used in thermostat-common Reviewed-by: sgehwolf Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2017-September/025214.html
author Simon Tooke <stooke@redhat.com>
date Fri, 29 Sep 2017 10:45:11 -0400
parents d624d92d95ca
children 4761e39f2d8a
files common/core/pom.xml common/plugin/pom.xml common/pom.xml common/portability/pom.xml common/test/pom.xml main/src/main/resources/com/redhat/thermostat/main/internal/bootstrapbundles.properties plugins/jvm-overview/agent/pom.xml pom.xml storage/core/pom.xml
diffstat 9 files changed, 16 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/common/core/pom.xml	Wed Sep 20 12:23:54 2017 +0200
+++ b/common/core/pom.xml	Fri Sep 29 10:45:11 2017 -0400
@@ -41,7 +41,7 @@
 
   <parent>
     <groupId>com.redhat.thermostat</groupId>
-    <artifactId>thermostat-common</artifactId>
+    <artifactId>thermostat-agent-common</artifactId>
     <version>1.99.12-SNAPSHOT</version>
   </parent>
   
--- a/common/plugin/pom.xml	Wed Sep 20 12:23:54 2017 +0200
+++ b/common/plugin/pom.xml	Fri Sep 29 10:45:11 2017 -0400
@@ -41,7 +41,7 @@
 
   <parent>
     <groupId>com.redhat.thermostat</groupId>
-    <artifactId>thermostat-common</artifactId>
+    <artifactId>thermostat-agent-common</artifactId>
     <version>1.99.12-SNAPSHOT</version>
   </parent>
   
--- a/common/pom.xml	Wed Sep 20 12:23:54 2017 +0200
+++ b/common/pom.xml	Fri Sep 29 10:45:11 2017 -0400
@@ -45,7 +45,7 @@
     <version>1.99.12-SNAPSHOT</version>
   </parent>
 
-  <artifactId>thermostat-common</artifactId>
+  <artifactId>thermostat-agent-common</artifactId>
   <packaging>pom</packaging>
 
   <name>Thermostat Common</name>
--- a/common/portability/pom.xml	Wed Sep 20 12:23:54 2017 +0200
+++ b/common/portability/pom.xml	Fri Sep 29 10:45:11 2017 -0400
@@ -41,7 +41,7 @@
 
     <parent>
         <groupId>com.redhat.thermostat</groupId>
-        <artifactId>thermostat-common</artifactId>
+        <artifactId>thermostat-agent-common</artifactId>
         <version>1.99.12-SNAPSHOT</version>
     </parent>
 
--- a/common/test/pom.xml	Wed Sep 20 12:23:54 2017 +0200
+++ b/common/test/pom.xml	Fri Sep 29 10:45:11 2017 -0400
@@ -41,7 +41,7 @@
 
   <parent>
     <groupId>com.redhat.thermostat</groupId>
-    <artifactId>thermostat-common</artifactId>
+    <artifactId>thermostat-agent-common</artifactId>
     <version>1.99.12-SNAPSHOT</version>
   </parent>
   
--- a/main/src/main/resources/com/redhat/thermostat/main/internal/bootstrapbundles.properties	Wed Sep 20 12:23:54 2017 +0200
+++ b/main/src/main/resources/com/redhat/thermostat/main/internal/bootstrapbundles.properties	Fri Sep 29 10:45:11 2017 -0400
@@ -3,7 +3,7 @@
         thermostat-common-core-@project.version@.jar, \
         thermostat-plugin-validator-@project.version@.jar, \
         thermostat-launcher-@project.version@.jar, \
-        thermostat-lang-schema-@project.version@.jar, \
+        thermostat-common-@thermostat.common.version@.jar, \
         commons-cli-@commons-cli.version@.jar, \
         org.apache.felix.scr-@felix.scr.version@.jar, \
         gson-@gson.version@.jar, \
--- a/plugins/jvm-overview/agent/pom.xml	Wed Sep 20 12:23:54 2017 +0200
+++ b/plugins/jvm-overview/agent/pom.xml	Fri Sep 29 10:45:11 2017 -0400
@@ -127,9 +127,9 @@
 
   <dependencies>
     <dependency>
-      <groupId>com.redhat.thermostat.lang.schema</groupId>
-      <artifactId>thermostat-lang-schema</artifactId>
-      <version>${project.version}</version>
+      <groupId>com.redhat.thermostat</groupId>
+      <artifactId>thermostat-common</artifactId>
+      <version>${thermostat.common.version}</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
--- a/pom.xml	Wed Sep 20 12:23:54 2017 +0200
+++ b/pom.xml	Fri Sep 29 10:45:11 2017 -0400
@@ -234,6 +234,9 @@
     <!-- directory into which the exploded web archive should be deployed to -->
     <thermostat.web.deploy.dir>${thermostat.build.directory}/${project.build.finalName}</thermostat.web.deploy.dir>
 
+    <!-- common Thermostat package from base repo (loaded from Maven central) -->
+    <thermostat.common.version>0.1.0</thermostat.common.version>
+
     <junit.version>4.10</junit.version>
     <mockito.version>1.9.5</mockito.version>
     <fest.version>1.2.1</fest.version>
@@ -304,7 +307,7 @@
 
     <httpcomponents.core.version>4.3.2</httpcomponents.core.version>
     <httpcomponents.client.version>4.3.4</httpcomponents.client.version>
-    <gson.version>2.2.2</gson.version>
+    <gson.version>2.6.2</gson.version>
     <jetty.version>9.1.0.v20131115</jetty.version>
     <jetty-schemas.version>3.1.M0</jetty-schemas.version>
     <!-- web-endpoint-plugin requires the javax.servlet bundle to be started.
--- a/storage/core/pom.xml	Wed Sep 20 12:23:54 2017 +0200
+++ b/storage/core/pom.xml	Fri Sep 29 10:45:11 2017 -0400
@@ -93,9 +93,9 @@
   
   <dependencies>
     <dependency>
-      <groupId>com.redhat.thermostat.lang.schema</groupId>
-      <artifactId>thermostat-lang-schema</artifactId>
-      <version>${project.version}</version>
+      <groupId>com.redhat.thermostat</groupId>
+      <artifactId>thermostat-common</artifactId>
+      <version>${thermostat.common.version}</version>
     </dependency>
     <dependency>
       <groupId>org.mockito</groupId>