Update rhq-enterprise-jar for independent versioning.

rhq-project · Oct 3, 2014 · 7117037 · 7117037
1 parent e09aa3e
commit 7117037
Show file tree

Hide file tree

Showing 22 changed files with 191 additions and 187 deletions.
diff --git a/etc/samples/custom-serverplugin/pom.xml b/etc/samples/custom-serverplugin/pom.xml
@@ -24,7 +24,7 @@
       <dependency>
          <groupId>org.rhq</groupId>
          <artifactId>rhq-enterprise-server</artifactId>
-         <version>${rhq.version}</version>
+         <version>${rhq-enterprise-server.version}</version>
          <scope>provided</scope> <!-- provided by the server/plugin-container -->
       </dependency>
 

diff --git a/etc/samples/simplereport-serverplugin/pom.xml b/etc/samples/simplereport-serverplugin/pom.xml
@@ -24,7 +24,7 @@
       <dependency>
          <groupId>org.rhq</groupId>
          <artifactId>rhq-enterprise-server</artifactId>
-         <version>${rhq.version}</version>
+         <version>${rhq-enterprise-server.version}</version>
          <scope>provided</scope> <!-- provided by the server/plugin-container -->
       </dependency>
 

diff --git a/modules/core/native-system/pom.xml b/modules/core/native-system/pom.xml
@@ -11,6 +11,7 @@
 
   <groupId>org.rhq</groupId>
   <artifactId>rhq-core-native-system</artifactId>
+  <version>4.9.0.JON320GA-redhat-1</version>
   <packaging>jar</packaging>
 
   <name>RHQ Native System API</name>
@@ -27,7 +28,7 @@
     <dependency>
       <groupId>${rhq.groupId}</groupId>
       <artifactId>rhq-core-util</artifactId>
-      <version>${project.version}</version>
+      <version>${project.parent.version}</version>
     </dependency>
 
     <dependency>
@@ -118,7 +119,7 @@
                    <goal>javadoc</goal>
                 </goals>
                 <configuration>
-                   <doctitle>RHQ ${project.version} System API</doctitle>
+                   <doctitle>RHQ ${project.parent.version} System API</doctitle>
                    <reportOutputDirectory>${javadoc.outputDirectory}</reportOutputDirectory>
                    <author>false</author>
                    <breakiterator>true</breakiterator>
@@ -154,8 +155,8 @@
                            <goal>javadoc</goal>
                         </goals>
                         <configuration>
-                           <doctitle>RHQ ${project.version} System API</doctitle>
-                           <windowtitle>RHQ ${project.version} System API</windowtitle>
+                           <doctitle>RHQ ${project.parent.version} System API</doctitle>
+                           <windowtitle>RHQ ${project.parent.version} System API</windowtitle>
                            <reportOutputDirectory>${javadoc.outputDirectory}</reportOutputDirectory>
                            <destDir>system</destDir>
                            <author>false</author>

diff --git a/modules/enterprise/binding/pom.xml b/modules/enterprise/binding/pom.xml
@@ -61,7 +61,7 @@
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>rhq-enterprise-server</artifactId>
-            <version>${project.version}</version>
+            <version>${rhq-enterprise-server.version}</version>
             <type>ejb-client</type>
             <exclusions>
                 <exclusion>

diff --git a/modules/enterprise/gui/agentupdate-war/pom.xml b/modules/enterprise/gui/agentupdate-war/pom.xml
@@ -27,7 +27,7 @@
       <dependency>
          <groupId>org.rhq</groupId>
          <artifactId>rhq-enterprise-server</artifactId>
-         <version>${project.version}</version>
+         <version>${rhq-enterprise-server.version}</version>
          <scope>provided</scope> <!-- by rhq.ear (as ejb-jar) -->
       </dependency>
 

diff --git a/modules/enterprise/gui/content_http-war/pom.xml b/modules/enterprise/gui/content_http-war/pom.xml
@@ -35,7 +35,7 @@
         <dependency>
             <groupId>org.rhq</groupId>
             <artifactId>rhq-enterprise-server</artifactId>
-            <version>${project.version}</version>
+            <version>${rhq-enterprise-server.version}</version>
             <scope>provided</scope> <!-- by rhq.ear (as ejb-jar) -->
         </dependency>
 

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

diff --git a/modules/enterprise/gui/downloads-war/pom.xml b/modules/enterprise/gui/downloads-war/pom.xml
@@ -27,7 +27,7 @@
       <dependency>
          <groupId>org.rhq</groupId>
          <artifactId>rhq-enterprise-server</artifactId>
