--- lucene-8.5.0/analysis/common/build.xml	2020-03-13 10:35:54.000000000 +0100
+++ lucene-8.5.0/analysis/common/build.xml	2020-04-06 13:49:27.925822466 +0200
@@ -133,4 +133,24 @@
       </replaceregexp>
       <fixcrlf srcdir="${snowball.programs.dir}" includes="*Stemmer.java" tab="remove" tablength="2" encoding="UTF-8" javafiles="yes" fixlast="yes"/>
   </target>
+
+  <target name="jar-core" depends="compile-core">
+    <jarify>
+	  <jarify-additional-manifest-attributes>
+		<attribute name="Bundle-Description" value="Additional Analyzers"/>
+		<attribute name="Bundle-DocURL" value="https://www.apache.org/"/>
+		<attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
+		<attribute name="Bundle-ManifestVersion" value="2"/>
+		<attribute name="Bundle-Name" value="Lucene Common Analyzers"/>
+		<attribute name="Bundle-SymbolicName" value="org.apache.lucene.${name}"/>
+		<attribute name="Bundle-Vendor" value="The Apache Software Foundation"/>
+		<attribute name="Bundle-Version" value="${version}"/>
+		<attribute name="Export-Package" value="org.apache.lucene.analysis.standard;version=&quot;${version}&quot;;analysis=split;mandatory:=analysis,org.apache.lucene.analysis.ar;version=&quot;${version}&quot;,org.apache.lucene.analysis.bg;version=&quot;${version}&quot;,org.apache.lucene.analysis.bn;version=&quot;${version}&quot;,org.apache.lucene.analysis.br;version=&quot;${version}&quot;,org.apache.lucene.analysis.ca;version=&quot;${version}&quot;,org.apache.lucene.analysis.charfilter;version=&quot;${version}&quot;,org.apache.lucene.analysis.cjk;version=&quot;${version}&quot;,org.apache.lucene.analysis.ckb;version=&quot;${version}&quot;,org.apache.lucene.analysis.commongrams;version=&quot;${version}&quot;,org.apache.lucene.analysis.compound;version=&quot;${version}&quot;,org.apache.lucene.analysis.compound.hyphenation;version=&quot;${version}&quot;,org.apache.lucene.analysis.core;version=&quot;${version}&quot;,org.apache.lucene.analysis.custom;version=&quot;${version}&quot;,org.apache.lucene.analysis.cz;version=&quot;${version}&quot;,org.apache.lucene.analysis.da;version=&quot;${version}&quot;,org.apache.lucene.analysis.de;version=&quot;${version}&quot;,org.apache.lucene.analysis.el;version=&quot;${version}&quot;,org.apache.lucene.analysis.en;version=&quot;${version}&quot;,org.apache.lucene.analysis.es;version=&quot;${version}&quot;,org.apache.lucene.analysis.eu;version=&quot;${version}&quot;,org.apache.lucene.analysis.fa;version=&quot;${version}&quot;,org.apache.lucene.analysis.fi;version=&quot;${version}&quot;,org.apache.lucene.analysis.fr;version=&quot;${version}&quot;,org.apache.lucene.analysis.ga;version=&quot;${version}&quot;,org.apache.lucene.analysis.gl;version=&quot;${version}&quot;,org.apache.lucene.analysis.hi;version=&quot;${version}&quot;,org.apache.lucene.analysis.hu;version=&quot;${version}&quot;,org.apache.lucene.analysis.hunspell;version=&quot;${version}&quot;,org.apache.lucene.analysis.hy;version=&quot;${version}&quot;,org.apache.lucene.analysis.id;version=&quot;${version}&quot;,org.apache.lucene.analysis.in;version=&quot;${version}&quot;,org.apache.lucene.analysis.it;version=&quot;${version}&quot;,org.apache.lucene.analysis.lt;version=&quot;${version}&quot;,org.apache.lucene.analysis.lv;version=&quot;${version}&quot;,org.apache.lucene.analysis.minhash;version=&quot;${version}&quot;,org.apache.lucene.analysis.miscellaneous;version=&quot;${version}&quot;,org.apache.lucene.analysis.ngram;version=&quot;${version}&quot;,org.apache.lucene.analysis.nl;version=&quot;${version}&quot;,org.apache.lucene.analysis.no;version=&quot;${version}&quot;,org.apache.lucene.analysis.path;version=&quot;${version}&quot;,org.apache.lucene.analysis.pattern;version=&quot;${version}&quot;,org.apache.lucene.analysis.payloads;version=&quot;${version}&quot;,org.apache.lucene.analysis.pt;version=&quot;${version}&quot;,org.apache.lucene.analysis.query;version=&quot;${version}&quot;,org.apache.lucene.analysis.reverse;version=&quot;${version}&quot;,org.apache.lucene.analysis.ro;version=&quot;${version}&quot;,org.apache.lucene.analysis.ru;version=&quot;${version}&quot;,org.apache.lucene.analysis.shingle;version=&quot;${version}&quot;,org.apache.lucene.analysis.sinks;version=&quot;${version}&quot;,org.apache.lucene.analysis.snowball;version=&quot;${version}&quot;,org.apache.lucene.analysis.sr;version=&quot;${version}&quot;,org.apache.lucene.analysis.sv;version=&quot;${version}&quot;,org.apache.lucene.analysis.synonym;version=&quot;${version}&quot;,org.apache.lucene.analysis.th;version=&quot;${version}&quot;,org.apache.lucene.analysis.tr;version=&quot;${version}&quot;,org.apache.lucene.analysis.util;version=&quot;${version}&quot;,org.apache.lucene.analysis.wikipedia;version=&quot;${version}&quot;,org.apache.lucene.collation;version=&quot;${version}&quot;,org.apache.lucene.collation.tokenattributes;version=&quot;${version}&quot;,org.tartarus.snowball;version=&quot;${version}&quot;,org.tartarus.snowball.ext;version=&quot;${version}&quot;"/>
+		<attribute name="Import-Package" value="javax.xml.parsers,org.apache.lucene.analysis,org.apache.lucene.analysis.ar,org.apache.lucene.analysis.charfilter,org.apache.lucene.analysis.compound.hyphenation,org.apache.lucene.analysis.core,org.apache.lucene.analysis.fr,org.apache.lucene.analysis.in,org.apache.lucene.analysis.miscellaneous,org.apache.lucene.analysis.pt,org.apache.lucene.analysis.snowball,org.apache.lucene.analysis.standard;analysis=split,org.apache.lucene.analysis.tokenattributes,org.apache.lucene.analysis.util,org.apache.lucene.codecs,org.apache.lucene.collation.tokenattributes,org.apache.lucene.document,org.apache.lucene.index,org.apache.lucene.store,org.apache.lucene.util,org.apache.lucene.util.automaton,org.apache.lucene.util.fst,org.tartarus.snowball,org.tartarus.snowball.ext,org.xml.sax,org.xml.sax.helpers"/>
+		<attribute name="Require-Bundle" value="org.apache.lucene.core;bundle-version=&quot;${version}&quot;"/>
+		<attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=${javac.target.version}))&quot;"/>
+	  </jarify-additional-manifest-attributes>
+	</jarify>
+  </target>
+
 </project>
--- lucene-8.5.0/analysis/icu/build.xml	2020-03-13 10:35:54.000000000 +0100
+++ lucene-8.5.0/analysis/icu/build.xml	2020-04-06 14:08:25.408018346 +0200
@@ -115,4 +115,22 @@
 
   <target name="regenerate" depends="gen-utr30-data-files,gennorm2,genrbbi"/>
 
+  <target name="jar-core" depends="compile-core">
+    <jarify>
+	  <jarify-additional-manifest-attributes>
+		<attribute name="Bundle-Description" value="Provides integration with ICU (International Components for Unicode) for    stronger Unicode and internationalization support."/>
+		<attribute name="Bundle-DocURL" value="https://www.apache.org/"/>
+		<attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
+		<attribute name="Bundle-ManifestVersion" value="2"/>
+		<attribute name="Bundle-Name" value="Lucene ICU Analysis Components"/>
+		<attribute name="Bundle-SymbolicName" value="org.apache.lucene.${name}"/>
+		<attribute name="Bundle-Vendor" value="The Apache Software Foundation"/>
+		<attribute name="Bundle-Version" value="${version}"/>
+		<attribute name="Export-Package" value="org.apache.lucene.analysis.icu;version=&quot;${version}&quot;,org.apache.lucene.analysis.icu.segmentation;version=&quot;${version}&quot;,org.apache.lucene.analysis.icu.tokenattributes;version=&quot;${version}&quot;,org.apache.lucene.collation;version=&quot;${version}&quot;,org.apache.lucene.collation.tokenattributes;version=&quot;${version}&quot;"/>
+		<attribute name="Import-Package" value="com.ibm.icu.lang,com.ibm.icu.text,com.ibm.icu.util,org.apache.lucene.analysis,org.apache.lucene.analysis.charfilter,org.apache.lucene.analysis.core,org.apache.lucene.analysis.icu.tokenattributes,org.apache.lucene.analysis.standard;analysis=split,org.apache.lucene.analysis.tokenattributes,org.apache.lucene.analysis.util,org.apache.lucene.collation.tokenattributes,org.apache.lucene.document,org.apache.lucene.index,org.apache.lucene.util"/>
+		<attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=${javac.target.version}))&quot;"/>
+	  </jarify-additional-manifest-attributes>
+	</jarify>
+  </target>
+
 </project>
