[teiid-commits] [teiid/teiid] 3f14f2: adding a dependency needed to run non-container in...

[shawkins]

  Branch: refs/heads/8.7.x
  Home:   https://github.com/teiid/teiid
  Commit: 3f14f2a81ea7e165160bb261007682d31073f8e7
      https://github.com/teiid/teiid/commit/3f14f2a81ea7e165160bb261007682d31073f8e7
  Author: shawkins <shawkins at redhat.com>
  Date:   2014-06-05 (Thu, 05 Jun 2014)

  Changed paths:
    M connectors/connector-ws/pom.xml
    M pom.xml

  Log Message:
  -----------
  adding a dependency needed to run non-container integration tests


  Commit: 0c3ed292158ef6f6d72c3c4743f2416e63b9d8e2
      https://github.com/teiid/teiid/commit/0c3ed292158ef6f6d72c3c4743f2416e63b9d8e2
  Author: shawkins <shawkins at redhat.com>
  Date:   2014-06-05 (Thu, 05 Jun 2014)

  Changed paths:
    M build/kits/embedded/examples/embedded-portfolio/run.bat
    M build/kits/embedded/examples/embedded-portfolio/run.sh
    M client/src/main/java/org/teiid/jdbc/EmbeddedProfile.java
    A client/src/main/java/org/teiid/jdbc/ModuleHelper.java
    M connectors/connector-ws/kits/embedded-dist.xml
    M connectors/connector-ws/kits/jboss-as7-dist.xml
    M connectors/connector-ws/pom.xml
    M pom.xml

  Log Message:
  -----------
  TEIID-2986 fixing issues with embedded
Conflicts:

	connectors/connector-ws/kits/jboss-as7-dist.xml


Compare: https://github.com/teiid/teiid/compare/0e383cc5b482...0c3ed292158e