gora-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lewi...@apache.org
Subject gora git commit: Resolve Spark dependencyManagement such that it can be used within both gora-core and core-tutorial
Date Wed, 15 Jun 2016 20:44:34 GMT
Repository: gora
Updated Branches:
  refs/heads/master 6d98c37f8 -> 82a45c70c


Resolve Spark dependencyManagement such that it can be used within both gora-core and core-tutorial


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

Branch: refs/heads/master
Commit: 82a45c70cce38764e28ec9f7f75dcb636a9433ff
Parents: 6d98c37
Author: Lewis John McGibbney <lewis.mcgibbney@gmail.com>
Authored: Wed Jun 15 13:50:30 2016 -0700
Committer: Lewis John McGibbney <lewis.mcgibbney@gmail.com>
Committed: Wed Jun 15 13:50:30 2016 -0700

----------------------------------------------------------------------
 gora-core/pom.xml     | 10 +-----
 gora-tutorial/pom.xml | 10 +++---
 pom.xml               | 83 ++++++++--------------------------------------
 3 files changed, 20 insertions(+), 83 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/gora/blob/82a45c70/gora-core/pom.xml
----------------------------------------------------------------------
diff --git a/gora-core/pom.xml b/gora-core/pom.xml
index b28a9a9..5bab376 100644
--- a/gora-core/pom.xml
+++ b/gora-core/pom.xml
@@ -143,17 +143,9 @@
     </dependency>
 
     <!-- Spark dependency -->
-    <dependency> <!-- Spark dependency -->
+    <dependency>
       <groupId>org.apache.spark</groupId>
       <artifactId>spark-core_2.10</artifactId>
-      <version>${spark.version}</version>
-      <scope>provided</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.eclipse.jetty.orbit</groupId>
-          <artifactId>javax.servlet</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
 
     <!-- Logging Dependencies -->

http://git-wip-us.apache.org/repos/asf/gora/blob/82a45c70/gora-tutorial/pom.xml
----------------------------------------------------------------------
diff --git a/gora-tutorial/pom.xml b/gora-tutorial/pom.xml
index 8474901..d73b4df 100644
--- a/gora-tutorial/pom.xml
+++ b/gora-tutorial/pom.xml
@@ -113,10 +113,6 @@
       <artifactId>gora-solr</artifactId>
     </dependency>
 
-    <!--dependency> <groupId>org.apache.gora</groupId> <artifactId>gora-sql</artifactId>

-      </dependency> <dependency> <groupId>org.apache.gora</groupId>
<artifactId>gora-solr</artifactId> 
-      </dependency -->
-
     <!-- Hadoop Dependencies -->
     <dependency>
       <groupId>org.apache.hadoop</groupId>
@@ -128,6 +124,12 @@
       <artifactId>avro</artifactId>
     </dependency>
 
+    <!-- Spark Dependencies -->
+    <dependency>
+      <groupId>org.apache.spark</groupId>
+      <artifactId>spark-core_2.10</artifactId>
+    </dependency>
+
     <!-- Misc Dependencies -->
     <dependency>
       <groupId>org.jdom</groupId>

http://git-wip-us.apache.org/repos/asf/gora/blob/82a45c70/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 565f3e6..06938de 100644
--- a/pom.xml
+++ b/pom.xml
@@ -849,16 +849,12 @@
         <artifactId>gora-compiler</artifactId>
         <version>${project.version}</version>
       </dependency>
-      <!--dependency> <groupId>org.apache.gora</groupId> <artifactId>gora-core</artifactId>

-        <version>${project.version}</version> <type>test-jar</type>
</dependency -->
 
       <dependency>
         <groupId>org.apache.gora</groupId>
         <artifactId>gora-compiler-cli</artifactId>
         <version>${project.version}</version>
       </dependency>
-      <!--dependency> <groupId>org.apache.gora</groupId> <artifactId>gora-core</artifactId>

-        <version>${project.version}</version> <type>test-jar</type>
</dependency -->
 
       <dependency>
         <groupId>org.apache.gora</groupId>
@@ -889,18 +885,20 @@
         <version>${project.version}</version>
         <type>test-jar</type>
       </dependency>
+      <!-- End of Internal Depednecies -->
 
