[2/2] git commit: PHOENIX-105 Remove commons-csv source

2014-09-02 Thread greid
PHOENIX-105 Remove commons-csv source

Remove the fork of the commons-csv source code and use the
released commons-csv artifact.


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

Branch: refs/heads/master
Commit: c36973263296d3eb4b6ffdbf1a43e9f3e4fe5930
Parents: 4774c63
Author: Gabriel Reid gabri...@ngdata.com
Authored: Tue Sep 2 10:03:13 2014 +0200
Committer: Gabriel Reid gabri...@ngdata.com
Committed: Tue Sep 2 13:00:42 2014 +0200

--
 .../src/build/components-major-client.xml   |   1 +
 .../components/all-common-dependencies.xml  |   3 +-
 phoenix-core/pom.xml|   4 +
 .../java/org/apache/commons/csv/Assertions.java |  36 -
 .../java/org/apache/commons/csv/CSVFormat.java  | 884 ---
 .../java/org/apache/commons/csv/CSVParser.java  | 470 --
 .../java/org/apache/commons/csv/CSVPrinter.java | 429 -
 .../java/org/apache/commons/csv/CSVRecord.java  | 225 -
 .../java/org/apache/commons/csv/Constants.java  |  68 --
 .../commons/csv/ExtendedBufferedReader.java | 178 
 .../main/java/org/apache/commons/csv/Lexer.java | 431 -
 .../main/java/org/apache/commons/csv/Quote.java |  48 -
 .../main/java/org/apache/commons/csv/Token.java |  75 --
 .../org/apache/commons/csv/package-info.java|  82 --
 .../apache/phoenix/util/CSVCommonsLoader.java   |   6 +-
 pom.xml |   7 +-
 16 files changed, 16 insertions(+), 2931 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/c3697326/phoenix-assembly/src/build/components-major-client.xml
--
diff --git a/phoenix-assembly/src/build/components-major-client.xml 
b/phoenix-assembly/src/build/components-major-client.xml
index 08083da..f1f37c2 100644
--- a/phoenix-assembly/src/build/components-major-client.xml
+++ b/phoenix-assembly/src/build/components-major-client.xml
@@ -45,6 +45,7 @@
 includecommons-logging:commons-logging/include
 includecommons-lang:commons-lang/include
 includecommons-cli:commons-cli/include
+includeorg.apache.commons:commons-csv/include
 includeorg.codehaus.jackson:jackson-mapper-asl/include
 includeorg.codehaus.jackson:jackson-core-asl/include
 includeorg.xerial.snappy:snappy-java/include

http://git-wip-us.apache.org/repos/asf/phoenix/blob/c3697326/phoenix-assembly/src/build/components/all-common-dependencies.xml
--
diff --git a/phoenix-assembly/src/build/components/all-common-dependencies.xml 
b/phoenix-assembly/src/build/components/all-common-dependencies.xml
index 7d943f6..df4a32f 100644
--- a/phoenix-assembly/src/build/components/all-common-dependencies.xml
+++ b/phoenix-assembly/src/build/components/all-common-dependencies.xml
@@ -32,6 +32,7 @@
 includecommons-io:commons-io/include
 includecommons-lang:commons-lang/include
 includecommons-logging:commons-logging/include
+includeorg.apache.commons:commons-csv/include
 includecom.google.guava:guava/include
 includeorg.apache.hadoop:hadoop*/include
 includecom.google.protobuf:protobuf-java/include
@@ -59,4 +60,4 @@
   /includes
 /dependencySet
   /dependencySets
-/component
\ No newline at end of file
+/component

http://git-wip-us.apache.org/repos/asf/phoenix/blob/c3697326/phoenix-core/pom.xml
--
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index 73b27bf..d5774ea 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -321,6 +321,10 @@
   groupIdcommons-collections/groupId
   artifactIdcommons-collections/artifactId
 /dependency
+dependency
+  groupIdorg.apache.commons/groupId
+  artifactIdcommons-csv/artifactId
+/dependency
   /dependencies
 
   profiles

http://git-wip-us.apache.org/repos/asf/phoenix/blob/c3697326/phoenix-core/src/main/java/org/apache/commons/csv/Assertions.java
--
diff --git a/phoenix-core/src/main/java/org/apache/commons/csv/Assertions.java 
b/phoenix-core/src/main/java/org/apache/commons/csv/Assertions.java
deleted file mode 100644
index 63c330a..000
--- a/phoenix-core/src/main/java/org/apache/commons/csv/Assertions.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright 

