You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hawq.apache.org by wl...@apache.org on 2015/12/18 09:55:30 UTC

[1/3] incubator-hawq git commit: HAWQ-186. Remove jar files in contrib/hawq-hadoop/hawq-mapreduce-tool/lib

Repository: incubator-hawq
Updated Branches:
  refs/heads/hawq-186_2 [created] dd0b374ec


HAWQ-186. Remove jar files in contrib/hawq-hadoop/hawq-mapreduce-tool/lib


Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/e277d3cd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/e277d3cd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/e277d3cd

Branch: refs/heads/hawq-186_2
Commit: e277d3cd143f042681dde9d063bda1ddc248456d
Parents: 2576e68
Author: Wen Lin <wl...@pivotal.io>
Authored: Fri Dec 18 16:47:00 2015 +0800
Committer: Wen Lin <wl...@pivotal.io>
Committed: Fri Dec 18 16:47:00 2015 +0800

----------------------------------------------------------------------
 .../lib/parquet-column-1.1.0.jar                | Bin 201437 -> 0 bytes
 .../lib/parquet-common-1.1.0.jar                | Bin 11057 -> 0 bytes
 .../lib/parquet-encoding-1.1.0.jar              | Bin 271947 -> 0 bytes
 .../lib/parquet-format-1.0.0.jar                | Bin 440035 -> 0 bytes
 .../lib/parquet-hadoop-1.1.0.jar                | Bin 1151874 -> 0 bytes
 .../lib/postgresql-9.2-1003-jdbc4.jar           | Bin 594653 -> 0 bytes
 .../hawq-mapreduce-tool/lib/snakeyaml-1.12.jar  | Bin 270779 -> 0 bytes
 .../lib/snappy-java-1.1.0.jar                   | Bin 410710 -> 0 bytes
 contrib/hawq-hadoop/hawq-mapreduce-tool/pom.xml |  26 +++++++++++++++++++
 9 files changed, 26 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/e277d3cd/contrib/hawq-hadoop/hawq-mapreduce-tool/lib/parquet-column-1.1.0.jar
