This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/main by this push: new d1c9667368 Restore solr extension d1c9667368 is described below commit d1c966736863306352fd2c13ef4bd36f4c402131 Author: James Netherton <jamesnether...@gmail.com> AuthorDate: Thu Feb 13 15:39:20 2025 +0000 Restore solr extension Fixes #6806 --- catalog/pom.xml | 13 ++ docs/modules/ROOT/examples/components/solr.yml | 13 ++ docs/modules/ROOT/nav.adoc | 1 + .../ROOT/pages/reference/extensions/solr.adoc | 45 ++++++ extensions/pom.xml | 1 + extensions/solr/deployment/pom.xml | 63 ++++++++ .../component/solr/deployment/SolrProcessor.java | 72 +++++++++ extensions/solr/pom.xml | 39 +++++ extensions/solr/runtime/pom.xml | 101 ++++++++++++ .../main/resources/META-INF/quarkus-extension.yaml | 33 ++++ integration-tests/pom.xml | 1 + integration-tests/solr/pom.xml | 170 +++++++++++++++++++++ .../quarkus/component/solr/it/SolrProducers.java | 69 +++++++++ .../quarkus/component/solr/it/SolrResource.java | 81 ++++++++++ .../quarkus/component/solr/it/SolrRoutes.java | 27 ++++ .../quarkus/component/solr/it/model/Item.java | 43 ++++++ .../camel/quarkus/component/solr/it/SolrIT.java | 24 +++ .../camel/quarkus/component/solr/it/SolrTest.java | 97 ++++++++++++ .../component/solr/it/SolrTestResource.java | 80 ++++++++++ pom.xml | 1 + poms/bom/pom.xml | 15 ++ poms/bom/src/main/generated/flattened-full-pom.xml | 15 ++ .../src/main/generated/flattened-reduced-pom.xml | 15 ++ .../generated/flattened-reduced-verbose-pom.xml | 15 ++ tooling/scripts/test-categories.yaml | 1 + 25 files changed, 1035 insertions(+) diff --git a/catalog/pom.xml b/catalog/pom.xml index ebe892d5b9..6aba7cccb1 100644 --- a/catalog/pom.xml +++ b/catalog/pom.xml @@ -3542,6 +3542,19 @@ </exclusion> </exclusions> </dependency> + <dependency> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-solr</artifactId> + <version>${project.version}</version> + <type>pom</type> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>*</groupId> + <artifactId>*</artifactId> + </exclusion> + </exclusions> + </dependency> <dependency> <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-splunk</artifactId> diff --git a/docs/modules/ROOT/examples/components/solr.yml b/docs/modules/ROOT/examples/components/solr.yml new file mode 100644 index 0000000000..66216a2bd5 --- /dev/null +++ b/docs/modules/ROOT/examples/components/solr.yml @@ -0,0 +1,13 @@ +# Do not edit directly! +# This file was generated by camel-quarkus-maven-plugin:update-extension-doc-page +cqArtifactId: camel-quarkus-solr +cqArtifactIdBase: solr +cqNativeSupported: true +cqStatus: Stable +cqDeprecated: false +cqJvmSince: 3.19.0 +cqNativeSince: 3.19.0 +cqCamelPartName: solr +cqCamelPartTitle: Solr +cqCamelPartDescription: Perform operations against Apache Lucene Solr. +cqExtensionPageTitle: Solr diff --git a/docs/modules/ROOT/nav.adoc b/docs/modules/ROOT/nav.adoc index ee6196da74..a2428aef9d 100644 --- a/docs/modules/ROOT/nav.adoc +++ b/docs/modules/ROOT/nav.adoc @@ -285,6 +285,7 @@ *** xref:reference/extensions/smallrye-reactive-messaging.adoc[SmallRye Reactive Messaging] *** xref:reference/extensions/smooks.adoc[Smooks] *** xref:reference/extensions/snakeyaml.adoc[SnakeYAML] +*** xref:reference/extensions/solr.adoc[Solr] *** xref:reference/extensions/splunk.adoc[Splunk] *** xref:reference/extensions/splunk-hec.adoc[Splunk HEC] *** xref:reference/extensions/spring-rabbitmq.adoc[Spring RabbitMQ] diff --git a/docs/modules/ROOT/pages/reference/extensions/solr.adoc b/docs/modules/ROOT/pages/reference/extensions/solr.adoc new file mode 100644 index 0000000000..d7c0d8d720 --- /dev/null +++ b/docs/modules/ROOT/pages/reference/extensions/solr.adoc @@ -0,0 +1,45 @@ +// Do not edit directly! +// This file was generated by camel-quarkus-maven-plugin:update-extension-doc-page +[id="extensions-solr"] += Solr +:linkattrs: +:cq-artifact-id: camel-quarkus-solr +:cq-native-supported: true +:cq-status: Stable +:cq-status-deprecation: Stable +:cq-description: Perform operations against Apache Lucene Solr. +:cq-deprecated: false +:cq-jvm-since: 3.19.0 +:cq-native-since: 3.19.0 + +ifeval::[{doc-show-badges} == true] +[.badges] +[.badge-key]##JVM since##[.badge-supported]##3.19.0## [.badge-key]##Native since##[.badge-supported]##3.19.0## +endif::[] + +Perform operations against Apache Lucene Solr. + +[id="extensions-solr-whats-inside"] +== What's inside + +* xref:{cq-camel-components}::solr-component.adoc[Solr component], URI syntax: `solr:host:port/basePath` + +Please refer to the above link for usage and configuration details. + +[id="extensions-solr-maven-coordinates"] +== Maven coordinates + +https://{link-quarkus-code-generator}/?extension-search=camel-quarkus-solr[Create a new project with this extension on {link-quarkus-code-generator}, window="_blank"] + +Or add the coordinates to your existing project: + +[source,xml] +---- +<dependency> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-solr</artifactId> +</dependency> +---- +ifeval::[{doc-show-user-guide-link} == true] +Check the xref:user-guide/index.adoc[User guide] for more information about writing Camel Quarkus applications. +endif::[] diff --git a/extensions/pom.xml b/extensions/pom.xml index d93677bda2..8b9244f32d 100644 --- a/extensions/pom.xml +++ b/extensions/pom.xml @@ -236,6 +236,7 @@ <module>smb</module> <module>snakeyaml</module> <module>soap</module> + <module>solr</module> <module>splunk</module> <module>splunk-hec</module> <module>spring-rabbitmq</module> diff --git a/extensions/solr/deployment/pom.xml b/extensions/solr/deployment/pom.xml new file mode 100644 index 0000000000..4999163c4f --- /dev/null +++ b/extensions/solr/deployment/pom.xml @@ -0,0 +1,63 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +--> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-solr-parent</artifactId> + <version>3.19.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <artifactId>camel-quarkus-solr-deployment</artifactId> + <name>Camel Quarkus :: Solr :: Deployment</name> + + <dependencies> + <dependency> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-core-deployment</artifactId> + </dependency> + <dependency> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-solr</artifactId> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <annotationProcessorPaths> + <path> + <groupId>io.quarkus</groupId> + <artifactId>quarkus-extension-processor</artifactId> + <version>${quarkus.version}</version> + </path> + </annotationProcessorPaths> + </configuration> + </plugin> + </plugins> + </build> + +</project> diff --git a/extensions/solr/deployment/src/main/java/org/apache/camel/quarkus/component/solr/deployment/SolrProcessor.java b/extensions/solr/deployment/src/main/java/org/apache/camel/quarkus/component/solr/deployment/SolrProcessor.java new file mode 100644 index 0000000000..b2b145f027 --- /dev/null +++ b/extensions/solr/deployment/src/main/java/org/apache/camel/quarkus/component/solr/deployment/SolrProcessor.java @@ -0,0 +1,72 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.quarkus.component.solr.deployment; + +import java.util.Set; +import java.util.stream.Collectors; + +import io.quarkus.deployment.annotations.BuildProducer; +import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.builditem.CombinedIndexBuildItem; +import io.quarkus.deployment.builditem.FeatureBuildItem; +import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem; +import org.apache.solr.client.solrj.beans.Field; +import org.apache.solr.client.solrj.response.QueryResponse; +import org.apache.solr.client.solrj.response.SolrPingResponse; +import org.apache.solr.client.solrj.response.SolrResponseBase; +import org.jboss.jandex.AnnotationInstance; +import org.jboss.jandex.AnnotationTarget; +import org.jboss.jandex.ClassInfo; +import org.jboss.jandex.DotName; + +class SolrProcessor { + private static final String FEATURE = "camel-solr"; + + @BuildStep + FeatureBuildItem feature() { + return new FeatureBuildItem(FEATURE); + } + + @BuildStep + void registerForReflection( + CombinedIndexBuildItem combinedIndex, + BuildProducer<ReflectiveClassBuildItem> reflectiveClass) { + + Set<String> solrBeans = combinedIndex.getIndex() + .getAnnotations(Field.class) + .stream() + .map(AnnotationInstance::target) + .map(annotationTarget -> { + if (annotationTarget.kind().equals(AnnotationTarget.Kind.FIELD)) { + return annotationTarget.asField().declaringClass(); + } else { + return annotationTarget.asMethod().declaringClass(); + } + }) + .map(ClassInfo::name) + .map(DotName::toString) + .collect(Collectors.toUnmodifiableSet()); + + // Register beans annotated with @Field for reflection + reflectiveClass.produce( + ReflectiveClassBuildItem.builder(solrBeans.toArray(new String[0])).fields().methods().build()); + + // SolrResponseConverter uses reflection to instantiate these types + reflectiveClass.produce( + ReflectiveClassBuildItem.builder(SolrResponseBase.class, SolrPingResponse.class, QueryResponse.class).build()); + } +} diff --git a/extensions/solr/pom.xml b/extensions/solr/pom.xml new file mode 100644 index 0000000000..856495f849 --- /dev/null +++ b/extensions/solr/pom.xml @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +--> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-extensions</artifactId> + <version>3.19.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <artifactId>camel-quarkus-solr-parent</artifactId> + <name>Camel Quarkus :: Solr</name> + <packaging>pom</packaging> + + <modules> + <module>deployment</module> + <module>runtime</module> + </modules> +</project> diff --git a/extensions/solr/runtime/pom.xml b/extensions/solr/runtime/pom.xml new file mode 100644 index 0000000000..0a1498b52b --- /dev/null +++ b/extensions/solr/runtime/pom.xml @@ -0,0 +1,101 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +--> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-solr-parent</artifactId> + <version>3.19.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <artifactId>camel-quarkus-solr</artifactId> + <name>Camel Quarkus :: Solr :: Runtime</name> + <description>Perform operations against Apache Lucene Solr.</description> + + <properties> + <camel.quarkus.jvmSince>3.19.0</camel.quarkus.jvmSince> + <camel.quarkus.nativeSince>3.19.0</camel.quarkus.nativeSince> + </properties> + + <dependencies> + <dependency> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-core</artifactId> + </dependency> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-solr</artifactId> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>io.quarkus</groupId> + <artifactId>quarkus-extension-maven-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <annotationProcessorPaths> + <path> + <groupId>io.quarkus</groupId> + <artifactId>quarkus-extension-processor</artifactId> + <version>${quarkus.version}</version> + </path> + </annotationProcessorPaths> + </configuration> + </plugin> + </plugins> + </build> + + + <profiles> + <profile> + <id>full</id> + <activation> + <property> + <name>!quickly</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-maven-plugin</artifactId> + <executions> + <execution> + <id>update-extension-doc-page</id> + <goals> + <goal>update-extension-doc-page</goal> + </goals> + <phase>process-classes</phase> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> +</project> diff --git a/extensions/solr/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/solr/runtime/src/main/resources/META-INF/quarkus-extension.yaml new file mode 100644 index 0000000000..96c3eb17f9 --- /dev/null +++ b/extensions/solr/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -0,0 +1,33 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# This is a generated file. Do not edit directly! +# To re-generate, run the following command from the top level directory: +# +# mvn -N cq:update-quarkus-metadata +# +--- +name: "Camel Solr" +description: "Perform operations against Apache Lucene Solr" +metadata: + icon-url: "https://raw.githubusercontent.com/apache/camel-website/main/antora-ui-camel/src/img/logo-d.svg" + sponsor: "Apache Software Foundation" + guide: "https://camel.apache.org/camel-quarkus/latest/reference/extensions/solr.html" + categories: + - "integration" + status: + - "stable" diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index 111bc22dcf..ca1ba90db0 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -214,6 +214,7 @@ <module>smallrye-reactive-messaging</module> <module>smb</module> <module>soap</module> + <module>solr</module> <module>splunk</module> <module>splunk-hec</module> <module>spring-rabbitmq</module> diff --git a/integration-tests/solr/pom.xml b/integration-tests/solr/pom.xml new file mode 100644 index 0000000000..7c3b02e3a8 --- /dev/null +++ b/integration-tests/solr/pom.xml @@ -0,0 +1,170 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +--> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-build-parent-it</artifactId> + <version>3.19.0-SNAPSHOT</version> + <relativePath>../../poms/build-parent-it/pom.xml</relativePath> + </parent> + + <artifactId>camel-quarkus-integration-test-solr</artifactId> + <name>Camel Quarkus :: Integration Tests :: Solr</name> + <description>Integration tests for Camel Quarkus Solr extension</description> + + <dependencies> + <dependency> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-direct</artifactId> + </dependency> + <dependency> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-solr</artifactId> + </dependency> + <dependency> + <groupId>io.quarkus</groupId> + <artifactId>quarkus-resteasy</artifactId> + </dependency> + <dependency> + <groupId>io.quarkus</groupId> + <artifactId>quarkus-resteasy-jackson</artifactId> + </dependency> + + <!-- test dependencies --> + <dependency> + <groupId>io.quarkus</groupId> + <artifactId>quarkus-junit5</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>io.rest-assured</groupId> + <artifactId>rest-assured</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.testcontainers</groupId> + <artifactId>solr</artifactId> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>io.quarkus</groupId> + <artifactId>quarkus-junit4-mock</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>io.smallrye.certs</groupId> + <artifactId>smallrye-certificate-generator-junit5</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.awaitility</groupId> + <artifactId>awaitility</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + + <profiles> + <profile> + <id>native</id> + <activation> + <property> + <name>native</name> + </property> + </activation> + <properties> + <quarkus.native.enabled>true</quarkus.native.enabled> + </properties> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-failsafe-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>integration-test</goal> + <goal>verify</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + <profile> + <id>virtualDependencies</id> + <activation> + <property> + <name>!noVirtualDependencies</name> + </property> + </activation> + <dependencies> + <!-- The following dependencies guarantee that this module is built after them. You can update them by running `mvn process-resources -Pformat -N` from the source tree root directory --> + <dependency> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-direct-deployment</artifactId> + <version>${project.version}</version> + <type>pom</type> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>*</groupId> + <artifactId>*</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-solr-deployment</artifactId> + <version>${project.version}</version> + <type>pom</type> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>*</groupId> + <artifactId>*</artifactId> + </exclusion> + </exclusions> + </dependency> + </dependencies> + </profile> + <profile> + <id>skip-testcontainers-tests</id> + <activation> + <property> + <name>skip-testcontainers-tests</name> + </property> + </activation> + <properties> + <skipTests>true</skipTests> + </properties> + </profile> + </profiles> + +</project> diff --git a/integration-tests/solr/src/main/java/org/apache/camel/quarkus/component/solr/it/SolrProducers.java b/integration-tests/solr/src/main/java/org/apache/camel/quarkus/component/solr/it/SolrProducers.java new file mode 100644 index 0000000000..1dc6e39f36 --- /dev/null +++ b/integration-tests/solr/src/main/java/org/apache/camel/quarkus/component/solr/it/SolrProducers.java @@ -0,0 +1,69 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.quarkus.component.solr.it; + +import java.io.FileInputStream; +import java.security.KeyStore; + +import javax.net.ssl.KeyManagerFactory; +import javax.net.ssl.SSLContext; +import javax.net.ssl.TrustManagerFactory; + +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Singleton; +import org.apache.solr.client.solrj.SolrClient; +import org.apache.solr.client.solrj.impl.HttpJdkSolrClient; +import org.eclipse.microprofile.config.inject.ConfigProperty; + +@ApplicationScoped +public class SolrProducers { + public static final String KEYSTORE_PASSWORD = "secret"; + + @ConfigProperty(name = "solr.host") + String solrHost; + + @Singleton + SolrClient solrClient(SSLContext sslContext) { + return new HttpJdkSolrClient.Builder(solrHost) + .withSSLContext(sslContext) + .build(); + } + + @Singleton + SSLContext sslContext() throws Exception { + KeyStore keyStore = KeyStore.getInstance("PKCS12"); + try (FileInputStream keyStoreInput = new FileInputStream("target/certs/solr-keystore.p12")) { + keyStore.load(keyStoreInput, KEYSTORE_PASSWORD.toCharArray()); + } + + KeyStore trustStore = KeyStore.getInstance("PKCS12"); + try (FileInputStream trustStoreInput = new FileInputStream("target/certs/solr-truststore.p12")) { + trustStore.load(trustStoreInput, KEYSTORE_PASSWORD.toCharArray()); + } + + KeyManagerFactory kmf = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm()); + kmf.init(keyStore, KEYSTORE_PASSWORD.toCharArray()); + + TrustManagerFactory tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm()); + tmf.init(trustStore); + + SSLContext sslContext = SSLContext.getInstance("TLS"); + sslContext.init(kmf.getKeyManagers(), tmf.getTrustManagers(), null); + + return sslContext; + } +} diff --git a/integration-tests/solr/src/main/java/org/apache/camel/quarkus/component/solr/it/SolrResource.java b/integration-tests/solr/src/main/java/org/apache/camel/quarkus/component/solr/it/SolrResource.java new file mode 100644 index 0000000000..7992f9d15f --- /dev/null +++ b/integration-tests/solr/src/main/java/org/apache/camel/quarkus/component/solr/it/SolrResource.java @@ -0,0 +1,81 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.quarkus.component.solr.it; + +import java.net.URI; + +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import org.apache.camel.FluentProducerTemplate; +import org.apache.camel.component.solr.SolrConstants; +import org.apache.camel.component.solr.SolrOperation; +import org.apache.camel.quarkus.component.solr.it.model.Item; +import org.apache.solr.client.solrj.response.QueryResponse; +import org.apache.solr.client.solrj.response.SolrPingResponse; + +@Path("/solr") +public class SolrResource { + @Inject + FluentProducerTemplate fluentProducerTemplate; + + @Consumes(MediaType.APPLICATION_JSON) + @POST + public Response insert(Item item) throws Exception { + fluentProducerTemplate.to("direct:start") + .withBody(item) + .withHeader(SolrConstants.PARAM_OPERATION, SolrConstants.OPERATION_INSERT) + .send(); + return Response.created(new URI("https://camel.apache.org")).build(); + } + + @Consumes(MediaType.TEXT_PLAIN) + @Produces(MediaType.APPLICATION_JSON) + @GET + public Response query(String queryString) { + QueryResponse response = fluentProducerTemplate.to("direct:start") + .withHeader(SolrConstants.PARAM_OPERATION, SolrConstants.OPERATION_QUERY) + .withHeader(SolrConstants.PARAM_QUERY_STRING, queryString) + .request(QueryResponse.class); + return Response.ok(response.getResults()).build(); + } + + @Consumes(MediaType.TEXT_PLAIN) + @DELETE + public void delete(String id) throws Exception { + fluentProducerTemplate.to("direct:start") + .withBody(id) + .withHeader(SolrConstants.PARAM_OPERATION, SolrConstants.OPERATION_DELETE_BY_ID) + .send(); + } + + @Path("/ping") + @Produces(MediaType.TEXT_PLAIN) + @GET + public Response ping() { + SolrPingResponse response = fluentProducerTemplate.to("direct:start") + .withHeader(SolrConstants.PARAM_OPERATION, SolrOperation.PING) + .request(SolrPingResponse.class); + return Response.ok(response.getStatus()).build(); + } +} diff --git a/integration-tests/solr/src/main/java/org/apache/camel/quarkus/component/solr/it/SolrRoutes.java b/integration-tests/solr/src/main/java/org/apache/camel/quarkus/component/solr/it/SolrRoutes.java new file mode 100644 index 0000000000..55eb211311 --- /dev/null +++ b/integration-tests/solr/src/main/java/org/apache/camel/quarkus/component/solr/it/SolrRoutes.java @@ -0,0 +1,27 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.quarkus.component.solr.it; + +import org.apache.camel.builder.RouteBuilder; + +public class SolrRoutes extends RouteBuilder { + @Override + public void configure() { + from("direct:start") + .to("solr:default"); + } +} diff --git a/integration-tests/solr/src/main/java/org/apache/camel/quarkus/component/solr/it/model/Item.java b/integration-tests/solr/src/main/java/org/apache/camel/quarkus/component/solr/it/model/Item.java new file mode 100644 index 0000000000..f870645d5c --- /dev/null +++ b/integration-tests/solr/src/main/java/org/apache/camel/quarkus/component/solr/it/model/Item.java @@ -0,0 +1,43 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.quarkus.component.solr.it.model; + +import org.apache.solr.client.solrj.beans.Field; + +public class Item { + @Field + String id; + + @Field("cat") + String[] categories; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String[] getCategories() { + return categories; + } + + public void setCategories(String[] categories) { + this.categories = categories; + } +} diff --git a/integration-tests/solr/src/test/java/org/apache/camel/quarkus/component/solr/it/SolrIT.java b/integration-tests/solr/src/test/java/org/apache/camel/quarkus/component/solr/it/SolrIT.java new file mode 100644 index 0000000000..7c703d817a --- /dev/null +++ b/integration-tests/solr/src/test/java/org/apache/camel/quarkus/component/solr/it/SolrIT.java @@ -0,0 +1,24 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.quarkus.component.solr.it; + +import io.quarkus.test.junit.QuarkusIntegrationTest; + +@QuarkusIntegrationTest +class SolrIT extends SolrTest { + +} diff --git a/integration-tests/solr/src/test/java/org/apache/camel/quarkus/component/solr/it/SolrTest.java b/integration-tests/solr/src/test/java/org/apache/camel/quarkus/component/solr/it/SolrTest.java new file mode 100644 index 0000000000..5130807752 --- /dev/null +++ b/integration-tests/solr/src/test/java/org/apache/camel/quarkus/component/solr/it/SolrTest.java @@ -0,0 +1,97 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.quarkus.component.solr.it; + +import java.time.Duration; +import java.util.UUID; + +import io.quarkus.test.common.QuarkusTestResource; +import io.quarkus.test.junit.QuarkusTest; +import io.restassured.RestAssured; +import io.restassured.http.ContentType; +import io.smallrye.certs.Format; +import io.smallrye.certs.junit5.Certificate; +import io.smallrye.certs.junit5.Certificates; +import org.apache.camel.quarkus.component.solr.it.model.Item; +import org.awaitility.Awaitility; +import org.junit.jupiter.api.Test; + +import static org.hamcrest.Matchers.is; + +@Certificates(baseDir = "target/certs", certificates = { + @Certificate(name = "solr", password = "secret", formats = { Format.PKCS12 }), +}) +@QuarkusTest +@QuarkusTestResource(SolrTestResource.class) +class SolrTest { + + @Test + void solrOperations() { + Item item = new Item(); + item.setId(UUID.randomUUID().toString()); + item.setCategories(new String[] { "foo", "bar" }); + + // Insert + RestAssured.given() + .contentType(ContentType.JSON) + .body(item) + .post("/solr") + .then() + .statusCode(201); + + // Query + Awaitility.await().pollInterval(Duration.ofMillis(250)).atMost(Duration.ofMinutes(1)).untilAsserted(() -> { + RestAssured.given() + .contentType(ContentType.TEXT) + .body("id:" + item.getId()) + .get("/solr") + .then() + .statusCode(200) + .body("[0].id", is(item.getId()), + "[0].cat[0]", is("foo"), + "[0].cat[1]", is("bar")); + }); + + // Delete + RestAssured.given() + .contentType(ContentType.TEXT) + .body(item.getId()) + .delete("/solr") + .then() + .statusCode(204); + + // Confirm deletion + Awaitility.await().pollInterval(Duration.ofMillis(250)).atMost(Duration.ofMinutes(1)).untilAsserted(() -> { + RestAssured.given() + .contentType(ContentType.TEXT) + .body("id:" + item.getId()) + .get("/solr") + .then() + .statusCode(200) + .body("size()", is(0)); + }); + } + + @Test + void solrPing() { + RestAssured.given() + .get("/solr/ping") + .then() + .statusCode(200) + .body(is("0")); + } +} diff --git a/integration-tests/solr/src/test/java/org/apache/camel/quarkus/component/solr/it/SolrTestResource.java b/integration-tests/solr/src/test/java/org/apache/camel/quarkus/component/solr/it/SolrTestResource.java new file mode 100644 index 0000000000..4aaa0db4ab --- /dev/null +++ b/integration-tests/solr/src/test/java/org/apache/camel/quarkus/component/solr/it/SolrTestResource.java @@ -0,0 +1,80 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.quarkus.component.solr.it; + +import java.nio.file.Paths; +import java.util.Map; + +import io.quarkus.test.common.QuarkusTestResourceLifecycleManager; +import org.eclipse.microprofile.config.ConfigProvider; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.testcontainers.containers.SolrContainer; +import org.testcontainers.containers.output.Slf4jLogConsumer; +import org.testcontainers.utility.DockerImageName; +import org.testcontainers.utility.MountableFile; + +import static org.apache.camel.quarkus.component.solr.it.SolrProducers.KEYSTORE_PASSWORD; + +public class SolrTestResource implements QuarkusTestResourceLifecycleManager { + private static final Logger LOGGER = LoggerFactory.getLogger(SolrTestResource.class); + private static final String COLLECTION_NAME = "test-collection"; + private static final DockerImageName SOLR_IMAGE = DockerImageName + .parse(ConfigProvider.getConfig().getValue("solr.container.image", String.class)) + .asCompatibleSubstituteFor("solr"); + + private SolrContainer container; + + @Override + public Map<String, String> start() { + container = new SolrContainer(SOLR_IMAGE) + .withCollection(COLLECTION_NAME) + .withZookeeper(false) + .withCopyFileToContainer(MountableFile.forHostPath(Paths.get("target/certs/solr-keystore.p12")), + "/ssl/solr-keystore.p12") + .withCopyFileToContainer(MountableFile.forHostPath(Paths.get("target/certs/solr-truststore.p12")), + "/ssl/solr-truststore.p12") + .withEnv("SOLR_SSL_ENABLED", "true") + .withEnv("SOLR_SSL_KEY_STORE", "/ssl/solr-keystore.p12") + .withEnv("SOLR_SSL_KEY_STORE_PASSWORD", KEYSTORE_PASSWORD) + .withEnv("SOLR_SSL_TRUST_STORE", "/ssl/solr-truststore.p12") + .withEnv("SOLR_SSL_TRUST_STORE_PASSWORD", KEYSTORE_PASSWORD) + .withEnv("SOLR_SSL_NEED_CLIENT_AUTH", "false") + .withEnv("SOLR_SSL_WANT_CLIENT_AUTH", "false") + .withEnv("SOLR_SSL_CHECK_PEER_NAME", "true") + .withEnv("SOLR_SSL_KEY_STORE_TYPE", "PKCS12") + .withEnv("SOLR_SSL_TRUST_STORE_TYPE", "PKCS12") + .withLogConsumer(new Slf4jLogConsumer(LOGGER)); + + container.start(); + try { + Thread.sleep(10000); + } catch (InterruptedException e) { + throw new RuntimeException(e); + } + + return Map.of("camel.component.solr.default-collection", COLLECTION_NAME, + "solr.host", "https://%s:%d/solr".formatted(container.getHost(), container.getSolrPort())); + } + + @Override + public void stop() { + if (container != null) { + container.stop(); + } + } +} diff --git a/pom.xml b/pom.xml index 9861f183b1..7b2a862e4c 100644 --- a/pom.xml +++ b/pom.xml @@ -251,6 +251,7 @@ <rabbitmq.container.image>mirror.gcr.io/rabbitmq:3.13.7-management-alpine</rabbitmq.container.image> <redis.container.image>mirror.gcr.io/redis:6.2.14-alpine</redis.container.image> <smb.container.image>quay.io/jamesnetherton/camel-smb-test-server:1.0.0</smb.container.image> + <solr.container.image>mirror.gcr.io/solr:9.8.0-slim</solr.container.image> <splunk.container.image>mirror.gcr.io/splunk/splunk:9.3.1</splunk.container.image> <sql-server.container.image>mcr.microsoft.com/mssql/server:2022-latest</sql-server.container.image> diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index 8e50f14087..691314a009 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -2561,6 +2561,11 @@ </exclusion> </exclusions> </dependency> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-solr</artifactId> + <version>${camel.version}</version> + </dependency> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-splunk</artifactId> @@ -5638,6 +5643,16 @@ <artifactId>camel-quarkus-soap-deployment</artifactId> <version>${camel-quarkus.version}</version> </dependency> + <dependency> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-solr</artifactId> + <version>${camel-quarkus.version}</version> + </dependency> + <dependency> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-solr-deployment</artifactId> + <version>${camel-quarkus.version}</version> + </dependency> <dependency> <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-splunk</artifactId> diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 0f5dfc37a2..e45ec218f9 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -2497,6 +2497,11 @@ </exclusion> </exclusions> </dependency> + <dependency> + <groupId>org.apache.camel</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>camel-solr</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>4.10.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + </dependency> <dependency> <groupId>org.apache.camel</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>camel-splunk</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -5562,6 +5567,16 @@ <artifactId>camel-quarkus-soap-deployment</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <version>3.19.0-SNAPSHOT</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> + <dependency> + <groupId>org.apache.camel.quarkus</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>camel-quarkus-solr</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>3.19.0-SNAPSHOT</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + </dependency> + <dependency> + <groupId>org.apache.camel.quarkus</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>camel-quarkus-solr-deployment</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>3.19.0-SNAPSHOT</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + </dependency> <dependency> <groupId>org.apache.camel.quarkus</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>camel-quarkus-splunk</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index f004616c7b..d078bdc41d 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -2487,6 +2487,11 @@ </exclusion> </exclusions> </dependency> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-solr</artifactId> + <version>4.10.0</version> + </dependency> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-splunk</artifactId> @@ -5552,6 +5557,16 @@ <artifactId>camel-quarkus-soap-deployment</artifactId> <version>3.19.0-SNAPSHOT</version> </dependency> + <dependency> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-solr</artifactId> + <version>3.19.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-solr-deployment</artifactId> + <version>3.19.0-SNAPSHOT</version> + </dependency> <dependency> <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-splunk</artifactId> diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml index 1b981e8733..beb6b096de 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -2487,6 +2487,11 @@ </exclusion> </exclusions> </dependency> + <dependency> + <groupId>org.apache.camel</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>camel-solr</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>4.10.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + </dependency> <dependency> <groupId>org.apache.camel</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>camel-splunk</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -5552,6 +5557,16 @@ <artifactId>camel-quarkus-soap-deployment</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <version>3.19.0-SNAPSHOT</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> + <dependency> + <groupId>org.apache.camel.quarkus</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>camel-quarkus-solr</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>3.19.0-SNAPSHOT</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + </dependency> + <dependency> + <groupId>org.apache.camel.quarkus</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>camel-quarkus-solr-deployment</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>3.19.0-SNAPSHOT</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + </dependency> <dependency> <groupId>org.apache.camel.quarkus</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>camel-quarkus-splunk</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> diff --git a/tooling/scripts/test-categories.yaml b/tooling/scripts/test-categories.yaml index a4eedcb333..8f21c3ca9c 100644 --- a/tooling/scripts/test-categories.yaml +++ b/tooling/scripts/test-categories.yaml @@ -184,6 +184,7 @@ group-10: - microprofile-health - platform-http-proxy - platform-http-proxy-ssl + - solr - swift group-11: - compression-grouped