-         <version>${project.version}</version>
+         <version>${rhq-enterprise-server.version}</version>
          <scope>provided</scope> <!-- by rhq.ear (as ejb-jar) -->
       </dependency>
 

diff --git a/modules/enterprise/gui/portal-war/pom.xml b/modules/enterprise/gui/portal-war/pom.xml
@@ -46,7 +46,7 @@
       <dependency>
          <groupId>org.rhq</groupId>
          <artifactId>rhq-enterprise-server</artifactId>
-         <version>${project.version}</version>
+         <version>${rhq-enterprise-server.version}</version>
          <scope>provided</scope> <!-- by rhq.ear (as ejb-jar) -->
       </dependency>
 

diff --git a/modules/enterprise/gui/remote-client-war/pom.xml b/modules/enterprise/gui/remote-client-war/pom.xml
@@ -27,7 +27,7 @@
       <dependency>
          <groupId>org.rhq</groupId>
          <artifactId>rhq-enterprise-server</artifactId>
-         <version>${project.version}</version>
+         <version>${rhq-enterprise-server.version}</version>
          <scope>provided</scope> <!-- by rhq.ear (as ejb-jar) -->
       </dependency>
 

diff --git a/modules/enterprise/gui/rest-war/pom.xml b/modules/enterprise/gui/rest-war/pom.xml
@@ -27,7 +27,7 @@
         <dependency>
            <groupId>org.rhq</groupId>
            <artifactId>rhq-enterprise-server</artifactId>
-           <version>${project.version}</version>
+           <version>${rhq-enterprise-server.version}</version>
            <scope>provided</scope> <!-- by rhq.ear (as ejb-jar) -->
         </dependency>
 

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

diff --git a/modules/enterprise/remoting/cli/pom.xml b/modules/enterprise/remoting/cli/pom.xml
@@ -134,6 +134,7 @@
                            <property name="rhq.client.build.include.client.jar" value="${rhq.client.build.include.client.jar}" />
                            <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}" />
                         </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
@@ -54,7 +54,7 @@
       <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-enterprise-server/${project.version}/rhq-enterprise-server-${project.version}-client.jar" tofile="${lib.home}/rhq-enterprise-server-${project.version}-client.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" />
       <copy file="${settings.localRepository}/org/jboss/logging/jboss-logging/${jboss-logging.version}/jboss-logging-${jboss-logging.version}.jar" tofile="${lib.home}/jboss-logging-${jboss-logging.version}.jar" verbose="true" />   	

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

diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml
@@ -27,7 +27,7 @@
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>rhq-enterprise-server</artifactId>
-            <version>${project.version}</version>
+            <version>${rhq-enterprise-server.version}</version>
             <type>ejb</type>
         </dependency>
 

diff --git a/modules/enterprise/server/itests-2/pom.xml b/modules/enterprise/server/itests-2/pom.xml
@@ -700,7 +700,7 @@
         <dependency>
           <groupId>org.rhq</groupId>
           <artifactId>rhq-enterprise-server</artifactId>
-          <version>${project.version}</version>
+          <version>${rhq-enterprise-server.version}</version>
           <scope>test</scope>
         </dependency>
 

diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml
@@ -11,6 +11,7 @@
   </parent>
 
   <artifactId>rhq-enterprise-server</artifactId>
+  <version>4.9.0.JON320GA-redhat-1</version>
   <packaging>ejb</packaging>
 
   <name>RHQ Enterprise Server JAR</name>
@@ -44,13 +45,13 @@
   <dependency>
     <groupId>org.rhq</groupId>
     <artifactId>rhq-enterprise-comm</artifactId>
-    <version>${project.version}</version>
+    <version>${project.parent.version}</version>
   </dependency>
 
     <dependency>
       <groupId>org.rhq</groupId>
       <artifactId>rhq-enterprise-server-xml-schemas</artifactId>
-      <version>${project.version}</version>
+      <version>${project.parent.version}</version>
     </dependency>
 
     <dependency>
@@ -63,7 +64,7 @@
     <dependency>
       <groupId>org.rhq</groupId>
       <artifactId>rhq-cassandra-schema</artifactId>
-      <version>${project.version}</version>
+      <version>${project.parent.version}</version>
       <exclusions>
         <exclusion>
           <groupId>org.hyperic</groupId>
@@ -91,7 +92,7 @@
     <dependency>
       <groupId>org.rhq</groupId>
       <artifactId>rhq-core-plugin-api</artifactId>
-      <version>${project.version}</version>
+      <version>${project.parent.version}</version>
       <exclusions>
         <exclusion>
           <groupId>org.hyperic</groupId>
