You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by re...@apache.org on 2022/11/19 15:17:59 UTC
[cxf] branch 3.6.x-fixes updated (af151eef0f -> 21531a4049)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a change to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
from af151eef0f Recording .gitmergeinfo Changes
new 1e6e2ac84a CXF-8794: Update to Lucene 9.4.x (#1026)
new 21531a4049 Recording .gitmergeinfo Changes
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.gitmergeinfo | 1 +
distribution/src/main/release/samples/jax_rs/search/pom.xml | 3 +--
.../search/src/main/java/demo/jaxrs/search/server/Catalog.java | 5 ++---
distribution/src/main/release/samples/pom.xml | 1 +
parent/pom.xml | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
[cxf] 01/02: CXF-8794: Update to Lucene 9.4.x (#1026)
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 1e6e2ac84a703685bb402c44b687a0cd4e2bcdee
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Sat Nov 19 09:47:00 2022 -0500
CXF-8794: Update to Lucene 9.4.x (#1026)
(cherry picked from commit f422bd4caf99c59083cf336f350ec666eeebad26)
# Conflicts:
# distribution/src/main/release/samples/pom.xml
# parent/pom.xml
# systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/extraction/BookCatalog.java
---
distribution/src/main/release/samples/jax_rs/search/pom.xml | 3 +--
.../search/src/main/java/demo/jaxrs/search/server/Catalog.java | 5 ++---
distribution/src/main/release/samples/pom.xml | 1 +
parent/pom.xml | 2 +-
4 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/distribution/src/main/release/samples/jax_rs/search/pom.xml b/distribution/src/main/release/samples/jax_rs/search/pom.xml
index 6fa49602df..6e13caf006 100644
--- a/distribution/src/main/release/samples/jax_rs/search/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/search/pom.xml
@@ -30,7 +30,6 @@
</parent>
<properties>
<cxf.version>${project.version}</cxf.version>
- <cxf.lucene.version>8.2.0</cxf.lucene.version>
</properties>
<profiles>
<profile>
@@ -119,7 +118,7 @@
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
- <artifactId>lucene-analyzers-common</artifactId>
+ <artifactId>lucene-analysis-common</artifactId>
<version>${cxf.lucene.version}</version>
</dependency>
<dependency>
diff --git a/distribution/src/main/release/samples/jax_rs/search/src/main/java/demo/jaxrs/search/server/Catalog.java b/distribution/src/main/release/samples/jax_rs/search/src/main/java/demo/jaxrs/search/server/Catalog.java
index 9f610fb6ba..0c7a13a4b8 100644
--- a/distribution/src/main/release/samples/jax_rs/search/src/main/java/demo/jaxrs/search/server/Catalog.java
+++ b/distribution/src/main/release/samples/jax_rs/search/src/main/java/demo/jaxrs/search/server/Catalog.java
@@ -80,8 +80,8 @@ import org.apache.lucene.search.Query;
import org.apache.lucene.search.ScoreDoc;
import org.apache.lucene.search.TermQuery;
import org.apache.lucene.search.TopDocs;
+import org.apache.lucene.store.ByteBuffersDirectory;
import org.apache.lucene.store.Directory;
-import org.apache.lucene.store.RAMDirectory;
import org.apache.tika.parser.Parser;
import org.apache.tika.parser.odf.OpenDocumentParser;
import org.apache.tika.parser.pdf.PDFParser;
@@ -91,7 +91,7 @@ public class Catalog {
private final TikaLuceneContentExtractor extractor = new TikaLuceneContentExtractor(
Arrays.< Parser >asList(new PDFParser(), new OpenDocumentParser()),
new LuceneDocumentMetadata());
- private final Directory directory = new RAMDirectory();
+ private final Directory directory = new ByteBuffersDirectory();
private final Analyzer analyzer = new StandardAnalyzer();
private final Storage storage;
private final LuceneQueryVisitor<SearchBean> visitor;
@@ -260,7 +260,6 @@ public class Catalog {
private void initIndex() throws IOException {
final IndexWriter writer = getIndexWriter();
-
try {
writer.commit();
} finally {
diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml
index 9ce53a4fae..7c1770c980 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -39,6 +39,7 @@
<cxf.tika.version>2.5.0</cxf.tika.version>
<cxf.tomcat.version>9.0.67</cxf.tomcat.version>
<graalvm.version>21.1.0</graalvm.version>
+ <cxf.lucene.version>9.4.1</cxf.lucene.version>
</properties>
<dependencies>
<dependency>
diff --git a/parent/pom.xml b/parent/pom.xml
index 84fa9826ea..86c7b8834c 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -164,7 +164,7 @@
<cxf.kerby.version>2.0.2</cxf.kerby.version>
<cxf.littleproxy.version>1.1.2</cxf.littleproxy.version>
<cxf.logback.classic.version>1.2.10</cxf.logback.classic.version>
- <cxf.lucene.version>9.2.0</cxf.lucene.version>
+ <cxf.lucene.version>9.4.1</cxf.lucene.version>
<cxf.maven.core.version>3.6.3</cxf.maven.core.version>
<cxf.micrometer.version>1.9.6</cxf.micrometer.version>
<cxf.microprofile.config.version>2.0</cxf.microprofile.config.version>
[cxf] 02/02: Recording .gitmergeinfo Changes
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 21531a4049139798c4f4efd546235648b8084c53
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Sat Nov 19 10:10:11 2022 -0500
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 89c6bbb01c..82cf89e499 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -161,6 +161,7 @@ M ec6d7253edf1f33decd2c2accefc98fa3bb8dc60
M ec9a65c12886611620d06a402f85d98e7936d66d
M f2ad3c15f9ed98cdbc7cb2abdaa0afda13faae24
M f3ff0735a7e0d8816bf0b43f5d97b54d5f034ff5
+M f422bd4caf99c59083cf336f350ec666eeebad26
M f48dc57d5bb4a8848f3b4f9ef5cedcfd9d8ab1b7
M f4c7785fd89a6709608c3fcd8ab31f3f05065eb4
M f72118971428a059b94f3ee4c0730c95d5f1c192