This is an automated email from the ASF dual-hosted git repository.
apupier pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new a9206850961f chore(deps): Bump solr-version from 9.10.1 to 10.0.0
a9206850961f is described below
commit a9206850961fbbaec4a8c97dc09134727f063dc5
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Mon Mar 9 08:59:32 2026 +0000
chore(deps): Bump solr-version from 9.10.1 to 10.0.0
Bumps `solr-version` from 9.10.1 to 10.0.0.
Updates `org.apache.solr:solr-solrj` from 9.10.1 to 10.0.0
Updates `org.apache.solr:solr-api` from 9.10.1 to 10.0.0
---
updated-dependencies:
- dependency-name: org.apache.solr:solr-solrj
dependency-version: 10.0.0
dependency-type: direct:production
update-type: version-update:semver-major
- dependency-name: org.apache.solr:solr-api
dependency-version: 10.0.0
dependency-type: direct:production
update-type: version-update:semver-major
...
adapt to new API
Signed-off-by: dependabot[bot] <[email protected]>
---
.../main/java/org/apache/camel/component/solr/SolrProducer.java | 2 +-
.../camel/component/solr/converter/SolrRequestConverter.java | 4 ++--
.../camel/component/solr/integration/SolrPingAndSearchTest.java | 8 +++++---
parent/pom.xml | 2 +-
4 files changed, 9 insertions(+), 7 deletions(-)
diff --git
a/components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrProducer.java
b/components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrProducer.java
index 241ed1856baa..8a3af0ab72ea 100644
---
a/components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrProducer.java
+++
b/components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrProducer.java
@@ -31,12 +31,12 @@ import org.apache.camel.WrappedFile;
import org.apache.camel.support.DefaultAsyncProducer;
import org.apache.camel.util.ObjectHelper;
import org.apache.solr.client.solrj.SolrClient;
-import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.client.solrj.SolrRequest;
import org.apache.solr.client.solrj.SolrServerException;
import org.apache.solr.client.solrj.impl.HttpSolrClientBase;
import org.apache.solr.client.solrj.request.QueryRequest;
import org.apache.solr.client.solrj.request.SolrPing;
+import org.apache.solr.client.solrj.request.SolrQuery;
import org.apache.solr.client.solrj.request.UpdateRequest;
import org.apache.solr.common.params.ModifiableSolrParams;
import org.apache.solr.common.params.SolrParams;
diff --git
a/components/camel-solr/src/main/java/org/apache/camel/component/solr/converter/SolrRequestConverter.java
b/components/camel-solr/src/main/java/org/apache/camel/component/solr/converter/SolrRequestConverter.java
index 46f3bdc914f2..1c2d3c0a7c65 100644
---
a/components/camel-solr/src/main/java/org/apache/camel/component/solr/converter/SolrRequestConverter.java
+++
b/components/camel-solr/src/main/java/org/apache/camel/component/solr/converter/SolrRequestConverter.java
@@ -35,12 +35,12 @@ import org.apache.camel.component.solr.SolrOperation;
import org.apache.camel.component.solr.SolrProducer;
import org.apache.camel.component.solr.SolrUtils;
import org.apache.camel.util.ObjectHelper;
-import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.client.solrj.beans.BindingException;
import org.apache.solr.client.solrj.beans.DocumentObjectBinder;
import org.apache.solr.client.solrj.request.ContentStreamUpdateRequest;
import org.apache.solr.client.solrj.request.QueryRequest;
import org.apache.solr.client.solrj.request.SolrPing;
+import org.apache.solr.client.solrj.request.SolrQuery;
import org.apache.solr.client.solrj.request.UpdateRequest;
import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.common.util.ContentStreamBase;
@@ -138,7 +138,7 @@ public final class SolrRequestConverter {
body = wrappedFile.getFile();
}
if (body instanceof File file) {
- ContentStreamBase.FileStream stream = new
ContentStreamBase.FileStream(file);
+ ContentStreamBase.FileStream stream = new
ContentStreamBase.FileStream(file.toPath());
if (ObjectHelper.isEmpty(contentType)) {
contentType = stream.getContentType();
}
diff --git
a/components/camel-solr/src/test/java/org/apache/camel/component/solr/integration/SolrPingAndSearchTest.java
b/components/camel-solr/src/test/java/org/apache/camel/component/solr/integration/SolrPingAndSearchTest.java
index 78f376241ba5..a718cb44d352 100644
---
a/components/camel-solr/src/test/java/org/apache/camel/component/solr/integration/SolrPingAndSearchTest.java
+++
b/components/camel-solr/src/test/java/org/apache/camel/component/solr/integration/SolrPingAndSearchTest.java
@@ -26,8 +26,9 @@ import org.apache.camel.InvalidPayloadException;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.solr.SolrConstants;
import org.apache.camel.component.solr.SolrUtils;
+import org.apache.solr.client.solrj.RemoteSolrException;
import org.apache.solr.client.solrj.SolrResponse;
-import org.apache.solr.client.solrj.impl.BaseHttpSolrClient;
+//import org.apache.solr.client.solrj.impl.BaseHttpSolrClient;
import org.apache.solr.client.solrj.request.CollectionAdminRequest;
import org.apache.solr.client.solrj.response.QueryResponse;
import org.apache.solr.client.solrj.response.SolrPingResponse;
@@ -91,9 +92,10 @@ class SolrPingAndSearchTest extends SolrTestSupport {
// clusterstatus should fail as we're not running in solrCloud mode
assertTrue(responseExchange.isFailed());
assertInstanceOf(CamelExchangeException.class,
responseExchange.getException());
- assertInstanceOf(BaseHttpSolrClient.RemoteSolrException.class,
responseExchange.getException().getCause().getCause());
+ System.out.println("### " +
responseExchange.getException().getCause().getCause().getClass());
+ assertInstanceOf(RemoteSolrException.class,
responseExchange.getException().getCause().getCause());
assertEquals(400,
- ((BaseHttpSolrClient.RemoteSolrException)
responseExchange.getException().getCause().getCause()).code());
+ ((RemoteSolrException)
responseExchange.getException().getCause().getCause()).code());
assertTrue(responseExchange.getException().getCause().getCause().getMessage()
.endsWith("Solr instance is not running in SolrCloud mode."));
diff --git a/parent/pom.xml b/parent/pom.xml
index 5317bdac2bfb..b865b4723409 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -504,7 +504,7 @@
<snakeyaml-version>2.6</snakeyaml-version>
<snakeyaml-engine-version>3.0.1</snakeyaml-engine-version>
<snmp4j-version>3.9.7</snmp4j-version>
- <solr-version>9.10.1</solr-version>
+ <solr-version>10.0.0</solr-version>
<solr-zookeeper-version>3.9.4</solr-zookeeper-version>
<splunk-version>1.9.5_1</splunk-version>
<spock-version>2.4-groovy-5.0</spock-version>