@@ -103,13 +104,13 @@
     <dependency>
       <groupId>org.rhq</groupId>
       <artifactId>rhq-core-client-api</artifactId>
-      <version>${project.version}</version>
+      <version>${project.parent.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.rhq</groupId>
       <artifactId>rhq-core-dbutils</artifactId>
-      <version>${project.version}</version>
+      <version>${project.parent.version}</version>
       <exclusions>
         <exclusion>
           <groupId>ant</groupId>
@@ -121,19 +122,19 @@
     <dependency>
       <groupId>org.rhq</groupId>
       <artifactId>safe-invoker</artifactId>
-      <version>${project.version}</version>
+      <version>${project.parent.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.rhq</groupId>
       <artifactId>rhq-common-drift</artifactId>
-      <version>${project.version}</version>
+      <version>${project.parent.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.rhq</groupId>
       <artifactId>rhq-server-metrics</artifactId>
-      <version>${project.version}</version>
+      <version>${project.parent.version}</version>
       <exclusions>
         <exclusion>
           <groupId>org.hyperic</groupId>
@@ -149,7 +150,7 @@
     <dependency>
       <groupId>org.rhq</groupId>
       <artifactId>rhq-cassandra-util</artifactId>
-      <version>${project.version}</version>
+      <version>${project.parent.version}</version>
       <exclusions>
         <exclusion>
           <groupId>com.datastax.cassandra</groupId>
@@ -205,7 +206,7 @@
     <dependency>
       <groupId>org.rhq</groupId>
       <artifactId>test-utils</artifactId>
-      <version>${project.version}</version>
+      <version>${project.parent.version}</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>
@@ -493,7 +494,7 @@
     <dependency>
       <groupId>org.rhq.helpers</groupId>
       <artifactId>rest-docs-generator</artifactId>
-      <version>${project.version}</version>
+      <version>${project.parent.version}</version>
       <scope>provided</scope>
     </dependency>
 
@@ -576,9 +577,9 @@
                 </tstamp>
 
                 <echo file="${project.build.outputDirectory}/rhq-server-version.properties" append="false">Product-Name=${rhq.product.name}
-                  Product-Version=${project.version}
+                  Product-Version=${project.parent.version}
                   Module-Name=${project.name}
-                  Module-Version=${project.version}
+                  Module-Version=${project.parent.version}
                   Build-Number=${buildNumber}
                   Build-Date=${build.time}
                   Build-Jdk-Vendor=${java.vendor}
@@ -896,7 +897,7 @@
 
                     <mkdir dir="${javadoc.outputDirectory}/remote-api"/>
                     <javadoc destdir="${javadoc.outputDirectory}/remote-api" author="false" version="true"
-                      windowtitle="RHQ ${project.version} Remote API" noindex="false">
+                      windowtitle="RHQ ${project.parent.version} Remote API" noindex="false">
                       <classpath>
                         <pathelement path="${maven.compile.classpath}"/>
                       </classpath>
@@ -933,7 +934,7 @@
       <dependency>
         <groupId>org.rhq.helpers</groupId>
         <artifactId>rest-docs-generator</artifactId>
-        <version>${project.version}</version>
+        <version>${project.parent.version}</version>
       </dependency>
 
       <!-- We need this, as otherwise processing fails completely with a class not found exception -->

diff --git a/modules/enterprise/server/plugins/alert-sms/pom.xml b/modules/enterprise/server/plugins/alert-sms/pom.xml
@@ -25,7 +25,7 @@
          <dependency>
              <groupId>org.rhq</groupId>
              <artifactId>rhq-enterprise-server</artifactId>
-             <version>${project.version}</version>
+             <version>${rhq-enterprise-server.version}</version>
              <scope>provided</scope> <!-- by JBossAS -->
          </dependency>         
 

diff --git a/modules/enterprise/server/plugins/pom.xml b/modules/enterprise/server/plugins/pom.xml
@@ -21,7 +21,7 @@
       <dependency>
          <groupId>org.rhq</groupId>
          <artifactId>rhq-enterprise-server</artifactId>
-         <version>${project.version}</version>
+         <version>${rhq-enterprise-server.version}</version>
          <type>ejb</type>
       </dependency>
 

diff --git a/modules/integration-tests/jndi-access/jndi-access-test/pom.xml b/modules/integration-tests/jndi-access/jndi-access-test/pom.xml
@@ -74,7 +74,7 @@
         <dependency>
             <groupId>org.rhq</groupId>
             <artifactId>rhq-enterprise-server</artifactId>
-            <version>${project.version}</version>
+            <version>${rhq-enterprise-server.version}</version>
             <scope>test</scope>
         </dependency>