--- lucene-8.5.0/analysis/kuromoji/build.xml	2020-03-13 10:35:54.000000000 +0100
+++ lucene-8.5.0/analysis/kuromoji/build.xml	2020-04-06 14:08:10.203935294 +0200
@@ -95,4 +95,22 @@
 
   <target name="regenerate" depends="build-dict"/>
 
+  <target name="jar-core" depends="compile-core">
+    <jarify>
+	  <jarify-additional-manifest-attributes>
+		<attribute name="Bundle-Description" value="Lucene Kuromoji Japanese Morphological Analyzer"/>
+		<attribute name="Bundle-DocURL" value="https://www.apache.org/"/>
+		<attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
+		<attribute name="Bundle-ManifestVersion" value="2"/>
+		<attribute name="Bundle-Name" value="Lucene Kuromoji Japanese Morphological Analyzer"/>
+		<attribute name="Bundle-SymbolicName" value="org.apache.lucene.${name}"/>
+		<attribute name="Bundle-Vendor" value="The Apache Software Foundation"/>
+		<attribute name="Bundle-Version" value="${version}"/>
+		<attribute name="Export-Package" value="org.apache.lucene.analysis.ja;version=&quot;${version}&quot;,org.apache.lucene.analysis.ja.dict;version=&quot;${version}&quot;,org.apache.lucene.analysis.ja.tokenattributes;version=&quot;${version}&quot;,org.apache.lucene.analysis.ja.util;version=&quot;${version}&quot;"/>
+		<attribute name="Import-Package" value="org.apache.lucene.analysis,org.apache.lucene.analysis.cjk,org.apache.lucene.analysis.ja,org.apache.lucene.analysis.ja.dict,org.apache.lucene.analysis.ja.tokenattributes,org.apache.lucene.analysis.ja.util,org.apache.lucene.analysis.tokenattributes,org.apache.lucene.analysis.util,org.apache.lucene.codecs,org.apache.lucene.store,org.apache.lucene.util,org.apache.lucene.util.fst"/>
+		<attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=${javac.target.version}))&quot;"/>
+	  </jarify-additional-manifest-attributes>
+	</jarify>
+  </target>
+
 </project>
--- lucene-8.5.0/analysis/morfologik/build.xml	2020-03-13 10:35:54.000000000 +0100
+++ lucene-8.5.0/analysis/morfologik/build.xml	2020-04-06 13:49:27.925822466 +0200
@@ -37,4 +37,23 @@
   </path>
 
   <target name="compile-core" depends="jar-analyzers-common, common.compile-core" />
+
+  <target name="jar-core" depends="compile-core">
+    <jarify>
+	  <jarify-additional-manifest-attributes>
+		<attribute name="Bundle-Description" value="A dictionary-driven lemmatizer for Polish (includes morphosyntactic annotations)"/>
+		<attribute name="Bundle-DocURL" value="https://www.apache.org/"/>
+		<attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
+		<attribute name="Bundle-ManifestVersion" value="2"/>
+		<attribute name="Bundle-Name" value="Lucene Morfologik Polish Lemmatizer"/>
+		<attribute name="Bundle-SymbolicName" value="org.apache.lucene.${name}"/>
+		<attribute name="Bundle-Vendor" value="The Apache Software Foundation"/>
+		<attribute name="Bundle-Version" value="${version}"/>
+		<attribute name="Export-Package" value="org.apache.lucene.analysis.morfologik;version=&quot;${version}&quot;,org.apache.lucene.analysis.uk;version=&quot;${version}&quot;"/>
+		<attribute name="Import-Package" value="morfologik.stemming,morfologik.stemming.polish,org.apache.lucene.analysis,org.apache.lucene.analysis.charfilter,org.apache.lucene.analysis.miscellaneous,org.apache.lucene.analysis.morfologik,org.apache.lucene.analysis.standard;analysis=split,org.apache.lucene.analysis.tokenattributes,org.apache.lucene.analysis.util,org.apache.lucene.util"/>
+		<attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=${javac.target.version}))&quot;"/>
+	  </jarify-additional-manifest-attributes>
+	</jarify>
+  </target>
+
 </project>
--- lucene-8.5.0/analysis/phonetic/build.xml	2020-03-13 10:35:55.000000000 +0100
+++ lucene-8.5.0/analysis/phonetic/build.xml	2020-04-06 14:07:46.463805601 +0200
@@ -32,4 +32,23 @@
   </path>
 
   <target name="compile-core" depends="jar-analyzers-common, common.compile-core" />
+
+  <target name="jar-core" depends="compile-core">
+    <jarify>
+	  <jarify-additional-manifest-attributes>
+		<attribute name="Bundle-Description" value="Provides phonetic encoding via Commons Codec."/>
+		<attribute name="Bundle-DocURL" value="https://www.apache.org/"/>
+		<attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
+		<attribute name="Bundle-ManifestVersion" value="2"/>
+		<attribute name="Bundle-Name" value="Lucene Phonetic Filters"/>
+		<attribute name="Bundle-SymbolicName" value="org.apache.lucene.${name}"/>
+		<attribute name="Bundle-Vendor" value="The Apache Software Foundation"/>
+		<attribute name="Bundle-Version" value="${version}"/>
+		<attribute name="Export-Package" value="org.apache.lucene.analysis.phonetic;version=&quot;${version}&quot;"/>
+		<attribute name="Import-Package" value="org.apache.commons.codec,org.apache.commons.codec.language,org.apache.commons.codec.language.bm,org.apache.lucene.analysis,org.apache.lucene.analysis.tokenattributes,org.apache.lucene.analysis.util,org.apache.lucene.util"/>
+		<attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=${javac.target.version}))&quot;"/>
+	  </jarify-additional-manifest-attributes>
+	</jarify>
+  </target>
+
 </project>
--- lucene-8.5.0/analysis/smartcn/build.xml	2020-03-13 10:35:55.000000000 +0100
+++ lucene-8.5.0/analysis/smartcn/build.xml	2020-04-06 14:09:53.164497775 +0200
@@ -31,4 +31,23 @@
   </path>
 
   <target name="compile-core" depends="jar-analyzers-common, common.compile-core" />
+
+  <target name="jar-core" depends="compile-core">
+    <jarify>
+	  <jarify-additional-manifest-attributes>
+		<attribute name="Bundle-Description" value="Smart Chinese Analyzer"/>
+		<attribute name="Bundle-DocURL" value="https://www.apache.org/"/>
+		<attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
+		<attribute name="Bundle-ManifestVersion" value="2"/>
+		<attribute name="Bundle-Name" value="Lucene Smart Chinese Analyzer"/>
+		<attribute name="Bundle-SymbolicName" value="org.apache.lucene.${name}"/>
+		<attribute name="Bundle-Vendor" value="The Apache Software Foundation"/>
+		<attribute name="Bundle-Version" value="${version}"/>
+		<attribute name="Export-Package" value="org.apache.lucene.analysis.cn.smart;version=&quot;${version}&quot;,org.apache.lucene.analysis.cn.smart.hhmm;version=&quot;${version}&quot;"/>
+		<attribute name="Import-Package" value="org.apache.lucene.analysis,org.apache.lucene.analysis.cn.smart,org.apache.lucene.analysis.cn.smart.hhmm,org.apache.lucene.analysis.en,org.apache.lucene.analysis.tokenattributes,org.apache.lucene.analysis.util,org.apache.lucene.util"/>
+		<attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=${javac.target.version}))&quot;"/>
+	  </jarify-additional-manifest-attributes>
+	</jarify>
+  </target>
+
 </project>
--- lucene-8.5.0/analysis/stempel/build.xml	2020-03-13 10:35:55.000000000 +0100
+++ lucene-8.5.0/analysis/stempel/build.xml	2020-04-06 14:11:27.469012914 +0200
@@ -30,5 +30,23 @@
     <path refid="base.classpath"/>
   </path>
   
