Hello community, here is the log from the commit of package lucene for openSUSE:Factory checked in at 2019-09-27 14:52:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lucene (Old) and /work/SRC/openSUSE:Factory/.lucene.new.2352 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lucene" Fri Sep 27 14:52:30 2019 rev:26 rq:733515 version:7.1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/lucene/lucene.changes 2019-06-25 22:21:52.565105640 +0200 +++ /work/SRC/openSUSE:Factory/.lucene.new.2352/lucene.changes 2019-09-27 14:52:57.748060484 +0200 @@ -1,0 +2,24 @@ +Thu Sep 26 18:45:50 UTC 2019 - Fridrich Strba <[email protected]> + +- Fix property Provides and Obsoletes in order to make upgrade + smooth +- Added patch: + * lucene-osgi-manifests.patch + + Patch the build to produce OSGi manifests needed by eclipse +- Install the artifacts to "lucene" subdirectory and create + compatibility symlinks +- Install lucene-misc as archful artifact, since it contains + JNI code + +------------------------------------------------------------------- +Thu Sep 26 07:26:14 UTC 2019 - Fridrich Strba <[email protected]> + +- Upgrade to version 7.1.0 +- Added patches: + * 0001-Disable-ivy-settings.patch + * 0002-Dependency-generation.patch + + Sync with Fedora's 7.1.0 + * lucene-java8compat.patch + + Avoid using java9+ only functions + +------------------------------------------------------------------- Old: ---- lucene-6.6.0-src.tgz lucene-analyzers-common-6.6.0.pom lucene-analyzers-smartcn-6.6.0.pom lucene-analyzers-stempel-6.6.0.pom lucene-backward-codecs-6.6.0.pom lucene-classification-6.6.0.pom lucene-codecs-6.6.0.pom lucene-core-6.6.0.pom lucene-facet-6.6.0.pom lucene-grouping-6.6.0.pom lucene-highlighter-6.6.0.pom lucene-join-6.6.0.pom lucene-memory-6.6.0.pom lucene-misc-6.6.0.pom lucene-queries-6.6.0.pom lucene-queryparser-6.6.0.pom lucene-sandbox-6.6.0.pom lucene-spatial-6.6.0.pom lucene-spatial3d-6.6.0.pom New: ---- 0001-Disable-ivy-settings.patch 0002-Dependency-generation.patch lucene-7.1.0-src.tgz lucene-analyzers-common-7.1.0.pom lucene-analyzers-smartcn-7.1.0.pom lucene-analyzers-stempel-7.1.0.pom lucene-backward-codecs-7.1.0.pom lucene-classification-7.1.0.pom lucene-codecs-7.1.0.pom lucene-core-7.1.0.pom lucene-facet-7.1.0.pom lucene-grouping-7.1.0.pom lucene-highlighter-7.1.0.pom lucene-java8compat.patch lucene-join-7.1.0.pom lucene-memory-7.1.0.pom lucene-misc-7.1.0.pom lucene-osgi-manifests.patch lucene-queries-7.1.0.pom lucene-queryparser-7.1.0.pom lucene-sandbox-7.1.0.pom lucene-spatial-7.1.0.pom lucene-spatial3d-7.1.0.pom ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lucene.spec ++++++ --- /var/tmp/diff_new_pack.rtTJDm/_old 2019-09-27 14:53:01.492050748 +0200 +++ /var/tmp/diff_new_pack.rtTJDm/_new 2019-09-27 14:53:01.496050738 +0200 @@ -16,15 +16,14 @@ # -%define jarname lucene-core Name: lucene -Version: 6.6.0 +Version: 7.1.0 Release: 0 Summary: Text search engine License: Apache-2.0 Group: Development/Libraries/Java URL: http://lucene.apache.org/ -Source0: http://www.apache.org/dist/lucene/java/%{version}/%{name}-%{version}-src.tgz +Source0: http://archive.apache.org/dist/lucene/java/%{version}/%{name}-%{version}-src.tgz Source1: http://repo1.maven.org/maven2/org/apache/lucene/lucene-queryparser/%{version}/lucene-queryparser-%{version}.pom Source2: http://repo1.maven.org/maven2/org/apache/lucene/lucene-join/%{version}/lucene-join-%{version}.pom Source3: http://repo1.maven.org/maven2/org/apache/lucene/lucene-queries/%{version}/lucene-queries-%{version}.pom @@ -43,6 +42,10 @@ Source16: http://repo1.maven.org/maven2/org/apache/lucene/lucene-analyzers-smartcn/%{version}/lucene-analyzers-smartcn-%{version}.pom Source17: http://repo1.maven.org/maven2/org/apache/lucene/lucene-analyzers-stempel/%{version}/lucene-analyzers-stempel-%{version}.pom Source18: http://repo1.maven.org/maven2/org/apache/lucene/lucene-core/%{version}/lucene-core-%{version}.pom +Patch0: 0001-Disable-ivy-settings.patch +Patch1: 0002-Dependency-generation.patch +Patch2: lucene-java8compat.patch +Patch3: lucene-osgi-manifests.patch BuildRequires: ant >= 1.6 BuildRequires: ant-junit >= 1.6 BuildRequires: antlr-java @@ -62,7 +65,6 @@ BuildRequires: log4j BuildRequires: regexp BuildRequires: zip -BuildArch: noarch %description Apache Lucene is a full-text search engine written entirely in Java. @@ -70,7 +72,20 @@ incremental indexing, ranked searching, field-based searches and multi-index searches. -%files -f .mfiles +%package core +Summary: Text search engine +Group: Development/Libraries/Java +Provides: %{name} = %{version}-%{release} +Obsoletes: %{name} < %{version}-%{release} +BuildArch: noarch + +%description core +Apache Lucene is a full-text search engine written entirely in Java. +It offers fuzzy search based on edit (Levenshtein) distance, +incremental indexing, ranked searching, field-based searches and +multi-index searches. + +%files core -f .mfiles-core %license LICENSE.txt %doc CHANGES.txt README.txt @@ -80,6 +95,7 @@ Requires: mvn(org.apache.lucene:lucene-core) Requires: mvn(org.apache.lucene:lucene-queries) Requires: mvn(org.apache.lucene:lucene-sandbox) +BuildArch: noarch %description queryparser Apache Lucene is a full-text search engine written entirely in Java. @@ -91,6 +107,7 @@ Summary: Join module for lucene Group: Development/Libraries/Java Requires: mvn(org.apache.lucene:lucene-core) +BuildArch: noarch %description join Apache Lucene is a full-text search engine written entirely in Java. @@ -102,6 +119,7 @@ Summary: Queries module for lucene Group: Development/Libraries/Java Requires: mvn(org.apache.lucene:lucene-core) +BuildArch: noarch %description queries Apache Lucene is a full-text search engine written entirely in Java. @@ -115,6 +133,7 @@ Requires: mvn(org.apache.lucene:lucene-core) Requires: mvn(org.apache.lucene:lucene-grouping) Requires: mvn(org.apache.lucene:lucene-queries) +BuildArch: noarch %description classification Apache Lucene is a full-text search engine written entirely in Java. @@ -127,6 +146,7 @@ Group: Development/Libraries/Java Requires: mvn(org.apache.lucene:lucene-core) Requires: mvn(org.apache.lucene:lucene-queries) +BuildArch: noarch %description facet Apache Lucene is a full-text search engine written entirely in Java. @@ -138,6 +158,7 @@ Summary: Codecs module for lucene Group: Development/Libraries/Java Requires: mvn(org.apache.lucene:lucene-core) +BuildArch: noarch %description codecs Apache Lucene is a full-text search engine written entirely in Java. @@ -149,6 +170,7 @@ Summary: Backward-codecs module for lucene Group: Development/Libraries/Java Requires: mvn(org.apache.lucene:lucene-core) +BuildArch: noarch %description backward-codecs Apache Lucene is a full-text search engine written entirely in Java. @@ -161,6 +183,7 @@ Group: Development/Libraries/Java Requires: mvn(org.apache.lucene:lucene-core) Requires: mvn(org.apache.lucene:lucene-queries) +BuildArch: noarch %description grouping Apache Lucene is a full-text search engine written entirely in Java. @@ -176,6 +199,7 @@ Requires: mvn(org.apache.lucene:lucene-join) Requires: mvn(org.apache.lucene:lucene-memory) Requires: mvn(org.apache.lucene:lucene-queries) +BuildArch: noarch %description highlighter Apache Lucene is a full-text search engine written entirely in Java. @@ -187,6 +211,7 @@ Summary: Memory module for lucene Group: Development/Libraries/Java Requires: mvn(org.apache.lucene:lucene-core) +BuildArch: noarch %description memory Apache Lucene is a full-text search engine written entirely in Java. @@ -209,6 +234,7 @@ Summary: Sandbox module for lucene Group: Development/Libraries/Java Requires: mvn(org.apache.lucene:lucene-core) +BuildArch: noarch %description sandbox Apache Lucene is a full-text search engine written entirely in Java. @@ -220,6 +246,7 @@ Summary: Spatial3d module for lucene Group: Development/Libraries/Java Requires: mvn(org.apache.lucene:lucene-core) +BuildArch: noarch %description spatial3d Apache Lucene is a full-text search engine written entirely in Java. @@ -231,6 +258,7 @@ Summary: Spatial module for lucene Group: Development/Libraries/Java Requires: mvn(org.apache.lucene:lucene-core) +BuildArch: noarch %description spatial Apache Lucene is a full-text search engine written entirely in Java. @@ -242,6 +270,9 @@ Summary: Analyzers-common module for lucene Group: Development/Libraries/Java Requires: mvn(org.apache.lucene:lucene-core) +Provides: %{name}-analysis = %{version}-%{release} +Obsoletes: %{name}-analysis < %{version}-%{release} +BuildArch: noarch %description analyzers-common Apache Lucene is a full-text search engine written entirely in Java. @@ -254,6 +285,7 @@ Group: Development/Libraries/Java Requires: mvn(org.apache.lucene:lucene-analyzers-common) Requires: mvn(org.apache.lucene:lucene-core) +BuildArch: noarch %description analyzers-smartcn Apache Lucene is a full-text search engine written entirely in Java. @@ -266,6 +298,7 @@ Group: Development/Libraries/Java Requires: mvn(org.apache.lucene:lucene-analyzers-common) Requires: mvn(org.apache.lucene:lucene-core) +BuildArch: noarch %description analyzers-stempel Apache Lucene is a full-text search engine written entirely in Java. @@ -276,76 +309,92 @@ %prep %setup -q +%patch0 -p2 +%patch1 -p2 +%patch2 -p1 +%patch3 -p1 + %build export CLASSPATH=$(build-classpath commons-digester jtidy junit regexp) export OPT_JAR_LIST=: -ant \ +%ant \ -Djavacc.home=%{_bindir}/javacc \ -Djavacc.jar=%{_javadir}/javacc.jar \ -Djavacc.jar.dir=%{_javadir} \ -Djavadoc.link=%{_javadocdir}/java \ -Dversion=%{version} \ - -Divy.mode=local + -Divy.mode=local -Divy.available=true # DOESN'T BUILD BECAUSE OF MISSING DEPS: replicator expressions spatial-extras analyzers-kuromoji analyzers-morfologik analyzers-phonetic export modules="queryparser join queries classification facet codecs backward-codecs grouping highlighter memory misc sandbox spatial3d spatial" for mod in $modules do - ant -f module-build.xml \ + %ant -f module-build.xml \ -Djavacc.home=%{_bindir}/javacc \ -Djavacc.jar=%{_javadir}/javacc.jar \ -Djavacc.jar.dir=%{_javadir} \ -Djavadoc.link=%{_javadocdir}/java \ -Dversion=%{version} \ - -Divy.mode=local \ + -Divy.mode=local -Divy.available=true \ jar-$mod done export modanalyzers="common smartcn stempel" pushd analysis -ant \ +%ant \ -Djavacc.home=%{_bindir}/javacc \ -Djavacc.jar=%{_javadir}/javacc.jar \ -Djavacc.jar.dir=%{_javadir} \ -Djavadoc.link=%{_javadocdir}/java \ -Dversion=%{version} \ - -Divy.mode=local \ + -Divy.mode=local -Divy.available=true \ $modanalyzers %install -install -d -m 0755 %{buildroot}%{_javadir} +install -d -m 0755 %{buildroot}%{_javadir}/%{name} +install -d -m 0755 %{buildroot}%{_jnidir}/%{name} # maven pom dir -install -d -m 0755 %{buildroot}%{_mavenpomdir}/ +install -d -m 0755 %{buildroot}%{_mavenpomdir}/%{name} -install -p -m 0644 build/core/%{jarname}-%{version}.jar %{buildroot}%{_javadir}/%{jarname}.jar -cp %{_sourcedir}/lucene-core-%{version}.pom build/core/pom.xml -%pom_remove_parent build/core -%pom_xpath_inject "pom:project" "<version>%{version}</version>" build/core -install -p -m 0644 build/core/pom.xml %{buildroot}%{_mavenpomdir}/%{name}-core.pom -%add_maven_depmap %{name}-core.pom lucene-core.jar +export noarch_modules="core queryparser join queries classification facet codecs backward-codecs grouping highlighter memory sandbox spatial3d spatial" +for mod in $noarch_modules +do + install -p -m 0644 build/${mod}/%{name}-$mod-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}-$mod.jar + ln -sf %{name}/%{name}-$mod.jar %{buildroot}%{_javadir}/%{name}-$mod.jar + cp %{_sourcedir}/%{name}-${mod}-%{version}.pom build/${mod}/pom.xml + %pom_remove_parent build/${mod} + %pom_xpath_inject "pom:project" "<version>%{version}</version>" build/${mod} + install -p -m 0644 build/${mod}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}-${mod}.pom + %add_maven_depmap %{name}/%{name}-${mod}.pom %{name}/%{name}-${mod}.jar -f ${mod} + echo %{_javadir}/%{name}-$mod.jar >> .mfiles-${mod} +done -export modules="queryparser join queries classification facet codecs backward-codecs grouping highlighter memory misc sandbox spatial3d spatial" -for mod in $modules +export arch_modules="misc" +for mod in $arch_modules do - install -p -m 0644 build/${mod}/lucene-$mod-%{version}.jar %{buildroot}%{_javadir}/lucene-$mod.jar - cp %{_sourcedir}/lucene-${mod}-%{version}.pom build/${mod}/pom.xml + install -p -m 0644 build/${mod}/%{name}-$mod-%{version}.jar %{buildroot}%{_jnidir}/%{name}/%{name}-$mod.jar + ln -sf %{name}/%{name}-$mod.jar %{buildroot}%{_jnidir}/%{name}-$mod.jar + cp %{_sourcedir}/%{name}-${mod}-%{version}.pom build/${mod}/pom.xml %pom_remove_parent build/${mod} %pom_xpath_inject "pom:project" "<version>%{version}</version>" build/${mod} - install -p -m 0644 build/${mod}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}-${mod}.pom - %add_maven_depmap %{name}-${mod}.pom lucene-${mod}.jar -f ${mod} + install -p -m 0644 build/${mod}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}-${mod}.pom + %add_maven_depmap %{name}/%{name}-${mod}.pom %{name}/%{name}-${mod}.jar -f ${mod} + echo %{_jnidir}/%{name}-$mod.jar >> .mfiles-${mod} done export modanalyzers="common smartcn stempel" for mod in $modanalyzers do - install -p -m 0644 build/analysis/$mod/lucene-analyzers-$mod-%{version}.jar %{buildroot}%{_javadir}/lucene-analyzers-${mod}.jar + install -p -m 0644 build/analysis/$mod/%{name}-analyzers-$mod-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}-analyzers-${mod}.jar + ln -sf %{name}/%{name}-analyzers-$mod.jar %{buildroot}%{_javadir}/%{name}-analyzers-$mod.jar cp %{_sourcedir}/lucene-analyzers-${mod}-%{version}.pom build/analysis/$mod/pom.xml %pom_remove_parent build/analysis/$mod %pom_xpath_inject "pom:project" "<version>%{version}</version>" build/analysis/$mod - install -p -m 0644 build/analysis/$mod/pom.xml %{buildroot}%{_mavenpomdir}/%{name}-analyzers-${mod}.pom - %add_maven_depmap %{name}-analyzers-${mod}.pom lucene-analyzers-${mod}.jar -f analyzers-${mod} + install -p -m 0644 build/analysis/$mod/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}-analyzers-${mod}.pom + %add_maven_depmap %{name}/%{name}-analyzers-${mod}.pom %{name}/%{name}-analyzers-${mod}.jar -f analyzers-${mod} + echo %{_javadir}/%{name}-analyzers-$mod.jar >> .mfiles-analyzers-${mod} done # javadoc DOES NOT BUILD BECAUSE OF MISSING MVN DEPS ++++++ 0001-Disable-ivy-settings.patch ++++++ From f80ad58a1f6d253b5dab2f78ad49881c6b0aa25d Mon Sep 17 00:00:00 2001 From: Michael Simacek <[email protected]> Date: Thu, 25 Feb 2016 12:26:12 +0100 Subject: [PATCH 1/2] Disable ivy-settings --- lucene/common-build.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/lucene/common-build.xml b/lucene/common-build.xml index 9e259e9..5416e1e 100644 --- a/lucene/common-build.xml +++ b/lucene/common-build.xml @@ -394,7 +394,6 @@ you have an idea, fix it. unless="ivy.settings.uptodate" --> <!-- override: just for safety, should be unnecessary --> - <ivy:configure file="${common.dir}/top-level-ivy-settings.xml" override="true"/> <!-- <property name="ivy.settings.uptodate" value="true"/> --> </target> -- 2.5.0 ++++++ 0002-Dependency-generation.patch ++++++ From e345146f765c5f07db205694106b035866183b19 Mon Sep 17 00:00:00 2001 From: Michael Simacek <[email protected]> Date: Thu, 25 Feb 2016 15:03:17 +0100 Subject: [PATCH 2/2] Dependency generation --- lucene/build.xml | 6 ++++-- lucene/common-build.xml | 4 ++-- .../org/apache/lucene/dependencies/GetMavenDependenciesTask.java | 2 ++ 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/lucene/build.xml b/lucene/build.xml index 8aef144..2318a78 100644 --- a/lucene/build.xml +++ b/lucene/build.xml @@ -421,12 +421,14 @@ </sequential> </target> - <target name="generate-maven-artifacts" depends="-unpack-lucene-tgz"> - <ant dir=".." target="resolve" inheritall="false"/> + <target name="generate-maven-artifacts"> + <ant dir="." target="resolve" inheritall="false"/> <antcall target="-filter-pom-templates" inheritall="false"/> + <!-- <antcall target="-dist-maven" inheritall="false"> <propertyset refid="uptodate.and.compiled.properties"/> </antcall> + --> </target> <target name="-validate-maven-dependencies" depends="compile-tools, install-maven-tasks, load-custom-tasks"> diff --git a/lucene/common-build.xml b/lucene/common-build.xml index 5416e1e..783c63e 100644 --- a/lucene/common-build.xml +++ b/lucene/common-build.xml @@ -1792,9 +1792,9 @@ ${ant.project.name}.test.dependencies=${test.classpath.list} <property name="maven.dependencies.filters.file" location="${common.build.dir}/maven.dependencies.filters.properties"/> <target name="-get-maven-dependencies" depends="compile-tools,load-custom-tasks"> - <ant dir="${common.dir}/.." target="-append-all-modules-dependencies-properties" inheritall="false"/> + <ant dir="${common.dir}" target="-append-module-dependencies-properties" inheritall="false"/> <get-maven-dependencies-macro - dir="${common.dir}/.." + dir="." centralized.versions.file="${common.dir}/ivy-versions.properties" module.dependencies.properties.file="${module.dependencies.properties.file}" maven.dependencies.filters.file="${maven.dependencies.filters.file}"/> diff --git a/lucene/tools/src/java/org/apache/lucene/dependencies/GetMavenDependenciesTask.java b/lucene/tools/src/java/org/apache/lucene/dependencies/GetMavenDependenciesTask.java index c998342..ddfd42c 100644 --- a/lucene/tools/src/java/org/apache/lucene/dependencies/GetMavenDependenciesTask.java +++ b/lucene/tools/src/java/org/apache/lucene/dependencies/GetMavenDependenciesTask.java @@ -480,6 +480,7 @@ public class GetMavenDependenciesTask extends Task { private Collection<String> getTransitiveDependenciesFromIvyCache (String groupId, String artifactId, String version) { SortedSet<String> transitiveDependencies = new TreeSet<>(); + /* // E.g. ~/.ivy2/cache/xerces/xercesImpl/ivy-2.9.1.xml File ivyXmlFile = new File(new File(new File(ivyCacheDir, groupId), artifactId), "ivy-" + version + ".xml"); if ( ! ivyXmlFile.exists()) { @@ -501,6 +502,7 @@ public class GetMavenDependenciesTask extends Task { + groupId + ':' + artifactId + ':' + version + " from " + ivyXmlFile.getAbsolutePath(), e); } + */ return transitiveDependencies; } -- 2.5.0 ++++++ lucene-6.6.0-src.tgz -> lucene-7.1.0-src.tgz ++++++ /work/SRC/openSUSE:Factory/lucene/lucene-6.6.0-src.tgz /work/SRC/openSUSE:Factory/.lucene.new.2352/lucene-7.1.0-src.tgz differ: char 14, line 1 ++++++ lucene-analyzers-common-6.6.0.pom -> lucene-analyzers-common-7.1.0.pom ++++++ --- /work/SRC/openSUSE:Factory/lucene/lucene-analyzers-common-6.6.0.pom 2017-08-24 18:37:13.765607117 +0200 +++ /work/SRC/openSUSE:Factory/.lucene.new.2352/lucene-analyzers-common-7.1.0.pom 2019-09-27 14:52:36.912114664 +0200 @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.lucene</groupId> <artifactId>lucene-parent</artifactId> - <version>6.6.0</version> + <version>7.1.0</version> <relativePath>../../pom.xml</relativePath> </parent> <groupId>org.apache.lucene</groupId> ++++++ lucene-analyzers-smartcn-6.6.0.pom -> lucene-analyzers-smartcn-7.1.0.pom ++++++ --- /work/SRC/openSUSE:Factory/lucene/lucene-analyzers-smartcn-6.6.0.pom 2017-08-24 18:37:15.945300040 +0200 +++ /work/SRC/openSUSE:Factory/.lucene.new.2352/lucene-analyzers-smartcn-7.1.0.pom 2019-09-27 14:52:37.876112158 +0200 @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.lucene</groupId> <artifactId>lucene-parent</artifactId> - <version>6.6.0</version> + <version>7.1.0</version> <relativePath>../../pom.xml</relativePath> </parent> <groupId>org.apache.lucene</groupId> ++++++ lucene-analyzers-stempel-6.6.0.pom -> lucene-analyzers-stempel-7.1.0.pom ++++++ --- /work/SRC/openSUSE:Factory/lucene/lucene-analyzers-stempel-6.6.0.pom 2017-08-24 18:37:18.604925350 +0200 +++ /work/SRC/openSUSE:Factory/.lucene.new.2352/lucene-analyzers-stempel-7.1.0.pom 2019-09-27 14:52:38.384110836 +0200 @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.lucene</groupId> <artifactId>lucene-parent</artifactId> - <version>6.6.0</version> + <version>7.1.0</version> <relativePath>../../pom.xml</relativePath> </parent> <groupId>org.apache.lucene</groupId> ++++++ lucene-backward-codecs-6.6.0.pom -> lucene-backward-codecs-7.1.0.pom ++++++ --- /work/SRC/openSUSE:Factory/lucene/lucene-backward-codecs-6.6.0.pom 2017-08-24 18:37:20.716627851 +0200 +++ /work/SRC/openSUSE:Factory/.lucene.new.2352/lucene-backward-codecs-7.1.0.pom 2019-09-27 14:52:38.896109505 +0200 @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.lucene</groupId> <artifactId>lucene-parent</artifactId> - <version>6.6.0</version> + <version>7.1.0</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.lucene</groupId> @@ -78,5 +78,18 @@ </excludes> </testResource> </testResources> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>test-jar</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> </build> </project> ++++++ lucene-classification-6.6.0.pom -> lucene-classification-7.1.0.pom ++++++ --- /work/SRC/openSUSE:Factory/lucene/lucene-classification-6.6.0.pom 2017-08-24 18:37:21.368536010 +0200 +++ /work/SRC/openSUSE:Factory/.lucene.new.2352/lucene-classification-7.1.0.pom 2019-09-27 14:52:39.124108912 +0200 @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.lucene</groupId> <artifactId>lucene-parent</artifactId> - <version>6.6.0</version> + <version>7.1.0</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.lucene</groupId> @@ -50,6 +50,10 @@ </dependency> <dependency> <groupId>org.apache.lucene</groupId> + <artifactId>lucene-analyzers-common</artifactId> + </dependency> + <dependency> + <groupId>org.apache.lucene</groupId> <artifactId>lucene-core</artifactId> </dependency> <dependency> @@ -63,11 +67,6 @@ <dependency> <groupId>org.apache.lucene</groupId> - <artifactId>lucene-analyzers-common</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.lucene</groupId> <artifactId>lucene-codecs</artifactId> <scope>test</scope> </dependency> ++++++ lucene-codecs-6.6.0.pom -> lucene-codecs-7.1.0.pom ++++++ --- /work/SRC/openSUSE:Factory/lucene/lucene-codecs-6.6.0.pom 2017-08-24 18:37:22.448383880 +0200 +++ /work/SRC/openSUSE:Factory/.lucene.new.2352/lucene-codecs-7.1.0.pom 2019-09-27 14:52:39.580107726 +0200 @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.lucene</groupId> <artifactId>lucene-parent</artifactId> - <version>6.6.0</version> + <version>7.1.0</version> <relativePath>../../../pom.xml</relativePath> </parent> <groupId>org.apache.lucene</groupId> ++++++ lucene-core-6.6.0.pom -> lucene-core-7.1.0.pom ++++++ --- /work/SRC/openSUSE:Factory/lucene/lucene-core-6.6.0.pom 2017-08-24 18:37:24.628076803 +0200 +++ /work/SRC/openSUSE:Factory/.lucene.new.2352/lucene-core-7.1.0.pom 2019-09-27 14:52:39.996106645 +0200 @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.lucene</groupId> <artifactId>lucene-parent</artifactId> - <version>6.6.0</version> + <version>7.1.0</version> <relativePath>../../../pom.xml</relativePath> </parent> <groupId>org.apache.lucene</groupId> ++++++ lucene-facet-6.6.0.pom -> lucene-facet-7.1.0.pom ++++++ --- /work/SRC/openSUSE:Factory/lucene/lucene-facet-6.6.0.pom 2017-08-24 18:37:27.635653093 +0200 +++ /work/SRC/openSUSE:Factory/.lucene.new.2352/lucene-facet-7.1.0.pom 2019-09-27 14:52:40.492105355 +0200 @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.lucene</groupId> <artifactId>lucene-parent</artifactId> - <version>6.6.0</version> + <version>7.1.0</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.lucene</groupId> ++++++ lucene-grouping-6.6.0.pom -> lucene-grouping-7.1.0.pom ++++++ --- /work/SRC/openSUSE:Factory/lucene/lucene-grouping-6.6.0.pom 2017-08-24 18:37:31.179153882 +0200 +++ /work/SRC/openSUSE:Factory/.lucene.new.2352/lucene-grouping-7.1.0.pom 2019-09-27 14:52:41.164103607 +0200 @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.lucene</groupId> <artifactId>lucene-parent</artifactId> - <version>6.6.0</version> + <version>7.1.0</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.lucene</groupId> ++++++ lucene-highlighter-6.6.0.pom -> lucene-highlighter-7.1.0.pom ++++++ --- /work/SRC/openSUSE:Factory/lucene/lucene-highlighter-6.6.0.pom 2017-08-24 18:37:32.862916672 +0200 +++ /work/SRC/openSUSE:Factory/.lucene.new.2352/lucene-highlighter-7.1.0.pom 2019-09-27 14:52:42.084101215 +0200 @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.lucene</groupId> <artifactId>lucene-parent</artifactId> - <version>6.6.0</version> + <version>7.1.0</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.lucene</groupId> ++++++ lucene-java8compat.patch ++++++ --- lucene-7.1.0/analysis/kuromoji/src/tools/java/org/apache/lucene/analysis/ja/util/BinaryDictionaryWriter.java 2017-10-13 18:14:40.000000000 +0200 +++ lucene-7.1.0.new/analysis/kuromoji/src/tools/java/org/apache/lucene/analysis/ja/util/BinaryDictionaryWriter.java 2019-09-26 09:19:44.404112874 +0200 @@ -22,6 +22,7 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStream; +import java.nio.Buffer; import java.nio.ByteBuffer; import java.nio.channels.Channels; import java.nio.channels.WritableByteChannel; @@ -94,7 +95,7 @@ int worstCase = 4 + 3 + 2*(baseForm.length() + reading.length() + pronunciation.length()); if (worstCase > left) { ByteBuffer newBuffer = ByteBuffer.allocate(ArrayUtil.oversize(buffer.limit() + worstCase - left, 1)); - buffer.flip(); + ((Buffer)buffer).flip(); newBuffer.put(buffer); buffer = newBuffer; } @@ -306,7 +307,7 @@ out.writeVInt(buffer.position()); final WritableByteChannel channel = Channels.newChannel(os); // Write Buffer - buffer.flip(); // set position to 0, set limit to current position + ((Buffer)buffer).flip(); // set position to 0, set limit to current position channel.write(buffer); assert buffer.remaining() == 0L; } finally { --- lucene-7.1.0/core/src/java/org/apache/lucene/store/ByteBufferIndexInput.java 2017-10-13 18:14:40.000000000 +0200 +++ lucene-7.1.0.new/core/src/java/org/apache/lucene/store/ByteBufferIndexInput.java 2019-09-26 09:19:44.404112874 +0200 @@ -19,6 +19,7 @@ import java.io.EOFException; import java.io.IOException; +import java.nio.Buffer; import java.nio.BufferUnderflowException; import java.nio.ByteBuffer; @@ -75,7 +76,7 @@ throw new EOFException("read past EOF: " + this); } curBuf = buffers[curBufIndex]; - curBuf.position(0); + ((Buffer)curBuf).position(0); } while (!curBuf.hasRemaining()); return guard.getByte(curBuf); } catch (NullPointerException npe) { @@ -98,7 +99,7 @@ throw new EOFException("read past EOF: " + this); } curBuf = buffers[curBufIndex]; - curBuf.position(0); + ((Buffer)curBuf).position(0); curAvail = curBuf.remaining(); } guard.getBytes(curBuf, b, offset, len); @@ -156,10 +157,10 @@ final int bi = (int) (pos >> chunkSizePower); try { if (bi == curBufIndex) { - curBuf.position((int) (pos & chunkSizeMask)); + ((Buffer)curBuf).position((int) (pos & chunkSizeMask)); } else { final ByteBuffer b = buffers[bi]; - b.position((int) (pos & chunkSizeMask)); + ((Buffer)b).position((int) (pos & chunkSizeMask)); // write values, on exception all is unchanged this.curBufIndex = bi; this.curBuf = b; @@ -187,7 +188,7 @@ private void setPos(long pos, int bi) throws IOException { try { final ByteBuffer b = buffers[bi]; - b.position((int) (pos & chunkSizeMask)); + ((Buffer)b).position((int) (pos & chunkSizeMask)); this.curBufIndex = bi; this.curBuf = b; } catch (ArrayIndexOutOfBoundsException | IllegalArgumentException aioobe) { @@ -287,7 +288,7 @@ @SuppressWarnings("resource") protected ByteBufferIndexInput newCloneInstance(String newResourceDescription, ByteBuffer[] newBuffers, int offset, long length) { if (newBuffers.length == 1) { - newBuffers[0].position(offset); + ((Buffer)newBuffers[0]).position(offset); return new SingleBufferImpl(newResourceDescription, newBuffers[0].slice(), length, chunkSizePower, this.guard); } else { return new MultiBufferImpl(newResourceDescription, newBuffers, offset, length, chunkSizePower, guard); @@ -311,7 +312,7 @@ } // set the last buffer's limit for the sliced view. - slices[slices.length - 1].limit((int) (sliceEnd & chunkSizeMask)); + ((Buffer)slices[slices.length - 1]).limit((int) (sliceEnd & chunkSizeMask)); return slices; } @@ -350,7 +351,7 @@ super(resourceDescription, new ByteBuffer[] { buffer }, length, chunkSizePower, guard); this.curBufIndex = 0; this.curBuf = buffer; - buffer.position(0); + ((Buffer)buffer).position(0); } // TODO: investigate optimizing readByte() & Co? @@ -358,7 +359,7 @@ @Override public void seek(long pos) throws IOException { try { - curBuf.position((int) pos); + ((Buffer)curBuf).position((int) pos); } catch (IllegalArgumentException e) { if (pos < 0) { throw new IllegalArgumentException("Seeking to negative position: " + this, e); --- lucene-7.1.0/core/src/java/org/apache/lucene/store/NIOFSDirectory.java 2017-10-13 18:14:40.000000000 +0200 +++ lucene-7.1.0.new/core/src/java/org/apache/lucene/store/NIOFSDirectory.java 2019-09-26 09:19:44.404112874 +0200 @@ -18,6 +18,7 @@ import java.io.EOFException; import java.io.IOException; +import java.nio.Buffer; import java.nio.ByteBuffer; import java.nio.channels.ClosedChannelException; // javadoc @link import java.nio.channels.FileChannel; @@ -159,7 +160,7 @@ // Use our own pre-wrapped byteBuf: assert byteBuf != null; bb = byteBuf; - byteBuf.clear().position(offset); + ((Buffer)byteBuf).clear().position(offset); } else { bb = ByteBuffer.wrap(b, offset, len); } @@ -174,7 +175,7 @@ int readLength = len; while (readLength > 0) { final int toRead = Math.min(CHUNK_SIZE, readLength); - bb.limit(bb.position() + toRead); + ((Buffer)bb).limit(bb.position() + toRead); assert bb.remaining() == toRead; final int i = channel.read(bb, pos); if (i < 0) { // be defensive here, even though we checked before hand, something could have changed --- lucene-7.1.0/core/src/java/org/apache/lucene/store/SimpleFSDirectory.java 2017-10-13 18:14:40.000000000 +0200 +++ lucene-7.1.0.new/core/src/java/org/apache/lucene/store/SimpleFSDirectory.java 2019-09-26 09:19:44.404112874 +0200 @@ -19,6 +19,7 @@ import java.io.EOFException; import java.io.IOException; +import java.nio.Buffer; import java.nio.ByteBuffer; import java.nio.channels.SeekableByteChannel; import java.nio.channels.ClosedChannelException; // javadoc @link @@ -155,7 +156,7 @@ // Use our own pre-wrapped byteBuf: assert byteBuf != null; bb = byteBuf; - byteBuf.clear().position(offset); + ((Buffer)byteBuf).clear().position(offset); } else { bb = ByteBuffer.wrap(b, offset, len); } --- lucene-7.1.0/misc/src/java/org/apache/lucene/store/NativeUnixDirectory.java 2017-10-13 18:14:41.000000000 +0200 +++ lucene-7.1.0.new/misc/src/java/org/apache/lucene/store/NativeUnixDirectory.java 2019-09-26 09:19:44.408112899 +0200 @@ -21,6 +21,7 @@ import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; +import java.nio.Buffer; import java.nio.ByteBuffer; import java.nio.channels.FileChannel; import java.nio.file.Path; @@ -212,7 +213,7 @@ //} private void dump() throws IOException { - buffer.flip(); + ((Buffer)buffer).flip(); final long limit = filePos + buffer.limit(); if (limit > fileLength) { // this dump extends the file @@ -222,7 +223,7 @@ } // must always round to next block - buffer.limit((int) ((buffer.limit() + ALIGN - 1) & ALIGN_NOT_MASK)); + ((Buffer)buffer).limit((int) ((buffer.limit() + ALIGN - 1) & ALIGN_NOT_MASK)); assert (buffer.limit() & ALIGN_NOT_MASK) == buffer.limit() : "limit=" + buffer.limit() + " vs " + (buffer.limit() & ALIGN_NOT_MASK); assert (filePos & ALIGN_NOT_MASK) == filePos; @@ -230,7 +231,7 @@ channel.write(buffer, filePos); filePos += bufferPos; bufferPos = 0; - buffer.clear(); + ((Buffer)buffer).clear(); //System.out.println("dump: done"); // TODO: the case where we'd seek'd back, wrote an @@ -341,7 +342,7 @@ final int delta = (int) (pos - alignedPos); if (delta != 0) { refill(); - buffer.position(delta); + ((Buffer)buffer).position(delta); bufferPos = delta; } else { // force refill on next read @@ -373,7 +374,7 @@ } private void refill() throws IOException { - buffer.clear(); + ((Buffer)buffer).clear(); filePos += bufferSize; bufferPos = 0; assert (filePos & ALIGN_NOT_MASK) == filePos : "filePos=" + filePos + " anded=" + (filePos & ALIGN_NOT_MASK); @@ -387,7 +388,7 @@ if (n < 0) { throw new EOFException("read past EOF: " + this); } - buffer.rewind(); + ((Buffer)buffer).rewind(); } @Override --- lucene-7.1.0/replicator/src/test/org/apache/lucene/replicator/nrt/SimpleTransLog.java 2017-10-13 18:14:41.000000000 +0200 +++ lucene-7.1.0.new/replicator/src/test/org/apache/lucene/replicator/nrt/SimpleTransLog.java 2019-09-26 09:19:44.408112899 +0200 @@ -20,6 +20,7 @@ import java.io.Closeable; import java.io.EOFException; import java.io.IOException; +import java.nio.Buffer; import java.nio.ByteBuffer; import java.nio.channels.FileChannel; import java.nio.file.Path; @@ -93,8 +94,8 @@ intBuffer[1] = (byte) (len >> 16); intBuffer[2] = (byte) (len >> 8); intBuffer[3] = (byte) len; - intByteBuffer.limit(4); - intByteBuffer.position(0); + ((Buffer)intByteBuffer).limit(4); + ((Buffer)intByteBuffer).position(0); writeBytesToChannel(intByteBuffer); writeBytesToChannel(ByteBuffer.wrap(bytes)); @@ -131,8 +132,8 @@ long pos = start; while (pos < end) { - intByteBuffer.position(0); - intByteBuffer.limit(4); + ((Buffer)intByteBuffer).position(0); + ((Buffer)intByteBuffer).limit(4); readBytesFromChannel(pos, intByteBuffer); pos += 4; int len = ((intBuffer[0] & 0xff) << 24) | ++++++ lucene-join-6.6.0.pom -> lucene-join-7.1.0.pom ++++++ --- /work/SRC/openSUSE:Factory/lucene/lucene-join-6.6.0.pom 2017-08-24 18:37:34.878632697 +0200 +++ /work/SRC/openSUSE:Factory/.lucene.new.2352/lucene-join-7.1.0.pom 2019-09-27 14:52:43.972096305 +0200 @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.lucene</groupId> <artifactId>lucene-parent</artifactId> - <version>6.6.0</version> + <version>7.1.0</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.lucene</groupId> ++++++ lucene-memory-6.6.0.pom -> lucene-memory-7.1.0.pom ++++++ --- /work/SRC/openSUSE:Factory/lucene/lucene-memory-6.6.0.pom 2017-08-24 18:37:36.702375767 +0200 +++ /work/SRC/openSUSE:Factory/.lucene.new.2352/lucene-memory-7.1.0.pom 2019-09-27 14:52:44.872093965 +0200 @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.lucene</groupId> <artifactId>lucene-parent</artifactId> - <version>6.6.0</version> + <version>7.1.0</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.lucene</groupId> ++++++ lucene-misc-6.6.0.pom -> lucene-misc-7.1.0.pom ++++++ --- /work/SRC/openSUSE:Factory/lucene/lucene-misc-6.6.0.pom 2017-08-24 18:37:37.910205607 +0200 +++ /work/SRC/openSUSE:Factory/.lucene.new.2352/lucene-misc-7.1.0.pom 2019-09-27 14:52:45.432092509 +0200 @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.lucene</groupId> <artifactId>lucene-parent</artifactId> - <version>6.6.0</version> + <version>7.1.0</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.lucene</groupId> ++++++ lucene-osgi-manifests.patch ++++++ diff -urEbwB lucene-7.1.0/analysis/common/build.xml lucene-7.1.0.new/analysis/common/build.xml --- lucene-7.1.0/analysis/common/build.xml 2019-09-26 10:59:46.324505233 +0200 +++ lucene-7.1.0.new/analysis/common/build.xml 2019-09-26 13:11:06.747970634 +0200 @@ -136,4 +136,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="${version}";analysis=split;mandatory:=analysis,org.apache.lucene.analysis.ar;version="${version}",org.apache.lucene.analysis.bg;version="${version}",org.apache.lucene.analysis.bn;version="${version}",org.apache.lucene.analysis.br;version="${version}",org.apache.lucene.analysis.ca;version="${version}",org.apache.lucene.analysis.charfilter;version="${version}",org.apache.lucene.analysis.cjk;version="${version}",org.apache.lucene.analysis.ckb;version="${version}",org.apache.lucene.analysis.commongrams;version="${version}",org.apache.lucene.analysis.compound;version="${version}",org.apache.lucene.analysis.compound.hyphenation;version="${version}",org.apache.lucene.analysis.core;version="${version}",org.apache.lucene.analysis.custom;version="${version}",org.apache.lucene.analysis.cz;version="${version}",org.apache.lucene.analysis.da;version="${version}",org.apache.lucene.analysis.de;version="${version}",org.apache.lucene.analysis.el;version="${version}",org.apache.lucene.analysis.en;version="${version}",org.apache.lucene.analysis.es;version="${version}",org.apache.lucene.analysis.eu;version="${version}",org.apache.lucene.analysis.fa;version="${version}",org.apache.lucene.analysis.fi;version="${version}",org.apache.lucene.analysis.fr;version="${version}",org.apache.lucene.analysis.ga;version="${version}",org.apache.lucene.analysis.gl;version="${version}",org.apache.lucene.analysis.hi;version="${version}",org.apache.lucene.analysis.hu;version="${version}",org.apache.lucene.analysis.hunspell;version="${version}",org.apache.lucene.analysis.hy;version="${version}",org.apache.lucene.analysis.id;version="${version}",org.apache.lucene.analysis.in;version="${version}",org.apache.lucene.analysis.it;version="${version}",org.apache.lucene.analysis.lt;version="${version}",org.apache.lucene.analysis.lv;version="${version}",org.apache.lucene.analysis.minhash;version="${version}",org.apache.lucene.analysis.miscellaneous;version="${version}",org.apache.lucene.analysis.ngram;version="${version}",org.apache.lucene.analysis.nl;version="${version}",org.apache.lucene.analysis.no;version="${version}",org.apache.lucene.analysis.path;version="${version}",org.apache.lucene.analysis.pattern;version="${version}",org.apache.lucene.analysis.payloads;version="${version}",org.apache.lucene.analysis.pt;version="${version}",org.apache.lucene.analysis.query;version="${version}",org.apache.lucene.analysis.reverse;version="${version}",org.apache.lucene.analysis.ro;version="${version}",org.apache.lucene.analysis.ru;version="${version}",org.apache.lucene.analysis.shingle;version="${version}",org.apache.lucene.analysis.sinks;version="${version}",org.apache.lucene.analysis.snowball;version="${version}",org.apache.lucene.analysis.sr;version="${version}",org.apache.lucene.analysis.sv;version="${version}",org.apache.lucene.analysis.synonym;version="${version}",org.apache.lucene.analysis.th;version="${version}",org.apache.lucene.analysis.tr;version="${version}",org.apache.lucene.analysis.util;version="${version}",org.apache.lucene.analysis.wikipedia;version="${version}",org.apache.lucene.collation;version="${version}",org.apache.lucene.collation.tokenattributes;version="${version}",org.tartarus.snowball;version="${version}",org.tartarus.snowball.ext;version="${version}""/> + <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="${version}""/> + <attribute name="Require-Capability" value="osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=${javac.target.version}))""/> + </jarify-additional-manifest-attributes> + </jarify> + </target> + </project> diff -urEbwB lucene-7.1.0/analysis/smartcn/build.xml lucene-7.1.0.new/analysis/smartcn/build.xml --- lucene-7.1.0/analysis/smartcn/build.xml 2019-09-26 10:59:46.344505354 +0200 +++ lucene-7.1.0.new/analysis/smartcn/build.xml 2019-09-26 13:11:06.767970753 +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="${version}",org.apache.lucene.analysis.cn.smart.hhmm;version="${version}""/> + <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:="(&(osgi.ee=JavaSE)(version=${javac.target.version}))""/> + </jarify-additional-manifest-attributes> + </jarify> + </target> + </project> diff -urEbwB lucene-7.1.0/analysis/stempel/build.xml lucene-7.1.0.new/analysis/stempel/build.xml --- lucene-7.1.0/analysis/stempel/build.xml 2019-09-26 10:59:46.348505378 +0200 +++ lucene-7.1.0.new/analysis/stempel/build.xml 2019-09-26 13:39:12.641247294 +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="${version}",org.apache.lucene.analysis.stempel;version="${version}",org.egothor.stemmer;version="${version}""/> + <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:="(&(osgi.ee=JavaSE)(version=${javac.target.version}))""/> + </jarify-additional-manifest-attributes> + </jarify> + </target> + <target name="compile-core" depends="jar-analyzers-common, common.compile-core"/> </project> diff -urEbwB lucene-7.1.0/backward-codecs/build.xml lucene-7.1.0.new/backward-codecs/build.xml --- lucene-7.1.0/backward-codecs/build.xml 2019-09-26 10:59:46.348505378 +0200 +++ lucene-7.1.0.new/backward-codecs/build.xml 2019-09-26 13:41:52.297963836 +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="${version}",org.apache.lucene.codecs.lucene50;version="${version}",org.apache.lucene.codecs.lucene53;version="${version}",org.apache.lucene.codecs.lucene54;version="${version}",org.apache.lucene.codecs.lucene60;version="${version}",org.apache.lucene.codecs.lucene62;version="${version}",org.apache.lucene.index;version="${version}""/> + <attribute name="Import-Package" value="org.apache.lucene.codecs,org.apache.lucene.codecs.lucene50,org.apache.lucene.codecs.lucene53,org.apache.lucene.codecs.lucene60,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:="(&(osgi.ee=JavaSE)(version=${javac.target.version}))""/> + </jarify-additional-manifest-attributes> + </jarify> + </target> + </project> Binary files lucene-7.1.0/build/analysis/common/lucene-analyzers-common-7.1.0.jar and lucene-7.1.0.new/build/analysis/common/lucene-analyzers-common-7.1.0.jar differ Binary files lucene-7.1.0/build/analysis/smartcn/lucene-analyzers-smartcn-7.1.0.jar and lucene-7.1.0.new/build/analysis/smartcn/lucene-analyzers-smartcn-7.1.0.jar differ Binary files lucene-7.1.0/build/analysis/stempel/lucene-analyzers-stempel-7.1.0.jar and lucene-7.1.0.new/build/analysis/stempel/lucene-analyzers-stempel-7.1.0.jar differ Binary files lucene-7.1.0/build/backward-codecs/lucene-backward-codecs-7.1.0.jar and lucene-7.1.0.new/build/backward-codecs/lucene-backward-codecs-7.1.0.jar differ Binary files lucene-7.1.0/build/classification/lucene-classification-7.1.0.jar and lucene-7.1.0.new/build/classification/lucene-classification-7.1.0.jar differ Binary files lucene-7.1.0/build/codecs/lucene-codecs-7.1.0.jar and lucene-7.1.0.new/build/codecs/lucene-codecs-7.1.0.jar differ Binary files lucene-7.1.0/build/core/lucene-core-7.1.0.jar and lucene-7.1.0.new/build/core/lucene-core-7.1.0.jar differ Binary files lucene-7.1.0/build/facet/lucene-facet-7.1.0.jar and lucene-7.1.0.new/build/facet/lucene-facet-7.1.0.jar differ Binary files lucene-7.1.0/build/grouping/lucene-grouping-7.1.0.jar and lucene-7.1.0.new/build/grouping/lucene-grouping-7.1.0.jar differ Binary files lucene-7.1.0/build/highlighter/lucene-highlighter-7.1.0.jar and lucene-7.1.0.new/build/highlighter/lucene-highlighter-7.1.0.jar differ Binary files lucene-7.1.0/build/join/lucene-join-7.1.0.jar and lucene-7.1.0.new/build/join/lucene-join-7.1.0.jar differ Binary files lucene-7.1.0/build/memory/lucene-memory-7.1.0.jar and lucene-7.1.0.new/build/memory/lucene-memory-7.1.0.jar differ Binary files lucene-7.1.0/build/misc/lucene-misc-7.1.0.jar and lucene-7.1.0.new/build/misc/lucene-misc-7.1.0.jar differ Binary files lucene-7.1.0/build/queries/lucene-queries-7.1.0.jar and lucene-7.1.0.new/build/queries/lucene-queries-7.1.0.jar differ Binary files lucene-7.1.0/build/queryparser/lucene-queryparser-7.1.0.jar and lucene-7.1.0.new/build/queryparser/lucene-queryparser-7.1.0.jar differ Binary files lucene-7.1.0/build/sandbox/lucene-sandbox-7.1.0.jar and lucene-7.1.0.new/build/sandbox/lucene-sandbox-7.1.0.jar differ Binary files lucene-7.1.0/build/spatial/lucene-spatial-7.1.0.jar and lucene-7.1.0.new/build/spatial/lucene-spatial-7.1.0.jar differ Binary files lucene-7.1.0/build/spatial3d/lucene-spatial3d-7.1.0.jar and lucene-7.1.0.new/build/spatial3d/lucene-spatial3d-7.1.0.jar differ diff -urEbwB lucene-7.1.0/classification/build.xml lucene-7.1.0.new/classification/build.xml --- lucene-7.1.0/classification/build.xml 2019-09-26 10:59:46.468506103 +0200 +++ lucene-7.1.0.new/classification/build.xml 2019-09-26 13:46:31.667620957 +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="${version}",org.apache.lucene.classification.document;version="${version}",org.apache.lucene.classification.utils;version="${version}""/> + <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:="(&(osgi.ee=JavaSE)(version=${javac.target.version}))""/> + </jarify-additional-manifest-attributes> + </jarify> + </target> <target name="javadocs" depends="javadocs-grouping,compile-core,check-javadocs-uptodate" unless="javadocs-uptodate-${name}"> diff -urEbwB lucene-7.1.0/common-build.xml lucene-7.1.0.new/common-build.xml --- lucene-7.1.0/common-build.xml 2019-09-26 10:59:46.468506103 +0200 +++ lucene-7.1.0.new/common-build.xml 2019-09-26 13:11:06.787970873 +0200 @@ -162,6 +162,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/"/> @@ -694,7 +695,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}"/> diff -urEbwB lucene-7.1.0/core/build.xml lucene-7.1.0.new/core/build.xml --- lucene-7.1.0/core/build.xml 2019-09-26 10:59:46.524506441 +0200 +++ lucene-7.1.0.new/core/build.xml 2019-09-26 13:11:06.927971710 +0200 @@ -186,6 +186,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="${version}",org.apache.lucene.analysis;version="${version}",org.apache.lucene.analysis.standard;version="${version}",org.apache.lucene.analysis.tokenattributes;version="${version}",org.apache.lucene.codecs;version="${version}",org.apache.lucene.codecs.blocktree;version="${version}",org.apache.lucene.codecs.compressing;version="${version}",org.apache.lucene.codecs.lucene50;version="${version}",org.apache.lucene.codecs.lucene60;version="${version}",org.apache.lucene.codecs.lucene62;version="${version}",org.apache.lucene.codecs.lucene70;version="${version}",org.apache.lucene.codecs.perfield;version="${version}",org.apache.lucene.document;version="${version}",org.apache.lucene.geo;version="${version}",org.apache.lucene.index;version="${version}",org.apache.lucene.search;version="${version}",org.apache.lucene.search.similarities;version="${version}",org.apache.lucene.search.spans;version="${version}",org.apache.lucene.store;version="${version}",org.apache.lucene.util;version="${version}",org.apache.lucene.util.automaton;version="${version}",org.apache.lucene.util.bkd;version="${version}",org.apache.lucene.util.fst;version="${version}",org.apache.lucene.util.graph;version="${version}",org.apache.lucene.util.mutable;version="${version}",org.apache.lucene.util.packed;version="${version}""/> + <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.perfield,org.apache.lucene.document,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.graph,org.apache.lucene.util.packed"/> + <attribute name="Require-Capability" value="osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=${javac.target.version}))""/> + </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: --> diff -urEbwB lucene-7.1.0/facet/build.xml lucene-7.1.0.new/facet/build.xml --- lucene-7.1.0/facet/build.xml 2019-09-26 10:59:46.532506490 +0200 +++ lucene-7.1.0.new/facet/build.xml 2019-09-26 13:55:52.878962570 +0200 @@ -48,4 +48,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="${version}",org.apache.lucene.facet.range;version="${version}",org.apache.lucene.facet.sortedset;version="${version}",org.apache.lucene.facet.taxonomy;version="${version}",org.apache.lucene.facet.taxonomy.directory;version="7.1.0",org.apache.lucene.facet.taxonomy.writercache;version="7.1.0""/> + <attribute name="Import-Package" value="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:="(&(osgi.ee=JavaSE)(version=${javac.target.version}))""/> + </jarify-additional-manifest-attributes> + </jarify> + </target> + </project> diff -urEbwB lucene-7.1.0/grouping/build.xml lucene-7.1.0.new/grouping/build.xml --- lucene-7.1.0/grouping/build.xml 2019-09-26 10:59:46.532506490 +0200 +++ lucene-7.1.0.new/grouping/build.xml 2019-09-26 13:11:06.935971759 +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="${version}""/> + <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:="(&(osgi.ee=JavaSE)(version=${javac.target.version}))""/> + </jarify-additional-manifest-attributes> + </jarify> + </target> + </project> diff -urEbwB lucene-7.1.0/highlighter/build.xml lucene-7.1.0.new/highlighter/build.xml --- lucene-7.1.0/highlighter/build.xml 2019-09-26 10:59:46.536506514 +0200 +++ lucene-7.1.0.new/highlighter/build.xml 2019-09-26 13:11:06.939971783 +0200 @@ -38,6 +38,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="${version}",org.apache.lucene.search.uhighlight;version="${version}",org.apache.lucene.search.vectorhighlight;version="${version}""/> + <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:="(&(osgi.ee=JavaSE)(version=${javac.target.version}))""/> + </jarify-additional-manifest-attributes> + </jarify> + </target> + <target name="javadocs" depends="javadocs-memory,compile-core,check-javadocs-uptodate" unless="javadocs-uptodate-${name}"> <invoke-module-javadoc> Binary files lucene-7.1.0/.javapackages_cache/metadata.cache and lucene-7.1.0.new/.javapackages_cache/metadata.cache differ Binary files lucene-7.1.0/.javapackages_cache/osgi.cache and lucene-7.1.0.new/.javapackages_cache/osgi.cache differ diff -urEbwB lucene-7.1.0/join/build.xml lucene-7.1.0.new/join/build.xml --- lucene-7.1.0/join/build.xml 2019-09-26 10:59:46.536506514 +0200 +++ lucene-7.1.0.new/join/build.xml 2019-09-26 13:11:06.943971806 +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="${version}""/> + <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:="(&(osgi.ee=JavaSE)(version=${javac.target.version}))""/> + </jarify-additional-manifest-attributes> + </jarify> + </target> + </project> diff -urEbwB lucene-7.1.0/memory/build.xml lucene-7.1.0.new/memory/build.xml --- lucene-7.1.0/memory/build.xml 2019-09-26 10:59:46.540506538 +0200 +++ lucene-7.1.0.new/memory/build.xml 2019-09-26 13:11:06.943971806 +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="${version}""/> + <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:="(&(osgi.ee=JavaSE)(version=${javac.target.version}))""/> + </jarify-additional-manifest-attributes> + </jarify> + </target> + </project> diff -urEbwB lucene-7.1.0/misc/build.xml lucene-7.1.0.new/misc/build.xml --- lucene-7.1.0/misc/build.xml 2019-09-26 10:59:46.540506538 +0200 +++ lucene-7.1.0.new/misc/build.xml 2019-09-26 13:11:06.947971830 +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="${version}";misc=split;mandatory:=misc,org.apache.lucene.index;version="${version}";misc=split;mandatory:=misc,org.apache.lucene.search;version="${version}";misc=split;mandatory:=misc,org.apache.lucene.store;version="${version}";misc=split;mandatory:=misc,org.apache.lucene.util.fst;version="${version}";misc=split;mandatory:=misc,org.apache.lucene.misc;version="${version}""/> + <attribute name="Import-Package" value="org.apache.lucene.analysis,org.apache.lucene.codecs,org.apache.lucene.index;misc=split,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="${version}""/> + <attribute name="Require-Capability" value="osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=${javac.target.version}))""/> + </jarify-additional-manifest-attributes> + </jarify> + </target> + </project> diff -urEbwB lucene-7.1.0/queries/build.xml lucene-7.1.0.new/queries/build.xml --- lucene-7.1.0/queries/build.xml 2019-09-26 10:59:46.544506562 +0200 +++ lucene-7.1.0.new/queries/build.xml 2019-09-26 13:11:06.947971830 +0200 @@ -21,4 +21,23 @@ </description> <import file="../module-build.xml"/> + + <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="${version}",org.apache.lucene.queries.function;version="${version}",org.apache.lucene.queries.function.docvalues;version="${version}",org.apache.lucene.queries.function.valuesource;version="${version}",org.apache.lucene.queries.mlt;version="${version}",org.apache.lucene.queries.payloads;version="${version}""/> + <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.mutable"/> + <attribute name="Require-Capability" value="osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=${javac.target.version}))""/> + </jarify-additional-manifest-attributes> + </jarify> + </target> + </project> diff -urEbwB lucene-7.1.0/sandbox/build.xml lucene-7.1.0.new/sandbox/build.xml --- lucene-7.1.0/sandbox/build.xml 2019-09-26 10:59:46.560506659 +0200 +++ lucene-7.1.0.new/sandbox/build.xml 2019-09-26 13:11:06.963971926 +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="${version}",org.apache.lucene.document;version="${version}",org.apache.lucene.payloads;version="${version}",org.apache.lucene.sandbox.queries;version="${version}",org.apache.lucene.search;version="${version}""/> + <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.packed"/> + <attribute name="Require-Capability" value="osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=${javac.target.version}))""/> + </jarify-additional-manifest-attributes> + </jarify> + </target> + </project> diff -urEbwB lucene-7.1.0/spatial/build.xml lucene-7.1.0.new/spatial/build.xml --- lucene-7.1.0/spatial/build.xml 2019-09-26 10:59:46.560506659 +0200 +++ lucene-7.1.0.new/spatial/build.xml 2019-09-26 14:18:48.351188471 +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="Geospatial Indexing and Query 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"/> + <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.util;version="${version}""/> + <attribute name="Import-Package" value="org.apache.lucene.geo,org.apache.lucene.util"/> + <attribute name="Require-Capability" value="osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=${javac.target.version}))""/> + </jarify-additional-manifest-attributes> + </jarify> + </target> + </project> diff -urEbwB lucene-7.1.0/spatial3d/build.xml lucene-7.1.0.new/spatial3d/build.xml --- lucene-7.1.0/spatial3d/build.xml 2019-09-26 10:59:46.576506756 +0200 +++ lucene-7.1.0.new/spatial3d/build.xml 2019-09-26 14:01:53.345118237 +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="${version}",org.apache.lucene.spatial3d.geom;version="${version}""/> + <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:="(&(osgi.ee=JavaSE)(version=${javac.target.version}))""/> + </jarify-additional-manifest-attributes> + </jarify> + </target> + </project> ++++++ lucene-queries-6.6.0.pom -> lucene-queries-7.1.0.pom ++++++ --- /work/SRC/openSUSE:Factory/lucene/lucene-queries-6.6.0.pom 2017-08-24 18:37:39.477984737 +0200 +++ /work/SRC/openSUSE:Factory/.lucene.new.2352/lucene-queries-7.1.0.pom 2019-09-27 14:52:48.504084521 +0200 @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.lucene</groupId> <artifactId>lucene-parent</artifactId> - <version>6.6.0</version> + <version>7.1.0</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.lucene</groupId> ++++++ lucene-queryparser-6.6.0.pom -> lucene-queryparser-7.1.0.pom ++++++ --- /work/SRC/openSUSE:Factory/lucene/lucene-queryparser-6.6.0.pom 2017-08-24 18:37:39.981913743 +0200 +++ /work/SRC/openSUSE:Factory/.lucene.new.2352/lucene-queryparser-7.1.0.pom 2019-09-27 14:52:51.380077042 +0200 @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.lucene</groupId> <artifactId>lucene-parent</artifactId> - <version>6.6.0</version> + <version>7.1.0</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.lucene</groupId> ++++++ lucene-sandbox-6.6.0.pom -> lucene-sandbox-7.1.0.pom ++++++ --- /work/SRC/openSUSE:Factory/lucene/lucene-sandbox-6.6.0.pom 2017-08-24 18:37:40.953776827 +0200 +++ /work/SRC/openSUSE:Factory/.lucene.new.2352/lucene-sandbox-7.1.0.pom 2019-09-27 14:52:53.172072383 +0200 @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.lucene</groupId> <artifactId>lucene-parent</artifactId> - <version>6.6.0</version> + <version>7.1.0</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.lucene</groupId> ++++++ lucene-spatial-6.6.0.pom -> lucene-spatial-7.1.0.pom ++++++ --- /work/SRC/openSUSE:Factory/lucene/lucene-spatial-6.6.0.pom 2017-08-24 18:37:41.897643853 +0200 +++ /work/SRC/openSUSE:Factory/.lucene.new.2352/lucene-spatial-7.1.0.pom 2019-09-27 14:52:55.624066007 +0200 @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.lucene</groupId> <artifactId>lucene-parent</artifactId> - <version>6.6.0</version> + <version>7.1.0</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.lucene</groupId> ++++++ lucene-spatial3d-6.6.0.pom -> lucene-spatial3d-7.1.0.pom ++++++ --- /work/SRC/openSUSE:Factory/lucene/lucene-spatial3d-6.6.0.pom 2017-08-24 18:37:42.309585820 +0200 +++ /work/SRC/openSUSE:Factory/.lucene.new.2352/lucene-spatial3d-7.1.0.pom 2019-09-27 14:52:57.192061929 +0200 @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.lucene</groupId> <artifactId>lucene-parent</artifactId> - <version>6.6.0</version> + <version>7.1.0</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.lucene</groupId> @@ -60,5 +60,18 @@ <build> <sourceDirectory>${module-path}/src/java</sourceDirectory> <testSourceDirectory>${module-path}/src/test</testSourceDirectory> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>test-jar</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> </build> </project>
