Branch: refs/heads/63-8.12.x Home: https://github.com/teiid/teiid Commit: 502424dd9ab76a7ffef4d83b9cf7cb9e39e8d28d https://github.com/teiid/teiid/commit/502424dd9ab76a7ffef4d83b9cf7cb9e39e... Author: shawkins <shawkins(a)redhat.com&gt; Date: 2016-01-23 (Sat, 23 Jan 2016) Changed paths: M build/assembly/jboss-as7/dist.xml A build/kits/jboss-as7/modules/org/apache/olingo/common/main/module.xml M build/kits/jboss-as7/modules/org/apache/olingo/main/module.xml A build/kits/jboss-as7/modules/org/jboss/teiid/olingo/common/main/module.xml M build/kits/jboss-as7/modules/org/jboss/teiid/olingo/main/module.xml M connectors/translator-odata4/kits/jboss-as7/modules/org/apache/olingo/client/main/module.xml M connectors/translator-odata4/kits/jboss-as7/modules/org/jboss/teiid/translator/odata4/main/module.xml M connectors/translator-odata4/pom.xml M connectors/translator-odata4/src/main/java/org/teiid/translator/odata4/BaseQueryExecution.java M connectors/translator-odata4/src/main/java/org/teiid/translator/odata4/ODataFilterVisitor.java M connectors/translator-odata4/src/main/java/org/teiid/translator/odata4/ODataMetadataProcessor.java M connectors/translator-odata4/src/main/java/org/teiid/translator/odata4/ODataProcedureExecution.java R connectors/translator-odata4/src/main/java/org/teiid/translator/odata4/ODataTypeManager.java M connectors/translator-odata4/src/main/java/org/teiid/translator/odata4/ODataUpdateExecution.java M connectors/translator-odata4/src/main/java/org/teiid/translator/odata4/ODataUpdateVisitor.java A olingo-common/pom.xml A olingo-common/src/main/java/org/teiid/olingo/common/ODataTypeManager.java M olingo/dependencies.xml M olingo/pom.xml R olingo/src/main/java/org/teiid/olingo/ODataTypeManager.java M olingo/src/main/java/org/teiid/olingo/service/EntityCollectionResponse.java M olingo/src/main/java/org/teiid/olingo/service/ODataExpressionToSQLVisitor.java M olingo/src/main/java/org/teiid/olingo/service/ODataSQLBuilder.java M olingo/src/main/java/org/teiid/olingo/service/ODataSchemaBuilder.java M olingo/src/main/java/org/teiid/olingo/service/ProcedureSQLBuilder.java M olingo/src/main/java/org/teiid/olingo/service/ReferenceUpdateSQLBuilder.java M pom.xml Log Message: ----------- TEIID-3912 creating an olingo-common module Conflicts: olingo/src/main/java/org/teiid/olingo/ODataPlugin.java olingo/src/main/resources/org/teiid/olingo/i18n.properties Conflicts: build/assembly/wildfly-dist.xml build/kits/jboss-as7/modules/com/fasterxml/jackson/dataformat/xml/main/module.xml build/kits/jboss-as7/modules/org/jboss/teiid/olingo/main/module.xml connectors/translator-odata4/kits/jboss-as7-dist.xml connectors/translator-odata4/kits/jboss-as7/modules/org/jboss/teiid/translator/odata4/main/module.xml olingo-common/kits/wildfly/modules/org/antlr/4.5/module.xml olingo-common/kits/wildfly/modules/org/apache/commons/lang/3.3.2/module.xml olingo-common/kits/wildfly/modules/org/apache/olingo/common/main/module.xml olingo/kits/wildfly-dist.xml olingo/src/main/java/org/teiid/olingo/ODataPlugin.java olingo/src/main/resources/org/teiid/olingo/i18n.properties test-integration/common/src/test/java/org/teiid/arquillian/IntegrationTestOData4.java