Modify rhq-database-plugin and rhq-postgres-plugin for independent v…

…ersioning.
rhq-project · Oct 3, 2014 · ff91261 · ff91261
1 parent e455de3
commit ff91261
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 10 deletions.
diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml
@@ -836,13 +836,13 @@
                                         <artifactItem>
                                             <groupId>${project.groupId}</groupId>
                                             <artifactId>rhq-database-plugin</artifactId>
-                                            <version>${project.version}</version>
+                                            <version>${rhq-database-plugin.version}</version>
                                         </artifactItem>
 
                                         <artifactItem>
                                             <groupId>${project.groupId}</groupId>
                                             <artifactId>rhq-postgres-plugin</artifactId>
-                                            <version>${project.version}</version>
+                                            <version>${rhq-postgres-plugin.version}</version>
                                         </artifactItem>
 
                                         <artifactItem>

diff --git a/modules/plugins/database/pom.xml b/modules/plugins/database/pom.xml
@@ -10,6 +10,7 @@
 
    <groupId>org.rhq</groupId>
    <artifactId>rhq-database-plugin</artifactId>
+   <version>4.9.0.JON320GA</version>
    <packaging>jar</packaging>
 
    <name>RHQ Database Plugin</name>
@@ -166,4 +167,4 @@
       </profile>
    </profiles>
 
-</project>
+</project>
diff --git a/modules/plugins/mysql/pom.xml b/modules/plugins/mysql/pom.xml
@@ -27,7 +27,7 @@
       <dependency>
          <groupId>org.rhq</groupId>
          <artifactId>rhq-database-plugin</artifactId>
-         <version>${project.version}</version>
+         <version>${rhq-database-plugin.version}</version>
          <scope>provided</scope>
       </dependency>
 
@@ -88,7 +88,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-database-plugin/${project.version}/rhq-database-plugin-${project.version}.jar" />
+                                    <include name="org/rhq/rhq-database-plugin/${rhq-database-plugin.version}/rhq-database-plugin-${rhq-database-plugin.version}.jar" />
                                  </fileset>
                                  <fileset dir="${project.build.directory}">
                                     <include name="${project.artifactId}-${project.version}.jar" />

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

diff --git a/modules/plugins/postgres/pom.xml b/modules/plugins/postgres/pom.xml
@@ -10,6 +10,7 @@
 
    <groupId>org.rhq</groupId>
    <artifactId>rhq-postgres-plugin</artifactId>
+   <version>4.9.0.JON320GA</version>
    <packaging>jar</packaging>
 
    <name>RHQ Postgres Plugin</name>
@@ -26,7 +27,7 @@
       <dependency>
          <groupId>org.rhq</groupId>
          <artifactId>rhq-database-plugin</artifactId>
-         <version>${project.version}</version>
+         <version>${rhq-database-plugin.version}</version>
          <scope>provided</scope>
       </dependency>
 
@@ -87,7 +88,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-database-plugin/${project.version}/rhq-database-plugin-${project.version}.jar" />
+                                    <include name="org/rhq/rhq-database-plugin/${rhq-database-plugin.version}/rhq-database-plugin-${rhq-database-plugin.version}.jar" />
                                  </fileset>
                                  <fileset dir="${project.build.directory}">
                                     <include name="${project.artifactId}-${project.version}.jar" />

diff --git a/modules/plugins/validate-all-plugins/pom.xml b/modules/plugins/validate-all-plugins/pom.xml
@@ -32,7 +32,7 @@
                               <pathelement location="../apache/target/rhq-apache-plugin-${project.version}.jar" />
                               <pathelement location="../augeas/target/rhq-augeas-plugin-${project.version}.jar" />
                               <pathelement location="../samba/target/rhq-samba-plugin-${project.version}.jar" />
-                              <pathelement location="../database/target/rhq-database-plugin-${project.version}.jar" />
+                              <pathelement location="../database/target/rhq-database-plugin-${rhq-database-plugin.version}.jar" />
                               <pathelement location="../grub/target/rhq-grub-plugin-${project.version}.jar" />
                               <pathelement location="../hadoop/target/hadoop-plugin-${project.version}.jar" />
                               <!--<pathelement location="../hardware/target/rhq-hardware-plugin-${project.version}.jar" />-->
@@ -52,7 +52,7 @@
                               <pathelement location="../oracle/target/rhq-oracle-plugin-${project.version}.jar" />
                               <pathelement location="../perftest/target/rhq-perftest-plugin-${project.version}.jar" />
                               <pathelement location="../platform/target/rhq-platform-plugin-${rhq-platform-plugin.version}.jar" />
-                              <pathelement location="../postgres/target/rhq-postgres-plugin-${project.version}.jar" />
+                              <pathelement location="../postgres/target/rhq-postgres-plugin-${rhq-postgres-plugin.version}.jar" />
                               <pathelement location="../rhq-agent/target/rhq-agent-plugin-${project.version}.jar" />
                               <pathelement location="../snmptrapd/target/rhq-snmptrapd-plugin-${project.version}.jar" />
                               <pathelement location="../sshd/target/rhq-sshd-plugin-${project.version}.jar" />