Adding independent versioning for rhq-core-client-api and rhq-jmx-pl…

…ugin.
rhq-project · Oct 3, 2014 · 63511b8 · 63511b8
1 parent 960aea2
commit 63511b8
Show file tree

Hide file tree

Showing 39 changed files with 58 additions and 56 deletions.
diff --git a/modules/core/arquillian-integration/archive/pom.xml b/modules/core/arquillian-integration/archive/pom.xml
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>org.rhq</groupId>
             <artifactId>rhq-core-client-api</artifactId>
-            <version>${project.version}</version>
+            <version>${rhq-core-client-api.version}</version>
         </dependency>
 
         <dependency>

diff --git a/modules/core/client-api/pom.xml b/modules/core/client-api/pom.xml
@@ -11,6 +11,7 @@
 
   <groupId>org.rhq</groupId>
   <artifactId>rhq-core-client-api</artifactId>
+  <version>4.9.0.JON320GA</version>
   <packaging>jar</packaging>
 
   <name>RHQ Client API</name>
@@ -39,14 +40,14 @@
     <dependency>
       <groupId>${rhq.groupId}</groupId>
       <artifactId>rhq-core-comm-api</artifactId>
-      <version>${project.version}</version>
+      <version>${rhq-core-comm-api.version}</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>${rhq.groupId}</groupId>
       <artifactId>rhq-common-drift</artifactId>
-      <version>${project.version}</version>
+      <version>${rhq-common-drift.version}</version>
       <scope>provided</scope>
     </dependency>
 

diff --git a/modules/core/gui/pom.xml b/modules/core/gui/pom.xml
@@ -31,7 +31,7 @@
       <dependency>
          <groupId>${rhq.groupId}</groupId>
          <artifactId>rhq-core-client-api</artifactId>
-         <version>${project.version}</version>
+         <version>${rhq-core-client-api.version}</version>
          <scope>provided</scope> <!-- by ${rhq.earName} -->
       </dependency>
 

diff --git a/modules/core/plugin-container-itest/pom.xml b/modules/core/plugin-container-itest/pom.xml
@@ -43,7 +43,7 @@
       <dependency>
          <groupId>${rhq.groupId}</groupId>
          <artifactId>rhq-core-client-api</artifactId>
-         <version>${project.version}</version>
+         <version>${rhq-core-client-api.version}</version>
          <scope>test</scope>
       </dependency>
 

diff --git a/modules/core/plugindoc/ant-run.xml b/modules/core/plugindoc/ant-run.xml
@@ -15,7 +15,7 @@
       <!-- include our own thirdparty libraries -->
       <fileset dir="${settings.localRepository}" id="run.classpath.fileset">
          <include name="org/rhq/rhq-core-domain/${rhq-core-domain.version}/rhq-core-domain-${rhq-core-domain.version}.jar" />
-         <include name="org/rhq/rhq-core-client-api/${project.version}/rhq-core-client-api-${project.version}.jar" />
+         <include name="org/rhq/rhq-core-client-api/${rhq-core-client-api.version}/rhq-core-client-api-${rhq-core-client-api.version}.jar" />
          <include name="commons-logging/commons-logging/1.1.0.jboss/commons-logging-1.1.0.jboss.jar" />
          <include name="commons-collections/commons-collections/3.2/commons-collections-3.2.jar" />
          <include name="commons-lang/commons-lang/2.4/commons-lang-2.4.jar" />

diff --git a/modules/core/plugindoc/pom.xml b/modules/core/plugindoc/pom.xml
@@ -24,7 +24,7 @@
       <dependency>
          <groupId>${rhq.groupId}</groupId>
          <artifactId>rhq-core-client-api</artifactId>
-         <version>${project.version}</version>
+         <version>${rhq-core-client-api.version}</version>
       </dependency>
 
       <dependency>