+  <target name="jar-core" depends="compile-core">
+    <jarify>
+	  <jarify-additional-manifest-attributes>
+		<attribute name="Bundle-Description" value="Stempel Analyzer"/>
+		<attribute name="Bundle-DocURL" value="https://www.apache.org/"/>
+		<attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
+		<attribute name="Bundle-ManifestVersion" value="2"/>
+		<attribute name="Bundle-Name" value="Lucene Stempel Analyzer"/>
+		<attribute name="Bundle-SymbolicName" value="org.apache.lucene.${name}"/>
+		<attribute name="Bundle-Vendor" value="The Apache Software Foundation"/>
+		<attribute name="Bundle-Version" value="${version}"/>
+		<attribute name="Export-Package" value="org.apache.lucene.analysis.pl;version=&quot;${version}&quot;,org.apache.lucene.analysis.stempel;version=&quot;${version}&quot;,org.egothor.stemmer;version=&quot;${version}&quot;"/>
+		<attribute name="Import-Package" value="org.apache.lucene.analysis,org.apache.lucene.analysis.miscellaneous,org.apache.lucene.analysis.pl,org.apache.lucene.analysis.standard;analysis=split,org.apache.lucene.analysis.stempel,org.apache.lucene.analysis.tokenattributes,org.apache.lucene.analysis.util,org.apache.lucene.util,org.egothor.stemmer"/>
+		<attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=${javac.target.version}))&quot;"/>
+	  </jarify-additional-manifest-attributes>
+	</jarify>
+  </target>
+
   <target name="compile-core" depends="jar-analyzers-common, common.compile-core"/>
 </project>
--- lucene-8.5.0/backward-codecs/build.xml	2020-03-13 10:35:55.000000000 +0100
+++ lucene-8.5.0/backward-codecs/build.xml	2020-04-06 14:13:37.197721634 +0200
@@ -23,4 +23,22 @@
 
   <import file="../module-build.xml"/>
 
+  <target name="jar-core" depends="compile-core">
+    <jarify>
+	  <jarify-additional-manifest-attributes>
+		<attribute name="Bundle-Description" value="Codecs for older versions of Lucene."/>
+		<attribute name="Bundle-DocURL" value="https://www.apache.org/"/>
+		<attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
+		<attribute name="Bundle-ManifestVersion" value="2"/>
+		<attribute name="Bundle-Name" value="Lucene Memory"/>
+		<attribute name="Bundle-SymbolicName" value="org.apache.lucene.${name}"/>
+		<attribute name="Bundle-Vendor" value="The Apache Software Foundation"/>
+		<attribute name="Bundle-Version" value="${version}"/>
+		<attribute name="Export-Package" value="org.apache.lucene.codecs;version=&quot;${version}&quot;,org.apache.lucene.codecs.lucene50;version=&quot;${version}&quot;,org.apache.lucene.codecs.lucene70;version=&quot;${version}&quot;,org.apache.lucene.codecs.lucene80;version=&quot;${version}&quot;"/>
+		<attribute name="Import-Package" value="org.apache.lucene.codecs,org.apache.lucene.codecs.blocktree,org.apache.lucene.codecs.lucene50,org.apache.lucene.codecs.lucene60,org.apache.lucene.codecs.lucene70,org.apache.lucene.codecs.perfield,org.apache.lucene.index,org.apache.lucene.search,org.apache.lucene.store,org.apache.lucene.util,org.apache.lucene.util.packed"/>
+		<attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=${javac.target.version}))&quot;"/>
+	  </jarify-additional-manifest-attributes>
+	</jarify>
+  </target>
+
 </project>
--- lucene-8.5.0/benchmark/build.xml	2020-03-13 10:35:55.000000000 +0100
+++ lucene-8.5.0/benchmark/build.xml	2020-04-06 14:15:06.342210360 +0200
@@ -286,4 +286,24 @@
         <fileset dir="conf"/>
       </copy>
     </target>
+
+  <target name="jar-core" depends="compile-core">
+    <jarify>
+	  <jarify-additional-manifest-attributes>
+		<attribute name="Bundle-Description" value="Lucene Benchmarking Module"/>
+		<attribute name="Bundle-DocURL" value="https://www.apache.org/"/>
+		<attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
+		<attribute name="Bundle-ManifestVersion" value="2"/>
+		<attribute name="Bundle-Name" value="Lucene Benchmark"/>
+		<attribute name="Bundle-SymbolicName" value="org.apache.lucene.${name}"/>
+		<attribute name="Bundle-Vendor" value="The Apache Software Foundation"/>
+		<attribute name="Bundle-Version" value="${version}"/>
+		<attribute name="Export-Package" value="org.apache.lucene.benchmark;version=&quot;${version}&quot;,org.apache.lucene.benchmark.byTask;version=&quot;${version}&quot;,org.apache.lucene.benchmark.byTask.feeds;version=&quot;${version}&quot;,org.apache.lucene.benchmark.byTask.programmatic;version=&quot;${version}&quot;,org.apache.lucene.benchmark.byTask.stats;version=&quot;${version}&quot;,org.apache.lucene.benchmark.byTask.tasks;version=&quot;${version}&quot;,org.apache.lucene.benchmark.byTask.utils;version=&quot;${version}&quot;,org.apache.lucene.benchmark.quality;version=&quot;${version}&quot;,org.apache.lucene.benchmark.quality.trec;version=&quot;${version}&quot;,org.apache.lucene.benchmark.quality.utils;version=&quot;${version}&quot;,org.apache.lucene.benchmark.utils;version=&quot;${version}&quot;"/>
+		<attribute name="Import-Package" value="com.ibm.icu.text,org.apache.commons.compress.compressors,org.apache.lucene.analysis,org.apache.lucene.analysis.standard;analysis=split,org.apache.lucene.analysis.tokenattributes,org.apache.lucene.analysis.util,org.apache.lucene.benchmark.byTask,org.apache.lucene.benchmark.byTask.feeds,org.apache.lucene.benchmark.byTask.stats,org.apache.lucene.benchmark.byTask.tasks,org.apache.lucene.benchmark.byTask.utils,org.apache.lucene.benchmark.quality,org.apache.lucene.benchmark.quality.utils,org.apache.lucene.codecs,org.apache.lucene.codecs.lucene70,org.apache.lucene.document,org.apache.lucene.facet,org.apache.lucene.facet.taxonomy,org.apache.lucene.facet.taxonomy.directory,org.apache.lucene.index,org.apache.lucene.queries.function,org.apache.lucene.queryparser.classic,org.apache.lucene.search,org.apache.lucene.search.highlight,org.apache.lucene.search.spans,org.apache.lucene.search.uhighlight,org.apache.lucene.search.vectorhighlight,org.apache.lucene.spatial,org.apache.lucene.spatial.composite,org.apache.lucene.spatial.prefix,org.apache.lucene.spatial.prefix.tree,org.apache.lucene.spatial.query,org.apache.lucene.spatial.serialized,org.apache.lucene.store,org.apache.lucene.util,org.cyberneko.html.parsers,org.locationtech.spatial4j.context,org.locationtech.spatial4j.shape,org.xml.sax,org.xml.sax.helpers"/>
+		<attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=${javac.target.version}))&quot;"/>
+	  </jarify-additional-manifest-attributes>
+	</jarify>
+  </target>
+
+
 </project>
--- lucene-8.5.0/classification/build.xml	2020-03-13 10:35:55.000000000 +0100
+++ lucene-8.5.0/classification/build.xml	2020-04-06 14:16:26.110648118 +0200
@@ -39,7 +39,23 @@
 
   <target name="compile-core" depends="jar-grouping,jar-queries,jar-analyzers-common,common.compile-core" />
 
-  <target name="jar-core" depends="common.jar-core" />
+  <target name="jar-core" depends="compile-core">
+    <jarify>
+	  <jarify-additional-manifest-attributes>
+		<attribute name="Bundle-Description" value="Lucene Classification"/>
+		<attribute name="Bundle-DocURL" value="https://www.apache.org/"/>
+		<attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
+		<attribute name="Bundle-ManifestVersion" value="2"/>
+		<attribute name="Bundle-Name" value="Lucene Classification"/>
+		<attribute name="Bundle-SymbolicName" value="org.apache.lucene.${name}"/>
+		<attribute name="Bundle-Vendor" value="The Apache Software Foundation"/>
+		<attribute name="Bundle-Version" value="${version}"/>
+		<attribute name="Export-Package" value="org.apache.lucene.classification;version=&quot;${version}&quot;,org.apache.lucene.classification.document;version=&quot;${version}&quot;,org.apache.lucene.classification.utils;version=&quot;${version}&quot;"/>
+		<attribute name="Import-Package" value="org.apache.lucene.analysis,org.apache.lucene.analysis.tokenattributes,org.apache.lucene.classification,org.apache.lucene.classification.utils,org.apache.lucene.document,org.apache.lucene.index,org.apache.lucene.queries.mlt,org.apache.lucene.search,org.apache.lucene.search.grouping,org.apache.lucene.search.similarities,org.apache.lucene.store,org.apache.lucene.util,org.apache.lucene.util.fst"/>
+		<attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=${javac.target.version}))&quot;"/>
+	  </jarify-additional-manifest-attributes>
+	</jarify>
+  </target>
 
   <target name="javadocs" depends="javadocs-grouping,compile-core,check-javadocs-uptodate"
           unless="javadocs-uptodate-${name}">
--- lucene-8.5.0/common-build.xml	2020-04-06 13:47:22.637143102 +0200
+++ lucene-8.5.0/common-build.xml	2020-04-06 13:49:27.929822488 +0200
@@ -192,6 +192,7 @@
   <property name="javac.deprecation" value="off"/>
   <property name="javac.debug" value="on"/>
   <property name="javac.release" value="8"/>
