You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ti...@apache.org on 2024/12/14 16:13:22 UTC
(tika) branch main updated (f1a24242c -> 84343b8ac)
This is an automated email from the ASF dual-hosted git repository.
tilman pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/tika.git
from f1a24242c TIKA-4327: revert jetty 12 update
new 9448be69a TIKA-4327: replace deprecated
new 84343b8ac TIKA-4327: revert cxf update
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:
tika-parent/pom.xml | 4 +++-
.../src/main/java/org/apache/tika/pipes/emitter/solr/SolrEmitter.java | 4 ++--
2 files changed, 5 insertions(+), 3 deletions(-)
(tika) 01/02: TIKA-4327: replace deprecated
Posted by ti...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tilman pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tika.git
commit 9448be69adac89dc632dbb52013c7d11904cd862
Author: Tilman Hausherr <ti...@apache.org>
AuthorDate: Sat Dec 14 17:12:33 2024 +0100
TIKA-4327: replace deprecated
---
.../src/main/java/org/apache/tika/pipes/emitter/solr/SolrEmitter.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tika-pipes/tika-emitters/tika-emitter-solr/src/main/java/org/apache/tika/pipes/emitter/solr/SolrEmitter.java b/tika-pipes/tika-emitters/tika-emitter-solr/src/main/java/org/apache/tika/pipes/emitter/solr/SolrEmitter.java
index 4b17ee64f..7a9713743 100644
--- a/tika-pipes/tika-emitters/tika-emitter-solr/src/main/java/org/apache/tika/pipes/emitter/solr/SolrEmitter.java
+++ b/tika-pipes/tika-emitters/tika-emitter-solr/src/main/java/org/apache/tika/pipes/emitter/solr/SolrEmitter.java
@@ -30,7 +30,7 @@ import java.util.concurrent.TimeUnit;
import org.apache.solr.client.solrj.SolrClient;
import org.apache.solr.client.solrj.impl.CloudSolrClient;
import org.apache.solr.client.solrj.impl.Http2SolrClient;
-import org.apache.solr.client.solrj.impl.LBHttpSolrClient;
+import org.apache.solr.client.solrj.impl.LBHttp2SolrClient;
import org.apache.solr.client.solrj.request.UpdateRequest;
import org.apache.solr.client.solrj.response.UpdateResponse;
import org.apache.solr.common.SolrInputDocument;
@@ -326,7 +326,7 @@ public class SolrEmitter extends AbstractEmitter implements Initializable {
.build();
} else {
- solrClient = new LBHttpSolrClient.Builder().withConnectionTimeout(connectionTimeout, TimeUnit.MILLISECONDS)
+ solrClient = new LBHttp2SolrClient.Builder().withConnectionTimeout(connectionTimeout, TimeUnit.MILLISECONDS)
.withSocketTimeout(socketTimeout, TimeUnit.MILLISECONDS).withHttpClient(httpClientFactory.build())
.withBaseEndpoints(solrUrls.toArray(new String[]{})).build();
}
(tika) 02/02: TIKA-4327: revert cxf update
Posted by ti...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tilman pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tika.git
commit 84343b8ac5cbe656cefb8127851d31d07ffc901b
Author: Tilman Hausherr <ti...@apache.org>
AuthorDate: Sat Dec 14 17:13:13 2024 +0100
TIKA-4327: revert cxf update
---
tika-parent/pom.xml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/tika-parent/pom.xml b/tika-parent/pom.xml
index 8a1309f83..d04149e1c 100644
--- a/tika-parent/pom.xml
+++ b/tika-parent/pom.xml
@@ -342,7 +342,9 @@
<commons.math3.version>3.6.1</commons.math3.version>
<commons.net.version>3.11.1</commons.net.version>
<ctakes.version>6.0.0</ctakes.version>
- <cxf.version>4.1.0</cxf.version>
+ <!-- can't use 4.1.0, fails in tika server core because it uses jetty 12, which we can't
+ use due to the problems explained there -->
+ <cxf.version>4.0.6</cxf.version>
<ddplist.version>1.28</ddplist.version>
<dl4j.version>1.0.0-M2.1</dl4j.version>
<fakeload.version>0.7.0</fakeload.version>