This is an automated email from the git hooks/post-receive script. seamlik-guest pushed a commit to branch master in repository lucene2.
commit adef21ea30cf64c7612ac06058b31b5ebb01aea0 Author: Jan-Pascal van Best <[email protected]> Date: Wed Jan 20 14:17:38 2010 +0000 Finalised OSGi metadata in jars --- debian/changelog | 9 ++-- debian/control | 2 +- .../05_add-osgi-metadata-in-manifests.dpatch | 63 ++++++++++++++-------- 3 files changed, 45 insertions(+), 29 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4630035..0e5f4fb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,11 @@ -lucene2 (2.9.1+ds1-3~pre1) experimental; urgency=low +lucene2 (2.9.1+ds1-3) unstable; urgency=low * Mention in this changelog that CVE-2007-2383 has been fixed (Closes: #558355; Fix CVE-2007-2383) - * First try at providing OSGi metadata in the Manifest for the - core and analysis packages (needed for building Eclipse). Still - need to set symbolicname and requirepackage for most jars. + * Providing OSGi metadata in the Manifest for the + core and contrib packages (needed for building Eclipse). - -- Jan-Pascal van Best <[email protected]> Thu, 24 Dec 2009 14:10:17 +0100 + -- Jan-Pascal van Best <[email protected]> Wed, 20 Jan 2010 13:54:48 +0100 lucene2 (2.9.1+ds1-2) unstable; urgency=low diff --git a/debian/control b/debian/control index 8603440..2ae0002 100644 --- a/debian/control +++ b/debian/control @@ -39,7 +39,7 @@ Recommends: libcommons-beanutils-java (>= 1.7.0), libjline-java (>= 0.9.5), libjtidy-java (>= 7+svn20070309), libregexp-java (>= 1.4) -Conflicts: solr-common (< 1.2.0+ds2-3) +Breaks: solr-common (<< 1.2.0+ds2-3) Description: Full-text search engine library for Java(TM) Lucene is a full-text search engine for the Java(TM) programming language. Lucene is not a complete application, but rather a code library and API diff --git a/debian/patches/05_add-osgi-metadata-in-manifests.dpatch b/debian/patches/05_add-osgi-metadata-in-manifests.dpatch index 42b788f..3dd1d4b 100755 --- a/debian/patches/05_add-osgi-metadata-in-manifests.dpatch +++ b/debian/patches/05_add-osgi-metadata-in-manifests.dpatch @@ -6,13 +6,13 @@ @DPATCH@ diff -urNad lucene2~/build.xml lucene2/build.xml ---- lucene2~/build.xml 2009-12-24 13:55:47.000000000 +0100 -+++ lucene2/build.xml 2009-12-24 13:55:48.000000000 +0100 +--- lucene2~/build.xml 2010-01-20 15:01:22.000000000 +0100 ++++ lucene2/build.xml 2010-01-20 15:01:24.000000000 +0100 @@ -21,6 +21,16 @@ <property name="junit.includes" value="**/Test*.java"/> -+ <property name="OSGI.symbolicname" value="org.apache.lucene" /> ++ <property name="OSGi.symbolicname" value="org.apache.lucene" /> + <pathconvert property="OSGi.exportpackage" pathsep=","> + <dirset dir="src/java" excludes="org org/apache"/> + <mapper> @@ -26,9 +26,9 @@ diff -urNad lucene2~/build.xml lucene2/build.xml <property name="build.demo.template" value="src/demo/demo-build.template"/> diff -urNad lucene2~/common-build.xml lucene2/common-build.xml ---- lucene2~/common-build.xml 2009-12-24 13:55:47.000000000 +0100 -+++ lucene2/common-build.xml 2009-12-24 13:56:02.000000000 +0100 -@@ -313,6 +313,28 @@ +--- lucene2~/common-build.xml 2010-01-20 15:01:22.000000000 +0100 ++++ lucene2/common-build.xml 2010-01-20 15:09:33.000000000 +0100 +@@ -313,6 +313,29 @@ value="${javac.source}"/> <attribute name="X-Compile-Target-JDK" value="${javac.target}"/> @@ -36,8 +36,11 @@ diff -urNad lucene2~/common-build.xml lucene2/common-build.xml + value="2"/> + <attribute name="Bundle-SymbolicName" + value="${OSGi.symbolicname}"/> ++ <!-- Not needed for core, I do not know how to ++ conditionally disable this + <attribute name="Require-Bundle" + value="${OSGi.requirebundle}"/> ++ --> + <attribute name="Bundle-Name" + value="@{title}"/> + <attribute name="Bundle-Version" @@ -50,32 +53,22 @@ diff -urNad lucene2~/common-build.xml lucene2/common-build.xml + value="The Apache Software Foundation"/> + <attribute name="Bundle-Localization" + value="plugin"/> -+ <!--<attribute name="Export-Package" -+ value="org.apache.lucene,org.apache.lucene.analysis,org.apache.lucene.analysis.standard,org.apache.lucene.analysis.tokenattributes,org.apache.lucene.document,org.apache.lucene.index,org.apache.lucene.messages,org.apache.lucene.queryParser,org.apache.lucene.search,org.apache.lucene.search.function,org.apache.lucene.search.payloads,org.apache.lucene.search.spans,org.apache.lucene.store,org.apache.lucene.util,org.apache.lucene.util.cache"/>--> + <attribute name="Export-Package" + value="${OSGi.exportpackage}"/> </manifest> </sequential> </macrodef> diff -urNad lucene2~/contrib/analyzers/common/build.xml lucene2/contrib/analyzers/common/build.xml ---- lucene2~/contrib/analyzers/common/build.xml 2009-12-24 13:55:47.000000000 +0100 -+++ lucene2/contrib/analyzers/common/build.xml 2009-12-24 13:55:48.000000000 +0100 -@@ -31,7 +31,24 @@ +--- lucene2~/contrib/analyzers/common/build.xml 2010-01-20 15:01:22.000000000 +0100 ++++ lucene2/contrib/analyzers/common/build.xml 2010-01-20 15:01:24.000000000 +0100 +@@ -31,7 +31,16 @@ <property name="maven.dist.dir" location="../../../dist/maven" /> <import file="../../contrib-build.xml"/> - + -+ <property name="OSGi.symbolicname" value="org.apache.lucene.analysis" /> -+ <property name="OSGi.requirebundle" -+ value='org.apache.lucene;bundle-version="${version}";visibility:=reexport' /> -+ <!-- -+ <property name="OSGi.exportpackage" -+ value="org.apache.lucene.analysis.shingle,org.apache.lucene.analysis.fr,org.apache.lucene.analysis.payloads,org.apache.lucene.analysis.cn,org.apache.lucene.analysis.reverse,org.apache.lucene.analysis.ar,org.apache.lucene.analysis.query,org.apache.lucene.analysis.fa,org.apache.lucene.analysis.el,org.apache.lucene.analysis.nl,org.apache.lucene.analysis.de,org.apache.lucene.analysis.cjk,org.apache.lucene.analysis.compound,org.apache.lucene.analysis.compound.hyphenation,org.apache.lucen [...] -+--> + <pathconvert property="OSGi.exportpackage" pathsep=","> + <dirset dir="src/java" excludes="org org/apache org/apache/lucene org/apache/lucene/analysis"/> -+ <!-- <map from="src/java" to=""/> --> + <mapper> + <chainedmapper> + <packagemapper from="${basedir}/src/java/*" to="*"/> @@ -86,15 +79,39 @@ diff -urNad lucene2~/contrib/analyzers/common/build.xml lucene2/contrib/analyzer <path id="test.classpath"> <path refid="classpath"/> <pathelement location="../../../build/classes/test/"/> +diff -urNad lucene2~/contrib/analyzers/smartcn/build.xml lucene2/contrib/analyzers/smartcn/build.xml +--- lucene2~/contrib/analyzers/smartcn/build.xml 2010-01-20 15:01:22.000000000 +0100 ++++ lucene2/contrib/analyzers/smartcn/build.xml 2010-01-20 15:01:24.000000000 +0100 +@@ -32,6 +32,15 @@ + + <import file="../../contrib-build.xml"/> + ++ <pathconvert property="OSGi.exportpackage" pathsep=","> ++ <dirset dir="src/java" excludes="org org/apache org/apache/lucene org/apache/lucene/analysis"/> ++ <mapper> ++ <chainedmapper> ++ <packagemapper from="${basedir}/src/java/*" to="*"/> ++ </chainedmapper> ++ </mapper> ++ </pathconvert> ++ + <path id="test.classpath"> + <path refid="classpath"/> + <pathelement location="../../../build/classes/test/"/> diff -urNad lucene2~/contrib/contrib-build.xml lucene2/contrib/contrib-build.xml ---- lucene2~/contrib/contrib-build.xml 2009-12-24 13:55:47.000000000 +0100 -+++ lucene2/contrib/contrib-build.xml 2009-12-24 13:55:48.000000000 +0100 -@@ -24,7 +24,16 @@ +--- lucene2~/contrib/contrib-build.xml 2010-01-20 15:01:22.000000000 +0100 ++++ lucene2/contrib/contrib-build.xml 2010-01-20 15:01:24.000000000 +0100 +@@ -24,7 +24,21 @@ <property name="build.dir" location="../../build/contrib/${ant.project.name}"/> <property name="dist.dir" location="../../dist/contrib/${ant.project.name}"/> <property name="maven.dist.dir" location="../../dist/maven"/> - -+ ++ ++ <!-- these can be overridden in the separate contrib ++ build.xml files --> ++ <property name="OSGi.requirebundle" ++ value='org.apache.lucene;bundle-version="${version}";visibility:=reexport' /> ++ <property name="OSGi.symbolicname" value="org.apache.lucene.${ant.project.name}" /> + <pathconvert property="OSGi.exportpackage" pathsep=","> + <dirset dir="src/java" excludes="org org/apache org/apache/lucene"/> + <mapper> -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/lucene2.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
