Branch: refs/heads/8.7.x Home: https://github.com/teiid/teiid Commit: 8c790c75a2069c8408fe84773659bd477609c26a https://github.com/teiid/teiid/commit/8c790c75a2069c8408fe84773659bd47760... Author: Van Halbert <vhalbert(a)redhat.com&gt; Date: 2014-11-24 (Mon, 24 Nov 2014) Changed paths: M build/kits/jboss-as7/standalone/configuration/standalone-teiid.xml M connectors/connector-ws/kits/jboss-as7-dist.xml A connectors/connector-ws/kits/jboss-as7/modules/javax/ws/rs/api/2.0/module.xml M connectors/connector-ws/kits/jboss-as7/modules/org/apache/cxf/impl/frontend-jaxrs/main/module.xml M connectors/connector-ws/pom.xml M pom.xml M test-integration/common/pom.xml M test-integration/common/src/test/java/org/teiid/arquillian/IntegrationTestDeployment.java M test-integration/common/src/test/java/org/teiid/arquillian/IntegrationTestOData.java M test-integration/common/src/test/resources/module.xml Log Message: ----------- fixes for TEIID-3226 to upgrade springframewor to 3.2.12 and part of TEIID-3185 which changed to use javax.ws.rs 2.0 jar version Commit: 567a65ab803c79d6de54a5303c0c020499cb6bb6 https://github.com/teiid/teiid/commit/567a65ab803c79d6de54a5303c0c020499c... Author: shawkins <shawkins(a)redhat.com&gt; Date: 2014-11-25 (Tue, 25 Nov 2014) Changed paths: M build/kits/jboss-as7/standalone/configuration/standalone-teiid.xml M connectors/connector-ws/kits/jboss-as7-dist.xml A connectors/connector-ws/kits/jboss-as7/modules/javax/ws/rs/api/2.0/module.xml M connectors/connector-ws/kits/jboss-as7/modules/org/apache/cxf/impl/frontend-jaxrs/main/module.xml M connectors/connector-ws/pom.xml M pom.xml M test-integration/common/pom.xml M test-integration/common/src/test/java/org/teiid/arquillian/IntegrationTestDeployment.java M test-integration/common/src/test/java/org/teiid/arquillian/IntegrationTestOData.java M test-integration/common/src/test/resources/module.xml Log Message: ----------- Merge pull request #366 from vhalbert/8.7.x fixes for TEIID-3226 and part of TEIID-3185 Compare: https://github.com/teiid/teiid/compare/b0380900fb3f...567a65ab803c