Modify jboss-as-dmr-client to be patchable.

Conflicts: pom.xml
rhq-project · Oct 3, 2014 · e28602b · e28602b
1 parent ae9665a
commit e28602b
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 5 deletions.
diff --git a/modules/enterprise/server/installer/pom.xml b/modules/enterprise/server/installer/pom.xml
@@ -52,7 +52,7 @@
         <dependency>
             <groupId>org.rhq</groupId>
             <artifactId>rhq-jboss-as-dmr-client</artifactId>
-            <version>${project.version}</version>
+            <version>${rhq-jboss-as-dmr-client.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
@@ -10,7 +10,7 @@
         <resource-root path="rhq-core-dbutils-${project.version}.jar"/>
         <resource-root path="rhq-core-util-${project.version}.jar"/>
         <resource-root path="rhq-enterprise-comm-${project.version}.jar"/>
-        <resource-root path="rhq-jboss-as-dmr-client-${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"/>
         <resource-root path="ant-launcher-${ant.version}.jar"/>
         <resource-root path="i18nlog-${i18nlog.version}.jar"/>

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

diff --git a/modules/enterprise/server/server-control/pom.xml b/modules/enterprise/server/server-control/pom.xml
@@ -41,7 +41,7 @@
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>rhq-jboss-as-dmr-client</artifactId>
-      <version>${project.version}</version>
+      <version>${rhq-jboss-as-dmr-client.version}</version>
     </dependency>
 
     <dependency>

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
@@ -6,7 +6,7 @@
   <resources>
     <resource-root path="${project.build.finalName}.jar"/>
     <resource-root path="rhq-core-util-${project.version}.jar"/>
-    <resource-root path="rhq-jboss-as-dmr-client-${project.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"/>
   </resources>

diff --git a/pom.xml b/pom.xml
@@ -280,6 +280,10 @@
     <!-- a default value for the child modules indicating that the module is not
          part of our public API and is therefore not API-checked. -->
     <rhq.internal>true</rhq.internal>
+
+    <!-- RHQ patching mechanism -->
+    <rhq-jboss-as-dmr-client.version>4.9.0.JON320GA-redhat-1</rhq-jboss-as-dmr-client.version>
+
   </properties>
 
 
@@ -1069,6 +1073,21 @@
        <version>${jgroups.version}</version>
        <scope>provided</scope>
      </dependency>
+
+      <!-- BZ 987652 : explicitly set jboss-ejb-client version as used by EAP -->
+      <dependency>
+         <groupId>org.jboss</groupId>
+         <artifactId>jboss-ejb-client</artifactId>
+         <version>${jboss.ejb.client.version}</version>
+      </dependency>
+
+      <!-- RHQ specific versioning for components -->
+      <dependency>
+         <groupId>org.rhq</groupId>
+         <artifactId>rhq-jboss-as-dmr-client</artifactId>
+         <version>${rhq-jboss-as-dmr-client.version}</version>
+      </dependency>
+
   </dependencies>
 
   </dependencyManagement>