diff --git a/modules/enterprise/agent/ant-run.xml b/modules/enterprise/agent/ant-run.xml
@@ -62,7 +62,7 @@ Ant Script that provides ways to package the Agent.
          <include name="org/rhq/rhq-core-domain/${rhq-core-domain.version}/rhq-core-domain-${rhq-core-domain.version}.jar" />
          <include name="org/rhq/rhq-core-plugin-api/${rhq-core-plugin-api.version}/rhq-core-plugin-api-${rhq-core-plugin-api.version}.jar" />
          <include name="org/rhq/rhq-core-plugin-container/${rhq-core-plugin-container.version}/rhq-core-plugin-container-${rhq-core-plugin-container.version}.jar" />
-         <include name="org/rhq/rhq-core-client-api/${project.version}/rhq-core-client-api-${project.version}.jar" />
+         <include name="org/rhq/rhq-core-client-api/${rhq-core-client-api.version}/rhq-core-client-api-${rhq-core-client-api.version}.jar" />
          <include name="org/rhq/rhq-common-drift/${project.version}/rhq-common-drift-${project.version}.jar"/>
          <include name="commons-io/commons-io/1.4/commons-io-1.4.jar"/>
          <include name="net/sf/trove4j/trove4j/${trove.version}/trove4j-${trove.version}.jar"/>
@@ -100,7 +100,7 @@ Ant Script that provides ways to package the Agent.
       <!--
       <include name="org/rhq/rhq-agent-plugin/${project.version}/rhq-agent-plugin-${project.version}.jar"/>
       <include name="org/rhq/rhq-platform-plugin/${rhq-platform-plugin.version}/rhq-platform-plugin-${rhq-platform-plugin.version}.jar"/>
-      <include name="org/rhq/rhq-jmx-plugin/${project.version}/rhq-jmx-plugin-${project.version}.jar"/>
+      <include name="org/rhq/rhq-jmx-plugin/${rhq-jmx-plugin.version}/rhq-jmx-plugin-${rhq-jmx-plugin.version}.jar"/>
       <include name="org/rhq/rhq-apache-plugin/${project.version}/rhq-apache-plugin-${project.version}.jar"/>
       <include name="org/rhq/rhq-jbossas-plugin/${project.version}/rhq-jbossas-plugin-${project.version}.jar"/>
       <include name="org/rhq/rhq-tomcat-plugin/${project.version}/rhq-tomcat-plugin-${project.version}.jar"/>

diff --git a/modules/enterprise/agent/pom.xml b/modules/enterprise/agent/pom.xml
@@ -57,7 +57,7 @@
     <dependency>
       <groupId>org.rhq</groupId>
       <artifactId>rhq-core-client-api</artifactId>
-      <version>${project.version}</version>
+      <version>${rhq-core-client-api.version}</version>
     </dependency>
 
    <dependency>

diff --git a/modules/enterprise/binding/pom.xml b/modules/enterprise/binding/pom.xml
@@ -20,7 +20,7 @@
         <dependency>
            <groupId>${project.groupId}</groupId>
            <artifactId>rhq-scripting-api</artifactId>
-           <version>${project.version}</version>
+           <version>${rhq-scripting-api.version}</version>
         </dependency>
 
         <dependency>

diff --git a/modules/enterprise/remoting/ant-run.xml b/modules/enterprise/remoting/ant-run.xml
@@ -58,7 +58,7 @@ ANT Script that provides ways to package the agent.
          <include name="org/rhq/rhq-core-util/${rhq-core-util.version}/rhq-core-util-${rhq-core-util.version}.jar" />
          <include name="org/rhq/rhq-core-native-system/${rhq-core-native-system.version}/rhq-core-native-system-${rhq-core-native-system.version}.jar" />
          <include name="org/rhq/rhq-core-domain/${rhq-core-domain.version}/rhq-core-domain-${rhq-core-domain.version}.jar" />
-         <include name="org/rhq/rhq-core-client-api/${project.version}/rhq-core-client-api-${project.version}.jar" />
+         <include name="org/rhq/rhq-core-client-api/${rhq-core-client-api.version}/rhq-core-client-api-${rhq-core-client-api.version}.jar" />
          <include name="jline/jline/${jline.version}/jline-${jline.version}.jar" />
 
       </fileset>

diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml
@@ -385,7 +385,7 @@
                                 <artifactItem>
                                     <groupId>${project.groupId}</groupId>
                                     <artifactId>rhq-jmx-plugin</artifactId>
-                                    <version>${project.version}</version>
+                                    <version>${rhq-jmx-plugin.version}</version>
                                 </artifactItem>
 
                                 <artifactItem>

diff --git a/modules/enterprise/server/itests-2/pom.xml b/modules/enterprise/server/itests-2/pom.xml
@@ -728,7 +728,7 @@
         <dependency>
           <groupId>${project.groupId}</groupId>
           <artifactId>rhq-core-client-api</artifactId>
-          <version>${project.version}</version>
+          <version>${rhq-core-client-api.version}</version>
           <type>test-jar</type>
           <scope>test</scope>
         </dependency>

diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml
@@ -104,7 +104,7 @@
     <dependency>
       <groupId>org.rhq</groupId>
       <artifactId>rhq-core-client-api</artifactId>
-      <version>${project.parent.version}</version>
+      <version>${rhq-core-client-api.version}</version>
     </dependency>
 
     <dependency>

diff --git a/modules/enterprise/server/plugins/alertdef-rhq/pom.xml b/modules/enterprise/server/plugins/alertdef-rhq/pom.xml
@@ -29,7 +29,7 @@
         <dependency>
             <groupId>org.rhq</groupId>
             <artifactId>rhq-core-client-api</artifactId>
-            <version>${project.version}</version>
+            <version>${rhq-core-client-api.version}</version>
             <scope>provided</scope>
         </dependency>
 

diff --git a/modules/enterprise/server/plugins/ant-bundle/pom.xml b/modules/enterprise/server/plugins/ant-bundle/pom.xml
@@ -27,7 +27,7 @@
         <dependency>
             <groupId>org.rhq</groupId>
             <artifactId>rhq-core-client-api</artifactId>
-            <version>${project.version}</version>
+            <version>${rhq-core-client-api.version}</version>
             <scope>provided</scope>
         </dependency>
 

diff --git a/modules/enterprise/server/plugins/disk/pom.xml b/modules/enterprise/server/plugins/disk/pom.xml
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>org.rhq</groupId>
             <artifactId>rhq-core-client-api</artifactId>
-            <version>${project.version}</version>
+            <version>${rhq-core-client-api.version}</version>
             <scope>provided</scope>
         </dependency>
 

diff --git a/modules/enterprise/server/plugins/drift-rhq/pom.xml b/modules/enterprise/server/plugins/drift-rhq/pom.xml
@@ -29,7 +29,7 @@
         <dependency>
             <groupId>org.rhq</groupId>
             <artifactId>rhq-core-client-api</artifactId>
-            <version>${project.version}</version>
+            <version>${rhq-core-client-api.version}</version>
             <scope>provided</scope>
         </dependency>
 

diff --git a/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml b/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml
@@ -29,7 +29,7 @@
         <dependency>
             <groupId>org.rhq</groupId>
             <artifactId>rhq-core-client-api</artifactId>
-            <version>${project.version}</version>
+            <version>${rhq-core-client-api.version}</version>
             <scope>provided</scope>
         </dependency>
 

diff --git a/modules/enterprise/server/plugins/jboss-software/pom.xml b/modules/enterprise/server/plugins/jboss-software/pom.xml
@@ -19,7 +19,7 @@
         <dependency>
             <groupId>org.rhq</groupId>
             <artifactId>rhq-core-client-api</artifactId>
-            <version>${project.version}</version>
+            <version>${rhq-core-client-api.version}</version>
             <scope>provided</scope>
         </dependency>
 

diff --git a/modules/enterprise/server/plugins/url/pom.xml b/modules/enterprise/server/plugins/url/pom.xml
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>org.rhq</groupId>
             <artifactId>rhq-core-client-api</artifactId>