+  <property name="javac.target.version" value="1.${javac.release}"/>
   <property name="javac.args" value="-Xlint -Xlint:-deprecation -Xlint:-serial"/>
   <property name="javac.profile.args" value="-profile compact2"/>
   <property name="javadoc.link" value="https://docs.oracle.com/javase/8/docs/api/"/>
@@ -788,7 +789,7 @@
         <attribute name="Implementation-Title" value="@{implementation.title}"/>
         <!-- impl version can be any string -->
         <attribute name="Implementation-Version"
-                   value="${version} ${checkoutid} - ${user.name} - ${DSTAMP} ${TSTAMP}"/>
+                   value="${version}"/>
         <attribute name="Implementation-Vendor"
                    value="The Apache Software Foundation"/>
         <attribute name="X-Compile-Source-JDK" value="${javac.release}"/>
--- lucene-8.5.0/core/build.xml	2020-03-13 10:35:55.000000000 +0100
+++ lucene-8.5.0/core/build.xml	2020-04-06 14:20:59.688149345 +0200
@@ -194,6 +194,24 @@
     </sequential>
   </macrodef>
   
+  <target name="jar-core" depends="compile-core">
+    <jarify>
+	  <jarify-additional-manifest-attributes>
+		<attribute name="Bundle-Description" value="Apache Lucene Java Core"/>
+		<attribute name="Bundle-DocURL" value="https://www.apache.org/"/>
+		<attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
+		<attribute name="Bundle-ManifestVersion" value="2"/>
+		<attribute name="Bundle-Name" value="Lucene Core"/>
+		<attribute name="Bundle-SymbolicName" value="org.apache.lucene.${name}"/>
+		<attribute name="Bundle-Vendor" value="The Apache Software Foundation"/>
+		<attribute name="Bundle-Version" value="${version}"/>
+		<attribute name="Export-Package" value="org.apache.lucene;version=&quot;${version}&quot;,org.apache.lucene.analysis;version=&quot;${version}&quot;,org.apache.lucene.analysis.standard;version=&quot;${version}&quot;,org.apache.lucene.analysis.tokenattributes;version=&quot;${version}&quot;,org.apache.lucene.codecs;version=&quot;${version}&quot;,org.apache.lucene.codecs.blocktree;version=&quot;${version}&quot;,org.apache.lucene.codecs.compressing;version=&quot;${version}&quot;,org.apache.lucene.codecs.lucene50;version=&quot;${version}&quot;,org.apache.lucene.codecs.lucene60;version=&quot;${version}&quot;,org.apache.lucene.codecs.lucene70;version=&quot;${version}&quot;,org.apache.lucene.codecs.lucene80;version=&quot;${version}&quot;,org.apache.lucene.codecs.lucene84;version=&quot;${version}&quot;,org.apache.lucene.codecs.perfield;version=&quot;${version}&quot;,org.apache.lucene.document;version=&quot;${version}&quot;,org.apache.lucene.geo;version=&quot;${version}&quot;,org.apache.lucene.index;version=&quot;${version}&quot;,org.apache.lucene.search;version=&quot;${version}&quot;,org.apache.lucene.search.similarities;version=&quot;${version}&quot;,org.apache.lucene.search.spans;version=&quot;${version}&quot;,org.apache.lucene.store;version=&quot;${version}&quot;,org.apache.lucene.util;version=&quot;${version}&quot;,org.apache.lucene.util.automaton;version=&quot;${version}&quot;,org.apache.lucene.util.bkd;version=&quot;${version}&quot;,org.apache.lucene.util.compress;version=&quot;${version}&quot;,org.apache.lucene.util.fst;version=&quot;${version}&quot;,org.apache.lucene.util.graph;version=&quot;${version}&quot;,org.apache.lucene.util.mutable;version=&quot;${version}&quot;,org.apache.lucene.util.packed;version=&quot;${version}&quot;"/>
+		<attribute name="Import-Package" value="org.apache.lucene.analysis,org.apache.lucene.analysis.standard,org.apache.lucene.analysis.tokenattributes,org.apache.lucene.codecs,org.apache.lucene.codecs.blocktree,org.apache.lucene.codecs.compressing,org.apache.lucene.codecs.lucene50,org.apache.lucene.codecs.lucene60,org.apache.lucene.codecs.lucene70,org.apache.lucene.codecs.lucene80,org.apache.lucene.codecs.perfield,org.apache.lucene.document,org.apache.lucene.geo,org.apache.lucene.index,org.apache.lucene.search,org.apache.lucene.search.similarities,org.apache.lucene.search.spans,org.apache.lucene.store,org.apache.lucene.util,org.apache.lucene.util.automaton,org.apache.lucene.util.bkd,org.apache.lucene.util.compress,org.apache.lucene.util.fst,org.apache.lucene.util.graph,org.apache.lucene.util.packed"/>
+		<attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=${javac.target.version}))&quot;"/>
+	  </jarify-additional-manifest-attributes>
+	</jarify>
+  </target>
+
   <condition property="-ignore-test-lock-factory">
     <or>
       <!-- We ignore our ant-based lock factory test, if user applies test filtering: -->
--- lucene-8.5.0/demo/build.xml	2020-03-13 10:35:55.000000000 +0100
+++ lucene-8.5.0/demo/build.xml	2020-04-06 14:24:28.413294729 +0200
@@ -58,4 +58,22 @@
 
   <target name="compile-core" depends="jar-analyzers-common,jar-queryparser,jar-queries,jar-facet,jar-expressions,common.compile-core" />
 
+  <target name="jar-core" depends="compile-core">
+    <jarify>
+	  <jarify-additional-manifest-attributes>
+		<attribute name="Bundle-Description" value="This is the demo for Apache Lucene Java"/>
+		<attribute name="Bundle-DocURL" value="https://www.apache.org/"/>
+		<attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
+		<attribute name="Bundle-ManifestVersion" value="2"/>
+		<attribute name="Bundle-Name" value="Lucene Demo"/>
+		<attribute name="Bundle-SymbolicName" value="org.apache.lucene.${name}"/>
+		<attribute name="Bundle-Vendor" value="The Apache Software Foundation"/>
+		<attribute name="Bundle-Version" value="${version}"/>
+		<attribute name="Export-Package" value="org.apache.lucene.demo;version=&quot;${version}&quot;,org.apache.lucene.demo.facet;version=&quot;${version}&quot;"/>
+		<attribute name="Import-Package" value="org.apache.lucene.analysis,org.apache.lucene.analysis.core,org.apache.lucene.analysis.standard;analysis=split,org.apache.lucene.document,org.apache.lucene.expressions,org.apache.lucene.expressions.js,org.apache.lucene.facet,org.apache.lucene.facet.range,org.apache.lucene.facet.sortedset,org.apache.lucene.facet.taxonomy,org.apache.lucene.facet.taxonomy.directory,org.apache.lucene.index,org.apache.lucene.queryparser.classic,org.apache.lucene.search,org.apache.lucene.store,org.apache.lucene.util"/>
+		<attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=${javac.target.version}))&quot;"/>
+	  </jarify-additional-manifest-attributes>
+	</jarify>
+  </target>
+
 </project>
--- lucene-8.5.0/expressions/build.xml	2020-03-13 10:35:55.000000000 +0100
+++ lucene-8.5.0/expressions/build.xml	2020-04-06 14:51:26.410310254 +0200
@@ -117,4 +117,23 @@
       </fixcrlf>
     </sequential>
   </macrodef>
+
+  <target name="jar-core" depends="compile-core">
+    <jarify>
+	  <jarify-additional-manifest-attributes>
+		<attribute name="Bundle-Description" value="Dynamically computed values to sort/facet/search on based on a pluggable grammar."/>
+		<attribute name="Bundle-DocURL" value="https://www.apache.org/"/>
+		<attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
+		<attribute name="Bundle-ManifestVersion" value="2"/>
+		<attribute name="Bundle-Name" value="Lucene Expressions"/>
+		<attribute name="Bundle-SymbolicName" value="org.apache.lucene.${name}"/>
+		<attribute name="Bundle-Vendor" value="The Apache Software Foundation"/>
+		<attribute name="Bundle-Version" value="${version}"/>
+		<attribute name="Export-Package" value="org.apache.lucene.expressions;version=&quot;${version}&quot;,org.apache.lucene.expressions.js;version=&quot;${version}&quot;"/>
+		<attribute name="Import-Package" value="org.antlr.v4.runtime,org.antlr.v4.runtime.atn,org.antlr.v4.runtime.dfa,org.antlr.v4.runtime.misc,org.antlr.v4.runtime.tree,org.apache.lucene.expressions,org.apache.lucene.index,org.apache.lucene.search,org.apache.lucene.util,org.objectweb.asm,org.objectweb.asm.commons"/>
+		<attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=${javac.target.version}))&quot;"/>
+	  </jarify-additional-manifest-attributes>
+	</jarify>
+  </target>
+
 </project>
