Update to 1.0.0-m1 version. Update Apache code signing
Project: http://git-wip-us.apache.org/repos/asf/incubator-drill/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-drill/commit/bcd77696 Tree: http://git-wip-us.apache.org/repos/asf/incubator-drill/tree/bcd77696 Diff: http://git-wip-us.apache.org/repos/asf/incubator-drill/diff/bcd77696 Branch: refs/heads/master Commit: bcd77696be89bbe6106cb8fdb0673c9ef70b7129 Parents: 5bf5824 Author: Jacques Nadeau <[email protected]> Authored: Tue Sep 3 18:01:08 2013 -0700 Committer: Jacques Nadeau <[email protected]> Committed: Tue Sep 3 19:43:33 2013 -0700 ---------------------------------------------------------------------- sandbox/prototype/KEYS | 86 ++++++++++++++++++++ sandbox/prototype/common/pom.xml | 6 +- sandbox/prototype/contrib/pom.xml | 6 +- sandbox/prototype/contrib/sqlline/pom.xml | 2 +- sandbox/prototype/contrib/storage-hbase/pom.xml | 4 +- sandbox/prototype/distribution/pom.xml | 43 +++++----- sandbox/prototype/exec/bufferl/pom.xml | 4 +- sandbox/prototype/exec/java-exec/pom.xml | 4 +- sandbox/prototype/exec/pom.xml | 6 +- sandbox/prototype/exec/ref/pom.xml | 11 +-- sandbox/prototype/planner/pom.xml | 17 ---- sandbox/prototype/pom.xml | 74 ++++++++++++----- sandbox/prototype/sqlparser/pom.xml | 8 +- 13 files changed, 183 insertions(+), 88 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/bcd77696/sandbox/prototype/KEYS ---------------------------------------------------------------------- diff --git a/sandbox/prototype/KEYS b/sandbox/prototype/KEYS new file mode 100644 index 0000000..205469b --- /dev/null +++ b/sandbox/prototype/KEYS @@ -0,0 +1,86 @@ +This file contains the PGP keys of various developers. +Please don't use them for email unless you have to. Their main +purpose is code signing. + +Examples of importing this file in your keystore: + gpg --import KEYS.txt + (need pgp and other examples here) + +Examples of adding your key to this file: + pgp -kxa <your name> and append it to this file. + (pgpk -ll <your name> && pgpk -xa <your name>) >> this file. + (gpg --list-sigs <your name> + && gpg --armor --export <your name>) >> this file. + +----------------------------------------------------------------------------------- + +pub 4096R/AB10D143 2013-09-01 [expires: 2017-09-01] +uid Jacques Nadeau <[email protected]> +sig 3 AB10D143 2013-09-01 Jacques Nadeau <[email protected]> +sub 4096R/6B5FA695 2013-09-01 [expires: 2017-09-01] +sig AB10D143 2013-09-01 Jacques Nadeau <[email protected]> + +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.13 (Darwin) + +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 +P5iIjn4zOZYYd6Fobkpw3vi03ifusAeOzwpCmw== +=6NWa +-----END PGP PUBLIC KEY BLOCK----- + http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/bcd77696/sandbox/prototype/common/pom.xml ---------------------------------------------------------------------- diff --git a/sandbox/prototype/common/pom.xml b/sandbox/prototype/common/pom.xml index a8ad008..cd973e2 100644 --- a/sandbox/prototype/common/pom.xml +++ b/sandbox/prototype/common/pom.xml @@ -5,14 +5,14 @@ <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>prototype-parent</artifactId> + <artifactId>drill-root</artifactId> <groupId>org.apache.drill</groupId> - <version>1.0-SNAPSHOT</version> + <version>1.0.0-m1-SNAPSHOT</version> </parent> <artifactId>common</artifactId> <packaging>jar</packaging> - <name>common</name> + <name>Common (Logical Plan, Base expressions)</name> <dependencies> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/bcd77696/sandbox/prototype/contrib/pom.xml ---------------------------------------------------------------------- diff --git a/sandbox/prototype/contrib/pom.xml b/sandbox/prototype/contrib/pom.xml index b095737..e521ffe 100644 --- a/sandbox/prototype/contrib/pom.xml +++ b/sandbox/prototype/contrib/pom.xml @@ -3,12 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>prototype-parent</artifactId> + <artifactId>drill-root</artifactId> <groupId>org.apache.drill</groupId> - <version>1.0-SNAPSHOT</version> + <version>1.0.0-m1-SNAPSHOT</version> </parent> <groupId>org.apache.drill.contrib</groupId> <artifactId>contrib-parent</artifactId> + <name>contrib/Parent Pom</name> <packaging>pom</packaging> <dependencies> @@ -16,5 +17,6 @@ </dependencies> <modules> <module>storage-hbase</module> + <module>sqlline</module> </modules> </project> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/bcd77696/sandbox/prototype/contrib/sqlline/pom.xml ---------------------------------------------------------------------- diff --git a/sandbox/prototype/contrib/sqlline/pom.xml b/sandbox/prototype/contrib/sqlline/pom.xml index 9710a49..fa8cc7f 100644 --- a/sandbox/prototype/contrib/sqlline/pom.xml +++ b/sandbox/prototype/contrib/sqlline/pom.xml @@ -9,7 +9,7 @@ <version>1.0-SNAPSHOT</version> </parent> <artifactId>sqlline</artifactId> - <name>sqlline</name> + <name>contrib/sqlline</name> <dependencies> <dependency> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/bcd77696/sandbox/prototype/contrib/storage-hbase/pom.xml ---------------------------------------------------------------------- diff --git a/sandbox/prototype/contrib/storage-hbase/pom.xml b/sandbox/prototype/contrib/storage-hbase/pom.xml index f42853e..a13b970 100644 --- a/sandbox/prototype/contrib/storage-hbase/pom.xml +++ b/sandbox/prototype/contrib/storage-hbase/pom.xml @@ -5,12 +5,12 @@ <parent> <artifactId>contrib-parent</artifactId> <groupId>org.apache.drill.contrib</groupId> - <version>1.0-SNAPSHOT</version> + <version>1.0.0-m1-SNAPSHOT</version> </parent> <artifactId>storage-hbase</artifactId> - <name>pom</name> + <name>contrib/hbase-storage-engine</name> <dependencies> </dependencies> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/bcd77696/sandbox/prototype/distribution/pom.xml ---------------------------------------------------------------------- diff --git a/sandbox/prototype/distribution/pom.xml b/sandbox/prototype/distribution/pom.xml index 5f60112..d680b18 100644 --- a/sandbox/prototype/distribution/pom.xml +++ b/sandbox/prototype/distribution/pom.xml @@ -1,47 +1,43 @@ <?xml version="1.0" encoding="UTF-8"?> -<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";> +<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>prototype-parent</artifactId> + <artifactId>drill-root</artifactId> <groupId>org.apache.drill</groupId> - <version>1.0-SNAPSHOT</version> + <version>1.0.0-m1-SNAPSHOT</version> </parent> <groupId>org.apache.drill</groupId> <artifactId>distribution</artifactId> <packaging>pom</packaging> - <name>Packaging</name> + <name>Packaging and Distribution Assembly</name> <dependencies> <dependency> <groupId>org.apache.drill.exec</groupId> <artifactId>java-exec</artifactId> - <version>1.0-SNAPSHOT</version> + <version>1.0.0-m1-SNAPSHOT</version> </dependency> - <dependency> - <groupId>org.apache.drill.exec</groupId> - <artifactId>netty-bufferl</artifactId> - <version>4.0.7.Final</version> - </dependency> - <dependency> - <groupId>org.apache.drill.exec</groupId> - <artifactId>ref</artifactId> - <version>1.0-SNAPSHOT</version> - </dependency> <dependency> - <groupId>org.apache.drill</groupId> - <artifactId>common</artifactId> - <version>1.0-SNAPSHOT</version> + <groupId>org.apache.drill.exec</groupId> + <artifactId>netty-bufferl</artifactId> + <version>4.0.7.Final</version> + </dependency> + <dependency> + <groupId>org.apache.drill.exec</groupId> + <artifactId>ref</artifactId> + <version>1.0.0-m1-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.drill</groupId> - <artifactId>planner</artifactId> - <version>1.0-SNAPSHOT</version> + <artifactId>common</artifactId> + <version>1.0.0-m1-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.drill</groupId> <artifactId>sqlparser</artifactId> - <version>1.0-SNAPSHOT</version> + <version>1.0.0-m1-SNAPSHOT</version> </dependency> <dependency> <groupId>com.google.protobuf</groupId> @@ -71,7 +67,7 @@ <descriptors> <descriptor>src/assemble/bin.xml</descriptor> </descriptors> - <finalName>drill-1.0</finalName> + <finalName>apache-drill-${project.version}</finalName> </configuration> </execution> </executions> @@ -79,7 +75,10 @@ </plugins> </build> + + <profiles> + <profile> <id>rpm</id> <build> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/bcd77696/sandbox/prototype/exec/bufferl/pom.xml ---------------------------------------------------------------------- diff --git a/sandbox/prototype/exec/bufferl/pom.xml b/sandbox/prototype/exec/bufferl/pom.xml index 11eef91..d52cae9 100644 --- a/sandbox/prototype/exec/bufferl/pom.xml +++ b/sandbox/prototype/exec/bufferl/pom.xml @@ -16,14 +16,14 @@ <parent> <groupId>org.apache.drill.exec</groupId> <artifactId>exec-parent</artifactId> - <version>1.0-SNAPSHOT</version> + <version>1.0.0-m1-SNAPSHOT</version> </parent> <groupId>org.apache.drill.exec</groupId> <version>4.0.7.Final</version> <artifactId>netty-bufferl</artifactId> - <name>Netty/Drill/Buffer</name> + <name>exec/Netty Little Endian Buffers</name> <dependencies> <dependency> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/bcd77696/sandbox/prototype/exec/java-exec/pom.xml ---------------------------------------------------------------------- diff --git a/sandbox/prototype/exec/java-exec/pom.xml b/sandbox/prototype/exec/java-exec/pom.xml index c3bd24c..2b35534 100644 --- a/sandbox/prototype/exec/java-exec/pom.xml +++ b/sandbox/prototype/exec/java-exec/pom.xml @@ -6,10 +6,10 @@ <parent> <artifactId>exec-parent</artifactId> <groupId>org.apache.drill.exec</groupId> - <version>1.0-SNAPSHOT</version> + <version>1.0.0-m1-SNAPSHOT</version> </parent> <artifactId>java-exec</artifactId> - <name>java-exec</name> + <name>exec/Java Execution Engine</name> <dependencies> <dependency> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/bcd77696/sandbox/prototype/exec/pom.xml ---------------------------------------------------------------------- diff --git a/sandbox/prototype/exec/pom.xml b/sandbox/prototype/exec/pom.xml index 8c54a19..75aafb6 100644 --- a/sandbox/prototype/exec/pom.xml +++ b/sandbox/prototype/exec/pom.xml @@ -2,15 +2,15 @@ <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>prototype-parent</artifactId> + <artifactId>drill-root</artifactId> <groupId>org.apache.drill</groupId> - <version>1.0-SNAPSHOT</version> + <version>1.0.0-m1-SNAPSHOT</version> </parent> <groupId>org.apache.drill.exec</groupId> <artifactId>exec-parent</artifactId> <packaging>pom</packaging> - <name>exec</name> + <name>exec/Parent Pom</name> <dependencies> </dependencies> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/bcd77696/sandbox/prototype/exec/ref/pom.xml ---------------------------------------------------------------------- diff --git a/sandbox/prototype/exec/ref/pom.xml b/sandbox/prototype/exec/ref/pom.xml index a8970ba..a22b8b4 100644 --- a/sandbox/prototype/exec/ref/pom.xml +++ b/sandbox/prototype/exec/ref/pom.xml @@ -6,19 +6,19 @@ <parent> <artifactId>exec-parent</artifactId> <groupId>org.apache.drill.exec</groupId> - <version>1.0-SNAPSHOT</version> + <version>1.0.0-m1-SNAPSHOT</version> </parent> <artifactId>ref</artifactId> - <name>Logical Plan Execution Reference Implementation</name> + <name>exec/Reference Interpreter</name> <dependencies> <dependency> <groupId>org.apache.drill</groupId> <artifactId>common</artifactId> - <version>1.0-SNAPSHOT</version> + <version>1.0.0-m1-SNAPSHOT</version> </dependency> <dependency> @@ -27,11 +27,6 @@ <version>0.4.2</version> </dependency> -<!-- <dependency> --> -<!-- <groupId>org.apache.hadoop</groupId> --> -<!-- <artifactId>hadoop-examples</artifactId> --> -<!-- <version>1.2.1</version> --> -<!-- </dependency> --> </dependencies> <profiles> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/bcd77696/sandbox/prototype/planner/pom.xml ---------------------------------------------------------------------- diff --git a/sandbox/prototype/planner/pom.xml b/sandbox/prototype/planner/pom.xml deleted file mode 100644 index c037fb8..0000000 --- a/sandbox/prototype/planner/pom.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0"?> -<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"; xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> - <modelVersion>4.0.0</modelVersion> - <parent> - <artifactId>prototype-parent</artifactId> - <groupId>org.apache.drill</groupId> - <version>1.0-SNAPSHOT</version> - </parent> - <artifactId>planner</artifactId> - - <name>planner</name> - - <dependencies> - </dependencies> - -</project> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/bcd77696/sandbox/prototype/pom.xml ---------------------------------------------------------------------- diff --git a/sandbox/prototype/pom.xml b/sandbox/prototype/pom.xml index e0d8644..277442f 100644 --- a/sandbox/prototype/pom.xml +++ b/sandbox/prototype/pom.xml @@ -6,15 +6,15 @@ <parent> <groupId>org.apache</groupId> <artifactId>apache</artifactId> - <version>9</version> + <version>13</version> </parent> <groupId>org.apache.drill</groupId> - <artifactId>prototype-parent</artifactId> - <version>1.0-SNAPSHOT</version> + <artifactId>drill-root</artifactId> + <version>1.0.0-m1-SNAPSHOT</version> <packaging>pom</packaging> - <name>prototype-parent</name> + <name>Apache Drill Root POM</name> <properties> <target.gen.source.path>${project.basedir}/target/generated-sources</target.gen.source.path> @@ -24,6 +24,12 @@ </properties> + <scm> + <connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-drill.git</connection> + <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-drill.git</developerConnection> + <url>https://github.com/apache/incubator-drill</url> + </scm> + <repositories> <repository> <id>conjars</id> @@ -37,9 +43,9 @@ </releases> <snapshots> <enabled>false</enabled> - </snapshots> + </snapshots> </repository> - + <repository> <id>pentaho</id> <name>Pentaho</name> @@ -54,7 +60,7 @@ <enabled>false</enabled> </snapshots> </repository> - + <repository> <id>sonatype-nexus-snapshots</id> <url>https://oss.sonatype.org/content/repositories/snapshots</url> @@ -67,7 +73,10 @@ </repository> </repositories> - + <issueManagement> + <system>Jira</system> + <url>https://issues.apache.org/jira/browse/DRILL</url> + </issueManagement> <build> @@ -76,6 +85,24 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> <configuration> + <archive> + <index>true</index> + <manifest> + <addDefaultImplementationEntries>true</addDefaultImplementationEntries> + <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries> + </manifest> + <manifestEntries> + <Extension-Name>org.apache.drill</Extension-Name> + <Built-By>${username}</Built-By> + <url>http://lucene.apache.org/mahout</url> + </manifestEntries> + </archive> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <configuration> <excludes> <exclude>**/logging.properties</exclude> <exclude>**/logback-test.xml</exclude> @@ -83,7 +110,7 @@ <exclude>**/logback.xml</exclude> </excludes> </configuration> - + <executions> <execution> <goals> @@ -92,7 +119,7 @@ </execution> </executions> </plugin> - + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId> @@ -253,7 +280,7 @@ <artifactId>guava</artifactId> <version>14.0.1</version> </dependency> - + <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> @@ -367,15 +394,15 @@ <dependencyManagement> <dependencies> <dependency> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - <version>2.9.1</version> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + <version>2.9.1</version> </dependency> <dependency> - <groupId>xalan</groupId> - <artifactId>xalan</artifactId> - <version>2.7.1</version> - </dependency> + <groupId>xalan</groupId> + <artifactId>xalan</artifactId> + <version>2.7.1</version> + </dependency> <dependency> <groupId>com.mapr.hadoop</groupId> <artifactId>maprfs</artifactId> @@ -416,7 +443,7 @@ </exclusion> <exclusion> - <artifactId>jets3t</artifactId> + <artifactId>jets3t</artifactId> <groupId>net.java.dev.jets3t</groupId> </exclusion> <exclusion> @@ -472,8 +499,12 @@ <repository> <id>mapr-releases</id> <url>http://repository.mapr.com/maven/</url> - <snapshots><enabled>false</enabled></snapshots> - <releases><enabled>true</enabled></releases> + <snapshots> + <enabled>false</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + </releases> </repository> </repositories> </profile> @@ -548,7 +579,6 @@ <module>common</module> <module>contrib</module> <module>exec</module> - <module>planner</module> <module>sqlparser</module> <module>distribution</module> </modules> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/bcd77696/sandbox/prototype/sqlparser/pom.xml ---------------------------------------------------------------------- diff --git a/sandbox/prototype/sqlparser/pom.xml b/sandbox/prototype/sqlparser/pom.xml index a9d6cfb..6ae2cb6 100644 --- a/sandbox/prototype/sqlparser/pom.xml +++ b/sandbox/prototype/sqlparser/pom.xml @@ -4,12 +4,12 @@ xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>prototype-parent</artifactId> + <artifactId>drill-root</artifactId> <groupId>org.apache.drill</groupId> - <version>1.0-SNAPSHOT</version> + <version>1.0.0-m1-SNAPSHOT</version> </parent> <artifactId>sqlparser</artifactId> - <name>sqlparser</name> + <name>SQL Parser</name> <dependencies> <dependency> @@ -20,7 +20,7 @@ <dependency> <groupId>org.apache.drill</groupId> <artifactId>common</artifactId> - <version>1.0-SNAPSHOT</version> + <version>1.0.0-m1-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.drill.exec</groupId>
