You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@drill.apache.org by ja...@apache.org on 2013/09/06 22:04:45 UTC
[1/2] git commit: Address issue where binary tarball was including
both rebuffed and non rebuffed jars. Address issue where binary tarball
wasn't including sample-data directory
Updated Branches:
refs/heads/master ce34dd40b -> a0d3c6977
Address issue where binary tarball was including both rebuffed and non rebuffed jars.
Address issue where binary tarball wasn't including sample-data directory
Project: http://git-wip-us.apache.org/repos/asf/incubator-drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-drill/commit/c211df00
Tree: http://git-wip-us.apache.org/repos/asf/incubator-drill/tree/c211df00
Diff: http://git-wip-us.apache.org/repos/asf/incubator-drill/diff/c211df00
Branch: refs/heads/master
Commit: c211df00c4c9fe1ab85b4753b79ce7080a334d06
Parents: ce34dd4
Author: Jacques Nadeau <ja...@apache.org>
Authored: Fri Sep 6 12:50:41 2013 -0700
Committer: Jacques Nadeau <ja...@apache.org>
Committed: Fri Sep 6 12:54:16 2013 -0700
----------------------------------------------------------------------
distribution/src/assemble/bin.xml | 27 +++++++++++++++++++++------
1 file changed, 21 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/c211df00/distribution/src/assemble/bin.xml
----------------------------------------------------------------------
diff --git a/distribution/src/assemble/bin.xml b/distribution/src/assemble/bin.xml
index cb8bb71..fe76c67 100644
--- a/distribution/src/assemble/bin.xml
+++ b/distribution/src/assemble/bin.xml
@@ -1,6 +1,7 @@
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+<assembly
+ xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
<id>binary-release</id>
<formats>
<format>tar.gz</format>
@@ -8,10 +9,16 @@
<includeBaseDirectory>true</includeBaseDirectory>
<moduleSets>
<moduleSet>
-
+
<!-- Enable access to all projects in the current multimodule build! -->
<useAllReactorProjects>true</useAllReactorProjects>
-
+
+ <!-- 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>
+ </includes>
<binaries>
<outputDirectory>jars</outputDirectory>
<unpack>false</unpack>
@@ -40,6 +47,14 @@
<scope>test</scope>
</dependencySet>
</dependencySets>
+
+ <fileSets>
+ <fileSet>
+ <directory>../sample-data</directory>
+ <outputDirectory>sample-data</outputDirectory>
+ </fileSet>
+ </fileSets>
+
<files>
<file>
<source>../common/target/common-${project.version}-rebuffed.jar</source>
@@ -89,5 +104,5 @@
<source>src/resources/storage-engines.json</source>
<outputDirectory>conf</outputDirectory>
</file>
- </files>
+ </files>
</assembly>
[2/2] git commit: [maven-release-plugin] prepare release
drill-1.0.0-m1
Posted by ja...@apache.org.
[maven-release-plugin] prepare release drill-1.0.0-m1
Project: http://git-wip-us.apache.org/repos/asf/incubator-drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-drill/commit/a0d3c697
Tree: http://git-wip-us.apache.org/repos/asf/incubator-drill/tree/a0d3c697
Diff: http://git-wip-us.apache.org/repos/asf/incubator-drill/diff/a0d3c697
Branch: refs/heads/master
Commit: a0d3c6977820516983142c96d7f9374681529968
Parents: c211df0
Author: Jacques Nadeau <ja...@apache.org>
Authored: Fri Sep 6 13:05:39 2013 -0700
Committer: Jacques Nadeau <ja...@apache.org>
Committed: Fri Sep 6 13:05:39 2013 -0700
----------------------------------------------------------------------
common/pom.xml | 6 ++----
contrib/pom.xml | 5 ++---
contrib/sqlline/pom.xml | 6 ++----
contrib/storage-hbase/pom.xml | 5 ++---
distribution/pom.xml | 5 ++---
exec/bufferl/pom.xml | 5 ++---
exec/java-exec/pom.xml | 12 ++++--------
exec/pom.xml | 2 +-
exec/ref/pom.xml | 6 ++----
pom.xml | 16 ++++++++--------
sqlparser/pom.xml | 6 ++----
11 files changed, 29 insertions(+), 45 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/a0d3c697/common/pom.xml
----------------------------------------------------------------------
diff --git a/common/pom.xml b/common/pom.xml
index cd973e2..eb63c1a 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -1,13 +1,11 @@
<?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">
+<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>drill-root</artifactId>
<groupId>org.apache.drill</groupId>
- <version>1.0.0-m1-SNAPSHOT</version>
+ <version>1.0.0-m1</version>
</parent>
<artifactId>common</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/a0d3c697/contrib/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/pom.xml b/contrib/pom.xml
index 4965823..cefc6c3 100644
--- a/contrib/pom.xml
+++ b/contrib/pom.xml
@@ -1,11 +1,10 @@
<?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">
+<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>drill-root</artifactId>
<groupId>org.apache.drill</groupId>
- <version>1.0.0-m1-SNAPSHOT</version>
+ <version>1.0.0-m1</version>
</parent>
<groupId>org.apache.drill.contrib</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/a0d3c697/contrib/sqlline/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/sqlline/pom.xml b/contrib/sqlline/pom.xml
index 1e80e5d..b8c022f 100644
--- a/contrib/sqlline/pom.xml
+++ b/contrib/sqlline/pom.xml
@@ -1,13 +1,11 @@
<?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">
+<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>
<groupId>org.apache.drill.contrib</groupId>
- <version>1.0.0-m1-SNAPSHOT</version>
+ <version>1.0.0-m1</version>
</parent>
<artifactId>sqlline</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/a0d3c697/contrib/storage-hbase/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/storage-hbase/pom.xml b/contrib/storage-hbase/pom.xml
index a13b970..bb907c2 100644
--- a/contrib/storage-hbase/pom.xml
+++ b/contrib/storage-hbase/pom.xml
@@ -1,11 +1,10 @@
<?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">
+<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>
<groupId>org.apache.drill.contrib</groupId>
- <version>1.0.0-m1-SNAPSHOT</version>
+ <version>1.0.0-m1</version>
</parent>
<artifactId>storage-hbase</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/a0d3c697/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/pom.xml b/distribution/pom.xml
index dd90547..62db7f0 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -1,11 +1,10 @@
<?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>drill-root</artifactId>
<groupId>org.apache.drill</groupId>
- <version>1.0.0-m1-SNAPSHOT</version>
+ <version>1.0.0-m1</version>
</parent>
<groupId>org.apache.drill</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/a0d3c697/exec/bufferl/pom.xml
----------------------------------------------------------------------
diff --git a/exec/bufferl/pom.xml b/exec/bufferl/pom.xml
index d52cae9..c38010f 100644
--- a/exec/bufferl/pom.xml
+++ b/exec/bufferl/pom.xml
@@ -8,15 +8,14 @@
~ WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
~ License for the specific language governing permissions and limitations
~ under the License. -->
-<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">
+<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">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.drill.exec</groupId>
<artifactId>exec-parent</artifactId>
- <version>1.0.0-m1-SNAPSHOT</version>
+ <version>1.0.0-m1</version>
</parent>
<groupId>org.apache.drill.exec</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/a0d3c697/exec/java-exec/pom.xml
----------------------------------------------------------------------
diff --git a/exec/java-exec/pom.xml b/exec/java-exec/pom.xml
index 2c25963..a5a55c8 100644
--- a/exec/java-exec/pom.xml
+++ b/exec/java-exec/pom.xml
@@ -1,12 +1,10 @@
<?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">
+<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>exec-parent</artifactId>
<groupId>org.apache.drill.exec</groupId>
- <version>1.0.0-m1-SNAPSHOT</version>
+ <version>1.0.0-m1</version>
</parent>
<artifactId>java-exec</artifactId>
<name>exec/Java Execution Engine</name>
@@ -285,14 +283,12 @@
<include name="*.proto" />
</fileset>
</path>
- <pathconvert pathsep=" " property="proto.files"
- refid="proto.path.files" />
+ <pathconvert pathsep=" " property="proto.files" refid="proto.path.files" />
<exec executable="protoc">
<arg value="--java_out=${target.gen.source.path}" />
<arg value="--proto_path=${proto.cas.path}" />
- <arg
- value="--proto_path=${project.basedir}/../../common/src/main/protobuf/" />
+ <arg value="--proto_path=${project.basedir}/../../common/src/main/protobuf/" />
<arg line="${proto.files}" />
</exec>
</tasks>
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/a0d3c697/exec/pom.xml
----------------------------------------------------------------------
diff --git a/exec/pom.xml b/exec/pom.xml
index 75aafb6..bd410c4 100644
--- a/exec/pom.xml
+++ b/exec/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>drill-root</artifactId>
<groupId>org.apache.drill</groupId>
- <version>1.0.0-m1-SNAPSHOT</version>
+ <version>1.0.0-m1</version>
</parent>
<groupId>org.apache.drill.exec</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/a0d3c697/exec/ref/pom.xml
----------------------------------------------------------------------
diff --git a/exec/ref/pom.xml b/exec/ref/pom.xml
index f819ff1..a2be5d8 100644
--- a/exec/ref/pom.xml
+++ b/exec/ref/pom.xml
@@ -1,12 +1,10 @@
<?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">
+<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>exec-parent</artifactId>
<groupId>org.apache.drill.exec</groupId>
- <version>1.0.0-m1-SNAPSHOT</version>
+ <version>1.0.0-m1</version>
</parent>
<artifactId>ref</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/a0d3c697/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8a5ed01..6764a17 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,6 +1,5 @@
<?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>
@@ -11,7 +10,7 @@
<groupId>org.apache.drill</groupId>
<artifactId>drill-root</artifactId>
- <version>1.0.0-m1-SNAPSHOT</version>
+ <version>1.0.0-m1</version>
<packaging>pom</packaging>
<name>Apache Drill Root POM</name>
@@ -28,6 +27,7 @@
<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>
+ <tag>drill-1.0.0-m1</tag>
</scm>
<repositories>
@@ -185,7 +185,7 @@
</goals>
</pluginExecutionFilter>
<action>
- <ignore></ignore>
+ <ignore />
</action>
</pluginExecution>
<pluginExecution>
@@ -198,7 +198,7 @@
</goals>
</pluginExecutionFilter>
<action>
- <ignore></ignore>
+ <ignore />
</action>
</pluginExecution>
<pluginExecution>
@@ -212,7 +212,7 @@
</goals>
</pluginExecutionFilter>
<action>
- <ignore></ignore>
+ <ignore />
</action>
</pluginExecution>
<pluginExecution>
@@ -225,7 +225,7 @@
</goals>
</pluginExecutionFilter>
<action>
- <ignore></ignore>
+ <ignore />
</action>
</pluginExecution>
<pluginExecution>
@@ -240,7 +240,7 @@
</goals>
</pluginExecutionFilter>
<action>
- <ignore></ignore>
+ <ignore />
</action>
</pluginExecution>
</pluginExecutions>
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/a0d3c697/sqlparser/pom.xml
----------------------------------------------------------------------
diff --git a/sqlparser/pom.xml b/sqlparser/pom.xml
index 8260df2..f10516f 100644
--- a/sqlparser/pom.xml
+++ b/sqlparser/pom.xml
@@ -1,12 +1,10 @@
<?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">
+<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>drill-root</artifactId>
<groupId>org.apache.drill</groupId>
- <version>1.0.0-m1-SNAPSHOT</version>
+ <version>1.0.0-m1</version>
</parent>
<artifactId>sqlparser</artifactId>
<name>SQL Parser</name>