[teiid-commits] teiid SVN: r806 - in trunk/connectors: connector-jdbc/src/assembly and 12 other directories.
teiid-commits at lists.jboss.org
teiid-commits at lists.jboss.org
Mon Apr 20 15:01:03 EDT 2009
Author: rareddy
Date: 2009-04-20 15:01:03 -0400 (Mon, 20 Apr 2009)
New Revision: 806
Modified:
trunk/connectors/connector-jdbc/pom.xml
trunk/connectors/connector-jdbc/src/assembly/bundle.xml
trunk/connectors/connector-ldap/pom.xml
trunk/connectors/connector-ldap/src/assembly/bundle.xml
trunk/connectors/connector-loopback/pom.xml
trunk/connectors/connector-loopback/src/assembly/bundle.xml
trunk/connectors/connector-salesforce/pom.xml
trunk/connectors/connector-salesforce/src/assembly/bundle.xml
trunk/connectors/connector-text/pom.xml
trunk/connectors/connector-text/src/assembly/bundle.xml
trunk/connectors/connector-xml-common/pom.xml
trunk/connectors/connector-xml-common/src/assembly/bundle.xml
trunk/connectors/connector-xml/pom.xml
trunk/connectors/connector-xml/src/assembly/bundle.xml
Log:
TEIID-488: connector build was using 'dependency' plugin to build the classpath and 'assembly' plugin to build the dependency jars, however they both do not resolve to correct path always. Dependency plug-in is more accurate, so moving to use the "dependency" plugin for both classpath and jar building and using the assembly for creating the zip file.
Modified: trunk/connectors/connector-jdbc/pom.xml
===================================================================
--- trunk/connectors/connector-jdbc/pom.xml 2009-04-20 18:21:26 UTC (rev 805)
+++ trunk/connectors/connector-jdbc/pom.xml 2009-04-20 19:01:03 UTC (rev 806)
@@ -59,6 +59,25 @@
<!-- bundles all its dependencies in a single zip file -->
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-dependencies</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <excludeTransitive>false</excludeTransitive>
+ <includeScope>runtime</includeScope>
+ <excludeTypes>pom</excludeTypes>
+ <outputDirectory>target/dependency</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.2-beta-2</version>
<configuration>
Modified: trunk/connectors/connector-jdbc/src/assembly/bundle.xml
===================================================================
--- trunk/connectors/connector-jdbc/src/assembly/bundle.xml 2009-04-20 18:21:26 UTC (rev 805)
+++ trunk/connectors/connector-jdbc/src/assembly/bundle.xml 2009-04-20 19:01:03 UTC (rev 806)
@@ -15,20 +15,10 @@
<includes><include>${project.artifactId}.xml</include></includes>
<outputDirectory>/</outputDirectory>
</fileSet>
+ <fileSet>
+ <directory>target/dependency</directory>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
</fileSets>
-
- <dependencySets>
- <dependencySet>
- <useProjectArtifact>true</useProjectArtifact>
- <useTransitiveDependencies>false</useTransitiveDependencies>
- <useTransitiveFiltering>false</useTransitiveFiltering>
- <useDefaultExcludes>true</useDefaultExcludes>
- <unpack>false</unpack>
-
- <excludes>
- <exclude>teiid:*</exclude>
- </excludes>
- </dependencySet>
- </dependencySets>
</assembly>
\ No newline at end of file
Modified: trunk/connectors/connector-ldap/pom.xml
===================================================================
--- trunk/connectors/connector-ldap/pom.xml 2009-04-20 18:21:26 UTC (rev 805)
+++ trunk/connectors/connector-ldap/pom.xml 2009-04-20 19:01:03 UTC (rev 806)
@@ -56,6 +56,25 @@
<!-- bundles all its dependencies in a single zip file -->
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-dependencies</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <excludeTransitive>false</excludeTransitive>
+ <includeScope>runtime</includeScope>
+ <excludeTypes>pom</excludeTypes>
+ <outputDirectory>target/dependency</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.2-beta-2</version>
<configuration>
Modified: trunk/connectors/connector-ldap/src/assembly/bundle.xml
===================================================================
--- trunk/connectors/connector-ldap/src/assembly/bundle.xml 2009-04-20 18:21:26 UTC (rev 805)
+++ trunk/connectors/connector-ldap/src/assembly/bundle.xml 2009-04-20 19:01:03 UTC (rev 806)
@@ -15,20 +15,10 @@
<includes><include>${project.artifactId}.xml</include></includes>
<outputDirectory>/</outputDirectory>
</fileSet>
+ <fileSet>
+ <directory>target/dependency</directory>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
</fileSets>
-
- <dependencySets>
- <dependencySet>
- <useProjectArtifact>true</useProjectArtifact>
- <useTransitiveDependencies>false</useTransitiveDependencies>
- <useTransitiveFiltering>false</useTransitiveFiltering>
- <useDefaultExcludes>true</useDefaultExcludes>
- <unpack>false</unpack>
-
- <excludes>
- <exclude>teiid:*</exclude>
- </excludes>
- </dependencySet>
- </dependencySets>
</assembly>
\ No newline at end of file
Modified: trunk/connectors/connector-loopback/pom.xml
===================================================================
--- trunk/connectors/connector-loopback/pom.xml 2009-04-20 18:21:26 UTC (rev 805)
+++ trunk/connectors/connector-loopback/pom.xml 2009-04-20 19:01:03 UTC (rev 806)
@@ -59,6 +59,25 @@
<!-- bundles all its dependencies in a single zip file -->
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-dependencies</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <excludeTransitive>false</excludeTransitive>
+ <includeScope>runtime</includeScope>
+ <excludeTypes>pom</excludeTypes>
+ <outputDirectory>target/dependency</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.2-beta-2</version>
<configuration>
Modified: trunk/connectors/connector-loopback/src/assembly/bundle.xml
===================================================================
--- trunk/connectors/connector-loopback/src/assembly/bundle.xml 2009-04-20 18:21:26 UTC (rev 805)
+++ trunk/connectors/connector-loopback/src/assembly/bundle.xml 2009-04-20 19:01:03 UTC (rev 806)
@@ -15,20 +15,10 @@
<includes><include>${project.artifactId}.xml</include></includes>
<outputDirectory>/</outputDirectory>
</fileSet>
+ <fileSet>
+ <directory>target/dependency</directory>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
</fileSets>
-
- <dependencySets>
- <dependencySet>
- <useProjectArtifact>true</useProjectArtifact>
- <useTransitiveDependencies>false</useTransitiveDependencies>
- <useTransitiveFiltering>false</useTransitiveFiltering>
- <useDefaultExcludes>true</useDefaultExcludes>
- <unpack>false</unpack>
-
- <excludes>
- <exclude>teiid:*</exclude>
- </excludes>
- </dependencySet>
- </dependencySets>
</assembly>
\ No newline at end of file
Modified: trunk/connectors/connector-salesforce/pom.xml
===================================================================
--- trunk/connectors/connector-salesforce/pom.xml 2009-04-20 18:21:26 UTC (rev 805)
+++ trunk/connectors/connector-salesforce/pom.xml 2009-04-20 19:01:03 UTC (rev 806)
@@ -69,6 +69,25 @@
<!-- bundles all its dependencies in a single zip file -->
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-dependencies</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <excludeTransitive>false</excludeTransitive>
+ <includeScope>runtime</includeScope>
+ <excludeTypes>pom</excludeTypes>
+ <outputDirectory>target/dependency</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.2-beta-2</version>
<configuration>
Modified: trunk/connectors/connector-salesforce/src/assembly/bundle.xml
===================================================================
--- trunk/connectors/connector-salesforce/src/assembly/bundle.xml 2009-04-20 18:21:26 UTC (rev 805)
+++ trunk/connectors/connector-salesforce/src/assembly/bundle.xml 2009-04-20 19:01:03 UTC (rev 806)
@@ -15,21 +15,9 @@
<includes><include>${project.artifactId}.xml</include></includes>
<outputDirectory>/</outputDirectory>
</fileSet>
- </fileSets>
-
- <dependencySets>
- <dependencySet>
- <useProjectArtifact>true</useProjectArtifact>
- <useTransitiveDependencies>false</useTransitiveDependencies>
- <useTransitiveFiltering>false</useTransitiveFiltering>
- <useDefaultExcludes>true</useDefaultExcludes>
- <unpack>false</unpack>
-
- <excludes>
- <exclude>teiid:*</exclude>
- <exclude>*:pom</exclude>
- </excludes>
- </dependencySet>
- </dependencySets>
-
+ <fileSet>
+ <directory>target/dependency</directory>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
+ </fileSets>
</assembly>
\ No newline at end of file
Modified: trunk/connectors/connector-text/pom.xml
===================================================================
--- trunk/connectors/connector-text/pom.xml 2009-04-20 18:21:26 UTC (rev 805)
+++ trunk/connectors/connector-text/pom.xml 2009-04-20 19:01:03 UTC (rev 806)
@@ -55,6 +55,25 @@
<!-- bundles all its dependencies in a single zip file -->
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-dependencies</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <excludeTransitive>false</excludeTransitive>
+ <includeScope>runtime</includeScope>
+ <excludeTypes>pom</excludeTypes>
+ <outputDirectory>target/dependency</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.2-beta-2</version>
<configuration>
Modified: trunk/connectors/connector-text/src/assembly/bundle.xml
===================================================================
--- trunk/connectors/connector-text/src/assembly/bundle.xml 2009-04-20 18:21:26 UTC (rev 805)
+++ trunk/connectors/connector-text/src/assembly/bundle.xml 2009-04-20 19:01:03 UTC (rev 806)
@@ -15,21 +15,9 @@
<includes><include>${project.artifactId}.xml</include></includes>
<outputDirectory>/</outputDirectory>
</fileSet>
+ <fileSet>
+ <directory>target/dependency</directory>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
</fileSets>
-
-
- <dependencySets>
- <dependencySet>
- <useProjectArtifact>true</useProjectArtifact>
- <useTransitiveDependencies>false</useTransitiveDependencies>
- <useTransitiveFiltering>false</useTransitiveFiltering>
- <useDefaultExcludes>true</useDefaultExcludes>
- <unpack>false</unpack>
-
- <excludes>
- <exclude>teiid:*</exclude>
- </excludes>
- </dependencySet>
- </dependencySets>
-
</assembly>
\ No newline at end of file
Modified: trunk/connectors/connector-xml/pom.xml
===================================================================
--- trunk/connectors/connector-xml/pom.xml 2009-04-20 18:21:26 UTC (rev 805)
+++ trunk/connectors/connector-xml/pom.xml 2009-04-20 19:01:03 UTC (rev 806)
@@ -70,6 +70,25 @@
<!-- bundles all its dependencies in a single zip file -->
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-dependencies</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <excludeTransitive>false</excludeTransitive>
+ <includeScope>runtime</includeScope>
+ <excludeTypes>pom</excludeTypes>
+ <outputDirectory>target/dependency</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.2-beta-2</version>
<configuration>
Modified: trunk/connectors/connector-xml/src/assembly/bundle.xml
===================================================================
--- trunk/connectors/connector-xml/src/assembly/bundle.xml 2009-04-20 18:21:26 UTC (rev 805)
+++ trunk/connectors/connector-xml/src/assembly/bundle.xml 2009-04-20 19:01:03 UTC (rev 806)
@@ -15,21 +15,9 @@
<includes><include>${project.artifactId}.xml</include></includes>
<outputDirectory>/</outputDirectory>
</fileSet>
+ <fileSet>
+ <directory>target/dependency</directory>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
</fileSets>
-
- <dependencySets>
- <dependencySet>
- <useProjectArtifact>true</useProjectArtifact>
- <useTransitiveDependencies>false</useTransitiveDependencies>
- <useTransitiveFiltering>false</useTransitiveFiltering>
- <useDefaultExcludes>true</useDefaultExcludes>
- <unpack>false</unpack>
-
- <excludes>
- <exclude>teiid:*</exclude>
- <exclude>*:pom</exclude>
- </excludes>
- </dependencySet>
- </dependencySets>
-
</assembly>
\ No newline at end of file
Modified: trunk/connectors/connector-xml-common/pom.xml
===================================================================
--- trunk/connectors/connector-xml-common/pom.xml 2009-04-20 18:21:26 UTC (rev 805)
+++ trunk/connectors/connector-xml-common/pom.xml 2009-04-20 19:01:03 UTC (rev 806)
@@ -115,6 +115,25 @@
<!-- bundles all its dependencies in a single zip file -->
<build>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-dependencies</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <excludeTransitive>false</excludeTransitive>
+ <includeScope>runtime</includeScope>
+ <excludeTypes>pom</excludeTypes>
+ <outputDirectory>target/dependency</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.2-beta-2</version>
Modified: trunk/connectors/connector-xml-common/src/assembly/bundle.xml
===================================================================
--- trunk/connectors/connector-xml-common/src/assembly/bundle.xml 2009-04-20 18:21:26 UTC (rev 805)
+++ trunk/connectors/connector-xml-common/src/assembly/bundle.xml 2009-04-20 19:01:03 UTC (rev 806)
@@ -9,18 +9,11 @@
<includeBaseDirectory>false</includeBaseDirectory>
- <dependencySets>
- <dependencySet>
- <useProjectArtifact>false</useProjectArtifact>
- <useTransitiveDependencies>false</useTransitiveDependencies>
- <useTransitiveFiltering>false</useTransitiveFiltering>
- <useDefaultExcludes>true</useDefaultExcludes>
- <unpack>false</unpack>
-
- <excludes>
- <exclude>teiid:*</exclude>
- </excludes>
- </dependencySet>
- </dependencySets>
+ <fileSets>
+ <fileSet>
+ <directory>target/dependency</directory>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
+ </fileSets>
</assembly>
\ No newline at end of file
More information about the teiid-commits
mailing list