-      <!-- Avro needs this version of jackson -->
-<!--       <dependency> -->
-<!--         <groupId>org.codehaus.jackson</groupId> -->
-<!--         <artifactId>jackson-core-asl</artifactId> -->
-<!--         <version>${jackson.version}</version> -->
-<!--       </dependency> -->
-<!--       <dependency> -->
-<!--         <groupId>org.codehaus.jackson</groupId> -->
-<!--         <artifactId>jackson-mapper-asl</artifactId> -->
-<!--         <version>${jackson.version}</version> -->
-<!--       </dependency> -->
+      <dependency>
+        <groupId>org.apache.spark</groupId>
+        <artifactId>spark-core_2.10</artifactId>
+        <version>${spark.version}</version>
+        <scope>provided</scope>
+        <exclusions>
+          <exclusion>
+            <groupId>org.eclipse.jetty.orbit</groupId>
+            <artifactId>javax.servlet</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
 
       <dependency>
         <groupId>org.apache.hadoop</groupId>
@@ -1046,33 +1044,6 @@
         </exclusions>
       </dependency>
 
-      <!-- Solr Dependencies -->
-<!--       <dependency> -->
-<!--         <groupId>org.apache.solr</groupId> -->
-<!--         <artifactId>solr-core</artifactId> -->
-<!--         <version>${lucene-solr.version}</version> -->
-<!--         <exclusions> -->
-<!--           <exclusion> -->
-<!--             <groupId>org.eclipse.jetty.orbit</groupId> -->
-<!--             <artifactId>javax.servlet</artifactId> -->
-<!--           </exclusion> -->
-<!--         </exclusions> -->
-<!--       </dependency> -->
-<!--       <dependency> -->
-<!--         <groupId>org.apache.solr</groupId> -->
-<!--         <artifactId>solr-solrj</artifactId> -->
-<!--         <version>${lucene-solr.version}</version> -->
-<!--       </dependency> -->
-<!--       <dependency> -->
-<!--         <groupId>org.apache.solr</groupId> -->
-<!--         <artifactId>solr-test-framework</artifactId> -->
-<!--         <version>${lucene-solr.version}</version> -->
-<!--       </dependency> -->
-<!--       <dependency> -->
-<!--         <groupId>org.apache.lucene</groupId> -->
-<!--         <artifactId>lucene-test-framework</artifactId> -->
-<!--         <version>${lucene-solr.version}</version> -->
-<!--       </dependency> -->
       <dependency>
         <groupId>com.ibm.icu</groupId>
         <artifactId>icu4j</artifactId>
@@ -1339,23 +1310,6 @@
         <version>2.0.10</version>
       </dependency>
 
-<!--       Lucene Dependencies -->
-<!--       <dependency> -->
-<!--         <groupId>org.apache.lucene</groupId> -->
-<!--         <artifactId>lucene-core</artifactId> -->
-<!--         <version>${lucene-solr.version}</version> -->
-<!--       </dependency> -->
-<!--       <dependency> -->
-<!--         <groupId>org.apache.lucene</groupId> -->
-<!--         <artifactId>lucene-analyzers-common</artifactId> -->
-<!--         <version>${lucene-solr.version}</version> -->
-<!--       </dependency> -->
-<!--       <dependency> -->
-<!--         <groupId>org.apache.lucene</groupId> -->
-<!--         <artifactId>lucene-queries</artifactId> -->
-<!--         <version>${lucene-solr.version}</version> -->
-<!--       </dependency> -->
-
       <!-- Amazon Dependencies -->
       <dependency>
         <groupId>com.amazonaws</groupId>
@@ -1392,17 +1346,6 @@
         </exclusions>
       </dependency>
 
-      <!--dependency> <groupId>org.hsqldb</groupId> <artifactId>hsqldb</artifactId>

-        <version>${hsqldb.version}</version> </dependency> <dependency>
<groupId>mysql</groupId> 
-        <artifactId>mysql-connector-java</artifactId> <version>${mysql.version}</version>

-        </dependency -->
-
-      <!--dependency>
-        <groupId>xerces</groupId>
-        <artifactId>xercesImpl</artifactId>
-        <version>${xerces.version}</version>
-      </dependency -->
-
       <!-- Logging Dependencies -->
       <dependency>
         <groupId>org.slf4j</groupId>


Mime
View raw message