gora-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lewi...@apache.org
Subject git commit: Attemtpt to resolve javax.servlet classloading issue within gora-solr
Date Fri, 20 Jun 2014 15:07:44 GMT
Repository: gora
Updated Branches:
  refs/heads/master ff312980a -> 68beaa7ff


Attemtpt to resolve javax.servlet classloading issue within gora-solr


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

Branch: refs/heads/master
Commit: 68beaa7ff37c913c5071d4317b8f89292e69bb9d
Parents: ff31298
Author: Lewis John McGibbney <lewis.j.mcgibbney@jpl.nasa.gov>
Authored: Fri Jun 20 11:07:11 2014 -0400
Committer: Lewis John McGibbney <lewis.j.mcgibbney@jpl.nasa.gov>
Committed: Fri Jun 20 11:07:11 2014 -0400

----------------------------------------------------------------------
 gora-solr/pom.xml | 4 ++++
 pom.xml           | 8 +++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/gora/blob/68beaa7f/gora-solr/pom.xml
----------------------------------------------------------------------
diff --git a/gora-solr/pom.xml b/gora-solr/pom.xml
index 8a0874c..7ea5db1 100644
--- a/gora-solr/pom.xml
+++ b/gora-solr/pom.xml
@@ -146,6 +146,10 @@
           <groupId>org.restlet.jee</groupId>
           <artifactId>org.restlet.ext.servlet</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>org.eclipse.jetty.orbit</groupId>
+          <artifactId>javax.servlet</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>

http://git-wip-us.apache.org/repos/asf/gora/blob/68beaa7f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d200cff..a799001 100644
--- a/pom.xml
+++ b/pom.xml
@@ -630,7 +630,7 @@
         <tika.version>1.5</tika.version>
         <httpcomponents.version>4.2.3</httpcomponents.version>
         <commons-io.version>1.3.2</commons-io.version>
-        <restlet.version>2.1.1</restlet.version>
+        <restlet.version>2.2.1</restlet.version>
 
         <!-- Misc Dependencies -->
         <guava.version>13.0</guava.version>
@@ -930,6 +930,12 @@
               <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>


Mime
View raw message