-            <version>${project.version}</version>
+            <version>${rhq-core-client-api.version}</version>
             <scope>provided</scope>
         </dependency>
 

diff --git a/modules/enterprise/server/plugins/yum/pom.xml b/modules/enterprise/server/plugins/yum/pom.xml
@@ -21,7 +21,7 @@
         <dependency>
             <groupId>org.rhq</groupId>
             <artifactId>rhq-core-client-api</artifactId>
-            <version>${project.version}</version>
+            <version>${rhq-core-client-api.version}</version>
             <scope>provided</scope>
         </dependency>
 

diff --git a/modules/enterprise/server/xml-schemas/pom.xml b/modules/enterprise/server/xml-schemas/pom.xml
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>${rhq.groupId}</groupId>
       <artifactId>rhq-core-client-api</artifactId>
-      <version>${project.version}</version>
+      <version>${rhq-core-client-api.version}</version>
     </dependency>
 
     <dependency>

diff --git a/modules/integration-tests/mod_cluster-plugin-test/pom.xml b/modules/integration-tests/mod_cluster-plugin-test/pom.xml
@@ -54,7 +54,7 @@
       <dependency>
          <groupId>${rhq.groupId}</groupId>
          <artifactId>rhq-jmx-plugin</artifactId>
-         <version>${project.version}</version>
+         <version>${rhq-jmx-plugin.version}</version>
          <scope>provided</scope>
       </dependency>
 
@@ -289,7 +289,7 @@
                               <copy toDir="target/testsetup/plugins" flatten="true">
                                  <fileset dir="${settings.localRepository}/">
                                     <include name="org/rhq/rhq-platform-plugin/${rhq-platform-plugin.version}/rhq-platform-plugin-${rhq-platform-plugin.version}.jar" />
-                                    <include name="org/rhq/rhq-jmx-plugin/${project.version}/rhq-jmx-plugin-${project.version}.jar" />
+                                    <include name="org/rhq/rhq-jmx-plugin/${rhq-jmx-plugin.version}/rhq-jmx-plugin-${rhq-jmx-plugin.version}.jar" />
                                     <include name="org/jboss/on/jopr-jboss-as-plugin/${project.version}/jopr-jboss-as-plugin-${project.version}.jar" />
                                     <include name="org/jboss/on/jopr-jboss-as-5-plugin/${project.version}/jopr-jboss-as-5-plugin-${project.version}.jar" />
                                     <include name="org/jboss/on/jopr-tomcat-plugin/${project.version}/jopr-tomcat-plugin-${project.version}.jar" />

