Solr native support fixes #1703

apache · Dec 2, 2020 · b289ceb · b289ceb
1 parent a916468
commit b289ceb
Show file tree

Hide file tree

Showing 27 changed files with 1,033 additions and 213 deletions.
diff --git a/docs/modules/ROOT/pages/reference/extensions/solr.adoc b/docs/modules/ROOT/pages/reference/extensions/solr.adoc
@@ -2,15 +2,15 @@
 // This file was generated by camel-quarkus-maven-plugin:update-extension-doc-page
 = Solr
 :cq-artifact-id: camel-quarkus-solr
-:cq-native-supported: false
-:cq-status: Preview
+:cq-native-supported: true
+:cq-status: Stable
 :cq-description: Perform operations against Apache Lucene Solr.
 :cq-deprecated: false
 :cq-jvm-since: 1.1.0
-:cq-native-since: n/a
+:cq-native-since: 1.5.0
 
 [.badges]
-[.badge-key]##JVM since##[.badge-supported]##1.1.0## [.badge-key]##Native##[.badge-unsupported]##unsupported##
+[.badge-key]##JVM since##[.badge-supported]##1.1.0## [.badge-key]##Native since##[.badge-supported]##1.5.0##
 
 Perform operations against Apache Lucene Solr.
 
@@ -33,3 +33,9 @@ Please refer to the above links for usage and configuration details.
 ----
 
 Check the xref:user-guide/index.adoc[User guide] for more information about writing Camel Quarkus applications.
+
+== SSL in native mode
+
+This extension auto-enables SSL support in native mode. Hence you do not need to add
+`quarkus.ssl.native=true` to your `application.properties` yourself. See also
+https://quarkus.io/guides/native-and-ssl[Quarkus SSL guide].
diff --git a/docs/modules/ROOT/partials/reference/components/solr.adoc b/docs/modules/ROOT/partials/reference/components/solr.adoc
@@ -2,11 +2,11 @@
 // This file was generated by camel-quarkus-maven-plugin:update-extension-doc-page
 :cq-artifact-id: camel-quarkus-solr
 :cq-artifact-id-base: solr
-:cq-native-supported: false
-:cq-status: Preview
+:cq-native-supported: true
+:cq-status: Stable
 :cq-deprecated: false
 :cq-jvm-since: 1.1.0
-:cq-native-since: n/a
+:cq-native-since: 1.5.0
 :cq-camel-part-name: solr
 :cq-camel-part-title: Solr
 :cq-camel-part-description: Perform operations against Apache Lucene Solr.

diff --git a/extensions-jvm/pom.xml b/extensions-jvm/pom.xml
@@ -119,7 +119,6 @@
         <module>sip</module>
         <module>smpp</module>
         <module>snmp</module>
-        <module>solr</module>
         <module>soroush</module>
         <module>spark</module>
         <module>splunk</module>

diff --git a/extensions-jvm/solr/integration-test/pom.xml b/extensions-jvm/solr/integration-test/pom.xml
diff --git a/...tegration-test/src/main/java/org/apache/camel/quarkus/component/solr/it/SolrResource.java b/...tegration-test/src/main/java/org/apache/camel/quarkus/component/solr/it/SolrResource.java
diff --git a/extensions/pom.xml b/extensions/pom.xml
@@ -193,6 +193,7 @@
         <module>smallrye-reactive-messaging</module>
         <module>snakeyaml</module>
         <module>soap</module>
+        <module>solr</module>
         <module>sql</module>
         <module>ssh</module>
         <module>stream</module>

diff --git a/extensions-jvm/solr/deployment/pom.xml → extensions/solr/deployment/pom.xml b/extensions-jvm/solr/deployment/pom.xml → extensions/solr/deployment/pom.xml
@@ -38,6 +38,18 @@
             <groupId>org.apache.camel.quarkus</groupId>
             <artifactId>camel-quarkus-solr</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.camel.quarkus</groupId>
