This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository lucene4.10.
commit 087c287d22ce69db1f43927266d995d2a6f57673 Author: Emmanuel Bourg <[email protected]> Date: Wed Feb 17 15:54:45 2016 +0100 Build with ivy-debian-helper --- debian/changelog | 1 + debian/control | 5 +- debian/maven.rules | 6 + debian/patch-ivy | 16 -- ...local-maven-repository-and-local-ivy.home.patch | 51 ------ ...02-Use-javax.servlet-servlet-api-directly.patch | 23 --- .../0003-Adjust-build-dep-versions-as-needed.patch | 182 --------------------- ...4-disable-ivy-retrieve-and-set-javacchome.patch | 34 ---- debian/patches/0006-use-local-artifacts.patch | 13 ++ debian/patches/series | 5 +- debian/rules | 10 +- 11 files changed, 26 insertions(+), 320 deletions(-) diff --git a/debian/changelog b/debian/changelog index 57b5a51..5535136 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ lucene4.10 (4.10.4+dfsg-2) UNRELEASED; urgency=medium * Team upload. + * Build with ivy-debian-helper * Standards-Version updated to 3.9.7 (no changes) -- Emmanuel Bourg <[email protected]> Wed, 17 Feb 2016 15:44:03 +0100 diff --git a/debian/control b/debian/control index 583d798..af3d563 100644 --- a/debian/control +++ b/debian/control @@ -3,10 +3,11 @@ Section: java Priority: extra Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Hilko Bengen <[email protected]> -Build-Depends: debhelper (>= 9~), default-jdk, maven-debian-helper, +Build-Depends: debhelper (>= 9~), default-jdk, + ivy-debian-helper, javacc, libjavacc-maven-plugin-java, -Build-Depends-Indep: ant, ivy, +Build-Depends-Indep: antlr3, libasm4-java, libcarrotsearch-hppc-java, diff --git a/debian/maven.rules b/debian/maven.rules new file mode 100644 index 0000000..432f53e --- /dev/null +++ b/debian/maven.rules @@ -0,0 +1,6 @@ +junit junit * s/.*/4.x/ * * +com.ibm.icu icu4j * s/.*/49/ * * +org.ow2.asm asm* * s/.*/4.x/ * * +org.antlr antlr-runtime * s/.*/3.x/ * * +s/org.eclipse.jetty.orbit/javax.servlet/ s/javax.servlet/servlet-api/ * s/.*/3.0/ * * +com.spatial4j spatial4j * s/.*/0.4.x/ * * diff --git a/debian/patch-ivy b/debian/patch-ivy deleted file mode 100755 index 53817a9..0000000 --- a/debian/patch-ivy +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh - -JUNIT_VERSION=4.11 -ANT_VERSION=1.9.2 -ICU_VERSION=52.1 -MAT_VERSION=2.2.1 - -SED='s,\("junit" rev="\).*\(" transitive\),\1'$JUNIT_VERSION'\2,' -SED="$SED;"'s,\("ant" rev="\).*\(" transitive\),\1'$ANT_VERSION'\2,' -SED="$SED;"'s,\("icu4j" rev="\).*\(" transitive\),\1'$ICU_VERSION'\2,' -SED="$SED;"'s,\("maven-ant-tasks" rev="\).*\(" transitive\),\1'$MAT_VERSION'\2,' - -find -name ivy.xml | while read f; do - test -e $f.orig && mv $f.orig $f - sed -i.orig -e "$SED" $f -done 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 deleted file mode 100644 index f553256..0000000 --- a/debian/patches/0001-Ivy-Use-local-maven-repository-and-local-ivy.home.patch +++ /dev/null @@ -1,51 +0,0 @@ -From: Hilko Bengen <[email protected]> -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 | 12 ++---------- - 2 files changed, 3 insertions(+), 10 deletions(-) - -diff --git a/common-build.xml b/common-build.xml -index faf699e..0216946 100644 ---- a/common-build.xml -+++ b/common-build.xml -@@ -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" /> - -+ <property name="ivy.home" location="${common.dir}/debian/_ivy" /> - <property name="ivy.bootstrap.version" value="2.3.0" /> - <property name="ivy.default.configuration" value="*"/> - <property name="ivy.sync" value="true"/> -diff --git a/ivy-settings.xml b/ivy-settings.xml -index 8518e0d..622d1e7 100644 ---- a/ivy-settings.xml -+++ b/ivy-settings.xml -@@ -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"> - <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> - </resolvers> - diff --git a/debian/patches/0002-Use-javax.servlet-servlet-api-directly.patch b/debian/patches/0002-Use-javax.servlet-servlet-api-directly.patch deleted file mode 100644 index 82da351..0000000 --- a/debian/patches/0002-Use-javax.servlet-servlet-api-directly.patch +++ /dev/null @@ -1,23 +0,0 @@ -From: Hilko Bengen <[email protected]> -Date: Thu, 9 Jan 2014 15:53:34 +0100 -Subject: Use javax.servlet/servlet-api directly - ---- - replicator/ivy.xml | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/replicator/ivy.xml b/replicator/ivy.xml -index d7725d1..9a1b191 100644 ---- a/replicator/ivy.xml -+++ b/replicator/ivy.xml -@@ -40,9 +40,7 @@ - - <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 deleted file mode 100644 index 60ed4f7..0000000 --- a/debian/patches/0003-Adjust-build-dep-versions-as-needed.patch +++ /dev/null @@ -1,182 +0,0 @@ -From: Hilko Bengen <[email protected]> -Date: Thu, 9 Jan 2014 15:53:34 +0100 -Subject: Adjust build-dep versions as needed - ---- - common-build.xml | 2 +- - ivy-versions.properties | 62 ++++++++++++++++++++++++------------------------- - 2 files changed, 32 insertions(+), 32 deletions(-) - -diff --git a/common-build.xml b/common-build.xml -index 865ce5d..4ed1b00 100644 ---- a/common-build.xml -+++ b/common-build.xml -@@ -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.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 bdde6ad..d49024b 100644 ---- a/ivy-versions.properties -+++ b/ivy-versions.properties -@@ -7,11 +7,11 @@ - /cglib/cglib-nodep = 2.2 - /com.adobe.xmp/xmpcore = 5.1.2 - --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.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 = 53.1 --/com.spatial4j/spatial4j = 0.4.1 -+/com.ibm.icu/icu4j = 49 -+/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.9 -+/commons-codec/commons-codec = debian - /commons-collections/commons-collections = 3.2.1 - /commons-configuration/commons-configuration = 1.6 - /commons-digester/commons-digester = 2.1 - /commons-fileupload/commons-fileupload = 1.2.1 - /commons-io/commons-io = 2.3 - /commons-lang/commons-lang = 2.6 --/commons-logging/commons-logging = 1.1.3 -+/commons-logging/commons-logging = debian - /de.l3s.boilerpipe/boilerpipe = 1.1.0 - /dom4j/dom4j = 1.6.1 - /hsqldb/hsqldb = 1.8.0.10 - /io.netty/netty = 3.7.0.Final --/jakarta-regexp/jakarta-regexp = 1.4 --/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 -+/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.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 -+/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 -@@ -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.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.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} -@@ -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} -@@ -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 - --org.eclipse.jetty.version = 8.1.10.v20130312 -+org.eclipse.jetty.version = debian - /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} -@@ -212,7 +212,7 @@ org.mortbay.jetty.version = 6.1.26 - /org.noggit/noggit = 0.5 - /org.objenesis/objenesis = 1.2 - --org.ow2.asm.version = 4.1 -+org.ow2.asm.version = 4.x - /org.ow2.asm/asm = ${org.ow2.asm.version} - /org.ow2.asm/asm-commons = ${org.ow2.asm.version} - -@@ -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} - --/org.simpleframework/simple-xml = 2.7 -+/org.simpleframework/simple-xml = debian - - org.slf4j.version = 1.7.6 - /org.slf4j/jcl-over-slf4j = ${org.slf4j.version} -@@ -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 --/xerces/xercesImpl = 2.9.1 -+/xerces/xercesImpl = debian diff --git a/debian/patches/0004-disable-ivy-retrieve-and-set-javacchome.patch b/debian/patches/0004-disable-ivy-retrieve-and-set-javacchome.patch deleted file mode 100644 index 55a2bc3..0000000 --- a/debian/patches/0004-disable-ivy-retrieve-and-set-javacchome.patch +++ /dev/null @@ -1,34 +0,0 @@ -From: tony mancill <[email protected]> -Date: Sat, 11 Jan 2014 08:48:00 -0800 -Subject: disable ivy:retrieve and set javacchome - --- ---- - queryparser/build.xml | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/queryparser/build.xml b/queryparser/build.xml -index 00f805e..a4252df 100644 ---- a/queryparser/build.xml -+++ b/queryparser/build.xml -@@ -142,9 +142,11 @@ import org.apache.lucene.queryparser.flexible.core.messages.*;" - - <target name="resolve-javacc" xmlns:ivy="antlib:org.apache.ivy.ant"> - <!-- setup a "fake" JavaCC distribution folder in ${build.dir} to make JavaCC ANT task happy: --> -+ <!-- - <ivy:retrieve organisation="net.java.dev.javacc" module="javacc" revision="5.0" - inline="true" conf="default" transitive="false" type="jar" sync="true" - pattern="${build.dir}/javacc/bin/lib/[artifact].[ext]"/> -+ --> - </target> - - <macrodef name="invoke-javacc"> -@@ -160,7 +162,7 @@ import org.apache.lucene.queryparser.flexible.core.messages.*;" - <javacc - target="@{target}" - outputDirectory="@{outputDir}" -- javacchome="${build.dir}/javacc" -+ javacchome="/usr/share/java" - jdkversion="${javac.source}" - /> - <fixcrlf srcdir="@{outputDir}" includes="*.java" encoding="UTF-8"> diff --git a/debian/patches/0006-use-local-artifacts.patch b/debian/patches/0006-use-local-artifacts.patch new file mode 100644 index 0000000..e39f4f6 --- /dev/null +++ b/debian/patches/0006-use-local-artifacts.patch @@ -0,0 +1,13 @@ +Description: Do not override the default settings from ivy-debian-helper +Author: Emmanuel Bourg <[email protected]> +Forwarded: not-needed +--- a/common-build.xml ++++ b/common-build.xml +@@ -423,7 +423,6 @@ + you have an idea, fix it. + unless="ivy.settings.uptodate" --> + <!-- override: just for safety, should be unnecessary --> +- <ivy:configure file="${common.dir}/ivy-settings.xml" override="true"/> + <!-- <property name="ivy.settings.uptodate" value="true"/> --> + </target> + diff --git a/debian/patches/series b/debian/patches/series index cb0161f..e98063a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,2 @@ -0001-Ivy-Use-local-maven-repository-and-local-ivy.home.patch -0002-Use-javax.servlet-servlet-api-directly.patch -0003-Adjust-build-dep-versions-as-needed.patch -0004-disable-ivy-retrieve-and-set-javacchome.patch 0005-Revert-upstream-removal-of-deprecated-QueryParser-co.patch +0006-use-local-artifacts.patch diff --git a/debian/rules b/debian/rules index 7112552..e764843 100755 --- a/debian/rules +++ b/debian/rules @@ -1,20 +1,14 @@ #!/usr/bin/make -f -# -*- makefile -*- - -export DH_VERBOSE=1 export VERSION=$(shell dpkg-parsechangelog -SVersion | sed -e 's,^\(.*:\)*\(.*\)+dfsg-.*,\2,') -export CLASSPATH=/usr/share/java/ivy.jar %: - dh $@ --with-buildsystem=ant + dh $@ --buildsystem=ivy override_dh_auto_build: - ant -buildfile queryparser/build.xml regenerate + dh_auto_build -- -buildfile queryparser/build.xml regenerate dh_auto_build -- -Dversion=$(VERSION) jar -# TODO: dependency test-framework: com.carrotsearch.randomizedtesting#junit4-ant - override_dh_installchangelogs: dh_installchangelogs CHANGES.txt -- 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