----------------------------------------------------------------------
diff --git a/contrib/hawq-hadoop/hawq-mapreduce-tool/lib/parquet-column-1.1.0.jar b/contrib/hawq-hadoop/hawq-mapreduce-tool/lib/parquet-column-1.1.0.jar
deleted file mode 100644
index 698c93b..0000000
Binary files a/contrib/hawq-hadoop/hawq-mapreduce-tool/lib/parquet-column-1.1.0.jar and /dev/null differ

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/e277d3cd/contrib/hawq-hadoop/hawq-mapreduce-tool/lib/parquet-common-1.1.0.jar
----------------------------------------------------------------------
diff --git a/contrib/hawq-hadoop/hawq-mapreduce-tool/lib/parquet-common-1.1.0.jar b/contrib/hawq-hadoop/hawq-mapreduce-tool/lib/parquet-common-1.1.0.jar
deleted file mode 100644
index 5a45060..0000000
Binary files a/contrib/hawq-hadoop/hawq-mapreduce-tool/lib/parquet-common-1.1.0.jar and /dev/null differ

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/e277d3cd/contrib/hawq-hadoop/hawq-mapreduce-tool/lib/parquet-encoding-1.1.0.jar
----------------------------------------------------------------------
diff --git a/contrib/hawq-hadoop/hawq-mapreduce-tool/lib/parquet-encoding-1.1.0.jar b/contrib/hawq-hadoop/hawq-mapreduce-tool/lib/parquet-encoding-1.1.0.jar
deleted file mode 100644
index a5fc5b3..0000000
Binary files a/contrib/hawq-hadoop/hawq-mapreduce-tool/lib/parquet-encoding-1.1.0.jar and /dev/null differ

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/e277d3cd/contrib/hawq-hadoop/hawq-mapreduce-tool/lib/parquet-format-1.0.0.jar
----------------------------------------------------------------------
diff --git a/contrib/hawq-hadoop/hawq-mapreduce-tool/lib/parquet-format-1.0.0.jar b/contrib/hawq-hadoop/hawq-mapreduce-tool/lib/parquet-format-1.0.0.jar
deleted file mode 100644
index 4c52579..0000000
Binary files a/contrib/hawq-hadoop/hawq-mapreduce-tool/lib/parquet-format-1.0.0.jar and /dev/null differ

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/e277d3cd/contrib/hawq-hadoop/hawq-mapreduce-tool/lib/parquet-hadoop-1.1.0.jar
----------------------------------------------------------------------
diff --git a/contrib/hawq-hadoop/hawq-mapreduce-tool/lib/parquet-hadoop-1.1.0.jar b/contrib/hawq-hadoop/hawq-mapreduce-tool/lib/parquet-hadoop-1.1.0.jar
deleted file mode 100644
index 6385792..0000000
Binary files a/contrib/hawq-hadoop/hawq-mapreduce-tool/lib/parquet-hadoop-1.1.0.jar and /dev/null differ

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/e277d3cd/contrib/hawq-hadoop/hawq-mapreduce-tool/lib/postgresql-9.2-1003-jdbc4.jar
----------------------------------------------------------------------
diff --git a/contrib/hawq-hadoop/hawq-mapreduce-tool/lib/postgresql-9.2-1003-jdbc4.jar b/contrib/hawq-hadoop/hawq-mapreduce-tool/lib/postgresql-9.2-1003-jdbc4.jar
deleted file mode 100644
index 34b2b93..0000000
Binary files a/contrib/hawq-hadoop/hawq-mapreduce-tool/lib/postgresql-9.2-1003-jdbc4.jar and /dev/null differ

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/e277d3cd/contrib/hawq-hadoop/hawq-mapreduce-tool/lib/snakeyaml-1.12.jar
----------------------------------------------------------------------
diff --git a/contrib/hawq-hadoop/hawq-mapreduce-tool/lib/snakeyaml-1.12.jar b/contrib/hawq-hadoop/hawq-mapreduce-tool/lib/snakeyaml-1.12.jar
deleted file mode 100644
index fd314d3..0000000
Binary files a/contrib/hawq-hadoop/hawq-mapreduce-tool/lib/snakeyaml-1.12.jar and /dev/null differ

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/e277d3cd/contrib/hawq-hadoop/hawq-mapreduce-tool/lib/snappy-java-1.1.0.jar
----------------------------------------------------------------------
diff --git a/contrib/hawq-hadoop/hawq-mapreduce-tool/lib/snappy-java-1.1.0.jar b/contrib/hawq-hadoop/hawq-mapreduce-tool/lib/snappy-java-1.1.0.jar
deleted file mode 100644
index f7660c4..0000000
Binary files a/contrib/hawq-hadoop/hawq-mapreduce-tool/lib/snappy-java-1.1.0.jar and /dev/null differ

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/e277d3cd/contrib/hawq-hadoop/hawq-mapreduce-tool/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/hawq-hadoop/hawq-mapreduce-tool/pom.xml b/contrib/hawq-hadoop/hawq-mapreduce-tool/pom.xml
index 99f51ba..0fe8b33 100644
--- a/contrib/hawq-hadoop/hawq-mapreduce-tool/pom.xml
+++ b/contrib/hawq-hadoop/hawq-mapreduce-tool/pom.xml
@@ -65,6 +65,32 @@ under the License.
                     </includes>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy</id> 
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal> 
+                        </goals>
+                        <configuration> 
+                            <outputDirectory>./lib</outputDirectory>
+							<includeArtifactIds>
+								parquet-column,
+								parquet-common,
+								parquet-encoding,
+								parquet-format,
+								parquet-hadoop,
+								postgresql,
+								snakeyaml,
+								snappy-java
+							</includeArtifactIds>
+						</configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 </project>


