Update rhq-core-util for independent versioning.

rhq-project · Mar 28, 2014 · c8905ca · c8905ca
1 parent 64861d5
commit c8905ca
Show file tree

Hide file tree

Showing 35 changed files with 38 additions and 35 deletions.
diff --git a/modules/common/ant-bundle/pom.xml b/modules/common/ant-bundle/pom.xml
@@ -26,7 +26,7 @@
         <dependency>
            <groupId>${project.groupId}</groupId>
            <artifactId>rhq-core-util</artifactId>
-           <version>${project.version}</version>
+           <version>${rhq-core-util.version}</version>
         </dependency>
 
         <dependency>

diff --git a/modules/common/cassandra-installer/pom.xml b/modules/common/cassandra-installer/pom.xml
@@ -98,7 +98,7 @@
                 <artifactItem>
                   <groupId>${project.groupId}</groupId>
                   <artifactId>rhq-core-util</artifactId>
-                  <version>${project.version}</version>
+                  <version>${rhq-core-util.version}</version>
                 </artifactItem>
                 <artifactItem>
                   <groupId>${project.groupId}</groupId>

diff --git a/modules/common/cassandra-installer/src/main/resources/module/main/module.xml b/modules/common/cassandra-installer/src/main/resources/module/main/module.xml
@@ -6,7 +6,7 @@
   <resources>
     <resource-root path="${project.build.finalName}.jar"/>
     <resource-root path="rhq-cassandra-ccm-core-${project.version}.jar"/>
-    <resource-root path="rhq-core-util-${project.version}.jar"/>
+    <resource-root path="rhq-core-util-${rhq-core-util.version}.jar"/>
     <resource-root path="rhq-cassandra-util-${project.version}.jar"/>
     <resource-root path="snakeyaml-${cassandra.snakeyaml.version}.jar"/>
   </resources>

diff --git a/modules/common/cassandra-util/pom.xml b/modules/common/cassandra-util/pom.xml
@@ -22,7 +22,7 @@
     <dependency>
       <groupId>${rhq.groupId}</groupId>
       <artifactId>rhq-core-util</artifactId>
-      <version>${project.version}</version>
+      <version>${rhq-core-util.version}</version>
     </dependency>
   </dependencies>
 

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

diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml
@@ -32,7 +32,7 @@
         <dependency>
           <groupId>${project.groupId}</groupId>
           <artifactId>rhq-core-util</artifactId>
-          <version>${project.version}</version>
+          <version>${rhq-core-util.version}</version>
         </dependency>
 
         <!-- 3rd Party Deps -->

diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml
@@ -34,7 +34,7 @@
       <dependency>
          <groupId>${rhq.groupId}</groupId>
          <artifactId>rhq-core-util</artifactId>
-         <version>${project.parent.version}</version>
+         <version>${rhq-core-util.version}</version>
       </dependency>
 
       <!-- provided by AS7 -->

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

diff --git a/modules/core/native-system/ant-run.xml b/modules/core/native-system/ant-run.xml
@@ -19,7 +19,7 @@ Ant Script that builds a test jar to run SIGAR bug replication code.
       <include name="log4j/log4j/${log4j.version}/log4j-${log4j.version}.jar" />
       <include name="org/testng/testng/5.1/testng-5.1-jdk15.jar" />
       <include name="commons-logging/commons-logging/1.1/commons-logging-1.1.jar" />
-      <include name="org/rhq/rhq-core-util/${project.version}/rhq-core-util-${project.version}.jar" />
+      <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" />
    </fileset>
 

diff --git a/modules/core/native-system/pom.xml b/modules/core/native-system/pom.xml
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>${rhq.groupId}</groupId>
       <artifactId>rhq-core-util</artifactId>
-      <version>${project.parent.version}</version>
+      <version>${rhq-core-util.version}</version>
     </dependency>
 
     <dependency>

diff --git a/modules/core/plugin-validator/pom.xml b/modules/core/plugin-validator/pom.xml
@@ -24,7 +24,7 @@
       <dependency>
          <groupId>org.rhq</groupId>
          <artifactId>rhq-core-util</artifactId>
-         <version>${project.version}</version>
+         <version>${rhq-core-util.version}</version>
       </dependency>
 
       <dependency>

