[lucene4.10] 20/24: Rebased patch queue

[Hilko Bengen]

This is an automated email from the git hooks/post-receive script.

bengen pushed a commit to branch master
in repository lucene4.10.

commit ab112ea9c030f438373fb787ecf49e8c01b316c5
Author: Hilko Bengen <bengen at debian.org>
Date:   Sat Nov 8 16:03:45 2014 +0100

    Rebased patch queue
---
 ...1-Ivy-Use-local-maven-repository-and-local-ivy.home.patch |  2 +-
 .../0002-Use-javax.servlet-servlet-api-directly.patch        | 12 ++++++------
 .../patches/0003-Adjust-build-dep-versions-as-needed.patch   | 12 ++++++------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/debian/patches/0001-Ivy-Use-local-maven-repository-and-local-ivy.home.patch b/debian/patches/0001-Ivy-Use-local-maven-repository-and-local-ivy.home.patch
index c4e6bd1..f553256 100644
--- a/debian/patches/0001-Ivy-Use-local-maven-repository-and-local-ivy.home.patch
+++ b/debian/patches/0001-Ivy-Use-local-maven-repository-and-local-ivy.home.patch
@@ -8,7 +8,7 @@ Subject: Ivy: Use local maven repository and local ivy.home
  2 files changed, 3 insertions(+), 10 deletions(-)
 
 diff --git a/common-build.xml b/common-build.xml
-index e176a45..d439d76 100644
+index faf699e..0216946 100644
 --- a/common-build.xml
 +++ b/common-build.xml
 @@ -84,6 +84,7 @@
diff --git a/debian/patches/0002-Use-javax.servlet-servlet-api-directly.patch b/debian/patches/0002-Use-javax.servlet-servlet-api-directly.patch
index 827792e..82da351 100644
--- a/debian/patches/0002-Use-javax.servlet-servlet-api-directly.patch
+++ b/debian/patches/0002-Use-javax.servlet-servlet-api-directly.patch
@@ -7,17 +7,17 @@ Subject: Use javax.servlet/servlet-api directly
  1 file changed, 1 insertion(+), 3 deletions(-)
 
 diff --git a/replicator/ivy.xml b/replicator/ivy.xml
-index d0ae57c..5a5cbcf 100644
+index d7725d1..9a1b191 100644
 --- a/replicator/ivy.xml
 +++ b/replicator/ivy.xml
 @@ -40,9 +40,7 @@
-     <dependency org="org.eclipse.jetty" name="jetty-continuation" rev="${/org.eclipse.jetty/jetty-continuation}" transitive="false" conf="jetty->default"/>
-     <dependency org="org.eclipse.jetty" name="jetty-http" rev="${/org.eclipse.jetty/jetty-http}" transitive="false" conf="jetty->default"/>
-     <dependency org="commons-logging" name="commons-logging" rev="${/commons-logging/commons-logging}" transitive="false" conf="logging->default"/>
--    <dependency org="org.eclipse.jetty.orbit" name="javax.servlet" rev="${/org.eclipse.jetty.orbit/javax.servlet}" transitive="false" conf="servlet->default">
+ 
+     <dependency org="commons-logging" name="commons-logging" rev="${/commons-logging/commons-logging}" conf="logging"/>
+ 
+-    <dependency org="org.eclipse.jetty.orbit" name="javax.servlet" rev="${/org.eclipse.jetty.orbit/javax.servlet}" conf="servlet">
 -      <artifact name="javax.servlet" type="orbit" ext="jar"/>
 -    </dependency>
 +    <dependency org="javax.servlet" name="servlet-api" rev="3.0" transitive="false"/>
+ 
      <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
    </dependencies>
- 
diff --git a/debian/patches/0003-Adjust-build-dep-versions-as-needed.patch b/debian/patches/0003-Adjust-build-dep-versions-as-needed.patch
index bc220e3..fcb6ba5 100644
--- a/debian/patches/0003-Adjust-build-dep-versions-as-needed.patch
+++ b/debian/patches/0003-Adjust-build-dep-versions-as-needed.patch
@@ -8,10 +8,10 @@ Subject: Adjust build-dep versions as needed
  2 files changed, 32 insertions(+), 32 deletions(-)
 
 diff --git a/common-build.xml b/common-build.xml
-index d439d76..905fc8e 100644
+index 0216946..40906ac 100644
 --- a/common-build.xml
 +++ b/common-build.xml
-@@ -2294,7 +2294,7 @@ ${ant.project.name}.test.dependencies=${test.classpath.list}
+@@ -2293,7 +2293,7 @@ ${ant.project.name}.test.dependencies=${test.classpath.list}
  
    <!-- GROOVY scripting engine for ANT tasks -->
    <target name="resolve-groovy" unless="groovy.loaded" depends="ivy-availability-check,ivy-configure">
@@ -21,7 +21,7 @@ index d439d76..905fc8e 100644
      <taskdef name="groovy"
        classname="org.codehaus.groovy.ant.Groovy"
 diff --git a/ivy-versions.properties b/ivy-versions.properties
-index 6ac116b..36a520d 100644
+index bdde6ad..d49024b 100644
 --- a/ivy-versions.properties
 +++ b/ivy-versions.properties
 @@ -7,11 +7,11 @@
@@ -156,7 +156,7 @@ index 6ac116b..36a520d 100644
  /org.eclipse.jetty/jetty-continuation = ${org.eclipse.jetty.version}
  /org.eclipse.jetty/jetty-deploy = ${org.eclipse.jetty.version}
  /org.eclipse.jetty/jetty-http = ${org.eclipse.jetty.version}
-@@ -213,7 +213,7 @@ org.mortbay.jetty.version = 6.1.26
+@@ -212,7 +212,7 @@ org.mortbay.jetty.version = 6.1.26
  /org.noggit/noggit = 0.5
  /org.objenesis/objenesis = 1.2
  
@@ -165,7 +165,7 @@ index 6ac116b..36a520d 100644
  /org.ow2.asm/asm = ${org.ow2.asm.version}
  /org.ow2.asm/asm-commons = ${org.ow2.asm.version}
  
-@@ -221,7 +221,7 @@ org.restlet.jee.version = 2.1.1
+@@ -220,7 +220,7 @@ org.restlet.jee.version = 2.1.1
  /org.restlet.jee/org.restlet = ${org.restlet.jee.version}
  /org.restlet.jee/org.restlet.ext.servlet = ${org.restlet.jee.version}
  
@@ -174,7 +174,7 @@ index 6ac116b..36a520d 100644
  
  org.slf4j.version = 1.7.6
  /org.slf4j/jcl-over-slf4j = ${org.slf4j.version}
-@@ -232,4 +232,4 @@ org.slf4j.version = 1.7.6
+@@ -231,4 +231,4 @@ org.slf4j.version = 1.7.6
  /org.tukaani/xz = 1.4
  /org.xerial.snappy/snappy-java = 1.0.5
  /rome/rome = 0.9

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/lucene4.10.git