--- lucene-8.5.0/facet/build.xml	2020-03-13 10:35:55.000000000 +0100
+++ lucene-8.5.0/facet/build.xml	2020-04-06 14:53:39.235034473 +0200
@@ -44,4 +44,22 @@
     </java>
   </target>
 
+  <target name="jar-core" depends="compile-core">
+    <jarify>
+	  <jarify-additional-manifest-attributes>
+		<attribute name="Bundle-Description" value="Package for Faceted Indexing and Search"/>
+		<attribute name="Bundle-DocURL" value="https://www.apache.org/"/>
+		<attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
+		<attribute name="Bundle-ManifestVersion" value="2"/>
+		<attribute name="Bundle-Name" value="Lucene Facets"/>
+		<attribute name="Bundle-SymbolicName" value="org.apache.lucene.${name}"/>
+		<attribute name="Bundle-Vendor" value="The Apache Software Foundation"/>
+		<attribute name="Bundle-Version" value="${version}"/>
+		<attribute name="Export-Package" value="org.apache.lucene.facet;version=&quot;${version}&quot;,org.apache.lucene.facet.range;version=&quot;${version}&quot;,org.apache.lucene.facet.sortedset;version=&quot;${version}&quot;,org.apache.lucene.facet.taxonomy;version=&quot;${version}&quot;,org.apache.lucene.facet.taxonomy.directory;version=&quot;${version}&quot;,org.apache.lucene.facet.taxonomy.writercache;version=&quot;${version}&quot;"/>
+		<attribute name="Import-Package" value="com.carrotsearch.hppc,com.carrotsearch.hppc.cursors,org.apache.lucene.analysis,org.apache.lucene.analysis.tokenattributes,org.apache.lucene.document,org.apache.lucene.facet,org.apache.lucene.facet.sortedset,org.apache.lucene.facet.taxonomy,org.apache.lucene.facet.taxonomy.directory,org.apache.lucene.facet.taxonomy.writercache,org.apache.lucene.index,org.apache.lucene.search,org.apache.lucene.store,org.apache.lucene.util"/>
+		<attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=${javac.target.version}))&quot;"/>
+	  </jarify-additional-manifest-attributes>
+	</jarify>
+  </target>
+
 </project>
--- lucene-8.5.0/grouping/build.xml	2020-03-13 10:35:55.000000000 +0100
+++ lucene-8.5.0/grouping/build.xml	2020-04-06 14:54:33.987333007 +0200
@@ -46,4 +46,22 @@
       </invoke-module-javadoc>
     </target>
 
+  <target name="jar-core" depends="compile-core">
+    <jarify>
+	  <jarify-additional-manifest-attributes>
+		<attribute name="Bundle-Description" value="Lucene Grouping Module"/>
+		<attribute name="Bundle-DocURL" value="https://www.apache.org/"/>
+		<attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
+		<attribute name="Bundle-ManifestVersion" value="2"/>
+		<attribute name="Bundle-Name" value="Lucene Grouping"/>
+		<attribute name="Bundle-SymbolicName" value="org.apache.lucene.${name}"/>
+		<attribute name="Bundle-Vendor" value="The Apache Software Foundation"/>
+		<attribute name="Bundle-Version" value="${version}"/>
+		<attribute name="Export-Package" value="org.apache.lucene.search.grouping;version=&quot;${version}&quot;"/>
+		<attribute name="Import-Package" value="org.apache.lucene.index,org.apache.lucene.queries.function,org.apache.lucene.search,org.apache.lucene.util,org.apache.lucene.util.mutable"/>
+		<attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=${javac.target.version}))&quot;"/>
+	  </jarify-additional-manifest-attributes>
+	</jarify>
+  </target>
+
 </project>
--- lucene-8.5.0/highlighter/build.xml	2020-03-13 10:35:55.000000000 +0100
+++ lucene-8.5.0/highlighter/build.xml	2020-04-06 13:49:27.929822488 +0200
@@ -43,6 +43,24 @@
 
   <target name="compile-core" depends="jar-memory,jar-queries,jar-join,jar-analyzers-common,common.compile-core" />
 
+  <target name="jar-core" depends="compile-core">
+    <jarify>
+	  <jarify-additional-manifest-attributes>
+		<attribute name="Bundle-Description" value="This is the highlighter for apache lucene java"/>
+		<attribute name="Bundle-DocURL" value="https://www.apache.org/"/>
+		<attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
+		<attribute name="Bundle-ManifestVersion" value="2"/>
+		<attribute name="Bundle-Name" value="Lucene Highlighter"/>
+		<attribute name="Bundle-SymbolicName" value="org.apache.lucene.${name}"/>
+		<attribute name="Bundle-Vendor" value="The Apache Software Foundation"/>
+		<attribute name="Bundle-Version" value="${version}"/>
+		<attribute name="Export-Package" value="org.apache.lucene.search.highlight;version=&quot;${version}&quot;,org.apache.lucene.search.uhighlight;version=&quot;${version}&quot;,org.apache.lucene.search.vectorhighlight;version=&quot;${version}&quot;"/>
+		<attribute name="Import-Package" value="org.apache.lucene.analysis,org.apache.lucene.analysis.miscellaneous,org.apache.lucene.analysis.tokenattributes,org.apache.lucene.document,org.apache.lucene.index,org.apache.lucene.index.memory,org.apache.lucene.queries,org.apache.lucene.search,org.apache.lucene.search.highlight,org.apache.lucene.search.join,org.apache.lucene.search.spans,org.apache.lucene.util,org.apache.lucene.util.automaton"/>
+		<attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=${javac.target.version}))&quot;"/>
+	  </jarify-additional-manifest-attributes>
+	</jarify>
+  </target>
+
   <target name="javadocs" depends="javadocs-memory,compile-core,check-javadocs-uptodate"
           unless="javadocs-uptodate-${name}">
     <invoke-module-javadoc>
--- lucene-8.5.0/join/build.xml	2020-03-13 10:35:55.000000000 +0100
+++ lucene-8.5.0/join/build.xml	2020-04-06 13:49:27.929822488 +0200
@@ -24,4 +24,22 @@
 
   <import file="../module-build.xml"/>
 
+  <target name="jar-core" depends="compile-core">
+    <jarify>
+	  <jarify-additional-manifest-attributes>
+		<attribute name="Bundle-Description" value="Lucene Join Module"/>
+		<attribute name="Bundle-DocURL" value="https://www.apache.org/"/>
+		<attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
+		<attribute name="Bundle-ManifestVersion" value="2"/>
+		<attribute name="Bundle-Name" value="Lucene Join"/>
+		<attribute name="Bundle-SymbolicName" value="org.apache.lucene.${name}"/>
+		<attribute name="Bundle-Vendor" value="The Apache Software Foundation"/>
+		<attribute name="Bundle-Version" value="${version}"/>
+		<attribute name="Export-Package" value="org.apache.lucene.search.join;version=&quot;${version}&quot;"/>
+		<attribute name="Import-Package" value="org.apache.lucene.document,org.apache.lucene.index,org.apache.lucene.search,org.apache.lucene.util"/>
+		<attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=${javac.target.version}))&quot;"/>
+	  </jarify-additional-manifest-attributes>
+	</jarify>
+  </target>
+
 </project>
--- lucene-8.5.0/memory/build.xml	2020-03-13 10:35:56.000000000 +0100
+++ lucene-8.5.0/memory/build.xml	2020-04-06 14:58:53.696749034 +0200
@@ -31,4 +31,23 @@
   </path>
 
   <target name="compile-core" depends="jar-queryparser,common.compile-core" />
+
+  <target name="jar-core" depends="compile-core">
+    <jarify>
+	  <jarify-additional-manifest-attributes>
+		<attribute name="Bundle-Description" value="High-performance single-document index to compare against Query"/>
+		<attribute name="Bundle-DocURL" value="https://www.apache.org/"/>
+		<attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
+		<attribute name="Bundle-ManifestVersion" value="2"/>
+		<attribute name="Bundle-Name" value="Lucene Memory"/>
+		<attribute name="Bundle-SymbolicName" value="org.apache.lucene.${name}"/>
+		<attribute name="Bundle-Vendor" value="The Apache Software Foundation"/>
+		<attribute name="Bundle-Version" value="${version}"/>
+		<attribute name="Export-Package" value="org.apache.lucene.index.memory;version=&quot;${version}&quot;"/>
+		<attribute name="Import-Package" value="org.apache.lucene.analysis,org.apache.lucene.analysis.tokenattributes,org.apache.lucene.document,org.apache.lucene.index,org.apache.lucene.search,org.apache.lucene.search.similarities,org.apache.lucene.util"/>
+		<attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=${javac.target.version}))&quot;"/>
+	  </jarify-additional-manifest-attributes>
+	</jarify>
+  </target>
+
 </project>
--- lucene-8.5.0/misc/build.xml	2020-03-13 10:35:56.000000000 +0100
+++ lucene-8.5.0/misc/build.xml	2020-04-06 15:00:13.485184082 +0200
@@ -49,4 +49,23 @@
     </cc>
   </target>
 