diff --git a/modules/core/util/pom.xml b/modules/core/util/pom.xml
@@ -9,6 +9,7 @@
   </parent>
 
   <artifactId>rhq-core-util</artifactId>
+  <version>4.9.0.JON320GA-redhat-1</version>
   <packaging>jar</packaging>
 
   <name>RHQ Utilities</name>
@@ -35,7 +36,7 @@
       <dependency>
           <groupId>${project.groupId}</groupId>
           <artifactId>test-utils</artifactId>
-          <version>${project.version}</version>
+          <version>${project.parent.version}</version>
           <scope>test</scope>
       </dependency>
 

diff --git a/modules/enterprise/agent/ant-run.xml b/modules/enterprise/agent/ant-run.xml
@@ -54,7 +54,7 @@ Ant Script that provides ways to package the Agent.
          <include name="jboss/jboss-serialization/${jboss-serialization.version}/jboss-serialization-${jboss-serialization.version}.jar" />
          <include name="org/rhq/rhq-enterprise-comm/${project.version}/rhq-enterprise-comm-${project.version}.jar" />
          <include name="org/rhq/rhq-enterprise-agent/${project.version}/rhq-enterprise-agent-${project.version}.jar" />
-         <include name="org/rhq/rhq-core-util/${project.version}/rhq-core-util-${project.version}.jar" />
+         <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-comm-api/${project.version}/rhq-core-comm-api-${project.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" />

diff --git a/modules/enterprise/agent/pom.xml b/modules/enterprise/agent/pom.xml
@@ -170,6 +170,7 @@ Build-Number=${buildNumber}
                    <property name="augeas.zip.version" value="${augeas.zip.version}" />
                    <property name="log4j.version" value="${log4j.version}" />
                    <property name="rhq-core-native-system.version" value="${rhq-core-native-system.version}" />
+                   <property name="rhq-core-util.version" value="${rhq-core-util.version}" />
                 </ant>
               </target>
             </configuration>

diff --git a/modules/enterprise/binding/pom.xml b/modules/enterprise/binding/pom.xml
@@ -26,7 +26,7 @@
         <dependency>
            <groupId>${project.groupId}</groupId>
            <artifactId>rhq-core-util</artifactId>
-           <version>${project.version}</version>
+           <version>${rhq-core-util.version}</version>
            <scope>provided</scope> <!-- by PC -->
         </dependency>
 

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

diff --git a/modules/enterprise/gui/agentupdate-war/pom.xml b/modules/enterprise/gui/agentupdate-war/pom.xml
@@ -34,7 +34,7 @@
       <dependency>
          <groupId>org.rhq</groupId>
          <artifactId>rhq-core-util</artifactId>
-         <version>${project.version}</version>
+         <version>${rhq-core-util.version}</version>
          <scope>provided</scope> <!-- by rhq.ear -->
       </dependency>
 

diff --git a/modules/enterprise/gui/content_http-war/pom.xml b/modules/enterprise/gui/content_http-war/pom.xml
@@ -42,7 +42,7 @@
         <dependency>
             <groupId>org.rhq</groupId>
             <artifactId>rhq-core-util</artifactId>
-            <version>${project.version}</version>
+            <version>${rhq-core-util.version}</version>
             <scope>provided</scope> <!-- by rhq.ear -->
         </dependency>
 

diff --git a/modules/enterprise/gui/coregui/pom.xml b/modules/enterprise/gui/coregui/pom.xml
@@ -101,7 +101,7 @@
     <dependency>
       <groupId>org.rhq</groupId>
       <artifactId>rhq-core-util</artifactId>
-      <version>${project.version}</version>
+      <version>${rhq-core-util.version}</version>
       <scope>provided</scope>
     </dependency>
 

diff --git a/modules/enterprise/gui/downloads-war/pom.xml b/modules/enterprise/gui/downloads-war/pom.xml
@@ -34,7 +34,7 @@
       <dependency>
          <groupId>org.rhq</groupId>
          <artifactId>rhq-core-util</artifactId>
-         <version>${project.version}</version>
+         <version>${rhq-core-util.version}</version>
          <scope>provided</scope> <!-- by rhq.ear -->
       </dependency>
 

diff --git a/modules/enterprise/gui/portal-war/pom.xml b/modules/enterprise/gui/portal-war/pom.xml
@@ -53,7 +53,7 @@
       <dependency>
          <groupId>org.rhq</groupId>
          <artifactId>rhq-core-util</artifactId>
-         <version>${project.version}</version>
+         <version>${rhq-core-util.version}</version>
          <scope>provided</scope> <!-- by rhq.ear -->
       </dependency>
 

diff --git a/modules/enterprise/gui/remote-client-war/pom.xml b/modules/enterprise/gui/remote-client-war/pom.xml
@@ -34,7 +34,7 @@
       <dependency>
          <groupId>org.rhq</groupId>
          <artifactId>rhq-core-util</artifactId>
-         <version>${project.version}</version>
+         <version>${rhq-core-util.version}</version>
          <scope>provided</scope> <!-- by rhq.ear -->
       </dependency>
 

diff --git a/modules/enterprise/remoting/ant-run.xml b/modules/enterprise/remoting/ant-run.xml
@@ -55,7 +55,7 @@ ANT Script that provides ways to package the agent.
          <include name="org/rhq/rhq-enterprise-server/${rhq-enterprise-server.version}/rhq-enterprise-server-${rhq-enterprise-server.version}.jar" />
          <include name="org/rhq/rhq-enterprise-comm/${project.version}/rhq-enterprise-comm-${project.version}.jar" />
 
-         <include name="org/rhq/rhq-core-util/${project.version}/rhq-core-util-${project.version}.jar" />
+         <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" />

diff --git a/modules/enterprise/remoting/cli/pom.xml b/modules/enterprise/remoting/cli/pom.xml
@@ -118,6 +118,7 @@
                            <property name="rhq.bundle-additional-script-languages" value="${rhq.bundle-additional-script-languages}"/>
                            <property name="rhq-core-domain.version" value="${rhq-core-domain.version}" />
                            <property name="rhq-enterprise-server.version" value="${rhq-enterprise-server.version}" />
+                           <property name="rhq-core-util.version" value="${rhq-core-util.version}" />
                         </ant>
                      </target>
                   </configuration>

diff --git a/modules/enterprise/remoting/cli/src/main/scripts/rhq-client.build.xml b/modules/enterprise/remoting/cli/src/main/scripts/rhq-client.build.xml
@@ -53,7 +53,7 @@
       <copy file="${settings.localRepository}/log4j/log4j/${log4j.version}/log4j-${log4j.version}.jar" tofile="${lib.home}/log4j-${log4j.version}.jar" verbose="true" />
       <copy file="${settings.localRepository}/org/rhq/rhq-remoting-client-api/${project.version}/rhq-remoting-client-api-${project.version}.jar" todir="${lib.home}" verbose="true" />
       <copy file="${settings.localRepository}/org/rhq/rhq-core-domain/${rhq-core-domain.version}/rhq-core-domain-${rhq-core-domain.version}.jar" tofile="${lib.home}/rhq-core-domain-${rhq-core-domain.version}.jar" verbose="true" />
-      <copy file="${settings.localRepository}/org/rhq/rhq-core-util/${project.version}/rhq-core-util-${project.version}.jar" tofile="${lib.home}/rhq-core-util-${project.version}.jar" verbose="true" />
+      <copy file="${settings.localRepository}/org/rhq/rhq-core-util/${rhq-core-util.version}/rhq-core-util-${rhq-core-util.version}.jar" tofile="${lib.home}/rhq-core-util-${rhq-core-util.version}.jar" verbose="true" />
       <copy file="${settings.localRepository}/org/rhq/rhq-enterprise-server/${rhq-enterprise-server.version}/rhq-enterprise-server-${rhq-enterprise-server.version}-client.jar" tofile="${lib.home}/rhq-enterprise-server-${rhq-enterprise-server.version}-client.jar" verbose="true" />
       <copy file="${settings.localRepository}/org/rhq/rhq-enterprise-comm/${project.version}/rhq-enterprise-comm-${project.version}.jar" tofile="${lib.home}/rhq-enterprise-comm-${project.version}.jar" verbose="true" />
       <copy file="${settings.localRepository}/org/jboss/jboss-common-core/${jboss-common-core.version}/jboss-common-core-${jboss-common-core.version}.jar" tofile="${lib.home}/jboss-common-core-${jboss-common-core.version}.jar" verbose="true" />

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

diff --git a/modules/enterprise/server/data-migration/pom.xml b/modules/enterprise/server/data-migration/pom.xml
@@ -22,7 +22,7 @@
     <dependency>
       <groupId>${rhq.groupId}</groupId>
       <artifactId>rhq-core-util</artifactId>
-      <version>${project.version}</version>
+      <version>${rhq-core-util.version}</version>
     </dependency>
 
     <dependency>
@@ -152,7 +152,7 @@
                 <artifactItem>
                   <groupId>${project.groupId}</groupId>
                   <artifactId>rhq-core-util</artifactId>
-                  <version>${project.version}</version>
+                  <version>${rhq-core-util.version}</version>
                 </artifactItem>
                 <artifactItem>
                   <groupId>joda-time</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
@@ -5,7 +5,7 @@
 
   <resources>
     <resource-root path="${project.build.finalName}.jar"/>
-    <resource-root path="rhq-core-util-${project.version}.jar"/>
+    <resource-root path="rhq-core-util-${rhq-core-util.version}.jar"/>
     <resource-root path="rhq-server-metrics-${project.version}.jar"/>
     <resource-root path="joda-time-${joda-time.version}.jar"/>
     <resource-root path="hibernate-core-${hibernate.version}.jar"/>

diff --git a/modules/enterprise/server/installer/pom.xml b/modules/enterprise/server/installer/pom.xml
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>org.rhq</groupId>
             <artifactId>rhq-core-util</artifactId>
-            <version>${project.version}</version>
+            <version>${rhq-core-util.version}</version>
         </dependency>
 
         <dependency>

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

diff --git a/modules/enterprise/server/server-control/pom.xml b/modules/enterprise/server/server-control/pom.xml
@@ -114,7 +114,7 @@
                 <artifactItem>
                   <groupId>${project.groupId}</groupId>
                   <artifactId>rhq-core-util</artifactId>
-                  <version>${project.version}</version>
+                  <version>${rhq-core-util.version}</version>
                 </artifactItem>
                 <artifactItem>
                   <groupId>${project.groupId}</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
@@ -5,7 +5,7 @@
 
   <resources>
     <resource-root path="${project.build.finalName}.jar"/>
-    <resource-root path="rhq-core-util-${project.version}.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-cassandra-installer-${project.version}.jar"/>

diff --git a/modules/helpers/bundleGen/pom.xml b/modules/helpers/bundleGen/pom.xml
@@ -67,7 +67,7 @@
          <dependency>
              <groupId>${rhq.groupId}</groupId>
              <artifactId>rhq-core-util</artifactId>
-             <version>${project.version}</version>
+             <version>${rhq-core-util.version}</version>
          </dependency>
      </dependencies>
-</project>
+</project>
diff --git a/modules/plugins/jboss-as/pom.xml b/modules/plugins/jboss-as/pom.xml
@@ -25,7 +25,7 @@
       <dependency>
          <groupId>${rhq.groupId}</groupId>
          <artifactId>rhq-core-util</artifactId>
-         <version>${project.version}</version>
+         <version>${rhq-core-util.version}</version>
          <scope>provided</scope> <!-- by plugin container -->
       </dependency>
 

diff --git a/pom.xml b/pom.xml
@@ -301,7 +301,7 @@
     <rhq-plugin-validator.version>${rhq.pom.version}</rhq-plugin-validator.version>
     <rhq-core-plugindoc.version>${rhq.pom.version}</rhq-core-plugindoc.version>
     <rhq-core-parent.version>${rhq.pom.version}</rhq-core-parent.version>
-    <rhq-core-util.version>${rhq.pom.version}</rhq-core-util.version>
+    <rhq-core-util.version>${rhq.pom.version}-redhat-1</rhq-core-util.version>
     <rhq-enterprise-agent.version>${rhq.pom.version}</rhq-enterprise-agent.version>
     <rhq-enterprise-agentupdate.version>${rhq.pom.version}</rhq-enterprise-agentupdate.version>
     <rhq-script-bindings.version>${rhq.pom.version}</rhq-script-bindings.version>