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 17:40:13 UTC
[cxf] branch 3.4.x-fixes updated (ac0950d696 -> bc0a08a7d3)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a change to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
from ac0950d696 Updating Jettison to 1.5.2
new 2bb368aa1e Update Lucene to 8.11.2
new bc0a08a7d3 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 | 4 ++++
.../jax_rs/search/src/main/java/demo/jaxrs/search/server/Catalog.java | 4 ++--
parent/pom.xml | 2 +-
.../java/org/apache/cxf/systest/jaxrs/extraction/BookCatalog.java | 4 ++--
4 files changed, 9 insertions(+), 5 deletions(-)
[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.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit bc0a08a7d3972b03ac25b2013202d7592cca328b
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Sat Nov 19 11:50:53 2022 -0500
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 8197527928..961306361c 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -94,6 +94,7 @@ B 5a03dc2cbd8b151947b71d2bb8db630d6f6089b7
B 5a546d9c0b50298e954e712cc992ed91150b45f9
B 5ac24299998ad1891f50c0cc13e91c3dfc8b1aa4
B 5c4ea7d55f93bc177c4956b325e53a27f65cbf77
+B 5c5662874adf54d4c79752badcb422f7ddc4ad5d
B 5d8d806a8dfa4fe38f48f72eb3d861068adc7cf4
B 61550ceb83004e01a8683e5c2cd578c528df8ec3
B 61a25f4e4a1713b90fe258125e6084de0285d931
@@ -254,6 +255,7 @@ M 1820f1a94b08ba840c3868ac3e1f3b7751540a08
M 19226671095cee205e63629f5c48d450f45cf32f
M 1955e0d57557bd682d0e7fe6bd68d3fb973c4af0
M 196f87904f7148b76d348874bf69c42a28f5e262
+M 1a999f377c2c54c57df12f743d01b7e5eaecf7d1
M 1b48b239be3807e843c56939f663ae935a53f6f5
M 1c7c39771adb05f1fa8678e20b97f1c735f2601c
M 1f7d72caf45c4351e27d3b04458cc523ccd3bfdf
@@ -331,6 +333,7 @@ M 52ae98b551cd9e68cfc00aa3518cddbd852cb700
M 52c993ae6e74fee283180b15cc0a2bf98b67732b
M 531a1871253cfb1adbf4def72d055b9f1efed646
M 53b3719fb77a11f5dde71741deec1f84682058ef
+M 53cff5917791df60bc3c86974670c5441329eba7
M 5409cc649fa5542e0f68af24546ab05a4e38a50c
M 541ec1e3bd63890a64831d2470f972bf0ed4811d
M 54538c21fac194884dad69d6543e67a9c8865bab
@@ -568,6 +571,7 @@ M efc5d35498f582335821cc6a2b750df935295f14
M f02e401b3e46c42b19db22300691f2197b0abfb7
M f0e67e2874bc23336b5b445ddfc9e11e7357adc7
M f2c3963682e6ff13ebe75bb21f725aaeac4d33d5
+M f4507e532b47399f627b065ae37d28f2e8d66805
M f7300e4a3df847c567376734579de7a240ac4111
M f8b2df911055acc776c9b7d64fe3ed529858d507
M fb7821164ec6d7fb98dc3f8caea67465db230a14
[cxf] 01/02: Update Lucene to 8.11.2
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 2bb368aa1e022ec7680487e943a3b681c0a8b14a
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Sat Nov 19 11:49:39 2022 -0500
Update Lucene to 8.11.2
(cherry picked from commit 1a999f377c2c54c57df12f743d01b7e5eaecf7d1)
---
.../jax_rs/search/src/main/java/demo/jaxrs/search/server/Catalog.java | 4 ++--
parent/pom.xml | 2 +-
.../java/org/apache/cxf/systest/jaxrs/extraction/BookCatalog.java | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
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..8515162b13 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;
diff --git a/parent/pom.xml b/parent/pom.xml
index 10ee7069dd..fa35f3809b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -167,7 +167,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>8.11.1</cxf.lucene.version>
+ <cxf.lucene.version>8.11.2</cxf.lucene.version>
<cxf.maven.core.version>3.6.3</cxf.maven.core.version>
<cxf.micrometer.version>1.5.17</cxf.micrometer.version>
<cxf.microprofile.config.version>2.0</cxf.microprofile.config.version>
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/extraction/BookCatalog.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/extraction/BookCatalog.java
index 14124d9a0d..b55dc5e293 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/extraction/BookCatalog.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/extraction/BookCatalog.java
@@ -54,14 +54,14 @@ import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.ScoreDoc;
+import org.apache.lucene.store.ByteBuffersDirectory;
import org.apache.lucene.store.Directory;
-import org.apache.lucene.store.RAMDirectory;
import org.apache.tika.parser.pdf.PDFParser;
@Path("/catalog")
public class BookCatalog {
private final TikaLuceneContentExtractor extractor = new TikaLuceneContentExtractor(new PDFParser());
- private final Directory directory = new RAMDirectory();
+ private final Directory directory = new ByteBuffersDirectory();
private final Analyzer analyzer = new StandardAnalyzer();
private final LuceneQueryVisitor<SearchBean> visitor = createVisitor();