+  <target name="jar-core" depends="compile-core">
+    <jarify>
+	  <jarify-additional-manifest-attributes>
+		<attribute name="Bundle-Description" value="Miscellaneous Lucene extensions"/>
+		<attribute name="Bundle-DocURL" value="https://www.apache.org/"/>
+		<attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
+		<attribute name="Bundle-ManifestVersion" value="2"/>
+		<attribute name="Bundle-Name" value="Lucene Miscellaneous"/>
+		<attribute name="Bundle-SymbolicName" value="org.apache.lucene.${name}"/>
+		<attribute name="Bundle-Vendor" value="The Apache Software Foundation"/>
+		<attribute name="Bundle-Version" value="${version}"/>
+		<attribute name="Export-Package" value="org.apache.lucene.document;version=&quot;${version}&quot;;misc=split;mandatory:=misc,org.apache.lucene.index;version=&quot;${version}&quot;;misc=split;mandatory:=misc,org.apache.lucene.search;version=&quot;${version}&quot;;misc=split;mandatory:=misc,org.apache.lucene.store;version=&quot;${version}&quot;;misc=split;mandatory:=misc,org.apache.lucene.util.fst;version=&quot;${version}&quot;;misc=split;mandatory:=misc,org.apache.lucene.misc;version=&quot;${version}&quot;,org.apache.lucene.search.similarity;version=&quot;${version}&quot;,org.apache.lucene.util;version=&quot;${version}&quot;"/>
+		<attribute name="Import-Package" value="org.apache.lucene.analysis,org.apache.lucene.codecs,org.apache.lucene.index;misc=split,org.apache.lucene.misc,org.apache.lucene.search;misc=split,org.apache.lucene.search.similarities,org.apache.lucene.store;misc=split,org.apache.lucene.util"/>
+		<attribute name="Require-Bundle" value="org.apache.lucene.core;bundle-version=&quot;${version}&quot;"/>
+		<attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=${javac.target.version}))&quot;"/>
+	  </jarify-additional-manifest-attributes>
+	</jarify>
+  </target>
+
 </project>
--- lucene-8.5.0/monitor/build.xml	2020-03-13 10:35:56.000000000 +0100
+++ lucene-8.5.0/monitor/build.xml	2020-04-06 15:11:58.105109430 +0200
@@ -50,4 +50,22 @@
     </invoke-module-javadoc>
   </target>
 
+  <target name="jar-core" depends="compile-core">
+    <jarify>
+	  <jarify-additional-manifest-attributes>
+		<attribute name="Bundle-Description" value="High-performance single-document index to compare against Query"/>
+		<attribute name="Bundle-DocURL" value="https://www.apache.org/"/>
+		<attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
+		<attribute name="Bundle-ManifestVersion" value="2"/>
+		<attribute name="Bundle-Name" value="Lucene Monitor"/>
+		<attribute name="Bundle-SymbolicName" value="org.apache.lucene.${name}"/>
+		<attribute name="Bundle-Vendor" value="The Apache Software Foundation"/>
+		<attribute name="Bundle-Version" value="${version}"/>
+		<attribute name="Export-Package" value="org.apache.lucene.monitor;version=&quot;${version}&quot;"/>
+		<attribute name="Import-Package" value="org.apache.lucene.analysis,org.apache.lucene.analysis.core,org.apache.lucene.analysis.tokenattributes,org.apache.lucene.document,org.apache.lucene.index,org.apache.lucene.index.memory,org.apache.lucene.search,org.apache.lucene.search.similarities,org.apache.lucene.store,org.apache.lucene.util"/>
+		<attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=${javac.target.version}))&quot;"/>
+	  </jarify-additional-manifest-attributes>
+	</jarify>
+  </target>
+
 </project>
--- lucene-8.5.0/queries/build.xml	2020-03-13 10:35:56.000000000 +0100
+++ lucene-8.5.0/queries/build.xml	2020-04-06 15:01:29.277597337 +0200
@@ -28,5 +28,24 @@
     <path refid="test.base.classpath"/>
   </path>
 
+
+  <target name="jar-core" depends="compile-core">
+    <jarify>
+	  <jarify-additional-manifest-attributes>
+		<attribute name="Bundle-Description" value="Lucene Queries Module"/>
+		<attribute name="Bundle-DocURL" value="https://www.apache.org/"/>
+		<attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
+		<attribute name="Bundle-ManifestVersion" value="2"/>
+		<attribute name="Bundle-Name" value="Lucene Queries"/>
+		<attribute name="Bundle-SymbolicName" value="org.apache.lucene.${name}"/>
+		<attribute name="Bundle-Vendor" value="The Apache Software Foundation"/>
+		<attribute name="Bundle-Version" value="${version}"/>
+		<attribute name="Export-Package" value="org.apache.lucene.queries;version=&quot;${version}&quot;,org.apache.lucene.queries.function;version=&quot;${version}&quot;,org.apache.lucene.queries.function.docvalues;version=&quot;${version}&quot;,org.apache.lucene.queries.function.valuesource;version=&quot;${version}&quot;,org.apache.lucene.queries.intervals;version=&quot;${version}&quot;,org.apache.lucene.queries.mlt;version=&quot;${version}&quot;,org.apache.lucene.queries.payloads;version=&quot;${version}&quot;"/>
+		<attribute name="Import-Package" value="org.apache.lucene.analysis,org.apache.lucene.analysis.tokenattributes,org.apache.lucene.document,org.apache.lucene.index,org.apache.lucene.queries.function,org.apache.lucene.queries.function.docvalues,org.apache.lucene.search,org.apache.lucene.search.similarities,org.apache.lucene.search.spans,org.apache.lucene.util,org.apache.lucene.util.automaton,org.apache.lucene.util.mutable"/>
+		<attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=${javac.target.version}))&quot;"/>
+	  </jarify-additional-manifest-attributes>
+	</jarify>
+  </target>
+
   <target name="compile-core" depends="jar-expressions,common.compile-core" />
 </project>
--- lucene-8.5.0/queryparser/build.xml	2020-03-13 10:35:56.000000000 +0100
+++ lucene-8.5.0/queryparser/build.xml	2020-04-06 15:04:20.302529868 +0200
@@ -175,4 +175,22 @@
 
   <target name="regenerate" depends="javacc"/>
 
+  <target name="jar-core" depends="compile-core">
+    <jarify>
+	  <jarify-additional-manifest-attributes>
+		<attribute name="Bundle-Description" value="Lucene QueryParsers module"/>
+		<attribute name="Bundle-DocURL" value="https://www.apache.org/"/>
+		<attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
+		<attribute name="Bundle-ManifestVersion" value="2"/>
+		<attribute name="Bundle-Name" value="Lucene QueryParsers"/>
+		<attribute name="Bundle-SymbolicName" value="org.apache.lucene.queryparser"/>
+		<attribute name="Bundle-Vendor" value="The Apache Software Foundation"/>
+		<attribute name="Bundle-Version" value="${version}"/>
+		<attribute name="Export-Package" value="org.apache.lucene.queryparser.classic;version=&quot;${version}&quot;,org.apache.lucene.queryparser.complexPhrase;version=&quot;${version}&quot;,org.apache.lucene.queryparser.ext;version=&quot;${version}&quot;,org.apache.lucene.queryparser.flexible.core;version=&quot;${version}&quot;,org.apache.lucene.queryparser.flexible.core.builders;version=&quot;${version}&quot;,org.apache.lucene.queryparser.flexible.core.config;version=&quot;${version}&quot;,org.apache.lucene.queryparser.flexible.core.messages;version=&quot;${version}&quot;,org.apache.lucene.queryparser.flexible.core.nodes;version=&quot;${version}&quot;,org.apache.lucene.queryparser.flexible.core.parser;version=&quot;${version}&quot;,org.apache.lucene.queryparser.flexible.core.processors;version=&quot;${version}&quot;,org.apache.lucene.queryparser.flexible.core.util;version=&quot;${version}&quot;,org.apache.lucene.queryparser.flexible.messages;version=&quot;${version}&quot;,org.apache.lucene.queryparser.flexible.precedence;version=&quot;${version}&quot;,org.apache.lucene.queryparser.flexible.precedence.processors;version=&quot;${version}&quot;,org.apache.lucene.queryparser.flexible.standard;version=&quot;${version}&quot;,org.apache.lucene.queryparser.flexible.standard.builders;version=&quot;${version}&quot;,org.apache.lucene.queryparser.flexible.standard.config;version=&quot;${version}&quot;,org.apache.lucene.queryparser.flexible.standard.nodes;version=&quot;${version}&quot;,org.apache.lucene.queryparser.flexible.standard.parser;version=&quot;${version}&quot;,org.apache.lucene.queryparser.flexible.standard.processors;version=&quot;${version}&quot;,org.apache.lucene.queryparser.simple;version=&quot;${version}&quot;,org.apache.lucene.queryparser.surround.parser;version=&quot;${version}&quot;,org.apache.lucene.queryparser.surround.query;version=&quot;${version}&quot;,org.apache.lucene.queryparser.xml;version=&quot;${version}&quot;,org.apache.lucene.queryparser.xml.builders;version=&quot;${version}&quot;"/>
+		<attribute name="Import-Package" value="javax.xml.parsers,org.apache.lucene.analysis,org.apache.lucene.analysis.tokenattributes,org.apache.lucene.document,org.apache.lucene.index,org.apache.lucene.queries.mlt,org.apache.lucene.queries.payloads,org.apache.lucene.queryparser.classic,org.apache.lucene.queryparser.flexible.core,org.apache.lucene.queryparser.flexible.core.builders,org.apache.lucene.queryparser.flexible.core.config,org.apache.lucene.queryparser.flexible.core.messages,org.apache.lucene.queryparser.flexible.core.nodes,org.apache.lucene.queryparser.flexible.core.parser,org.apache.lucene.queryparser.flexible.core.processors,org.apache.lucene.queryparser.flexible.core.util,org.apache.lucene.queryparser.flexible.messages,org.apache.lucene.queryparser.flexible.precedence.processors,org.apache.lucene.queryparser.flexible.standard,org.apache.lucene.queryparser.flexible.standard.builders,org.apache.lucene.queryparser.flexible.standard.config,org.apache.lucene.queryparser.flexible.standard.nodes,org.apache.lucene.queryparser.flexible.standard.parser,org.apache.lucene.queryparser.flexible.standard.processors,org.apache.lucene.queryparser.surround.query,org.apache.lucene.queryparser.xml,org.apache.lucene.queryparser.xml.builders,org.apache.lucene.sandbox.queries,org.apache.lucene.search,org.apache.lucene.search.spans,org.apache.lucene.util,org.w3c.dom,org.xml.sax"/>
+		<attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=${javac.target.version}))&quot;"/>
+	  </jarify-additional-manifest-attributes>
+	</jarify>
+  </target>
+
 </project>
