[teiid-commits] teiid SVN: r473 - in trunk: connectors/connector-salesforce and 3 other directories.
teiid-commits at lists.jboss.org
teiid-commits at lists.jboss.org
Mon Feb 16 13:56:03 EST 2009
Author: shawkins
Date: 2009-02-16 13:56:03 -0500 (Mon, 16 Feb 2009)
New Revision: 473
Modified:
trunk/connectors/connector-salesforce/pom.xml
trunk/connectors/connector-xml-common/pom.xml
trunk/connectors/connector-xml/pom.xml
trunk/connectors/salesforce-api/pom.xml
trunk/pom.xml
Log:
TEIID-133 minimizing dependencies in common xml module.
Modified: trunk/connectors/connector-salesforce/pom.xml
===================================================================
--- trunk/connectors/connector-salesforce/pom.xml 2009-02-16 17:42:45 UTC (rev 472)
+++ trunk/connectors/connector-salesforce/pom.xml 2009-02-16 18:56:03 UTC (rev 473)
@@ -1,56 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <parent>
- <artifactId>teiid-connectors</artifactId>
- <groupId>org.jboss.teiid.connectors</groupId>
- <version>6.0.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>connector-salesforce</artifactId>
- <name>Salesforce Connector</name>
- <description>Integrates the query engine with Salesforce.com.</description>
- <dependencies>
- <dependency>
- <groupId>axis</groupId>
- <artifactId>axis-saaj</artifactId>
- <version>1.2</version>
- </dependency>
- <dependency>
- <groupId>axis</groupId>
- <artifactId>axis-jaxrpc</artifactId>
- <version>1.2</version>
- </dependency>
- <dependency>
- <groupId>apache-discovery</groupId>
- <artifactId>commons-discovery</artifactId>
- <version>0.2</version>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
- <dependency>
- <groupId>wsdl4j</groupId>
- <artifactId>wsdl4j</artifactId>
- <version>1.5.1</version>
- </dependency>
- <dependency>
- <groupId>axis</groupId>
- <artifactId>axis</artifactId>
- <version>1.3</version>
- </dependency>
- <dependency>
- <groupId>apache-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <version>3.0.1</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <parent>
+ <artifactId>teiid-connectors</artifactId>
<groupId>org.jboss.teiid.connectors</groupId>
- <artifactId>salesforce-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
+ <version>6.0.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>connector-salesforce</artifactId>
+ <name>Salesforce Connector</name>
+ <description>Integrates the query engine with Salesforce.com.</description>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.teiid.connectors</groupId>
+ <artifactId>connector-xml-common</artifactId>
+ <version>${project.version}</version>
+ <type>pom</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.teiid.connectors</groupId>
+ <artifactId>salesforce-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
</project>
\ No newline at end of file
Modified: trunk/connectors/connector-xml/pom.xml
===================================================================
--- trunk/connectors/connector-xml/pom.xml 2009-02-16 17:42:45 UTC (rev 472)
+++ trunk/connectors/connector-xml/pom.xml 2009-02-16 18:56:03 UTC (rev 473)
@@ -1,27 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <parent>
- <artifactId>connector-xml-common</artifactId>
- <groupId>org.jboss.teiid.connectors</groupId>
- <version>6.0.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>connector-xml</artifactId>
- <name>XML Connector</name>
- <description>This connector produces the XML documents from Web
- service and transforms the document into a relational structure.</description>
- <dependencies>
- <dependency>
- <groupId>org.jboss.teiid.connectors</groupId>
- <artifactId>connector-xml-common</artifactId>
- <version>6.0.0-SNAPSHOT</version>
- <type>pom</type>
- </dependency>
- </dependencies>
- <dependencyManagement>
- <dependencies>
- </dependencies>
- </dependencyManagement>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <parent>
+ <artifactId>teiid-connectors</artifactId>
+ <groupId>org.jboss.teiid.connectors</groupId>
+ <version>6.0.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>connector-xml</artifactId>
+ <name>XML Connector</name>
+ <description>This connector produces the XML documents from Web
+ service and transforms the document into a relational structure.</description>
+ <dependencies>
+ <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>
</project>
\ No newline at end of file
Modified: trunk/connectors/connector-xml-common/pom.xml
===================================================================
--- trunk/connectors/connector-xml-common/pom.xml 2009-02-16 17:42:45 UTC (rev 472)
+++ trunk/connectors/connector-xml-common/pom.xml 2009-02-16 18:56:03 UTC (rev 473)
@@ -8,11 +8,9 @@
<version>6.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.teiid.connectors</groupId>
<artifactId>connector-xml-common</artifactId>
<packaging>pom</packaging>
<name>XML Common Connector</name>
- <version>6.0.0-SNAPSHOT</version>
<description>This project holds the common dependencies for the XML Connector</description>
<dependencies>
<dependency>
@@ -39,6 +37,18 @@
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xom</groupId>
+ <artifactId>xom</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -67,12 +77,6 @@
</dependency>
<dependency>
<groupId>axis</groupId>
- <artifactId>axis-wsdl4j</artifactId>
- <version>1.5.1</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>axis</groupId>
<artifactId>axis-schema</artifactId>
<version>1.3</version>
<scope>runtime</scope>
@@ -106,10 +110,5 @@
<version>2.7.0</version>
<scope>runtime</scope>
</dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <scope>compile</scope>
- </dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: trunk/connectors/salesforce-api/pom.xml
===================================================================
--- trunk/connectors/salesforce-api/pom.xml 2009-02-16 17:42:45 UTC (rev 472)
+++ trunk/connectors/salesforce-api/pom.xml 2009-02-16 18:56:03 UTC (rev 473)
@@ -1,6 +1,6 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
- <artifactId>connector-xml-common</artifactId>
+ <artifactId>teiid-connectors</artifactId>
<groupId>org.jboss.teiid.connectors</groupId>
<version>6.0.0-SNAPSHOT</version>
</parent>
@@ -12,7 +12,7 @@
<dependency>
<groupId>org.jboss.teiid.connectors</groupId>
<artifactId>connector-xml-common</artifactId>
- <version>6.0.0-SNAPSHOT</version>
+ <version>${project.version}</version>
<type>pom</type>
</dependency>
</dependencies>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2009-02-16 17:42:45 UTC (rev 472)
+++ trunk/pom.xml 2009-02-16 18:56:03 UTC (rev 473)
@@ -343,6 +343,16 @@
<artifactId>commons-logging</artifactId>
<version>1.1</version>
<scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>logkit</groupId>
+ <artifactId>logkit</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>jgroups</groupId>
More information about the teiid-commits
mailing list