gora-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lewi...@apache.org
Subject [22/25] gora git commit: Merge branch 'master' of https://github.com/kamaci/gora into GORA-386
Date Thu, 03 Sep 2015 07:28:58 GMT
Merge branch 'master' of https://github.com/kamaci/gora into GORA-386


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

Branch: refs/heads/master
Commit: 965c44999d0afde2b6379b035c568d8539b0c384
Parents: a303ff7 3cf5502
Author: Lewis John McGibbney <lewis.j.mcgibbney@jpl.nasa.gov>
Authored: Tue Sep 1 13:49:50 2015 -0700
Committer: Lewis John McGibbney <lewis.j.mcgibbney@jpl.nasa.gov>
Committed: Tue Sep 1 13:49:50 2015 -0700

----------------------------------------------------------------------
 bin/gora                                        |   5 +
 gora-core/pom.xml                               |  13 ++
 .../gora/examples/spark/SparkWordCount.java     | 150 ++++++++++++++
 .../org/apache/gora/spark/GoraSparkEngine.java  | 150 ++++++++++++++
 .../gora/mapreduce/MapReduceTestUtils.java      |  31 +++
 .../mapreduce/TestHBaseStoreWordCount.java      |   8 +
 .../mapreduce/TestMongoStoreWordCount.java      |   9 +
 gora-tutorial/pom.xml                           |   5 +
 .../gora/tutorial/log/LogAnalyticsSpark.java    | 200 +++++++++++++++++++
 pom.xml                                         |   1 +
 10 files changed, 572 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/gora/blob/965c4499/gora-core/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/gora/blob/965c4499/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index e8ed87d,2b5821c..8197371
--- a/pom.xml
+++ b/pom.xml
@@@ -669,9 -641,10 +669,10 @@@
      <jetty.version>8.1.8.v20121106</jetty.version>
      <tika.version>1.7</tika.version>
      <httpcomponents.version>4.3.1</httpcomponents.version>
 -    <commons-io.version>1.3.2</commons-io.version>
 +    <commons-io.version>2.4</commons-io.version>
      <restlet.version>2.3.1</restlet.version>
  
+     <spark.version>1.4.1</spark.version>
      <!-- Misc Dependencies -->
      <guava.version>13.0</guava.version>
      <commons-lang.version>2.6</commons-lang.version>


Mime
View raw message