--- lucene-8.5.0/replicator/build.xml	2020-03-13 10:35:56.000000000 +0100
+++ lucene-8.5.0/replicator/build.xml	2020-04-06 15:06:02.943093612 +0200
@@ -50,4 +50,22 @@
     </invoke-module-javadoc>
   </target>
 
+  <target name="jar-core" depends="compile-core">
+    <jarify>
+	  <jarify-additional-manifest-attributes>
+		<attribute name="Bundle-Description" value="Lucene Replicator Module"/>
+		<attribute name="Bundle-DocURL" value="https://www.apache.org/"/>
+		<attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
+		<attribute name="Bundle-ManifestVersion" value="2"/>
+		<attribute name="Bundle-Name" value="Lucene Replicator"/>
+		<attribute name="Bundle-SymbolicName" value="org.apache.lucene.${name}"/>
+		<attribute name="Bundle-Vendor" value="The Apache Software Foundation"/>
+		<attribute name="Bundle-Version" value="${version}"/>
+		<attribute name="Export-Package" value="org.apache.lucene.replicator;version=&quot;${version}&quot;,org.apache.lucene.replicator.http;version=&quot;${version}&quot;,org.apache.lucene.replicator.nrt;version=&quot;${version}&quot;"/>
+		<attribute name="Import-Package" value="javax.servlet,javax.servlet.http,org.apache.http,org.apache.http.client.config,org.apache.http.client.methods,org.apache.http.conn,org.apache.http.impl.client,org.apache.http.util,org.apache.lucene.codecs,org.apache.lucene.facet.taxonomy.directory,org.apache.lucene.facet.taxonomy.writercache,org.apache.lucene.index,org.apache.lucene.replicator,org.apache.lucene.search,org.apache.lucene.store,org.apache.lucene.util"/>
+		<attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=${javac.target.version}))&quot;"/>
+	  </jarify-additional-manifest-attributes>
+	</jarify>
+  </target>
+
 </project>
--- lucene-8.5.0/sandbox/build.xml	2020-03-13 10:35:56.000000000 +0100
+++ lucene-8.5.0/sandbox/build.xml	2020-04-06 15:08:48.916035666 +0200
@@ -23,4 +23,22 @@
 
   <import file="../module-build.xml"/>
 
+  <target name="jar-core" depends="compile-core">
+    <jarify>
+	  <jarify-additional-manifest-attributes>
+		<attribute name="Bundle-Description" value="Lucene Sandbox"/>
+		<attribute name="Bundle-DocURL" value="https://www.apache.org/"/>
+		<attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
+		<attribute name="Bundle-ManifestVersion" value="2"/>
+		<attribute name="Bundle-Name" value="Lucene Sandbox"/>
+		<attribute name="Bundle-SymbolicName" value="org.apache.lucene.${name}"/>
+		<attribute name="Bundle-Vendor" value="The Apache Software Foundation"/>
+		<attribute name="Bundle-Version" value="${version}"/>
+		<attribute name="Export-Package" value="org.apache.lucene.codecs.idversion;version=&quot;${version}&quot;,org.apache.lucene.document;version=&quot;${version}&quot;,org.apache.lucene.payloads;version=&quot;${version}&quot;,org.apache.lucene.sandbox.queries;version=&quot;${version}&quot;,org.apache.lucene.search;version=&quot;${version}&quot;"/>
+		<attribute name="Import-Package" value="org.apache.lucene.analysis,org.apache.lucene.analysis.tokenattributes,org.apache.lucene.codecs,org.apache.lucene.codecs.blocktree,org.apache.lucene.geo,org.apache.lucene.index,org.apache.lucene.search,org.apache.lucene.search.similarities,org.apache.lucene.search.spans,org.apache.lucene.store,org.apache.lucene.util,org.apache.lucene.util.automaton,org.apache.lucene.util.bkd,org.apache.lucene.util.fst,org.apache.lucene.util.mutable,org.apache.lucene.util.packed"/>
+		<attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=${javac.target.version}))&quot;"/>
+	  </jarify-additional-manifest-attributes>
+	</jarify>
+  </target>
+
 </project>
--- lucene-8.5.0/spatial3d/build.xml	2020-03-13 10:35:56.000000000 +0100
+++ lucene-8.5.0/spatial3d/build.xml	2020-04-06 15:13:07.429502891 +0200
@@ -27,4 +27,23 @@
   <path id="classpath">
     <path refid="base.classpath"/>
   </path>
+
+  <target name="jar-core" depends="compile-core">
+    <jarify>
+	  <jarify-additional-manifest-attributes>
+		<attribute name="Bundle-Description" value="Lucene Spatial shapes implemented using 3D planar geometry"/>
+		<attribute name="Bundle-DocURL" value="https://www.apache.org/"/>
+		<attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
+		<attribute name="Bundle-ManifestVersion" value="2"/>
+		<attribute name="Bundle-Name" value="Lucene Spatial 3D"/>
+		<attribute name="Bundle-SymbolicName" value="org.apache.lucene.${name}"/>
+		<attribute name="Bundle-Vendor" value="The Apache Software Foundation"/>
+		<attribute name="Bundle-Version" value="${version}"/>
+		<attribute name="Export-Package" value="org.apache.lucene.spatial3d;version=&quot;${version}&quot;,org.apache.lucene.spatial3d.geom;version=&quot;${version}&quot;"/>
+		<attribute name="Import-Package" value="org.apache.lucene.document,org.apache.lucene.geo,org.apache.lucene.index,org.apache.lucene.search,org.apache.lucene.spatial3d.geom,org.apache.lucene.util"/>
+		<attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=${javac.target.version}))&quot;"/>
+	  </jarify-additional-manifest-attributes>
+	</jarify>
+  </target>
+
 </project>
--- lucene-8.5.0/spatial-extras/build.xml	2020-03-13 10:35:56.000000000 +0100
+++ lucene-8.5.0/spatial-extras/build.xml	2020-04-06 13:49:27.933822509 +0200
@@ -59,4 +59,23 @@
       </links>
     </invoke-module-javadoc>
   </target>
+
+  <target name="jar-core" depends="compile-core">
+    <jarify>
+	  <jarify-additional-manifest-attributes>
+		<attribute name="Bundle-Description" value="Advanced Spatial Shape Strategies for Apache Lucene"/>
+		<attribute name="Bundle-DocURL" value="https://www.apache.org/"/>
+		<attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
+		<attribute name="Bundle-ManifestVersion" value="2"/>
+		<attribute name="Bundle-Name" value="Lucene Spatial Extras"/>
+		<attribute name="Bundle-SymbolicName" value="org.apache.lucene.${name}"/>
+		<attribute name="Bundle-Vendor" value="The Apache Software Foundation"/>
+		<attribute name="Bundle-Version" value="${version}"/>
+		<attribute name="Export-Package" value="org.apache.lucene.spatial;version=&quot;${version}&quot;,org.apache.lucene.spatial.bbox;version=&quot;${version}&quot;,org.apache.lucene.spatial.composite;version=&quot;${version}&quot;,org.apache.lucene.spatial.prefix;version=&quot;${version}&quot;,org.apache.lucene.spatial.prefix.tree;version=&quot;${version}&quot;,org.apache.lucene.spatial.query;version=&quot;${version}&quot;,org.apache.lucene.spatial.serialized;version=&quot;${version}&quot;,org.apache.lucene.spatial.spatial4j;version=&quot;${version}&quot;,org.apache.lucene.spatial.util;version=&quot;${version}&quot;,org.apache.lucene.spatial.vector;version=&quot;${version}&quot;"/>
+		<attribute name="Import-Package" value="org.apache.lucene.analysis,org.apache.lucene.analysis.tokenattributes,org.apache.lucene.document,org.apache.lucene.index,org.apache.lucene.search,org.apache.lucene.spatial,org.apache.lucene.spatial.prefix,org.apache.lucene.spatial.prefix.tree,org.apache.lucene.spatial.query,org.apache.lucene.spatial.serialized,org.apache.lucene.spatial.util,org.apache.lucene.spatial3d.geom,org.apache.lucene.util,org.locationtech.spatial4j.context,org.locationtech.spatial4j.distance,org.locationtech.spatial4j.exception,org.locationtech.spatial4j.io,org.locationtech.spatial4j.shape,org.locationtech.spatial4j.shape.impl"/>
+		<attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=${javac.target.version}))&quot;"/>
+	  </jarify-additional-manifest-attributes>
+	</jarify>
+  </target>
+
 </project>
--- lucene-8.5.0/suggest/build.xml	2020-03-13 10:35:56.000000000 +0100
+++ lucene-8.5.0/suggest/build.xml	2020-04-06 15:16:13.382558294 +0200
@@ -44,4 +44,23 @@
 
   <target name="compile-core" depends="jar-expressions, jar-analyzers-common, common.compile-core" />
 
+  <target name="jar-core" depends="compile-core">
+    <jarify>
+	  <jarify-additional-manifest-attributes>
+		<attribute name="Bundle-Description" value="Lucene Suggest Module"/>
+		<attribute name="Bundle-DocURL" value="https://www.apache.org/"/>
+		<attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
+		<attribute name="Bundle-ManifestVersion" value="2"/>
+		<attribute name="Bundle-Name" value="Lucene Suggest"/>
+		<attribute name="Bundle-SymbolicName" value="org.apache.lucene.${name}"/>
+		<attribute name="Bundle-Vendor" value="The Apache Software Foundation"/>
+		<attribute name="Bundle-Version" value="${version}"/>
+		<attribute name="Export-Package" value="org.apache.lucene.search.spell;version=&quot;${version}&quot;,org.apache.lucene.search.suggest;version=&quot;${version}&quot;,org.apache.lucene.search.suggest.analyzing;version=&quot;${version}&quot;,org.apache.lucene.search.suggest.document;version=&quot;${version}&quot;,org.apache.lucene.search.suggest.fst;version=&quot;${version}&quot;,org.apache.lucene.search.suggest.jaspell;version=&quot;${version}&quot;,org.apache.lucene.search.suggest.tst;version=&quot;${version}&quot;"/>
+		<attribute name="Import-Package" value="org.apache.lucene.analysis,org.apache.lucene.analysis.core,org.apache.lucene.analysis.ngram,org.apache.lucene.analysis.shingle,org.apache.lucene.analysis.tokenattributes,org.apache.lucene.analysis.util,org.apache.lucene.codecs,org.apache.lucene.document,org.apache.lucene.index,org.apache.lucene.search,org.apache.lucene.search.spell,org.apache.lucene.search.suggest,org.apache.lucene.search.suggest.analyzing,org.apache.lucene.search.suggest.fst,org.apache.lucene.store,org.apache.lucene.util,org.apache.lucene.util.automaton,org.apache.lucene.util.fst"/>
+		<attribute name="Import-Package" value="org.apache.lucene.analysis,org.apache.lucene.analysis.en,org.apache.lucene.analysis.miscellaneous,org.apache.lucene.analysis.ngram,org.apache.lucene.analysis.shingle,org.apache.lucene.analysis.tokenattributes,org.apache.lucene.analysis.util,org.apache.lucene.codecs,org.apache.lucene.document,org.apache.lucene.index,org.apache.lucene.search,org.apache.lucene.search.spell,org.apache.lucene.search.suggest,org.apache.lucene.search.suggest.analyzing,org.apache.lucene.search.suggest.fst,org.apache.lucene.store,org.apache.lucene.util,org.apache.lucene.util.automaton,org.apache.lucene.util.fst"/>
+		<attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=${javac.target.version}))&quot;"/>
+	  </jarify-additional-manifest-attributes>
+	</jarify>
+  </target>
+
 </project>
--- lucene-8.5.0/test-framework/build.xml	2020-03-13 10:35:56.000000000 +0100
+++ lucene-8.5.0/test-framework/build.xml	2020-04-06 15:18:39.975390289 +0200
@@ -79,4 +79,23 @@
               title="Lucene Search Engine: Test Framework" />
     </sequential>
   </target>
+
+  <target name="jar-core" depends="compile-core">
+    <jarify>
+	  <jarify-additional-manifest-attributes>
+		<attribute name="Bundle-Description" value="Apache Lucene Java Test Framework"/>
+		<attribute name="Bundle-DocURL" value="https://www.apache.org/"/>
+		<attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
+		<attribute name="Bundle-ManifestVersion" value="2"/>
+		<attribute name="Bundle-Name" value="Lucene Test Framework"/>
+		<attribute name="Bundle-SymbolicName" value="org.apache.lucene.${name}"/>
+		<attribute name="Bundle-Vendor" value="The Apache Software Foundation"/>
+		<attribute name="Bundle-Version" value="${version}"/>
+		<attribute name="Export-Package" value="org.apache.lucene.analysis;version=&quot;${version}&quot;,org.apache.lucene.analysis.standard;version=&quot;${version}&quot;,org.apache.lucene.codecs;version=&quot;${version}&quot;,org.apache.lucene.codecs.asserting;version=&quot;${version}&quot;,org.apache.lucene.codecs.blockterms;version=&quot;${version}&quot;,org.apache.lucene.codecs.bloom;version=&quot;${version}&quot;,org.apache.lucene.codecs.cheapbastard;version=&quot;${version}&quot;,org.apache.lucene.codecs.compressing;version=&quot;${version}&quot;,org.apache.lucene.codecs.compressing.dummy;version=&quot;${version}&quot;,org.apache.lucene.codecs.cranky;version=&quot;${version}&quot;,org.apache.lucene.codecs.mockrandom;version=&quot;${version}&quot;,org.apache.lucene.codecs.ramonly;version=&quot;${version}&quot;,org.apache.lucene.codecs.uniformsplit;version=&quot;${version}&quot;,org.apache.lucene.codecs.uniformsplit.sharedterms;version=&quot;${version}&quot;,org.apache.lucene.geo;version=&quot;${version}&quot;,org.apache.lucene.index;version=&quot;${version}&quot;,org.apache.lucene.mockfile;version=&quot;${version}&quot;,org.apache.lucene.search;version=&quot;${version}&quot;,org.apache.lucene.search.similarities;version=&quot;${version}&quot;,org.apache.lucene.search.spans;version=&quot;${version}&quot;,org.apache.lucene.store;version=&quot;${version}&quot;,org.apache.lucene.util;version=&quot;${version}&quot;,org.apache.lucene.util.automaton;version=&quot;${version}&quot;,org.apache.lucene.util.fst;version=&quot;${version}&quot;"/>
+		<attribute name="Import-Package" value="com.carrotsearch.randomizedtesting,com.carrotsearch.randomizedtesting.annotations,com.carrotsearch.randomizedtesting.generators,com.carrotsearch.randomizedtesting.rules,junit.framework,org.apache.lucene.analysis,org.apache.lucene.analysis.tokenattributes,org.apache.lucene.codecs,org.apache.lucene.codecs.asserting,org.apache.lucene.codecs.blockterms,org.apache.lucene.codecs.blocktree,org.apache.lucene.codecs.blocktreeords,org.apache.lucene.codecs.bloom,org.apache.lucene.codecs.cheapbastard,org.apache.lucene.codecs.compressing,org.apache.lucene.codecs.compressing.dummy,org.apache.lucene.codecs.lucene50,org.apache.lucene.codecs.lucene60,org.apache.lucene.codecs.lucene70,org.apache.lucene.codecs.memory,org.apache.lucene.codecs.mockrandom,org.apache.lucene.codecs.perfield,org.apache.lucene.codecs.simpletext,org.apache.lucene.document,org.apache.lucene.index,org.apache.lucene.mockfile,org.apache.lucene.search,org.apache.lucene.search.similarities,org.apache.lucene.search.spans,org.apache.lucene.store,org.apache.lucene.util,org.apache.lucene.util.automaton,org.apache.lucene.util.bkd,org.apache.lucene.util.fst,org.apache.lucene.util.packed,org.junit,org.junit.internal,org.junit.rules,org.junit.runner,org.junit.runner.notification,org.junit.runners.model"/>
+		<attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=${javac.target.version}))&quot;"/>
+	  </jarify-additional-manifest-attributes>
+	</jarify>
+  </target>
+
 </project>