[2/2] git commit: PHOENIX-105 Remove commons-csv source

2014-09-02 Thread greid
PHOENIX-105 Remove commons-csv source

Remove the fork of the commons-csv source code and use the
released commons-csv artifact.


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

Branch: refs/heads/4.0
Commit: ab49a16b34905bac1a9b0b9d5f0c8f1006a84e58
Parents: 214a4cc
Author: Gabriel Reid gabri...@ngdata.com
Authored: Tue Sep 2 10:03:13 2014 +0200
Committer: Gabriel Reid gabri...@ngdata.com
Committed: Tue Sep 2 12:58:45 2014 +0200

--
 .../src/build/components-major-client.xml   |   1 +
 .../components/all-common-dependencies.xml  |   3 +-
 phoenix-core/pom.xml|   4 +
 .../java/org/apache/commons/csv/Assertions.java |  36 -
 .../java/org/apache/commons/csv/CSVFormat.java  | 884 ---
 .../java/org/apache/commons/csv/CSVParser.java  | 470 --
 .../java/org/apache/commons/csv/CSVPrinter.java | 429 -
 .../java/org/apache/commons/csv/CSVRecord.java  | 225 -
 .../java/org/apache/commons/csv/Constants.java  |  68 --
 .../commons/csv/ExtendedBufferedReader.java | 178 
 .../main/java/org/apache/commons/csv/Lexer.java | 431 -
 .../main/java/org/apache/commons/csv/Quote.java |  48 -
 .../main/java/org/apache/commons/csv/Token.java |  75 --
 .../org/apache/commons/csv/package-info.java|  82 --
 .../apache/phoenix/util/CSVCommonsLoader.java   |   6 +-
 pom.xml |   7 +-
 16 files changed, 16 insertions(+), 2931 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/ab49a16b/phoenix-assembly/src/build/components-major-client.xml
--
diff --git a/phoenix-assembly/src/build/components-major-client.xml 
b/phoenix-assembly/src/build/components-major-client.xml
index 08083da..f1f37c2 100644
--- a/phoenix-assembly/src/build/components-major-client.xml
+++ b/phoenix-assembly/src/build/components-major-client.xml
@@ -45,6 +45,7 @@
 includecommons-logging:commons-logging/include
 includecommons-lang:commons-lang/include
 includecommons-cli:commons-cli/include
+includeorg.apache.commons:commons-csv/include
 includeorg.codehaus.jackson:jackson-mapper-asl/include
 includeorg.codehaus.jackson:jackson-core-asl/include
 includeorg.xerial.snappy:snappy-java/include

http://git-wip-us.apache.org/repos/asf/phoenix/blob/ab49a16b/phoenix-assembly/src/build/components/all-common-dependencies.xml
--
diff --git a/phoenix-assembly/src/build/components/all-common-dependencies.xml 
b/phoenix-assembly/src/build/components/all-common-dependencies.xml
index 7d943f6..df4a32f 100644
--- a/phoenix-assembly/src/build/components/all-common-dependencies.xml
+++ b/phoenix-assembly/src/build/components/all-common-dependencies.xml
@@ -32,6 +32,7 @@
 includecommons-io:commons-io/include
 includecommons-lang:commons-lang/include
 includecommons-logging:commons-logging/include
+includeorg.apache.commons:commons-csv/include
 includecom.google.guava:guava/include
 includeorg.apache.hadoop:hadoop*/include
 includecom.google.protobuf:protobuf-java/include
@@ -59,4 +60,4 @@
   /includes
 /dependencySet
   /dependencySets
-/component
\ No newline at end of file
+/component

http://git-wip-us.apache.org/repos/asf/phoenix/blob/ab49a16b/phoenix-core/pom.xml
--
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index a74abcd..5e25056 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -321,6 +321,10 @@
   groupIdcommons-collections/groupId
   artifactIdcommons-collections/artifactId
 /dependency
+dependency
+  groupIdorg.apache.commons/groupId
+  artifactIdcommons-csv/artifactId
+/dependency
   /dependencies
 
   profiles

http://git-wip-us.apache.org/repos/asf/phoenix/blob/ab49a16b/phoenix-core/src/main/java/org/apache/commons/csv/Assertions.java
--
diff --git a/phoenix-core/src/main/java/org/apache/commons/csv/Assertions.java 
b/phoenix-core/src/main/java/org/apache/commons/csv/Assertions.java
deleted file mode 100644
index 63c330a..000
--- a/phoenix-core/src/main/java/org/apache/commons/csv/Assertions.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright