A few more updates for rhq-core-native-system and version documentat…

…ion.
rhq-project · Mar 28, 2014 · 09e423a · 09e423a
1 parent dd8f611
commit 09e423a
Show file tree

Hide file tree

Showing 25 changed files with 26 additions and 23 deletions.
diff --git a/etc/classloaders-test/plugin1/pom.xml b/etc/classloaders-test/plugin1/pom.xml
@@ -35,7 +35,7 @@
       <dependency>
          <groupId>org.rhq</groupId>
          <artifactId>rhq-core-native-system</artifactId>
-         <version>${rhq.version}</version>
+         <version>${rhq-core-native-system.version}</version>
          <scope>provided</scope> <!-- provided by the agent/plugin-container -->
       </dependency>
 

diff --git a/etc/classloaders-test/plugin2/pom.xml b/etc/classloaders-test/plugin2/pom.xml
@@ -35,7 +35,7 @@
       <dependency>
          <groupId>org.rhq</groupId>
          <artifactId>rhq-core-native-system</artifactId>
-         <version>${rhq.version}</version>
+         <version>${rhq-core-native-system.version}</version>
          <scope>provided</scope> <!-- provided by the agent/plugin-container -->
       </dependency>
 

diff --git a/etc/rhq-plugin-archetype/src/main/resources/archetype-resources/pom.xml b/etc/rhq-plugin-archetype/src/main/resources/archetype-resources/pom.xml
@@ -38,7 +38,7 @@
     <dependency>
       <groupId>org.rhq</groupId>
       <artifactId>rhq-core-native-system</artifactId>
-      <version>${rhq.version}</version>
+      <version>${rhq-core-native-system.version}</version>
       <scope>provided</scope> <!-- provided by the agent/plugin-container -->
     </dependency>
 

diff --git a/etc/samples/embedded-ext-plugin/pom.xml b/etc/samples/embedded-ext-plugin/pom.xml
@@ -37,7 +37,7 @@
       <dependency>
          <groupId>org.rhq</groupId>
          <artifactId>rhq-core-native-system</artifactId>
-         <version>${rhq.version}</version>
+         <version>${rhq-core-native-system.version}</version>
          <scope>provided</scope>
       </dependency>
 

diff --git a/etc/samples/skeleton-plugin/pom.xml b/etc/samples/skeleton-plugin/pom.xml
@@ -38,7 +38,7 @@
       <dependency>
          <groupId>org.rhq</groupId>
          <artifactId>rhq-core-native-system</artifactId>
-         <version>${rhq.version}</version>
+         <version>${rhq-core-native-system.version}</version>
          <scope>provided</scope> <!-- provided by the agent/plugin-container -->
       </dependency>
 

diff --git a/etc/samples/skinny-platform/pom.xml b/etc/samples/skinny-platform/pom.xml
@@ -33,7 +33,7 @@
       <dependency>
          <groupId>org.rhq</groupId>
          <artifactId>rhq-core-native-system</artifactId>
-         <version>${rhq.version}</version>
+         <version>${rhq-core-native-system.version}</version>
          <scope>provided</scope> <!-- provided by the agent/plugin-container -->
       </dependency>
 

diff --git a/modules/common/ant-bundle/pom.xml b/modules/common/ant-bundle/pom.xml
@@ -32,7 +32,7 @@
         <dependency>
            <groupId>${project.groupId}</groupId>
            <artifactId>rhq-core-native-system</artifactId>
-           <version>${project.version}</version>
+           <version>${rhq-core-native-system.version}</version>
            <exclusions>
               <exclusion>
                  <groupId>org.hyperic</groupId>

diff --git a/modules/common/filetemplate-bundle/pom.xml b/modules/common/filetemplate-bundle/pom.xml
@@ -31,7 +31,7 @@
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>rhq-core-native-system</artifactId>
-            <version>${project.version}</version>
+            <version>${rhq-core-native-system.version}</version>
             <scope>provided</scope>
             <exclusions>
                 <exclusion>

