Modify rhq-installer-util, rhq-server-control and rhq-server-metrics…

… for independent versioning.
rhq-project · Oct 3, 2014 · 702b1a5 · 702b1a5
1 parent f6895d5
commit 702b1a5
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 19 deletions.
diff --git a/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml b/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml
@@ -228,7 +228,7 @@
                dest="${jboss.modules.dir}" />
 
         <echo>Adding installer module to ${jboss.modules.dir} ...</echo>
-        <unzip src="${settings.localRepository}/org/rhq/rhq-installer-util/${project.version}/rhq-installer-util-${project.version}.zip"
+        <unzip src="${settings.localRepository}/org/rhq/rhq-installer-util/${rhq-installer-util.version}/rhq-installer-util-${rhq-installer-util.version}.zip"
                dest="${jboss.modules.dir}" />
 
         <echo>Adding Cassandra installer module to ${jboss.modules.dir}...</echo>
@@ -240,7 +240,7 @@
              dest="${jboss.modules.dir}"/>
 
         <echo>Adding RHQ Server Control module to ${jboss.modules.dir}...</echo>
-        <unzip src="${settings.localRepository}/org/rhq/rhq-server-control/${project.version}/rhq-server-control-${project.version}.zip"
+        <unzip src="${settings.localRepository}/org/rhq/rhq-server-control/${rhq-server-control.version}/rhq-server-control-${rhq-server-control.version}.zip"
                dest="${jboss.modules.dir}"/>
 
         <echo>Injecting RHQ JDR plugin to JBoss JDR module ${jboss.home}/modules</echo>

diff --git a/modules/enterprise/server/data-migration/pom.xml b/modules/enterprise/server/data-migration/pom.xml
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>rhq-server-metrics</artifactId>
-      <version>${project.version}</version>
+      <version>${rhq-server-metrics.version}</version>
     </dependency>
 
     <dependency>
@@ -147,7 +147,7 @@
                 <artifactItem>
                   <groupId>${project.groupId}</groupId>
                   <artifactId>rhq-server-metrics</artifactId>
-                  <version>${project.version}</version>
+                  <version>${rhq-server-metrics.version}</version>
                 </artifactItem>
                 <artifactItem>
                   <groupId>${project.groupId}</groupId>

diff --git a/modules/enterprise/server/data-migration/src/main/resources/module/main/module.xml b/modules/enterprise/server/data-migration/src/main/resources/module/main/module.xml
@@ -6,7 +6,7 @@
   <resources>
     <resource-root path="${project.build.finalName}.jar"/>
     <resource-root path="rhq-core-util-${rhq-core-util.version}.jar"/>
-    <resource-root path="rhq-server-metrics-${project.version}.jar"/>
+    <resource-root path="rhq-server-metrics-${rhq-server-metrics.version}.jar"/>
     <resource-root path="joda-time-${joda-time.version}.jar"/>
     <resource-root path="hibernate-core-${hibernate.version}.jar"/>
     <resource-root path="hibernate-entitymanager-${hibernate.version}.jar"/>

diff --git a/modules/enterprise/server/installer/pom.xml b/modules/enterprise/server/installer/pom.xml
@@ -12,6 +12,7 @@
 
     <groupId>org.rhq</groupId>
     <artifactId>rhq-installer-util</artifactId>
+    <version>4.9.0.JON320GA</version>
     <packaging>jar</packaging>
 
     <name>RHQ Enterprise Installer Utility</name>
@@ -39,14 +40,14 @@
         <dependency>
             <groupId>org.rhq</groupId>
             <artifactId>rhq-core-dbutils</artifactId>
-            <version>${project.version}</version>
+            <version>${rhq-core-dbutils.version}</version>
         </dependency>
 
         <dependency>
             <!-- need this solely for SecurityUtils -->
             <groupId>org.rhq</groupId>
             <artifactId>rhq-enterprise-comm</artifactId>
-            <version>${project.version}</version>
+            <version>${rhq-enterprise-comm.version}</version>
         </dependency>
 
         <dependency>
@@ -58,7 +59,7 @@
       <dependency>
         <groupId>org.rhq</groupId>
         <artifactId>rhq-cassandra-schema</artifactId>
-        <version>${project.version}</version>
+        <version>${rhq-cassandra-schema.version}</version>
       </dependency>
 
         <dependency>
