TEIID-4358: JDG: Retain supported dependencies in the module.xml for …

…out-of-the-box usage
teiid · Aug 19, 2016 · 78d3fc2 · 78d3fc2
1 parent f5385ae
commit 78d3fc2
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 5 deletions.
diff --git a/build/kits/jboss-as7/overlay/docs/teiid/teiid-releasenotes.html b/build/kits/jboss-as7/overlay/docs/teiid/teiid-releasenotes.html
@@ -277,6 +277,9 @@ <h4 class="western">from ${project.version}</h4>
 	<li/>
 	<p style="margin-bottom: 0in">
 <a href='https://issues.jboss.org/browse/TEIID-4335'>TEIID-4335</a>] - No buffer when close is called (fixing the npe)
+	<li/>
+	<p style="margin-bottom: 0in">
+<a href='https://issues.jboss.org/browse/TEIID-4358'>TEIID-4358</a>] - JDG: Retain supported dependencies in the module.xml for out-of-the-box usage
 </ul>
 
 <h4 class="western">from 8.11</h4>

diff --git a/...sl/kits/jboss-as7/modules/org/jboss/teiid/resource-adapter/infinispan/dsl/main/module.xml b/...sl/kits/jboss-as7/modules/org/jboss/teiid/resource-adapter/infinispan/dsl/main/module.xml
@@ -19,9 +19,18 @@
 
 		<!--  the JDG dependencies can be found in the translator-infinispan-dsl module -->
 
- 	<module name="org.infinispan.commons" slot="${jdg.slot}" optional="true" services="import"/>
-   	<module name="org.infinispan.client.hotrod" slot="${jdg.slot}" optional="true" services="import"/>
-        <module name="org.infinispan.protostream" slot="${jdg.slot}"  optional="true" services="import" />
+ 		<module name="org.infinispan.commons" slot="${jdg.slot}" optional="true" services="import"/>
+   		<module name="org.infinispan.client.hotrod" slot="${jdg.slot}" optional="true" services="import"/>
+    	<module name="org.infinispan.protostream" slot="${jdg.slot}"  optional="true" services="import" />
+
+    	<module name="org.infinispan.commons" slot="jdg-6.5" optional="true" services="import"/>
+		<module name="org.infinispan.client.hotrod" slot="jdg-6.5" optional="true" services="import"/>
+    	<module name="org.infinispan.protostream" slot="jdg-6.5"  optional="true" services="import" />
+
+    	<module name="org.infinispan.commons" slot="jdg-6.4" optional="true" services="import"/>
+		<module name="org.infinispan.client.hotrod" slot="jdg-6.4" optional="true" services="import"/>
+    	<module name="org.infinispan.protostream" slot="jdg-6.4"  optional="true" services="import" />
+
 
         <module name="org.jboss.remoting3"  />   
 

diff --git a/...inispan.6/kits/jboss-as7/modules/org/jboss/teiid/resource-adapter/infinispan/6/module.xml b/...inispan.6/kits/jboss-as7/modules/org/jboss/teiid/resource-adapter/infinispan/6/module.xml
@@ -18,8 +18,15 @@
         <module name="org.jboss.teiid.translator.infinispan.cache" export="true"/>
         <module name="org.jboss.modules"/>
 
-		<module name="org.infinispan" slot="${jdg.slot}" optional="true" services="export"  export="true" />
-		<module name="org.infinispan.query" slot="${jdg.slot}" optional="true"  services="export" export="true"  />
+ 		<module name="org.infinispan" slot="${jdg.slot}" optional="true" services="export"  export="true" />
+		<module name="org.infinispan.query" slot="${jdg.slot}" optional="true"  services="export" export="true"  />       
+
+		<module name="org.infinispan" slot="jdg-6.5" optional="true" services="export"  export="true" />
+		<module name="org.infinispan.query" slot="jdg-6.5" optional="true"  services="export" export="true"  />
+
+		<module name="org.infinispan" slot="jdg-6.4" optional="true" services="export"  export="true" />
+		<module name="org.infinispan.query" slot="jdg-6.4" optional="true"  services="export" export="true"  />
+
 
     </dependencies>
 </module>
diff --git a/...-cache/kits/jboss-as7/modules/org/jboss/teiid/translator/infinispan/cache/main/module.xml b/...-cache/kits/jboss-as7/modules/org/jboss/teiid/translator/infinispan/cache/main/module.xml
@@ -20,7 +20,19 @@
         <module name="org.infinispan.query.dsl" slot="${jdg.slot}" optional="true"  export="true" /> 
 
         <module name="org.infinispan.lucene-directory" slot="${jdg.slot}" optional="true"  export="true" /> 
+
+        <module name="org.infinispan" slot="jdg-6.5" optional="true"  export="true"  services="import" />
+        <module name="org.infinispan.query" slot="jdg-6.5" optional="true" export="true"  services="import" />
+        <module name="org.infinispan.query.dsl" slot="jdg-6.5" optional="true"  export="true" /> 
+
+        <module name="org.infinispan.lucene-directory" slot="jdg-6.5" optional="true"  export="true" /> 
 
+        <module name="org.infinispan" slot="jdg-6.4" optional="true"  export="true"  services="import" />
+        <module name="org.infinispan.query" slot="jdg-6.4" optional="true" export="true"  services="import" />
+        <module name="org.infinispan.query.dsl" slot="jdg-6.4" optional="true"  export="true" /> 
+
+        <module name="org.infinispan.lucene-directory" slot="jdg-6.4" optional="true"  export="true" /> 
+
     </dependencies>
 </module>
 
diff --git a/...span-dsl/kits/jboss-as7/modules/org/jboss/teiid/translator/infinispan/dsl/main/module.xml b/...span-dsl/kits/jboss-as7/modules/org/jboss/teiid/translator/infinispan/dsl/main/module.xml
@@ -19,5 +19,11 @@
    		<module name="org.infinispan.protostream" slot="${jdg.slot}" optional="true" export="true" />
         <module name="org.infinispan.query.dsl" slot="${jdg.slot}" optional="true" export="true" />    
 
+    	<module name="org.infinispan.protostream" slot="jdg-6.5" optional="true" export="true" />
+        <module name="org.infinispan.query.dsl" slot="jdg-6.5" optional="true" export="true" />    
+
+    	<module name="org.infinispan.protostream" slot="jdg-6.4" optional="true" export="true" />
+        <module name="org.infinispan.query.dsl" slot="jdg-6.4" optional="true" export="true" />    
+
     </dependencies>   
 </module>