[2/3] incubator-hawq git commit: HAWQ-186. Fix indent

Posted by wl...@apache.org.
HAWQ-186. Fix indent


Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/996c0645
Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/996c0645
Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/996c0645

Branch: refs/heads/hawq-186_2
Commit: 996c06458d1fb4700ff7e96a5520a1bf3dd2636f
Parents: e277d3c
Author: Wen Lin <wl...@pivotal.io>
Authored: Fri Dec 18 16:55:22 2015 +0800
Committer: Wen Lin <wl...@pivotal.io>
Committed: Fri Dec 18 16:55:22 2015 +0800

----------------------------------------------------------------------
 contrib/hawq-hadoop/hawq-mapreduce-tool/pom.xml | 22 ++++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/996c0645/contrib/hawq-hadoop/hawq-mapreduce-tool/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/hawq-hadoop/hawq-mapreduce-tool/pom.xml b/contrib/hawq-hadoop/hawq-mapreduce-tool/pom.xml
index 0fe8b33..708a9e5 100644
--- a/contrib/hawq-hadoop/hawq-mapreduce-tool/pom.xml
+++ b/contrib/hawq-hadoop/hawq-mapreduce-tool/pom.xml
@@ -77,17 +77,17 @@ under the License.
                         </goals>
                         <configuration> 
                             <outputDirectory>./lib</outputDirectory>
-							<includeArtifactIds>
-								parquet-column,
-								parquet-common,
-								parquet-encoding,
-								parquet-format,
-								parquet-hadoop,
-								postgresql,
-								snakeyaml,
-								snappy-java
-							</includeArtifactIds>
-						</configuration>
+                            <includeArtifactIds>
+                                parquet-column,
+                                parquet-common,
+                                parquet-encoding,
+                                parquet-format,
+                                parquet-hadoop,
+                                postgresql,
+                                snakeyaml,
+                                snappy-java
+                            </includeArtifactIds>
+                        </configuration>
                     </execution>
                 </executions>
             </plugin>


[3/3] incubator-hawq git commit: HAWQ-186 Fix copy error

Posted by wl...@apache.org.
HAWQ-186 Fix copy error


Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/dd0b374e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/dd0b374e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/dd0b374e

Branch: refs/heads/hawq-186_2
Commit: dd0b374ec690920708c8d4f52005c96467f5ccdc
Parents: 996c064
Author: Wen Lin <wl...@pivotal.io>
Authored: Fri Dec 18 17:03:38 2015 +0800
Committer: Wen Lin <wl...@pivotal.io>
Committed: Fri Dec 18 17:03:38 2015 +0800

----------------------------------------------------------------------
 contrib/hawq-hadoop/hawq-mapreduce-tool/pom.xml | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/dd0b374e/contrib/hawq-hadoop/hawq-mapreduce-tool/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/hawq-hadoop/hawq-mapreduce-tool/pom.xml b/contrib/hawq-hadoop/hawq-mapreduce-tool/pom.xml
index 708a9e5..6aef225 100644
--- a/contrib/hawq-hadoop/hawq-mapreduce-tool/pom.xml
+++ b/contrib/hawq-hadoop/hawq-mapreduce-tool/pom.xml
@@ -77,16 +77,7 @@ under the License.
                         </goals>
                         <configuration> 
                             <outputDirectory>./lib</outputDirectory>
-                            <includeArtifactIds>
-                                parquet-column,
-                                parquet-common,
-                                parquet-encoding,
-                                parquet-format,
-                                parquet-hadoop,
-                                postgresql,
-                                snakeyaml,
-                                snappy-java
-                            </includeArtifactIds>
+                            <includeArtifactIds>parquet-column,parquet-common,parquet-encoding,parquet-format,parquet-hadoop,postgresql,snakeyaml,snappy-java</includeArtifactIds>
                         </configuration>
                     </execution>
                 </executions>