Hello community, here is the log from the commit of package lucene for openSUSE:Factory checked in at 2020-04-14 15:09:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lucene (Old) and /work/SRC/openSUSE:Factory/.lucene.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lucene" Tue Apr 14 15:09:45 2020 rev:30 rq:792673 version:8.5.0 Changes: -------- --- /work/SRC/openSUSE:Factory/lucene/lucene.changes 2020-03-24 22:33:43.269129615 +0100 +++ /work/SRC/openSUSE:Factory/.lucene.new.2738/lucene.changes 2020-04-14 16:24:01.279728651 +0200 @@ -1,0 +2,17 @@ +Thu Apr 9 09:20:58 UTC 2020 - Fridrich Strba <[email protected]> + +- Upgrade to version 8.5.0 +- Modified patches: + * 0001-Disable-ivy-settings.patch + * 0002-Dependency-generation.patch + * lucene-java8compat.patch + * lucene-osgi-manifests.patch + + rediff to changed context +- Added patch: + * lucene-missing-dependencies.patch + + patch out dependencies that are not needed for modules + that we distribute + + patch out dependencies on jars that we don't build + + add target for the new monitor jars + +------------------------------------------------------------------- Old: ---- 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-join-7.1.0.pom lucene-memory-7.1.0.pom lucene-misc-7.1.0.pom 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 New: ---- lucene-8.5.0-src.tgz lucene-analyzers-common-8.5.0.pom lucene-analyzers-smartcn-8.5.0.pom lucene-analyzers-stempel-8.5.0.pom lucene-backward-codecs-8.5.0.pom lucene-classification-8.5.0.pom lucene-codecs-8.5.0.pom lucene-core-8.5.0.pom lucene-grouping-8.5.0.pom lucene-highlighter-8.5.0.pom lucene-join-8.5.0.pom lucene-memory-8.5.0.pom lucene-misc-8.5.0.pom lucene-missing-dependencies.patch lucene-monitor-8.5.0.pom lucene-queries-8.5.0.pom lucene-queryparser-8.5.0.pom lucene-sandbox-8.5.0.pom lucene-spatial3d-8.5.0.pom ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lucene.spec ++++++ --- /var/tmp/diff_new_pack.F1ckUD/_old 2020-04-14 16:24:02.743729998 +0200 +++ /var/tmp/diff_new_pack.F1ckUD/_new 2020-04-14 16:24:02.747730002 +0200 @@ -17,35 +17,35 @@ Name: lucene -Version: 7.1.0 +Version: 8.5.0 Release: 0 Summary: Text search engine License: Apache-2.0 Group: Development/Libraries/Java -URL: http://lucene.apache.org/ -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 -Source4: http://repo1.maven.org/maven2/org/apache/lucene/lucene-classification/%{version}/lucene-classification-%{version}.pom -Source5: http://repo1.maven.org/maven2/org/apache/lucene/lucene-facet/%{version}/lucene-facet-%{version}.pom -Source6: http://repo1.maven.org/maven2/org/apache/lucene/lucene-codecs/%{version}/lucene-codecs-%{version}.pom -Source7: http://repo1.maven.org/maven2/org/apache/lucene/lucene-backward-codecs/%{version}/lucene-backward-codecs-%{version}.pom -Source8: http://repo1.maven.org/maven2/org/apache/lucene/lucene-grouping/%{version}/lucene-grouping-%{version}.pom -Source9: http://repo1.maven.org/maven2/org/apache/lucene/lucene-highlighter/%{version}/lucene-highlighter-%{version}.pom -Source10: http://repo1.maven.org/maven2/org/apache/lucene/lucene-memory/%{version}/lucene-memory-%{version}.pom -Source11: http://repo1.maven.org/maven2/org/apache/lucene/lucene-misc/%{version}/lucene-misc-%{version}.pom -Source12: http://repo1.maven.org/maven2/org/apache/lucene/lucene-sandbox/%{version}/lucene-sandbox-%{version}.pom -Source13: http://repo1.maven.org/maven2/org/apache/lucene/lucene-spatial3d/%{version}/lucene-spatial3d-%{version}.pom -Source14: http://repo1.maven.org/maven2/org/apache/lucene/lucene-spatial/%{version}/lucene-spatial-%{version}.pom -Source15: http://repo1.maven.org/maven2/org/apache/lucene/lucene-analyzers-common/%{version}/lucene-analyzers-common-%{version}.pom -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 +URL: https://lucene.apache.org/ +Source0: https://archive.apache.org/dist/lucene/java/%{version}/%{name}-%{version}-src.tgz +Source1: https://repo1.maven.org/maven2/org/apache/lucene/lucene-queryparser/%{version}/lucene-queryparser-%{version}.pom +Source2: https://repo1.maven.org/maven2/org/apache/lucene/lucene-join/%{version}/lucene-join-%{version}.pom +Source3: https://repo1.maven.org/maven2/org/apache/lucene/lucene-queries/%{version}/lucene-queries-%{version}.pom +Source4: https://repo1.maven.org/maven2/org/apache/lucene/lucene-classification/%{version}/lucene-classification-%{version}.pom +Source6: https://repo1.maven.org/maven2/org/apache/lucene/lucene-codecs/%{version}/lucene-codecs-%{version}.pom +Source7: https://repo1.maven.org/maven2/org/apache/lucene/lucene-backward-codecs/%{version}/lucene-backward-codecs-%{version}.pom +Source8: https://repo1.maven.org/maven2/org/apache/lucene/lucene-grouping/%{version}/lucene-grouping-%{version}.pom +Source9: https://repo1.maven.org/maven2/org/apache/lucene/lucene-highlighter/%{version}/lucene-highlighter-%{version}.pom +Source10: https://repo1.maven.org/maven2/org/apache/lucene/lucene-memory/%{version}/lucene-memory-%{version}.pom +Source11: https://repo1.maven.org/maven2/org/apache/lucene/lucene-misc/%{version}/lucene-misc-%{version}.pom +Source12: https://repo1.maven.org/maven2/org/apache/lucene/lucene-sandbox/%{version}/lucene-sandbox-%{version}.pom +Source13: https://repo1.maven.org/maven2/org/apache/lucene/lucene-spatial3d/%{version}/lucene-spatial3d-%{version}.pom +Source14: https://repo1.maven.org/maven2/org/apache/lucene/lucene-monitor/%{version}/lucene-monitor-%{version}.pom +Source15: https://repo1.maven.org/maven2/org/apache/lucene/lucene-analyzers-common/%{version}/lucene-analyzers-common-%{version}.pom +Source16: https://repo1.maven.org/maven2/org/apache/lucene/lucene-analyzers-smartcn/%{version}/lucene-analyzers-smartcn-%{version}.pom +Source17: https://repo1.maven.org/maven2/org/apache/lucene/lucene-analyzers-stempel/%{version}/lucene-analyzers-stempel-%{version}.pom +Source18: https://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 +Patch4: lucene-missing-dependencies.patch BuildRequires: ant >= 1.6 BuildRequires: ant-junit >= 1.6 BuildRequires: antlr-java @@ -76,6 +76,8 @@ Group: Development/Libraries/Java Provides: %{name} = %{version}-%{release} Obsoletes: %{name} < %{version}-%{release} +Obsoletes: %{name}-facet < %{version}-%{release} +Obsoletes: %{name}-spatial < %{version}-%{release} BuildArch: noarch %description core @@ -129,6 +131,7 @@ %package classification Summary: Classification module for lucene Group: Development/Libraries/Java +Requires: mvn(org.apache.lucene:lucene-analyzers-common) Requires: mvn(org.apache.lucene:lucene-core) Requires: mvn(org.apache.lucene:lucene-grouping) Requires: mvn(org.apache.lucene:lucene-queries) @@ -140,19 +143,6 @@ %files classification -f .mfiles-classification -%package facet -Summary: Facet module for lucene -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. -This package provides the "facet" module for Lucene. - -%files facet -f .mfiles-facet - %package codecs Summary: Codecs module for lucene Group: Development/Libraries/Java @@ -193,11 +183,9 @@ %package highlighter Summary: Highlighter module for lucene Group: Development/Libraries/Java -Requires: mvn(org.apache.lucene:lucene-analyzers-common) Requires: mvn(org.apache.lucene:lucene-core) 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 @@ -253,17 +241,20 @@ %files spatial3d -f .mfiles-spatial3d -%package spatial +%package monitor Summary: Spatial module for lucene Group: Development/Libraries/Java +Requires: mvn(org.apache.lucene:lucene-analyzers-common) Requires: mvn(org.apache.lucene:lucene-core) +Requires: mvn(org.apache.lucene:lucene-memory) +Requires: mvn(org.apache.lucene:lucene-queryparser) BuildArch: noarch -%description spatial +%description monitor Apache Lucene is a full-text search engine written entirely in Java. -This package provides the "spatial" module for Lucene. +This package provides the "monitor" module for Lucene. -%files spatial -f .mfiles-spatial +%files monitor -f .mfiles-monitor %package analyzers-common Summary: Analyzers-common module for lucene @@ -306,6 +297,18 @@ %files analyzers-stempel -f .mfiles-analyzers-stempel %if 0 +%package facet +Summary: Facet module for lucene +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. +This package provides the "facet" module for Lucene. + +%files facet -f .mfiles-facet %package analyzers-icu Summary: Lucene ICU Analysis Components @@ -506,11 +509,12 @@ %patch1 -p2 %patch2 -p1 %patch3 -p1 +%patch4 -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} \ @@ -518,12 +522,13 @@ -Dversion=%{version} \ -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" +# DOESN'T BUILD BECAUSE OF MISSING DEPS: replicator expressions facet spatial-extras analyzers-kuromoji analyzers-morfologik analyzers-phonetic +export modules="queryparser join queries classification codecs backward-codecs grouping highlighter memory misc sandbox spatial3d monitor" for mod in $modules do - %ant -f module-build.xml \ + echo "BUILDING MODULE ${mod}" + %{ant} -f module-build.xml \ -Djavacc.home=%{_bindir}/javacc \ -Djavacc.jar=%{_javadir}/javacc.jar \ -Djavacc.jar.dir=%{_javadir} \ @@ -535,7 +540,7 @@ export modanalyzers="common smartcn stempel" pushd analysis -%ant \ +%{ant} \ -Djavacc.home=%{_bindir}/javacc \ -Djavacc.jar=%{_javadir}/javacc.jar \ -Djavacc.jar.dir=%{_javadir} \ @@ -551,7 +556,7 @@ # maven pom dir install -d -m 0755 %{buildroot}%{_mavenpomdir}/%{name} -export noarch_modules="core queryparser join queries classification facet codecs backward-codecs grouping highlighter memory sandbox spatial3d spatial" +export noarch_modules="core queryparser join queries classification codecs backward-codecs grouping highlighter memory sandbox spatial3d monitor" for mod in $noarch_modules do install -p -m 0644 build/${mod}/%{name}-$mod-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}-$mod.jar ++++++ 0001-Disable-ivy-settings.patch ++++++ --- /var/tmp/diff_new_pack.F1ckUD/_old 2020-04-14 16:24:02.759730013 +0200 +++ /var/tmp/diff_new_pack.F1ckUD/_new 2020-04-14 16:24:02.759730013 +0200 @@ -1,17 +1,17 @@ -From f80ad58a1f6d253b5dab2f78ad49881c6b0aa25d Mon Sep 17 00:00:00 2001 +From d409860c17a93f046ae55f34257f9e74fa5e45f5 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 +Subject: [PATCH 1/3] 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 +index 0bbd19a..6767ffe 100644 --- a/lucene/common-build.xml +++ b/lucene/common-build.xml -@@ -394,7 +394,6 @@ +@@ -442,7 +442,6 @@ you have an idea, fix it. unless="ivy.settings.uptodate" --> <!-- override: just for safety, should be unnecessary --> @@ -20,4 +20,5 @@ </target> -- -2.5.0 +2.20.1 + ++++++ 0002-Dependency-generation.patch ++++++ --- /var/tmp/diff_new_pack.F1ckUD/_old 2020-04-14 16:24:02.767730021 +0200 +++ /var/tmp/diff_new_pack.F1ckUD/_new 2020-04-14 16:24:02.767730021 +0200 @@ -1,56 +1,49 @@ -From e345146f765c5f07db205694106b035866183b19 Mon Sep 17 00:00:00 2001 +From 521dc174c93efbe616dc5f573a5d293339df642b 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 +Subject: [PATCH 2/3] Dependency generation --- - lucene/build.xml | 6 ++++-- - lucene/common-build.xml | 4 ++-- - .../org/apache/lucene/dependencies/GetMavenDependenciesTask.java | 2 ++ + lucene/common-build.xml | 4 ++-- + .../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 +index e3cf905..facc19b 100644 --- a/lucene/build.xml +++ b/lucene/build.xml -@@ -421,12 +421,14 @@ +@@ -426,12 +426,8 @@ </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> -+ --> +- <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 +index 41da3f2..d2f9d16 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"/> - +@@ -1879,7 +1879,7 @@ ${ant.project.name}.test.dependencies=${test.classpath.list} <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"/> + <ant dir="${common.dir}/.." target="-append-all-modules-dependencies-properties" inheritall="false"/> <get-maven-dependencies-macro - dir="${common.dir}/.." -+ dir="." ++ dir="${common.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 +index 610323f..13bde29 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 { +@@ -537,6 +537,7 @@ public class GetMavenDependenciesTask extends Task { private Collection<String> getTransitiveDependenciesFromIvyCache (String groupId, String artifactId, String version) { SortedSet<String> transitiveDependencies = new TreeSet<>(); @@ -58,7 +51,7 @@ // 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 { +@@ -558,6 +559,7 @@ public class GetMavenDependenciesTask extends Task { + groupId + ':' + artifactId + ':' + version + " from " + ivyXmlFile.getAbsolutePath(), e); } @@ -67,5 +60,5 @@ } -- -2.5.0 +2.20.1 ++++++ lucene-7.1.0-src.tgz -> lucene-8.5.0-src.tgz ++++++ /work/SRC/openSUSE:Factory/lucene/lucene-7.1.0-src.tgz /work/SRC/openSUSE:Factory/.lucene.new.2738/lucene-8.5.0-src.tgz differ: char 14, line 1 ++++++ lucene-analyzers-common-7.1.0.pom -> lucene-analyzers-common-8.5.0.pom ++++++ --- /work/SRC/openSUSE:Factory/lucene/lucene-analyzers-common-7.1.0.pom 2019-09-27 14:52:36.912114664 +0200 +++ /work/SRC/openSUSE:Factory/.lucene.new.2738/lucene-analyzers-common-8.5.0.pom 2020-04-14 16:24:00.827728235 +0200 @@ -18,12 +18,12 @@ --> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.lucene</groupId> <artifactId>lucene-parent</artifactId> - <version>7.1.0</version> + <version>8.5.0</version> <relativePath>../../pom.xml</relativePath> </parent> <groupId>org.apache.lucene</groupId> ++++++ lucene-analyzers-smartcn-7.1.0.pom -> lucene-analyzers-smartcn-8.5.0.pom ++++++ --- /work/SRC/openSUSE:Factory/lucene/lucene-analyzers-smartcn-7.1.0.pom 2019-09-27 14:52:37.876112158 +0200 +++ /work/SRC/openSUSE:Factory/.lucene.new.2738/lucene-analyzers-smartcn-8.5.0.pom 2020-04-14 16:24:00.843728250 +0200 @@ -18,12 +18,12 @@ --> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.lucene</groupId> <artifactId>lucene-parent</artifactId> - <version>7.1.0</version> + <version>8.5.0</version> <relativePath>../../pom.xml</relativePath> </parent> <groupId>org.apache.lucene</groupId> ++++++ lucene-analyzers-stempel-7.1.0.pom -> lucene-analyzers-stempel-8.5.0.pom ++++++ --- /work/SRC/openSUSE:Factory/lucene/lucene-analyzers-stempel-7.1.0.pom 2019-09-27 14:52:38.384110836 +0200 +++ /work/SRC/openSUSE:Factory/.lucene.new.2738/lucene-analyzers-stempel-8.5.0.pom 2020-04-14 16:24:00.859728264 +0200 @@ -18,12 +18,12 @@ --> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.lucene</groupId> <artifactId>lucene-parent</artifactId> - <version>7.1.0</version> + <version>8.5.0</version> <relativePath>../../pom.xml</relativePath> </parent> <groupId>org.apache.lucene</groupId> ++++++ lucene-backward-codecs-7.1.0.pom -> lucene-backward-codecs-8.5.0.pom ++++++ --- /work/SRC/openSUSE:Factory/lucene/lucene-backward-codecs-7.1.0.pom 2019-09-27 14:52:38.896109505 +0200 +++ /work/SRC/openSUSE:Factory/.lucene.new.2738/lucene-backward-codecs-8.5.0.pom 2020-04-14 16:24:00.875728279 +0200 @@ -18,12 +18,12 @@ --> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.lucene</groupId> <artifactId>lucene-parent</artifactId> - <version>7.1.0</version> + <version>8.5.0</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.lucene</groupId> ++++++ lucene-classification-7.1.0.pom -> lucene-classification-8.5.0.pom ++++++ --- /work/SRC/openSUSE:Factory/lucene/lucene-classification-7.1.0.pom 2019-09-27 14:52:39.124108912 +0200 +++ /work/SRC/openSUSE:Factory/.lucene.new.2738/lucene-classification-8.5.0.pom 2020-04-14 16:24:00.895728297 +0200 @@ -18,12 +18,12 @@ --> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.lucene</groupId> <artifactId>lucene-parent</artifactId> - <version>7.1.0</version> + <version>8.5.0</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.lucene</groupId> ++++++ lucene-codecs-7.1.0.pom -> lucene-codecs-8.5.0.pom ++++++ --- /work/SRC/openSUSE:Factory/lucene/lucene-codecs-7.1.0.pom 2019-09-27 14:52:39.580107726 +0200 +++ /work/SRC/openSUSE:Factory/.lucene.new.2738/lucene-codecs-8.5.0.pom 2020-04-14 16:24:00.907728308 +0200 @@ -18,12 +18,12 @@ --> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.lucene</groupId> <artifactId>lucene-parent</artifactId> - <version>7.1.0</version> + <version>8.5.0</version> <relativePath>../../../pom.xml</relativePath> </parent> <groupId>org.apache.lucene</groupId> ++++++ lucene-core-7.1.0.pom -> lucene-core-8.5.0.pom ++++++ --- /work/SRC/openSUSE:Factory/lucene/lucene-core-7.1.0.pom 2019-09-27 14:52:39.996106645 +0200 +++ /work/SRC/openSUSE:Factory/.lucene.new.2738/lucene-core-8.5.0.pom 2020-04-14 16:24:00.923728323 +0200 @@ -18,12 +18,12 @@ --> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.lucene</groupId> <artifactId>lucene-parent</artifactId> - <version>7.1.0</version> + <version>8.5.0</version> <relativePath>../../../pom.xml</relativePath> </parent> <groupId>org.apache.lucene</groupId> ++++++ lucene-grouping-7.1.0.pom -> lucene-grouping-8.5.0.pom ++++++ --- /work/SRC/openSUSE:Factory/lucene/lucene-grouping-7.1.0.pom 2019-09-27 14:52:41.164103607 +0200 +++ /work/SRC/openSUSE:Factory/.lucene.new.2738/lucene-grouping-8.5.0.pom 2020-04-14 16:24:00.943728342 +0200 @@ -18,12 +18,12 @@ --> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.lucene</groupId> <artifactId>lucene-parent</artifactId> - <version>7.1.0</version> + <version>8.5.0</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.lucene</groupId> ++++++ lucene-highlighter-7.1.0.pom -> lucene-highlighter-8.5.0.pom ++++++ --- /work/SRC/openSUSE:Factory/lucene/lucene-highlighter-7.1.0.pom 2019-09-27 14:52:42.084101215 +0200 +++ /work/SRC/openSUSE:Factory/.lucene.new.2738/lucene-highlighter-8.5.0.pom 2020-04-14 16:24:00.955728353 +0200 @@ -18,12 +18,12 @@ --> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.lucene</groupId> <artifactId>lucene-parent</artifactId> - <version>7.1.0</version> + <version>8.5.0</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.lucene</groupId> @@ -52,18 +52,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> <groupId>org.apache.lucene</groupId> - <artifactId>lucene-join</artifactId> - </dependency> - <dependency> - <groupId>org.apache.lucene</groupId> <artifactId>lucene-memory</artifactId> </dependency> <dependency> @@ -73,6 +65,11 @@ <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-java8compat.patch ++++++ --- /var/tmp/diff_new_pack.F1ckUD/_old 2020-04-14 16:24:02.947730186 +0200 +++ /var/tmp/diff_new_pack.F1ckUD/_new 2020-04-14 16:24:02.947730186 +0200 @@ -1,14 +1,14 @@ ---- 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; +--- lucene-8.5.0/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/util/BinaryDictionaryWriter.java 2020-03-13 10:35:54.000000000 +0100 ++++ lucene-8.5.0/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/util/BinaryDictionaryWriter.java 2020-04-06 11:47:37.590300471 +0200 +@@ -20,6 +20,7 @@ + import java.io.BufferedOutputStream; 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 @@ +@@ -98,7 +99,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)); @@ -17,17 +17,17 @@ newBuffer.put(buffer); buffer = newBuffer; } -@@ -306,7 +307,7 @@ +@@ -321,7 +322,7 @@ out.writeVInt(buffer.position()); - final WritableByteChannel channel = Channels.newChannel(os); + final WritableByteChannel channel = Channels.newChannel(bos); // 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 + } +--- lucene-8.5.0/core/src/java/org/apache/lucene/store/ByteBufferIndexInput.java 2020-03-13 10:35:55.000000000 +0100 ++++ lucene-8.5.0/core/src/java/org/apache/lucene/store/ByteBufferIndexInput.java 2020-04-06 11:49:45.810989724 +0200 @@ -19,6 +19,7 @@ import java.io.EOFException; @@ -35,26 +35,26 @@ +import java.nio.Buffer; import java.nio.BufferUnderflowException; import java.nio.ByteBuffer; - -@@ -75,7 +76,7 @@ + import java.nio.ByteOrder; +@@ -85,7 +86,7 @@ throw new EOFException("read past EOF: " + this); } - curBuf = buffers[curBufIndex]; + setCurBuf(buffers[curBufIndex]); - curBuf.position(0); + ((Buffer)curBuf).position(0); } while (!curBuf.hasRemaining()); return guard.getByte(curBuf); } catch (NullPointerException npe) { -@@ -98,7 +99,7 @@ +@@ -108,7 +109,7 @@ throw new EOFException("read past EOF: " + this); } - curBuf = buffers[curBufIndex]; + setCurBuf(buffers[curBufIndex]); - curBuf.position(0); + ((Buffer)curBuf).position(0); curAvail = curBuf.remaining(); } guard.getBytes(curBuf, b, offset, len); -@@ -156,10 +157,10 @@ +@@ -204,10 +205,10 @@ final int bi = (int) (pos >> chunkSizePower); try { if (bi == curBufIndex) { @@ -66,17 +66,17 @@ + ((Buffer)b).position((int) (pos & chunkSizeMask)); // write values, on exception all is unchanged this.curBufIndex = bi; - this.curBuf = b; -@@ -187,7 +188,7 @@ + setCurBuf(b); +@@ -235,7 +236,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; + setCurBuf(b); } catch (ArrayIndexOutOfBoundsException | IllegalArgumentException aioobe) { -@@ -287,7 +288,7 @@ +@@ -335,7 +336,7 @@ @SuppressWarnings("resource") protected ByteBufferIndexInput newCloneInstance(String newResourceDescription, ByteBuffer[] newBuffers, int offset, long length) { if (newBuffers.length == 1) { @@ -85,7 +85,7 @@ 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 @@ +@@ -359,7 +360,7 @@ } // set the last buffer's limit for the sliced view. @@ -94,16 +94,16 @@ return slices; } -@@ -350,7 +351,7 @@ +@@ -399,7 +400,7 @@ super(resourceDescription, new ByteBuffer[] { buffer }, length, chunkSizePower, guard); this.curBufIndex = 0; - this.curBuf = buffer; + setCurBuf(buffer); - buffer.position(0); + ((Buffer)buffer).position(0); } // TODO: investigate optimizing readByte() & Co? -@@ -358,7 +359,7 @@ +@@ -407,7 +408,7 @@ @Override public void seek(long pos) throws IOException { try { @@ -112,8 +112,8 @@ } 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 +--- lucene-8.5.0/core/src/java/org/apache/lucene/store/NIOFSDirectory.java 2020-03-13 10:35:55.000000000 +0100 ++++ lucene-8.5.0/core/src/java/org/apache/lucene/store/NIOFSDirectory.java 2020-04-06 11:47:37.590300471 +0200 @@ -18,6 +18,7 @@ import java.io.EOFException; @@ -140,8 +140,8 @@ 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 +--- lucene-8.5.0/core/src/java/org/apache/lucene/store/SimpleFSDirectory.java 2020-03-13 10:35:55.000000000 +0100 ++++ lucene-8.5.0/core/src/java/org/apache/lucene/store/SimpleFSDirectory.java 2020-04-06 11:47:37.590300471 +0200 @@ -19,6 +19,7 @@ import java.io.EOFException; @@ -159,8 +159,8 @@ } 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 +--- lucene-8.5.0/misc/src/java/org/apache/lucene/store/NativeUnixDirectory.java 2020-03-13 10:35:56.000000000 +0100 ++++ lucene-8.5.0/misc/src/java/org/apache/lucene/store/NativeUnixDirectory.java 2020-04-06 11:47:37.590300471 +0200 @@ -21,6 +21,7 @@ import java.io.FileInputStream; import java.io.FileOutputStream; @@ -169,7 +169,7 @@ import java.nio.ByteBuffer; import java.nio.channels.FileChannel; import java.nio.file.Path; -@@ -212,7 +213,7 @@ +@@ -211,7 +212,7 @@ //} private void dump() throws IOException { @@ -178,7 +178,7 @@ final long limit = filePos + buffer.limit(); if (limit > fileLength) { // this dump extends the file -@@ -222,7 +223,7 @@ +@@ -221,7 +222,7 @@ } // must always round to next block @@ -187,7 +187,7 @@ 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 @@ +@@ -229,7 +230,7 @@ channel.write(buffer, filePos); filePos += bufferPos; bufferPos = 0; @@ -196,7 +196,7 @@ //System.out.println("dump: done"); // TODO: the case where we'd seek'd back, wrote an -@@ -341,7 +342,7 @@ +@@ -340,7 +341,7 @@ final int delta = (int) (pos - alignedPos); if (delta != 0) { refill(); @@ -205,7 +205,7 @@ bufferPos = delta; } else { // force refill on next read -@@ -373,7 +374,7 @@ +@@ -372,7 +373,7 @@ } private void refill() throws IOException { @@ -214,7 +214,7 @@ filePos += bufferSize; bufferPos = 0; assert (filePos & ALIGN_NOT_MASK) == filePos : "filePos=" + filePos + " anded=" + (filePos & ALIGN_NOT_MASK); -@@ -387,7 +388,7 @@ +@@ -386,7 +387,7 @@ if (n < 0) { throw new EOFException("read past EOF: " + this); } @@ -223,8 +223,8 @@ } @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 +--- lucene-8.5.0/replicator/src/test/org/apache/lucene/replicator/nrt/SimpleTransLog.java 2020-03-13 10:35:56.000000000 +0100 ++++ lucene-8.5.0/replicator/src/test/org/apache/lucene/replicator/nrt/SimpleTransLog.java 2020-04-06 11:47:37.594300492 +0200 @@ -20,6 +20,7 @@ import java.io.Closeable; import java.io.EOFException; ++++++ lucene-join-7.1.0.pom -> lucene-join-8.5.0.pom ++++++ --- /work/SRC/openSUSE:Factory/lucene/lucene-join-7.1.0.pom 2019-09-27 14:52:43.972096305 +0200 +++ /work/SRC/openSUSE:Factory/.lucene.new.2738/lucene-join-8.5.0.pom 2020-04-14 16:24:01.087728474 +0200 @@ -18,12 +18,12 @@ --> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.lucene</groupId> <artifactId>lucene-parent</artifactId> - <version>7.1.0</version> + <version>8.5.0</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.lucene</groupId> ++++++ lucene-memory-7.1.0.pom -> lucene-memory-8.5.0.pom ++++++ --- /work/SRC/openSUSE:Factory/lucene/lucene-memory-7.1.0.pom 2019-09-27 14:52:44.872093965 +0200 +++ /work/SRC/openSUSE:Factory/.lucene.new.2738/lucene-memory-8.5.0.pom 2020-04-14 16:24:01.103728489 +0200 @@ -18,12 +18,12 @@ --> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.lucene</groupId> <artifactId>lucene-parent</artifactId> - <version>7.1.0</version> + <version>8.5.0</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.lucene</groupId> ++++++ lucene-misc-7.1.0.pom -> lucene-misc-8.5.0.pom ++++++ --- /work/SRC/openSUSE:Factory/lucene/lucene-misc-7.1.0.pom 2019-09-27 14:52:45.432092509 +0200 +++ /work/SRC/openSUSE:Factory/.lucene.new.2738/lucene-misc-8.5.0.pom 2020-04-14 16:24:01.119728503 +0200 @@ -18,12 +18,12 @@ --> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.lucene</groupId> <artifactId>lucene-parent</artifactId> - <version>7.1.0</version> + <version>8.5.0</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.lucene</groupId> ++++++ lucene-missing-dependencies.patch ++++++ --- lucene-8.5.0/analysis/common/build.xml 2020-04-06 12:09:05.493250593 +0200 +++ lucene-8.5.0/analysis/common/build.xml 2020-04-06 12:22:01.033446015 +0200 @@ -88,7 +88,7 @@ <property name="icu4j.resolved" value="true"/> </target> - <target name="unicode-data" depends="-resolve-icu4j,resolve-groovy"> + <target name="unicode-data" depends="-resolve-icu4j"> <groovy classpathref="icu4j.classpath" src="src/tools/groovy/generate-unicode-data.groovy"/> <fixcrlf file="${unicode-props-file}" encoding="UTF-8"/> </target> --- lucene-8.5.0/build.xml 2020-04-06 11:43:38.337014365 +0200 +++ lucene-8.5.0/build.xml 2020-04-06 12:21:53.785406802 +0200 @@ -538,7 +538,7 @@ </target> <!-- Override common-build.xml definition to check for the jar already being up-to-date --> - <target name="jar-core" depends="resolve-groovy,check-lucene-core-uptodate,compile-lucene-core" unless="lucene-core.uptodate"> + <target name="jar-core" depends="check-lucene-core-uptodate,compile-lucene-core" unless="lucene-core.uptodate"> <ant dir="${common.dir}/core" target="jar-core" inheritAll="false"> <propertyset refid="uptodate.and.compiled.properties"/> </ant> --- lucene-8.5.0/common-build.xml 2020-04-06 12:09:05.497250615 +0200 +++ lucene-8.5.0/common-build.xml 2020-04-06 12:20:32.720968275 +0200 @@ -625,12 +625,10 @@ </jarify> </target> - <target name="-jar-core" depends="-mrjar-check" unless="has-mrjar-patched-files"> + <target name="jar-core" depends="compile-core"> <jarify/> </target> - <target name="jar-core" depends="-mrjar-core,-jar-core"/> - <!-- Packaging targets: --> <property name="lucene.tgz.file" location="${common.dir}/dist/lucene-${version}.tgz"/> @@ -1534,8 +1498,8 @@ </taskdef> </target> - <target name="test" depends="clover,compile-test,patch-mrjar-classes,install-junit4-taskdef,validate,-init-totals,-test,-check-totals" description="Runs unit tests"/> - <target name="beast" depends="install-ant-contrib,clover,compile-test,patch-mrjar-classes,install-junit4-taskdef,validate,-init-totals,-beast,-check-totals" description="Runs unit tests in a loop (-Dbeast.iters=n)"/> + <target name="test" depends="clover,compile-test,install-junit4-taskdef,validate,-init-totals,-test,-check-totals" description="Runs unit tests"/> + <target name="beast" depends="install-ant-contrib,clover,compile-test,install-junit4-taskdef,validate,-init-totals,-beast,-check-totals" description="Runs unit tests in a loop (-Dbeast.iters=n)"/> <target name="test-nocompile" depends="-clover.disable,install-junit4-taskdef,-init-totals,-test,-check-totals" description="Only runs unit tests. Jars are not downloaded; compilation is not updated; and Clover is not enabled."/> @@ -1595,7 +1559,7 @@ </target> <!-- Beast the actual tests (must be wrapped with -init-totals, -check-totals) --> - <target name="-beast" depends="resolve-groovy,install-ant-contrib"> + <target name="-beast" depends="install-ant-contrib"> <fail message="The Beast only works inside of individual modules (where 'junit.classpath' is defined)"> <condition> <not><isreference refid="junit.classpath"/></not> @@ -1606,7 +1570,7 @@ <fail message="Fail baby fail" if="groovy.error"/> </target> - <target name="-check-totals" if="tests.totals.toplevel" depends="resolve-groovy"> + <target name="-check-totals" if="tests.totals.toplevel"> <!-- We are concluding a test pass at the outermost level. Sum up all executed tests. --> <groovy><