@@ -190,12 +191,12 @@
                                 <artifactItem>
                                   <groupId>org.rhq</groupId>
                                   <artifactId>rhq-cassandra-util</artifactId>
-                                  <version>${project.version}</version>
+                                  <version>${rhq-cassandra-util.version}</version>
                                 </artifactItem>
                                 <artifactItem>
                                   <groupId>org.rhq</groupId>
                                   <artifactId>rhq-cassandra-ccm-core</artifactId>
-                                  <version>${project.version}</version>
+                                  <version>${rhq-cassandra-ccm-core.version}</version>
                                 </artifactItem>
                                 <artifactItem>
                                 <groupId>joda-time</groupId>

diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml
@@ -134,7 +134,7 @@
     <dependency>
       <groupId>org.rhq</groupId>
       <artifactId>rhq-server-metrics</artifactId>
-      <version>${project.parent.version}</version>
+      <version>${rhq-server-metrics.version}</version>
       <exclusions>
         <exclusion>
           <groupId>org.hyperic</groupId>

diff --git a/modules/enterprise/server/server-control/pom.xml b/modules/enterprise/server/server-control/pom.xml
@@ -11,6 +11,7 @@
   </parent>
 
   <artifactId>rhq-server-control</artifactId>
+  <version>4.9.0.JON320GA</version>
   <name>RHQ Server Control</name>
   <packaging>jar</packaging>
 
@@ -29,13 +30,13 @@
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>rhq-installer-util</artifactId>
-      <version>${project.version}</version>
+      <version>${rhq-installer-util.version}</version>
     </dependency>
 
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>rhq-cassandra-installer</artifactId>
-      <version>${project.version}</version>
+      <version>${rhq-cassandra-installer.version}</version>
     </dependency>
 
     <dependency>
@@ -119,12 +120,12 @@
                 <artifactItem>
                   <groupId>${project.groupId}</groupId>
                   <artifactId>rhq-installer-util</artifactId>
-                  <version>${project.version}</version>
+                  <version>${rhq-installer-util.version}</version>
                 </artifactItem>
                 <artifactItem>
                   <groupId>${project.groupId}</groupId>
                   <artifactId>rhq-cassandra-installer</artifactId>
-                  <version>${project.version}</version>
+                  <version>${rhq-cassandra-installer.version}</version>
                 </artifactItem>
                 <artifactItem>
                   <groupId>org.rhq</groupId>

diff --git a/modules/enterprise/server/server-control/src/main/resources/module/main/module.xml b/modules/enterprise/server/server-control/src/main/resources/module/main/module.xml
@@ -7,7 +7,7 @@
     <resource-root path="${project.build.finalName}.jar"/>
     <resource-root path="rhq-core-util-${rhq-core-util.version}.jar"/>
     <resource-root path="rhq-jboss-as-dmr-client-${rhq-jboss-as-dmr-client.version}.jar"/>
-    <resource-root path="rhq-installer-util-${project.version}.jar"/>
+    <resource-root path="rhq-installer-util-${rhq-installer-util.version}.jar"/>
     <resource-root path="rhq-cassandra-installer-${project.version}.jar"/>
   </resources>
 

diff --git a/modules/enterprise/server/server-metrics/pom.xml b/modules/enterprise/server/server-metrics/pom.xml
@@ -36,6 +36,7 @@
   </parent>
 
   <artifactId>rhq-server-metrics</artifactId>
+  <version>4.9.0.JON320GA</version>
   <name>RHQ Server Metrics</name>
 
   <properties>
@@ -109,14 +110,14 @@
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>rhq-cassandra-ccm-testng</artifactId>
-      <version>${project.version}</version>
+      <version>${rhq-cassandra-ccm-testng.version}</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>test-utils</artifactId>
-      <version>${project.version}</version>
+      <version>${test-utils.version}</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>

diff --git a/modules/helpers/metrics-simulator/pom.xml b/modules/helpers/metrics-simulator/pom.xml
@@ -36,7 +36,7 @@
     <dependency>
       <groupId>org.rhq</groupId>
       <artifactId>rhq-server-metrics</artifactId>
-      <version>${project.version}</version>
+      <version>${rhq-server-metrics.version}</version>
     </dependency>
 
     <dependency>