TEIID-3912 using odata commons instead

teiid · Jan 25, 2016 · 196ac7b · 196ac7b
1 parent 1c1a207
commit 196ac7b
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/connectors/translator-odata4/kits/wildfly/modules/org/apache/olingo/client/main/module.xml b/connectors/translator-odata4/kits/wildfly/modules/org/apache/olingo/client/main/module.xml
@@ -19,7 +19,7 @@
         <module name="com.fasterxml.jackson.dataformat.xml"/>
         <module name="org.slf4j"/>
         <module name="org.apache.httpcomponents"/>
-        <module name="org.apache.olingo.common"/>
+        <module name="org.apache.olingo.commons"/>
     </dependencies>
 
 </module>
diff --git a/olingo-common/kits/wildfly-dist.xml b/olingo-common/kits/wildfly-dist.xml
@@ -36,7 +36,7 @@
       <useProjectArtifact>true</useProjectArtifact>
     </dependencySet>      
     <dependencySet>
-      <outputDirectory>${wildfly-module-root}/org/apache/olingo/common/main</outputDirectory>
+      <outputDirectory>${wildfly-module-root}/org/apache/olingo/commons/main</outputDirectory>
       <useTransitiveDependencies>false</useTransitiveDependencies>
       <includes>
         <include>org.apache.olingo:odata-commons-api</include>

diff --git a/.../org/apache/olingo/common/main/module.xml → ...org/apache/olingo/commons/main/module.xml b/.../org/apache/olingo/common/main/module.xml → ...org/apache/olingo/commons/main/module.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module xmlns="urn:jboss:module:1.0" name="org.apache.olingo.common">
+<module xmlns="urn:jboss:module:1.0" name="org.apache.olingo.commons">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>

diff --git a/olingo-common/kits/wildfly/modules/org/jboss/teiid/olingo/common/main/module.xml b/olingo-common/kits/wildfly/modules/org/jboss/teiid/olingo/common/main/module.xml
@@ -9,7 +9,7 @@
     </resources>
 
     <dependencies>
-        <module name="org.apache.olingo.common" export="true"/>    
+        <module name="org.apache.olingo.commons" export="true"/>    
         <module name="org.jboss.teiid.common-core" />
         <module name="org.jboss.teiid" />
         <module name="org.jboss.teiid.api"/>

diff --git a/olingo/kits/wildfly/modules/org/apache/olingo/server/main/module.xml b/olingo/kits/wildfly/modules/org/apache/olingo/server/main/module.xml
@@ -25,7 +25,7 @@
         <module name="org.apache.commons.codec"/>
         <module name="org.apache.commons.lang" slot="3.3.2"/>
         <module name="org.antlr" slot="4.5"/>
-        <module name="org.apache.olingo.common"/>
+        <module name="org.apache.olingo.commons"/>
     </dependencies>
 
 </module>