diff --git a/modules/plugins/cassandra/pom.xml b/modules/plugins/cassandra/pom.xml
@@ -40,7 +40,7 @@
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>rhq-jmx-plugin</artifactId>
-      <version>${project.version}</version>
+      <version>${rhq-jmx-plugin.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -94,7 +94,7 @@
                   <mkdir dir="target/testsetup/plugins" />
                   <copy toDir="target/testsetup/plugins" flatten="true">
                      <fileset dir="${settings.localRepository}/">
-                        <include name="org/rhq/rhq-jmx-plugin/${project.version}/rhq-jmx-plugin-${project.version}.jar" />
+                        <include name="org/rhq/rhq-jmx-plugin/${rhq-jmx-plugin.version}/rhq-jmx-plugin-${rhq-jmx-plugin.version}.jar" />
                      </fileset>
                      <fileset dir="${project.build.directory}" includes="${project.artifactId}-${project.version}.jar" />
                   </copy>

diff --git a/modules/plugins/hadoop/pom.xml b/modules/plugins/hadoop/pom.xml
@@ -132,7 +132,7 @@
             <dependency>
                 <groupId>org.rhq</groupId>
                 <artifactId>rhq-jmx-plugin</artifactId>
-                <version>${project.version}</version>
+                <version>${rhq-jmx-plugin.version}</version>
                 <scope>provided</scope>
             </dependency>
 

diff --git a/modules/plugins/hibernate/pom.xml b/modules/plugins/hibernate/pom.xml
@@ -21,7 +21,7 @@
       <dependency>
          <groupId>${rhq.groupId}</groupId>
          <artifactId>rhq-jmx-plugin</artifactId>
-         <version>${project.version}</version>
+         <version>${rhq-jmx-plugin.version}</version>
          <scope>provided</scope>
       </dependency>
 
@@ -84,7 +84,7 @@
                               <copy toDir="target/itest/plugins" flatten="true">
                                  <fileset dir="${settings.localRepository}/">
                                     <include name="org/rhq/rhq-platform-plugin/${rhq-platform-plugin.version}/rhq-platform-plugin-${rhq-platform-plugin.version}.jar" />
-                                    <include name="org/rhq/rhq-jmx-plugin/${project.version}/rhq-jmx-plugin-${project.version}.jar" />
+                                    <include name="org/rhq/rhq-jmx-plugin/${rhq-jmx-plugin.version}/rhq-jmx-plugin-${rhq-jmx-plugin.version}.jar" />
                                     <include name="org/jboss/on/jopr-tomcat-plugin/${project.version}/jopr-tomcat-plugin-${project.version}.jar" />
                                     <include name="org/jboss/on/jopr-jboss-as-plugin/${project.version}/jopr-jboss-as-plugin-${project.version}.jar" />
                                  </fileset>

diff --git a/modules/plugins/jboss-as-5/pom.xml b/modules/plugins/jboss-as-5/pom.xml
@@ -75,7 +75,7 @@
     <dependency>
       <groupId>${rhq.groupId}</groupId>
       <artifactId>rhq-jmx-plugin</artifactId>
-      <version>${project.version}</version>
+      <version>${rhq-jmx-plugin.version}</version>
       <scope>provided</scope>
     </dependency>
 
@@ -297,7 +297,7 @@
                         <include
                             name="org/rhq/rhq-platform-plugin/${rhq-platform-plugin.version}/rhq-platform-plugin-${rhq-platform-plugin.version}.jar"/>
                         <include
-                            name="org/rhq/rhq-jmx-plugin/${project.version}/rhq-jmx-plugin-${project.version}.jar"/>
+                            name="org/rhq/rhq-jmx-plugin/${rhq-jmx-plugin.version}/rhq-jmx-plugin-${rhq-jmx-plugin.version}.jar"/>
                       </fileset>
                       <fileset dir="${project.build.directory}">
                         <include name="${project.artifactId}-${project.version}.jar"/>

diff --git a/modules/plugins/jboss-as-5/testsuite/pom.xml b/modules/plugins/jboss-as-5/testsuite/pom.xml
@@ -157,7 +157,7 @@ to load. Cactus will still run without this JAR.     jdobies, Feb 16, 2007. -->
                                 <artifactItem>
                                     <groupId>${rhq.groupId}</groupId>
                                     <artifactId>rhq-jmx-plugin</artifactId>
-                                    <version>${rhq.version}</version>
+                                    <version>${rhq-jmx-plugin.version}</version>
                                 </artifactItem>
 
                                 <artifactItem>

diff --git a/modules/plugins/jboss-as-7/pom.xml b/modules/plugins/jboss-as-7/pom.xml
@@ -39,7 +39,7 @@
     <dependency>
       <groupId>org.rhq</groupId>
       <artifactId>rhq-jmx-plugin</artifactId>
-      <version>${project.version}</version>
+      <version>${rhq-jmx-plugin.version}</version>
       <scope>provided</scope>
       <!-- by the plugin container -->
     </dependency>

diff --git a/modules/plugins/jboss-as/pom.xml b/modules/plugins/jboss-as/pom.xml
@@ -32,7 +32,7 @@
       <dependency>
          <groupId>${rhq.groupId}</groupId>
          <artifactId>rhq-jmx-plugin</artifactId>
-         <version>${project.version}</version>
+         <version>${rhq-jmx-plugin.version}</version>
          <scope>provided</scope>
       </dependency>
 
@@ -66,7 +66,7 @@
       <dependency>
          <groupId>${rhq.groupId}</groupId>
          <artifactId>rhq-core-client-api</artifactId>
-         <version>${project.version}</version>
+         <version>${rhq-core-client-api.version}</version>
          <scope>test</scope> <!-- this is OK. plugins do not have access to clientapi, but this is only for tests so this is OK -->
       </dependency>
 
@@ -207,7 +207,7 @@
                                  <fileset dir="${settings.localRepository}/">
                                     <include name="org/rhq/rhq-platform-plugin/${rhq-platform-plugin.version}/rhq-platform-plugin-${rhq-platform-plugin.version}.jar" />
                                     <include name="org/jboss/on/jopr-tomcat-plugin/${project.version}/jopr-tomcat-plugin-${project.version}.jar" />
-                                    <include name="org/rhq/rhq-jmx-plugin/${project.version}/rhq-jmx-plugin-${project.version}.jar" />
+                                    <include name="org/rhq/rhq-jmx-plugin/${rhq-jmx-plugin.version}/rhq-jmx-plugin-${rhq-jmx-plugin.version}.jar" />
                                  </fileset>
                                  <fileset dir="${project.build.directory}">
                                     <include name="${project.artifactId}-${project.version}.jar" />

diff --git a/modules/plugins/jboss-cache-v3/pom.xml b/modules/plugins/jboss-cache-v3/pom.xml
@@ -44,7 +44,7 @@
      <dependency>
          <groupId>${rhq.groupId}</groupId>
          <artifactId>rhq-jmx-plugin</artifactId>
-         <version>${project.version}</version>
+         <version>${rhq-jmx-plugin.version}</version>
          <scope>provided</scope>
      </dependency>
 
@@ -330,7 +330,7 @@
                                 <copy toDir="target/itest/plugins" flatten="true">
                                    <fileset dir="${settings.localRepository}/">
                                       <include name="org/rhq/rhq-platform-plugin/${rhq-platform-plugin.version}/rhq-platform-plugin-${rhq-platform-plugin.version}.jar" />
-                                      <include name="org/rhq/rhq-jmx-plugin/${project.version}/rhq-jmx-plugin-${project.version}.jar" />
+                                      <include name="org/rhq/rhq-jmx-plugin/${rhq-jmx-plugin.version}/rhq-jmx-plugin-${rhq-jmx-plugin.version}.jar" />
                                       <include name="org/jboss/on/jopr-jboss-as-5-plugin/${project.version}/jopr-jboss-as-5-plugin-${project.version}.jar" />
                                    </fileset>
                                    <fileset dir="${project.build.directory}">

diff --git a/modules/plugins/jboss-cache/pom.xml b/modules/plugins/jboss-cache/pom.xml
@@ -20,7 +20,7 @@
       <dependency>
          <groupId>${rhq.groupId}</groupId>
          <artifactId>rhq-jmx-plugin</artifactId>
-         <version>${project.version}</version>
+         <version>${rhq-jmx-plugin.version}</version>
          <scope>provided</scope>
       </dependency>
 
@@ -74,7 +74,7 @@
                               <copy toDir="target/itest/plugins" flatten="true">
                                  <fileset dir="${settings.localRepository}/">
                                     <include name="org/rhq/rhq-platform-plugin/${rhq-platform-plugin.version}/rhq-platform-plugin-${rhq-platform-plugin.version}.jar" />
-                                    <include name="org/rhq/rhq-jmx-plugin/${project.version}/rhq-jmx-plugin-${project.version}.jar" />
+                                    <include name="org/rhq/rhq-jmx-plugin/${rhq-jmx-plugin.version}/rhq-jmx-plugin-${rhq-jmx-plugin.version}.jar" />
                                     <include name="org/jboss/on/rhq-tomcat-plugin/${project.version}/rhq-tomcat-plugin-${project.version}.jar" />
                                     <include name="org/jboss/on/rhq-jbossas-plugin/${project.version}/rhq-jbossas-plugin-${project.version}.jar" />
                                  </fileset>