diff --git a/modules/core/native-system/ant-run.xml b/modules/core/native-system/ant-run.xml
@@ -20,7 +20,7 @@ Ant Script that builds a test jar to run SIGAR bug replication code.
       <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-native-system/${project.version}/rhq-core-native-system-${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" />
    </fileset>
 
    <fileset dir="${settings.localRepository}" id="native.fileset">

diff --git a/modules/core/plugin-api/pom.xml b/modules/core/plugin-api/pom.xml
@@ -33,7 +33,7 @@
       <dependency>
          <groupId>${rhq.groupId}</groupId>
          <artifactId>rhq-core-native-system</artifactId>
-         <version>${project.version}</version>
+         <version>${rhq-core-native-system.version}</version>
       </dependency>
 
       <!-- 3rd Party Deps -->

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

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

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

diff --git a/modules/enterprise/agent/pom.xml b/modules/enterprise/agent/pom.xml
@@ -169,6 +169,7 @@ Build-Number=${buildNumber}
                    <property name="augeas.zip.mask" value="${augeas.zip.mask}"/>
                    <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}" />
                 </ant>
               </target>
             </configuration>

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

diff --git a/modules/plugins/cassandra/pom.xml b/modules/plugins/cassandra/pom.xml
@@ -34,7 +34,7 @@
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>rhq-core-native-system</artifactId>
-      <version>${project.version}</version>
+      <version>${rhq-core-native-system.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

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

diff --git a/modules/plugins/irc/pom.xml b/modules/plugins/irc/pom.xml
@@ -144,7 +144,7 @@
             <dependency>
                 <groupId>org.rhq</groupId>
                 <artifactId>rhq-core-native-system</artifactId>
-                <version>${project.version}</version>
+                <version>${rhq-core-native-system.version}</version>
                 <scope>provided</scope>
             </dependency>
 

diff --git a/modules/plugins/jboss-as-5/testsuite/pom.xml b/modules/plugins/jboss-as-5/testsuite/pom.xml
@@ -68,7 +68,7 @@
         <dependency>
             <groupId>${rhq.groupId}</groupId>
             <artifactId>rhq-core-native-system</artifactId>
-            <version>${rhq.version}</version>
+            <version>${rhq-core-native-system.version}</version>
         </dependency>
 
         <dependency>

diff --git a/modules/plugins/pattern-generator/pom.xml b/modules/plugins/pattern-generator/pom.xml
@@ -126,7 +126,7 @@
             <dependency>
                 <groupId>${rhq.groupId}</groupId>
                 <artifactId>rhq-core-native-system</artifactId>
-                <version>${project.version}</version>
+                <version>${rhq-core-native-system.version}</version>
                 <scope>provided</scope>
             </dependency>
 

diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml
@@ -35,7 +35,7 @@
       <dependency>
          <groupId>${rhq.groupId}</groupId>
          <artifactId>rhq-core-native-system</artifactId>
-         <version>${project.version}</version>
+         <version>${rhq-core-native-system.version}</version>
          <scope>provided</scope> <!-- by PC -->
       </dependency>
 

diff --git a/modules/plugins/services/pom.xml b/modules/plugins/services/pom.xml
@@ -122,7 +122,7 @@
             <dependency>
                 <groupId>org.rhq</groupId>
                 <artifactId>rhq-core-native-system</artifactId>
-                <version>${project.version}</version>
+                <version>${rhq-core-native-system.version}</version>
                 <scope>provided</scope>
             </dependency>
        <dependency>

diff --git a/modules/plugins/snmptrapd/pom.xml b/modules/plugins/snmptrapd/pom.xml
@@ -152,7 +152,7 @@
     <dependency>
       <groupId>org.rhq</groupId>
       <artifactId>rhq-core-native-system</artifactId>
-      <version>${project.version}</version>
+      <version>${rhq-core-native-system.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

diff --git a/modules/plugins/twitter/pom.xml b/modules/plugins/twitter/pom.xml
@@ -136,7 +136,7 @@
             <dependency>
                 <groupId>org.rhq</groupId>
                 <artifactId>rhq-core-native-system</artifactId>
-                <version>${project.version}</version>
+                <version>${rhq-core-native-system.version}</version>
                 <scope>provided</scope>
             </dependency>
 

diff --git a/pom.xml b/pom.xml
@@ -270,6 +270,8 @@
     <jacoco-arquillian-extension.version>1.0.0.Alpha5</jacoco-arquillian-extension.version>
 
     <!-- Add RHQ version properties to support update versioning -->
+    <!-- spinder: 2-28-14. The following rhq.pom.version value needs to be explicitly set or causes numerous 
+         recursive maven version issues. See http://stackoverflow.com/questions/3684664/maven-property-substitution-not-done-for-project-version-tag-of-pom for more. http://jira.codehaus.org/browse/MNG-624  -->
     <rhq.pom.version>4.9.0.JON320GA</rhq.pom.version>
     <rhq-code-coverage.version>${rhq.pom.version}</rhq-code-coverage.version>
     <rhq-cli-tests.version>${rhq.pom.version}</rhq-cli-tests.version>