8:25 a.m.
Author: shawkins
Date: 2009-06-08 09:25:47 -0400 (Mon, 08 Jun 2009)
New Revision: 1026
Modified:
trunk/build/assembly/embedded/embedded-dist.xml
trunk/connectors/connector-salesforce/pom.xml
trunk/connectors/connector-xml-common/pom.xml
trunk/connectors/connector-xml/pom.xml
Log:
TEIID-644 further refining xml dependencies.
Modified: trunk/build/assembly/embedded/embedded-dist.xml
===================================================================
--- trunk/build/assembly/embedded/embedded-dist.xml 2009-06-07 00:28:15 UTC (rev 1025)
+++ trunk/build/assembly/embedded/embedded-dist.xml 2009-06-08 13:25:47 UTC (rev 1026)
@@ -49,14 +49,6 @@
</fileSet>
<fileSet>
-
<directory>target/distribution/teiid-${version}-connector-dependencies.dir</directory>
- <includes>
- <include>*.jar</include>
- </includes>
- <outputDirectory>extensions</outputDirectory>
- </fileSet>
-
- <fileSet>
<directory>build/target/kit-embedded</directory>
<outputDirectory>/</outputDirectory>
<excludes>
Modified: trunk/connectors/connector-salesforce/pom.xml
===================================================================
--- trunk/connectors/connector-salesforce/pom.xml 2009-06-07 00:28:15 UTC (rev 1025)
+++ trunk/connectors/connector-salesforce/pom.xml 2009-06-08 13:25:47 UTC (rev 1026)
@@ -22,7 +22,22 @@
<groupId>org.jboss.teiid</groupId>
<artifactId>teiid-common-core</artifactId>
<scope>provided</scope>
- </dependency>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>jdom</groupId>
+ <artifactId>jdom</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.jboss.teiid.connectors</groupId>
<artifactId>connector-xml-common</artifactId>
Modified: trunk/connectors/connector-xml/pom.xml
===================================================================
--- trunk/connectors/connector-xml/pom.xml 2009-06-07 00:28:15 UTC (rev 1025)
+++ trunk/connectors/connector-xml/pom.xml 2009-06-08 13:25:47 UTC (rev 1026)
@@ -23,18 +23,28 @@
<groupId>org.jboss.teiid</groupId>
<artifactId>teiid-common-core</artifactId>
<scope>provided</scope>
- </dependency>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>jdom</groupId>
+ <artifactId>jdom</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.jboss.teiid.connectors</groupId>
<artifactId>connector-xml-common</artifactId>
<version>${project.version}</version>
<type>pom</type>
</dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <scope>compile</scope>
- </dependency>
</dependencies>
<!-- This build portion is identical for all the connectors that are deployed; so
when making changes make sure
Modified: trunk/connectors/connector-xml-common/pom.xml
===================================================================
--- trunk/connectors/connector-xml-common/pom.xml 2009-06-07 00:28:15 UTC (rev 1025)
+++ trunk/connectors/connector-xml-common/pom.xml 2009-06-08 13:25:47 UTC (rev 1026)
@@ -14,11 +14,6 @@
<description>This project holds the common dependencies for the XML
Connector</description>
<dependencies>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- </dependency>
- <dependency>
<groupId>apache-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
<version>3.0.1</version>
@@ -49,13 +44,13 @@
<groupId>xom</groupId>
<artifactId>xom</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>jdom</groupId>
+ <artifactId>jdom</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
- <groupId>jdom</groupId>
- <artifactId>jdom</artifactId>
- </dependency>
- <dependency>
<groupId>javax.jms</groupId>
<artifactId>jms</artifactId>
<version>1.1</version>
@@ -64,6 +59,12 @@
<groupId>axis</groupId>
<artifactId>axis</artifactId>
<version>1.3</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>wss4j</groupId>
@@ -100,15 +101,16 @@
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
<version>2.7.0</version>
<scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>xom</groupId>