+            <artifactId>camel-quarkus-support-httpclient-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-netty-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.camel.quarkus</groupId>
+            <artifactId>camel-quarkus-support-commons-logging-deployment</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

diff --git a/...ponent/solr/deployment/SolrProcessor.java → ...ponent/solr/deployment/SolrProcessor.java b/...ponent/solr/deployment/SolrProcessor.java → ...ponent/solr/deployment/SolrProcessor.java
@@ -17,11 +17,8 @@
 package org.apache.camel.quarkus.component.solr.deployment;
 
 import io.quarkus.deployment.annotations.BuildStep;
-import io.quarkus.deployment.annotations.ExecutionTime;
-import io.quarkus.deployment.annotations.Record;
+import io.quarkus.deployment.builditem.ExtensionSslNativeSupportBuildItem;
 import io.quarkus.deployment.builditem.FeatureBuildItem;
-import io.quarkus.deployment.pkg.steps.NativeBuild;
-import org.apache.camel.quarkus.core.JvmOnlyRecorder;
 import org.jboss.logging.Logger;
 
 class SolrProcessor {
@@ -34,13 +31,8 @@ FeatureBuildItem feature() {
         return new FeatureBuildItem(FEATURE);
     }
 
-    /**
-     * Remove this once this extension starts supporting the native mode.
-     */
-    @BuildStep(onlyIf = NativeBuild.class)
-    @Record(value = ExecutionTime.RUNTIME_INIT)
-    void warnJvmInNative(JvmOnlyRecorder recorder) {
-        JvmOnlyRecorder.warnJvmInNative(LOG, FEATURE); // warn at build time
-        recorder.warnJvmInNative(FEATURE); // warn at runtime
+    @BuildStep
+    ExtensionSslNativeSupportBuildItem activateSslNativeSupport() {
+        return new ExtensionSslNativeSupportBuildItem(FEATURE);
     }
 }
diff --git a/extensions-jvm/solr/pom.xml → extensions/solr/pom.xml b/extensions-jvm/solr/pom.xml → extensions/solr/pom.xml
@@ -33,6 +33,5 @@
     <modules>
         <module>deployment</module>
         <module>runtime</module>
-        <module>integration-test</module>
     </modules>
 </project>
diff --git a/extensions-jvm/solr/runtime/pom.xml → extensions/solr/runtime/pom.xml b/extensions-jvm/solr/runtime/pom.xml → extensions/solr/runtime/pom.xml
@@ -32,6 +32,7 @@
 
     <properties>
         <camel.quarkus.jvmSince>1.1.0</camel.quarkus.jvmSince>
+        <camel.quarkus.nativeSince>1.5.0</camel.quarkus.nativeSince>
     </properties>
 
     <dependencyManagement>
@@ -55,6 +56,18 @@
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-solr</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.camel.quarkus</groupId>
+            <artifactId>camel-quarkus-support-httpclient</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-netty</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.camel.quarkus</groupId>
+            <artifactId>camel-quarkus-support-commons-logging</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

diff --git a/...resources/META-INF/quarkus-extension.yaml → ...resources/META-INF/quarkus-extension.yaml b/...resources/META-INF/quarkus-extension.yaml → ...resources/META-INF/quarkus-extension.yaml
@@ -24,9 +24,8 @@
 name: "Camel Solr"
 description: "Perform operations against Apache Lucene Solr"
 metadata:
-  unlisted: true
   guide: "https://camel.apache.org/camel-quarkus/latest/reference/extensions/solr.html"
   categories:
   - "integration"
   status:
-  - "preview"
+  - "stable"
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
@@ -162,6 +162,7 @@
         <module>slack</module>
         <module>smallrye-reactive-messaging</module>
         <module>soap</module>
+        <module>solr</module>
         <module>sql</module>
         <module>ssh</module>
         <module>stringtemplate</module>