Updated Branches: refs/heads/master c9f90c21f -> 7af77a2f3
DRILL-234: Prefix drill artifacts with "drill-" to avoid ambiguity in jar names. Project: http://git-wip-us.apache.org/repos/asf/incubator-drill/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-drill/commit/c9155eeb Tree: http://git-wip-us.apache.org/repos/asf/incubator-drill/tree/c9155eeb Diff: http://git-wip-us.apache.org/repos/asf/incubator-drill/diff/c9155eeb Branch: refs/heads/master Commit: c9155eeb47efcb4d4e05d4fb2ab5afadafae1669 Parents: c9f90c2 Author: Aditya Kishore <[email protected]> Authored: Wed Sep 11 13:49:35 2013 -0700 Committer: Jacques Nadeau <[email protected]> Committed: Wed Sep 18 18:14:02 2013 -0700 ---------------------------------------------------------------------- common/pom.xml | 2 +- contrib/pom.xml | 2 +- contrib/sqlline/pom.xml | 6 +++--- contrib/storage-hbase/pom.xml | 4 ++-- distribution/pom.xml | 12 ++++++------ distribution/src/assemble/bin.xml | 10 +++++----- exec/bufferl/pom.xml | 4 ++-- exec/java-exec/pom.xml | 10 +++++----- exec/ref/pom.xml | 4 ++-- sqlparser/pom.xml | 12 ++++++------ 10 files changed, 33 insertions(+), 33 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/c9155eeb/common/pom.xml ---------------------------------------------------------------------- diff --git a/common/pom.xml b/common/pom.xml index 01c6d31..19a9bea 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -24,7 +24,7 @@ <version>1.0.0-m2-incubating-SNAPSHOT</version> </parent> - <artifactId>common</artifactId> + <artifactId>drill-common</artifactId> <packaging>jar</packaging> <name>Common (Logical Plan, Base expressions)</name> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/c9155eeb/contrib/pom.xml ---------------------------------------------------------------------- diff --git a/contrib/pom.xml b/contrib/pom.xml index d6af214..dc07979 100644 --- a/contrib/pom.xml +++ b/contrib/pom.xml @@ -24,7 +24,7 @@ </parent> <groupId>org.apache.drill.contrib</groupId> - <artifactId>contrib-parent</artifactId> + <artifactId>drill-contrib-parent</artifactId> <name>contrib/Parent Pom</name> <packaging>pom</packaging> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/c9155eeb/contrib/sqlline/pom.xml ---------------------------------------------------------------------- diff --git a/contrib/sqlline/pom.xml b/contrib/sqlline/pom.xml index 8483b39..d4963a6 100644 --- a/contrib/sqlline/pom.xml +++ b/contrib/sqlline/pom.xml @@ -19,18 +19,18 @@ <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>contrib-parent</artifactId> + <artifactId>drill-contrib-parent</artifactId> <groupId>org.apache.drill.contrib</groupId> <version>1.0.0-m2-incubating-SNAPSHOT</version> </parent> - <artifactId>sqlline</artifactId> + <artifactId>drill-sqlline</artifactId> <name>contrib/sqlline</name> <dependencies> <dependency> <groupId>org.apache.drill</groupId> - <artifactId>sqlparser</artifactId> + <artifactId>drill-sqlparser</artifactId> <version>${project.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/c9155eeb/contrib/storage-hbase/pom.xml ---------------------------------------------------------------------- diff --git a/contrib/storage-hbase/pom.xml b/contrib/storage-hbase/pom.xml index 1b4c4c6..7860ea5 100644 --- a/contrib/storage-hbase/pom.xml +++ b/contrib/storage-hbase/pom.xml @@ -18,12 +18,12 @@ <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/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>contrib-parent</artifactId> + <artifactId>drill-contrib-parent</artifactId> <groupId>org.apache.drill.contrib</groupId> <version>1.0.0-m2-incubating-SNAPSHOT</version> </parent> - <artifactId>storage-hbase</artifactId> + <artifactId>drill-storage-hbase</artifactId> <name>contrib/hbase-storage-engine</name> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/c9155eeb/distribution/pom.xml ---------------------------------------------------------------------- diff --git a/distribution/pom.xml b/distribution/pom.xml index f1fad48..df0b180 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -32,27 +32,27 @@ <dependencies> <dependency> <groupId>org.apache.drill.exec</groupId> - <artifactId>java-exec</artifactId> + <artifactId>drill-java-exec</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.drill.exec</groupId> - <artifactId>netty-bufferl</artifactId> - <version>4.0.8.Final-SNAPSHOT</version> + <artifactId>drill-netty-bufferl</artifactId> + <version>4.0.7.Final</version> </dependency> <dependency> <groupId>org.apache.drill.exec</groupId> - <artifactId>ref</artifactId> + <artifactId>drill-ref</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.drill</groupId> - <artifactId>common</artifactId> + <artifactId>drill-common</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.drill</groupId> - <artifactId>sqlparser</artifactId> + <artifactId>drill-sqlparser</artifactId> <version>${project.version}</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/c9155eeb/distribution/src/assemble/bin.xml ---------------------------------------------------------------------- diff --git a/distribution/src/assemble/bin.xml b/distribution/src/assemble/bin.xml index 45fd1cc..80bc6cb 100644 --- a/distribution/src/assemble/bin.xml +++ b/distribution/src/assemble/bin.xml @@ -32,9 +32,9 @@ <!-- Now, select which projects to include in this module-set. --> <includes> - <include>org.apache.drill:sqlparser:jar</include> - <include>org.apache.drill.exec:netty-bufferl</include> - <include>org.apache.drill.exec:ref</include> + <include>org.apache.drill:drill-sqlparser:jar</include> + <include>org.apache.drill.exec:drill-netty-bufferl</include> + <include>org.apache.drill.exec:drill-ref</include> </includes> <binaries> <outputDirectory>jars</outputDirectory> @@ -74,11 +74,11 @@ <files> <file> - <source>../common/target/common-${project.version}-rebuffed.jar</source> + <source>../common/target/drill-common-${project.version}-rebuffed.jar</source> <outputDirectory>jars</outputDirectory> </file> <file> - <source>../exec/java-exec/target/java-exec-${project.version}-rebuffed.jar</source> + <source>../exec/java-exec/target/drill-java-exec-${project.version}-rebuffed.jar</source> <outputDirectory>jars</outputDirectory> </file> <file> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/c9155eeb/exec/bufferl/pom.xml ---------------------------------------------------------------------- diff --git a/exec/bufferl/pom.xml b/exec/bufferl/pom.xml index eae272d..834a98f 100644 --- a/exec/bufferl/pom.xml +++ b/exec/bufferl/pom.xml @@ -19,8 +19,8 @@ </parent> <groupId>org.apache.drill.exec</groupId> - <version>4.0.8.Final-SNAPSHOT</version> - <artifactId>netty-bufferl</artifactId> + <version>4.0.7.Final</version> + <artifactId>drill-netty-bufferl</artifactId> <name>exec/Netty Little Endian Buffers</name> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/c9155eeb/exec/java-exec/pom.xml ---------------------------------------------------------------------- diff --git a/exec/java-exec/pom.xml b/exec/java-exec/pom.xml index 1515d6e..122b16c 100644 --- a/exec/java-exec/pom.xml +++ b/exec/java-exec/pom.xml @@ -22,7 +22,7 @@ <groupId>org.apache.drill.exec</groupId> <version>1.0.0-m2-incubating-SNAPSHOT</version> </parent> - <artifactId>java-exec</artifactId> + <artifactId>drill-java-exec</artifactId> <name>exec/Java Execution Engine</name> <dependencies> @@ -118,17 +118,17 @@ </dependency> <dependency> <groupId>org.apache.drill</groupId> - <artifactId>common</artifactId> + <artifactId>drill-common</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.drill.exec</groupId> - <version>4.0.8.Final-SNAPSHOT</version> - <artifactId>netty-bufferl</artifactId> + <version>4.0.7.Final</version> + <artifactId>drill-netty-bufferl</artifactId> </dependency> <dependency> <groupId>org.apache.drill</groupId> - <artifactId>common</artifactId> + <artifactId>drill-common</artifactId> <version>${project.version}</version> <classifier>tests</classifier> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/c9155eeb/exec/ref/pom.xml ---------------------------------------------------------------------- diff --git a/exec/ref/pom.xml b/exec/ref/pom.xml index 939e745..b1b31dd 100644 --- a/exec/ref/pom.xml +++ b/exec/ref/pom.xml @@ -23,7 +23,7 @@ <version>1.0.0-m2-incubating-SNAPSHOT</version> </parent> - <artifactId>ref</artifactId> + <artifactId>drill-ref</artifactId> <name>exec/Reference Interpreter</name> @@ -31,7 +31,7 @@ <dependency> <groupId>org.apache.drill</groupId> - <artifactId>common</artifactId> + <artifactId>drill-common</artifactId> <version>${project.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/c9155eeb/sqlparser/pom.xml ---------------------------------------------------------------------- diff --git a/sqlparser/pom.xml b/sqlparser/pom.xml index 1d55ae6..34622f7 100644 --- a/sqlparser/pom.xml +++ b/sqlparser/pom.xml @@ -16,7 +16,7 @@ <groupId>org.apache.drill</groupId> <version>1.0.0-m2-incubating-SNAPSHOT</version> </parent> - <artifactId>sqlparser</artifactId> + <artifactId>drill-sqlparser</artifactId> <name>SQL Parser</name> <dependencies> @@ -26,22 +26,22 @@ </dependency> <dependency> <groupId>org.apache.drill</groupId> - <artifactId>common</artifactId> + <artifactId>drill-common</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.drill.exec</groupId> - <artifactId>ref</artifactId> + <artifactId>drill-ref</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.drill.exec</groupId> - <artifactId>java-exec</artifactId> + <artifactId>drill-java-exec</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.drill.exec</groupId> - <artifactId>java-exec</artifactId> + <artifactId>drill-java-exec</artifactId> <version>${project.version}</version> <classifier>tests</classifier> <scope>test</scope> @@ -59,7 +59,7 @@ </dependency> <dependency> <groupId>org.apache.drill.exec</groupId> - <artifactId>ref</artifactId> + <artifactId>drill-ref</artifactId> <version>${project.version}</version> <classifier>tests</classifier> <scope>test</scope>
