Hello community,
here is the log from the commit of package lucene for openSUSE:Leap:15.2
checked in at 2020-02-05 07:29:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.2/lucene (Old)
and /work/SRC/openSUSE:Leap:15.2/.lucene.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lucene"
Wed Feb 5 07:29:11 2020 rev:12 rq:764757 version:7.1.0
Changes:
--------
--- /work/SRC/openSUSE:Leap:15.2/lucene/lucene.changes 2020-01-15
15:27:46.950655716 +0100
+++ /work/SRC/openSUSE:Leap:15.2/.lucene.new.26092/lucene.changes
2020-02-05 07:29:16.358743002 +0100
@@ -1,0 +2,68 @@
+Fri Oct 11 13:39:04 UTC 2019 - Fridrich Strba <fst...@suse.com>
+
+- Modified patch:
+ * lucene-osgi-manifests.patch
+ + add the OSGi manifests also to modules that are currently
+ not built due to missing dependencies
+
+-------------------------------------------------------------------
+Tue Oct 1 11:25:47 UTC 2019 - Fridrich Strba <fst...@suse.com>
+
+- Remove a bogus log4j build dependency
+
+-------------------------------------------------------------------
+Thu Sep 26 18:45:50 UTC 2019 - Fridrich Strba <fst...@suse.com>
+
+- 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 <fst...@suse.com>
+
+- 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
+
+-------------------------------------------------------------------
+Mon Jun 24 12:26:21 UTC 2019 - Fridrich Strba <fst...@suse.com>
+
+- Remove the parent references from the pom files, since we are not
+ building lucene using maven.
+- Overhaul the packaging to distribute the artifacts and the
+ corresponding metadata and pom files in the same package
+- Specify runtime dependencies of the different packages
+- Remove version information from the artifact names
+
+-------------------------------------------------------------------
+Mon Jun 24 10:44:08 UTC 2019 - Ismail Dönmez <idon...@suse.com>
+
+- Remove the JPP prefix from pom filenames
+
+-------------------------------------------------------------------
+Tue Feb 12 16:41:36 UTC 2019 - Fridrich Strba <fst...@suse.com>
+
+- Remove dependency on jline, because nothing in the build uses it
+
+-------------------------------------------------------------------
+Sat Dec 22 05:31:12 UTC 2018 - Fridrich Strba <fst...@suse.com>
+
+- Require the different apache-commons-* packages instead of
+ jakarta-commons-*
+
+-------------------------------------------------------------------
+Thu Nov 1 12:55:48 UTC 2018 - Fridrich Strba <fst...@suse.com>
+
+- Do not require asm to build. Nothing depends on it
+
+-------------------------------------------------------------------
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 ++++++
++++ 679 lines (skipped)
++++ between /work/SRC/openSUSE:Leap:15.2/lucene/lucene.spec
++++ and /work/SRC/openSUSE:Leap:15.2/.lucene.new.26092/lucene.spec
++++++ 0001-Disable-ivy-settings.patch ++++++
>From f80ad58a1f6d253b5dab2f78ad49881c6b0aa25d Mon Sep 17 00:00:00 2001
From: Michael Simacek <msima...@redhat.com>
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 <msima...@redhat.com>
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:Leap:15.2/lucene/lucene-6.6.0-src.tgz
/work/SRC/openSUSE:Leap:15.2/.lucene.new.26092/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:Leap:15.2/lucene/lucene-analyzers-common-6.6.0.pom
2020-01-15 15:27:46.562655499 +0100
+++
/work/SRC/openSUSE:Leap:15.2/.lucene.new.26092/lucene-analyzers-common-7.1.0.pom
2020-02-05 07:29:15.538742656 +0100
@@ -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:Leap:15.2/lucene/lucene-analyzers-smartcn-6.6.0.pom
2020-01-15 15:27:46.590655515 +0100
+++
/work/SRC/openSUSE:Leap:15.2/.lucene.new.26092/lucene-analyzers-smartcn-7.1.0.pom
2020-02-05 07:29:15.566742669 +0100
@@ -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:Leap:15.2/lucene/lucene-analyzers-stempel-6.6.0.pom
2020-01-15 15:27:46.610655526 +0100
+++
/work/SRC/openSUSE:Leap:15.2/.lucene.new.26092/lucene-analyzers-stempel-7.1.0.pom
2020-02-05 07:29:15.590742678 +0100
@@ -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:Leap:15.2/lucene/lucene-backward-codecs-6.6.0.pom
2020-01-15 15:27:46.630655537 +0100
+++
/work/SRC/openSUSE:Leap:15.2/.lucene.new.26092/lucene-backward-codecs-7.1.0.pom
2020-02-05 07:29:15.610742687 +0100
@@ -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:Leap:15.2/lucene/lucene-classification-6.6.0.pom
2020-01-15 15:27:46.654655551 +0100
+++
/work/SRC/openSUSE:Leap:15.2/.lucene.new.26092/lucene-classification-7.1.0.pom
2020-02-05 07:29:15.646742702 +0100
@@ -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:Leap:15.2/lucene/lucene-codecs-6.6.0.pom 2020-01-15
15:27:46.674655561 +0100
+++ /work/SRC/openSUSE:Leap:15.2/.lucene.new.26092/lucene-codecs-7.1.0.pom
2020-02-05 07:29:15.670742712 +0100
@@ -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:Leap:15.2/lucene/lucene-core-6.6.0.pom 2020-01-15
15:27:46.690655571 +0100
+++ /work/SRC/openSUSE:Leap:15.2/.lucene.new.26092/lucene-core-7.1.0.pom
2020-02-05 07:29:15.686742719 +0100
@@ -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:Leap:15.2/lucene/lucene-facet-6.6.0.pom 2020-01-15
15:27:46.718655586 +0100
+++ /work/SRC/openSUSE:Leap:15.2/.lucene.new.26092/lucene-facet-7.1.0.pom
2020-02-05 07:29:15.706742727 +0100
@@ -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:Leap:15.2/lucene/lucene-grouping-6.6.0.pom
2020-01-15 15:27:46.738655597 +0100
+++ /work/SRC/openSUSE:Leap:15.2/.lucene.new.26092/lucene-grouping-7.1.0.pom
2020-02-05 07:29:15.730742738 +0100
@@ -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:Leap:15.2/lucene/lucene-highlighter-6.6.0.pom
2020-01-15 15:27:46.758655609 +0100
+++ /work/SRC/openSUSE:Leap:15.2/.lucene.new.26092/lucene-highlighter-7.1.0.pom
2020-02-05 07:29:15.794742764 +0100
@@ -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:Leap:15.2/lucene/lucene-join-6.6.0.pom 2020-01-15
15:27:46.786655625 +0100
+++ /work/SRC/openSUSE:Leap:15.2/.lucene.new.26092/lucene-join-7.1.0.pom
2020-02-05 07:29:15.854742790 +0100
@@ -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:Leap:15.2/lucene/lucene-memory-6.6.0.pom 2020-01-15
15:27:46.810655638 +0100
+++ /work/SRC/openSUSE:Leap:15.2/.lucene.new.26092/lucene-memory-7.1.0.pom
2020-02-05 07:29:15.886742803 +0100
@@ -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:Leap:15.2/lucene/lucene-misc-6.6.0.pom 2020-01-15
15:27:46.830655649 +0100
+++ /work/SRC/openSUSE:Leap:15.2/.lucene.new.26092/lucene-misc-7.1.0.pom
2020-02-05 07:29:15.906742811 +0100
@@ -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 ++++++
++++ 741 lines (skipped)
++++++ lucene-queries-6.6.0.pom -> lucene-queries-7.1.0.pom ++++++
--- /work/SRC/openSUSE:Leap:15.2/lucene/lucene-queries-6.6.0.pom
2020-01-15 15:27:46.854655662 +0100
+++ /work/SRC/openSUSE:Leap:15.2/.lucene.new.26092/lucene-queries-7.1.0.pom
2020-02-05 07:29:16.098742893 +0100
@@ -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:Leap:15.2/lucene/lucene-queryparser-6.6.0.pom
2020-01-15 15:27:46.870655671 +0100
+++ /work/SRC/openSUSE:Leap:15.2/.lucene.new.26092/lucene-queryparser-7.1.0.pom
2020-02-05 07:29:16.154742916 +0100
@@ -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:Leap:15.2/lucene/lucene-sandbox-6.6.0.pom
2020-01-15 15:27:46.886655680 +0100
+++ /work/SRC/openSUSE:Leap:15.2/.lucene.new.26092/lucene-sandbox-7.1.0.pom
2020-02-05 07:29:16.214742941 +0100
@@ -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:Leap:15.2/lucene/lucene-spatial-6.6.0.pom
2020-01-15 15:27:46.906655691 +0100
+++ /work/SRC/openSUSE:Leap:15.2/.lucene.new.26092/lucene-spatial-7.1.0.pom
2020-02-05 07:29:16.278742969 +0100
@@ -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:Leap:15.2/lucene/lucene-spatial3d-6.6.0.pom
2020-01-15 15:27:46.926655703 +0100
+++ /work/SRC/openSUSE:Leap:15.2/.lucene.new.26092/lucene-spatial3d-7.1.0.pom
2020-02-05 07:29:16.302742979 +0100
@@ -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>
