This is an automated email from the git hooks/post-receive script. bengen pushed a commit to branch master in repository lucene4.10.
commit 061e22af0015b2485bd71088d0d62a3cd3ec7387 Author: Hilko Bengen <[email protected]> Date: Wed Oct 22 22:37:13 2014 +0200 Updated patches --- ...local-maven-repository-and-local-ivy.home.patch | 22 ++-- .../0003-Adjust-build-dep-versions-as-needed.patch | 122 +++++++++++++-------- 2 files changed, 87 insertions(+), 57 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 6c622ed..c4e6bd1 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 @@ -3,15 +3,15 @@ Date: Wed, 8 Jan 2014 11:54:00 +0100 Subject: Ivy: Use local maven repository and local ivy.home --- - common-build.xml | 1 + - ivy-settings.xml | 8 ++------ - 2 files changed, 3 insertions(+), 6 deletions(-) + common-build.xml | 1 + + ivy-settings.xml | 12 ++---------- + 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/common-build.xml b/common-build.xml -index b4111ac..07f69c0 100644 +index e176a45..d439d76 100644 --- a/common-build.xml +++ b/common-build.xml -@@ -68,6 +68,7 @@ +@@ -84,6 +84,7 @@ <!-- we exclude ext/*.jar because we don't want example/lib/ext logging jars on the cp --> <property name="common.classpath.excludes" value="**/*.txt,**/*.template,**/*.sha1,ext/*.jar" /> @@ -20,26 +20,30 @@ index b4111ac..07f69c0 100644 <property name="ivy.default.configuration" value="*"/> <property name="ivy.sync" value="true"/> diff --git a/ivy-settings.xml b/ivy-settings.xml -index c7c3754..96157d3 100644 +index 8518e0d..622d1e7 100644 --- a/ivy-settings.xml +++ b/ivy-settings.xml -@@ -36,6 +36,7 @@ +@@ -41,7 +41,7 @@ <!-- you might need to tweak this from china so it works --> <ibiblio name="working-chinese-mirror" root="http://uk.maven.org/maven2"; m2compatible="true" /> +- + <ibiblio name="debian" root="file:///usr/share/maven-repo" m2compatible="true" /> - <!-- <filesystem name="local-maven-2" m2compatible="true" local="true"> -@@ -47,12 +48,7 @@ + <artifact +@@ -52,15 +52,7 @@ --> <chain name="default" returnFirst="true" checkmodified="true" changingPattern=".*SNAPSHOT"> - <resolver ref="local"/> - <!-- <resolver ref="local-maven-2" /> --> - <resolver ref="main"/> +- <resolver ref="cloudera"/> +- <resolver ref="releases.cloudera.com"/> - <resolver ref="sonatype-releases" /> - <resolver ref="maven.restlet.org" /> +- <!-- <resolver ref="svnkit-releases" /> --> - <resolver ref="working-chinese-mirror" /> + <resolver ref="debian"/> </chain> 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 5284b8f..bc220e3 100644 --- a/debian/patches/0003-Adjust-build-dep-versions-as-needed.patch +++ b/debian/patches/0003-Adjust-build-dep-versions-as-needed.patch @@ -4,124 +4,150 @@ Subject: Adjust build-dep versions as needed --- common-build.xml | 2 +- - ivy-versions.properties | 46 +++++++++++++++++++++++----------------------- - 2 files changed, 24 insertions(+), 24 deletions(-) + ivy-versions.properties | 62 ++++++++++++++++++++++++------------------------- + 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/common-build.xml b/common-build.xml -index 07f69c0..50f1ee7 100644 +index d439d76..905fc8e 100644 --- a/common-build.xml +++ b/common-build.xml -@@ -2170,7 +2170,7 @@ ${tests-output}/junit4-*.suites - per-JVM executed suites - +@@ -2294,7 +2294,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"> -- <ivy:cachepath organisation="org.codehaus.groovy" module="groovy-all" revision="2.1.5" +- <ivy:cachepath organisation="org.codehaus.groovy" module="groovy-all" revision="2.3.1" + <ivy:cachepath organisation="org.codehaus.groovy" module="groovy-all" revision="debian" inline="true" conf="default" type="jar" transitive="true" pathid="groovy.classpath"/> <taskdef name="groovy" classname="org.codehaus.groovy.ant.Groovy" diff --git a/ivy-versions.properties b/ivy-versions.properties -index a71f538..d646421 100644 +index 6ac116b..36a520d 100644 --- a/ivy-versions.properties +++ b/ivy-versions.properties -@@ -4,11 +4,11 @@ - +@@ -7,11 +7,11 @@ /cglib/cglib-nodep = 2.2 + /com.adobe.xmp/xmpcore = 5.1.2 --com.carrotsearch.randomizedtesting.version = 2.0.13 +-com.carrotsearch.randomizedtesting.version = 2.1.6 +com.carrotsearch.randomizedtesting.version = debian /com.carrotsearch.randomizedtesting/junit4-ant = ${com.carrotsearch.randomizedtesting.version} /com.carrotsearch.randomizedtesting/randomizedtesting-runner = ${com.carrotsearch.randomizedtesting.version} -/com.carrotsearch/hppc = 0.5.2 +/com.carrotsearch/hppc = debian - /com.cybozu.labs/langdetect = 1.1-20120112 - /com.drewnoakes/metadata-extractor = 2.6.2 - /com.google.guava/guava = 14.0.1 -@@ -16,39 +16,39 @@ com.carrotsearch.randomizedtesting.version = 2.0.13 + + com.codahale.metrics.version = 3.0.1 + /com.codahale.metrics/metrics-core = ${com.codahale.metrics.version} +@@ -35,8 +35,8 @@ com.google.inject.guice.version = 3.0 /com.googlecode.concurrentlinkedhashmap/concurrentlinkedhashmap-lru = 1.2 /com.googlecode.juniversalchardet/juniversalchardet = 1.0.3 /com.googlecode.mp4parser/isoparser = 1.0-RC-1 --/com.ibm.icu/icu4j = 49.1 +-/com.ibm.icu/icu4j = 53.1 +-/com.spatial4j/spatial4j = 0.4.1 +/com.ibm.icu/icu4j = 49 - /com.spatial4j/spatial4j = 0.3 - /com.sun.jersey/jersey-core = 1.16 - /commons-beanutils/commons-beanutils = 1.7.0 ++/com.spatial4j/spatial4j = 0.4.x + + com.sun.jersey.version = 1.9 + /com.sun.jersey.contribs/jersey-guice = ${com.sun.jersey.version} +@@ -45,46 +45,46 @@ com.sun.jersey.version = 1.9 + /com.sun.jersey/jersey-json = ${com.sun.jersey.version} + /com.sun.jersey/jersey-server = ${com.sun.jersey.version} + +-/com.sun.mail/gimap = 1.5.1 +-/com.sun.mail/javax.mail = 1.5.1 ++/com.sun.mail/gimap = debian ++/com.sun.mail/javax.mail = debian + +-/com.sun.xml.bind/jaxb-impl = 2.2.3-1 ++/com.sun.xml.bind/jaxb-impl = debian + /com.thoughtworks.paranamer/paranamer = 2.3 + /com.typesafe/config = 1.0.2 + /com.uwyn/jhighlight = 1.0 +-/commons-beanutils/commons-beanutils = 1.8.3 ++/commons-beanutils/commons-beanutils = debian /commons-cli/commons-cli = 1.2 --/commons-codec/commons-codec = 1.7 +-/commons-codec/commons-codec = 1.9 +/commons-codec/commons-codec = debian /commons-collections/commons-collections = 3.2.1 /commons-configuration/commons-configuration = 1.6 - /commons-digester/commons-digester = 2.0 + /commons-digester/commons-digester = 2.1 /commons-fileupload/commons-fileupload = 1.2.1 - /commons-io/commons-io = 2.1 + /commons-io/commons-io = 2.3 /commons-lang/commons-lang = 2.6 --/commons-logging/commons-logging = 1.1.1 +-/commons-logging/commons-logging = 1.1.3 +/commons-logging/commons-logging = debian /de.l3s.boilerpipe/boilerpipe = 1.1.0 /dom4j/dom4j = 1.6.1 - /edu.ucar/netcdf = 4.2-min /hsqldb/hsqldb = 1.8.0.10 + /io.netty/netty = 3.7.0.Final -/jakarta-regexp/jakarta-regexp = 1.4 -+/jakarta-regexp/jakarta-regexp = debian - /javax.activation/activation = 1.1 - /javax.mail/mail = 1.4.1 +-/javax.activation/activation = 1.1.1 +-/javax.inject/javax.inject= 1 -/javax.servlet/javax.servlet-api = 3.0.1 -/javax.servlet/servlet-api = 2.4 -+/javax.servlet/javax.servlet-api = 3.0 -+/javax.servlet/servlet-api = 2.5 ++/jakarta-regexp/jakarta-regexp = debian ++/javax.activation/activation = debian ++/javax.mail/mail = debian ++/javax.servlet/javax.servlet-api = 3.1 ++/javax.servlet/servlet-api = debian /jdom/jdom = 1.0 /joda-time/joda-time = 2.2 -/junit/junit = 4.10 --/log4j/log4j = 1.2.16 +-/log4j/log4j = 1.2.17 +/junit/junit = 4.x +/log4j/log4j = 1.2.x /mecab/mecab-ipadic = 2.7.0-20070801 /mecab/mecab-naist-jdic = 0.6.3b-20111013 /net.arnx/jsonic = 1.2.7 + /net.sf.saxon/Saxon-HE = 9.5.1-4 + /net.sourceforge.argparse4j/argparse4j = 0.4.3 -/net.sourceforge.nekohtml/nekohtml = 1.9.17 -/org.antlr/antlr-runtime = 3.5 -/org.apache.ant/ant = 1.8.2 --/org.apache.commons/commons-compress = 1.4.1 +/net.sourceforge.nekohtml/nekohtml = debian +/org.antlr/antlr-runtime = 3.x +/org.apache.ant/ant = debian + /org.apache.avro/avro = 1.7.5 +-/org.apache.commons/commons-compress = 1.7 +/org.apache.commons/commons-compress = debian /org.apache.derby/derby = 10.9.1.0 org.apache.hadoop.version = 2.2.0 -@@ -59,9 +59,9 @@ org.apache.hadoop.version = 2.2.0 +@@ -110,11 +110,11 @@ org.apache.hadoop.version = 2.2.0 # The httpcore version is often different from the httpclient and httpmime versions, # so the httpcore version value should not share the same symbolic name with them. --/org.apache.httpcomponents/httpclient = 4.2.6 --/org.apache.httpcomponents/httpcore = 4.2.5 --/org.apache.httpcomponents/httpmime = 4.2.6 +-/org.apache.httpcomponents/httpclient = 4.3.1 +-/org.apache.httpcomponents/httpcore = 4.3 +-/org.apache.httpcomponents/httpmime = 4.3.1 +/org.apache.httpcomponents/httpclient = debian +/org.apache.httpcomponents/httpcore = debian +/org.apache.httpcomponents/httpmime = debian - org.apache.james.apache.mime4j = 0.7.2 - /org.apache.james/apache-mime4j-core = ${org.apache.james.apache.mime4j} -@@ -85,7 +85,7 @@ org.apache.tika.version = 1.4 - /org.apache.tika/tika-core = ${org.apache.tika.version} +-/org.apache.ivy/ivy = 2.3.0 ++/org.apache.ivy/ivy = debian + + org.apache.james.apache.mime4j.version = 0.7.2 + /org.apache.james/apache-mime4j-core = ${org.apache.james.apache.mime4j.version} +@@ -140,7 +140,7 @@ org.apache.tika.version = 1.5 /org.apache.tika/tika-parsers = ${org.apache.tika.version} + /org.apache.tika/tika-xmp = ${org.apache.tika.version} -org.apache.uima.version = 2.3.1 +org.apache.uima.version = debian /org.apache.uima/AlchemyAPIAnnotator = ${org.apache.uima.version} /org.apache.uima/OpenCalaisAnnotator = ${org.apache.uima.version} /org.apache.uima/Tagger = ${org.apache.uima.version} -@@ -104,7 +104,7 @@ org.bouncycastle.version = 1.45 - /org.carrot2.attributes/attributes-binder = 1.2.0 - /org.carrot2/carrot2-mini = 3.8.0 +@@ -160,7 +160,7 @@ org.bouncycastle.version = 1.45 + /org.carrot2.attributes/attributes-binder = 1.2.1 + /org.carrot2/carrot2-mini = 3.9.0 -org.carrot2.morfologik.version = 1.7.1 +org.carrot2.morfologik.version = debian /org.carrot2/morfologik-fsa = ${org.carrot2.morfologik.version} /org.carrot2/morfologik-polish = ${org.carrot2.morfologik.version} /org.carrot2/morfologik-stemming = ${org.carrot2.morfologik.version} -@@ -119,7 +119,7 @@ org.codehaus.jackson.version = 1.7.4 +@@ -176,7 +176,7 @@ org.codehaus.jackson.version = 1.9.13 /org.easymock/easymock = 3.0 /org.eclipse.jetty.orbit/javax.servlet = 3.0.0.v201112011016 @@ -130,7 +156,7 @@ index a71f538..d646421 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} -@@ -144,7 +144,7 @@ org.mortbay.jetty.version = 6.1.26 +@@ -213,7 +213,7 @@ org.mortbay.jetty.version = 6.1.26 /org.noggit/noggit = 0.5 /org.objenesis/objenesis = 1.2 @@ -139,18 +165,18 @@ index a71f538..d646421 100644 /org.ow2.asm/asm = ${org.ow2.asm.version} /org.ow2.asm/asm-commons = ${org.ow2.asm.version} -@@ -152,7 +152,7 @@ org.restlet.jee.version = 2.1.1 +@@ -221,7 +221,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} -/org.simpleframework/simple-xml = 2.7 +/org.simpleframework/simple-xml = debian - org.slf4j.version = 1.6.6 + org.slf4j.version = 1.7.6 /org.slf4j/jcl-over-slf4j = ${org.slf4j.version} -@@ -162,4 +162,4 @@ org.slf4j.version = 1.6.6 - - /org.tukaani/xz = 1.0 +@@ -232,4 +232,4 @@ org.slf4j.version = 1.7.6 + /org.tukaani/xz = 1.4 + /org.xerial.snappy/snappy-java = 1.0.5 /rome/rome = 0.9 -/xerces/xercesImpl = 2.9.1 +/xerces/xercesImpl = debian -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/lucene4.10.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
