You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2021/08/19 08:51:24 UTC

[camel-quarkus] branch main updated (e0dd8bd -> fb36bc6)

This is an automated email from the ASF dual-hosted git repository.

jamesnetherton pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git.


    from e0dd8bd  Updated CHANGELOG.md
     new 9470886  Upgrade Quarkus to 2.2.0.CR1
     new 2f78326  Register SASL security provider for kudu
     new 6abc946  Register ApacheXMLDSig security provider for XmlSecurity
     new 7dc924a  Temporarily override google-cloud-graalvm-support until quarkus-google-cloud-services 0.10.0 is available
     new fb36bc6  Temporarily disable xchange tests #3016

The 5 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:
 docs/antora.yml                                                  | 2 +-
 .../camel/quarkus/component/kudu/deployment/KuduProcessor.java   | 6 ++++++
 .../component/xmlsecurity/deployment/XmlsecurityProcessor.java   | 7 +++++++
 .../org/apache/camel/quarkus/component/xchange/it/XchangeIT.java | 2 ++
 .../apache/camel/quarkus/component/xchange/it/XchangeTest.java   | 2 ++
 pom.xml                                                          | 9 +++++----
 poms/bom/pom.xml                                                 | 5 +++++
 7 files changed, 28 insertions(+), 5 deletions(-)

[camel-quarkus] 03/05: Register ApacheXMLDSig security provider for XmlSecurity

Posted by ja...@apache.org.
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

commit 6abc94685864e096925e321788d3d377ba752d65
Author: James Netherton <ja...@gmail.com>
AuthorDate: Tue Aug 10 11:20:46 2021 +0100

    Register ApacheXMLDSig security provider for XmlSecurity
    
    Fixes #2977
---
 .../component/xmlsecurity/deployment/XmlsecurityProcessor.java     | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/extensions/xmlsecurity/deployment/src/main/java/org/apache/camel/quarkus/component/xmlsecurity/deployment/XmlsecurityProcessor.java b/extensions/xmlsecurity/deployment/src/main/java/org/apache/camel/quarkus/component/xmlsecurity/deployment/XmlsecurityProcessor.java
index 4922f3c..6de8f47 100644
--- a/extensions/xmlsecurity/deployment/src/main/java/org/apache/camel/quarkus/component/xmlsecurity/deployment/XmlsecurityProcessor.java
+++ b/extensions/xmlsecurity/deployment/src/main/java/org/apache/camel/quarkus/component/xmlsecurity/deployment/XmlsecurityProcessor.java
@@ -27,8 +27,10 @@ import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
 import io.quarkus.deployment.builditem.ExtensionSslNativeSupportBuildItem;
 import io.quarkus.deployment.builditem.FeatureBuildItem;
 import io.quarkus.deployment.builditem.IndexDependencyBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.NativeImageSecurityProviderBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem;
+import org.apache.jcp.xml.dsig.internal.dom.XMLDSigRI;
 import org.apache.xml.security.c14n.CanonicalizerSpi;
 import org.apache.xml.security.stax.ext.XMLSecurityConstants;
 import org.apache.xml.security.transforms.TransformSpi;
@@ -77,4 +79,9 @@ class XmlsecurityProcessor {
                 .map(RuntimeInitializedClassBuildItem::new)
                 .forEach(runtimeInitializedClasses::produce);
     }
+
+    @BuildStep
+    NativeImageSecurityProviderBuildItem saslSecurityProvider() {
+        return new NativeImageSecurityProviderBuildItem(XMLDSigRI.class.getName());
+    }
 }

[camel-quarkus] 01/05: Upgrade Quarkus to 2.2.0.CR1

Posted by ja...@apache.org.
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

commit 94708869d53ef74551b8e73d93ea3fe7d602a108
Author: James Netherton <ja...@gmail.com>
AuthorDate: Tue Jun 29 11:59:41 2021 +0100

    Upgrade Quarkus to 2.2.0.CR1
---
 docs/antora.yml | 2 +-
 pom.xml         | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/antora.yml b/docs/antora.yml
index 5e21f13..3dc55a0 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -25,4 +25,4 @@ asciidoc:
     cq-camel-components: 3.11.x@components # replace ${camel.docs.components.xref}
     min-maven-version: 3.6.2 # replace ${min-maven-version}
     target-maven-version: 3.8.1 # replace ${target-maven-version}
-    quarkus-version: 2.1.1.Final # replace ${quarkus.version}
+    quarkus-version: 2.2.0.CR1 # replace ${quarkus.version}
diff --git a/pom.xml b/pom.xml
index 62a435c..6db6930 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,7 +48,7 @@
         <optaplanner.version>8.8.0.Final</optaplanner.version><!-- May go back to Camel's ${optaplanner-version} when they are in sync https://repo1.maven.org/maven2/org/optaplanner/optaplanner-quarkus/ -->
         <quarkiverse.freemarker.version>0.3.0</quarkiverse.freemarker.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/freemarker/quarkus-freemarker-parent/ -->
         <quarkiverse-minio.version>2.0.0</quarkiverse-minio.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/minio/quarkus-minio-parent/ -->
-        <quarkus.version>2.1.1.Final</quarkus.version><!-- https://repo1.maven.org/maven2/io/quarkus/quarkus-bom/ -->
+        <quarkus.version>2.2.0.CR1</quarkus.version><!-- https://repo1.maven.org/maven2/io/quarkus/quarkus-bom/ -->
         <quarkus-google-cloud.version>0.9.0</quarkus-google-cloud.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/googlecloudservices/quarkus-google-cloud-services-bom/ -->
         <quarkus-hazelcast-client.version>2.0.0</quarkus-hazelcast-client.version><!-- https://repo1.maven.org/maven2/com/hazelcast/quarkus-hazelcast-client-bom/ -->
         <quarkus-qpid-jms.version>0.26.0</quarkus-qpid-jms.version><!-- https://repo1.maven.org/maven2/org/amqphub/quarkus/quarkus-qpid-jms-bom/ -->
@@ -75,8 +75,8 @@
         <jodatime.version>2.10.6</jodatime.version><!-- Mess in transitive dependencies of Spark and Splunk -->
         <github-api.version>1.111</github-api.version><!-- Used in a Groovy script bellow -->
         <guava.version>29.0-jre</guava.version>
-        <graalvm.version>21.1.0</graalvm.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.graalvm.nativeimage:svm -->
-        <grpc.version>1.35.0</grpc.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:io.grpc:grpc-core -->
+        <graalvm.version>21.2.0</graalvm.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.graalvm.nativeimage:svm -->
+        <grpc.version>1.38.1</grpc.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:io.grpc:grpc-core -->
         <gson.version>2.8.6</gson.version><!-- @sync com.ibm.jsonata4java:JSONata4Java:${jsonata4java-version} dep:com.google.code.gson:gson -->
         <hadoop2.version>${hadoop2-version}</hadoop2.version><!-- Spark -->
         <hapi.version>${hapi-version}</hapi.version>
@@ -109,7 +109,7 @@
         <retrofit.version>2.5.0</retrofit.version>
         <saaj.impl.version>1.5.3</saaj.impl.version>
         <scala-2.11.version>2.11.12</scala-2.11.version><!-- Spark -->
-        <smallrye.reactive.messaging.camel.version>3.7.1</smallrye.reactive.messaging.camel.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:io.smallrye.reactive:smallrye-reactive-messaging-provider -->
+        <smallrye.reactive.messaging.camel.version>3.9.0</smallrye.reactive.messaging.camel.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:io.smallrye.reactive:smallrye-reactive-messaging-provider -->
         <spring.version>${spring5-version}</spring.version>
         <snakeyaml.version>${snakeyaml-version}</snakeyaml.version>
         <snappy.version>1.1.7.7</snappy.version><!-- Spark -->

[camel-quarkus] 04/05: Temporarily override google-cloud-graalvm-support until quarkus-google-cloud-services 0.10.0 is available

Posted by ja...@apache.org.
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

commit 7dc924aa65bcef1511cecc76f12ec2c9596e57df
Author: James Netherton <ja...@gmail.com>
AuthorDate: Mon Aug 16 09:43:35 2021 +0100

    Temporarily override google-cloud-graalvm-support until quarkus-google-cloud-services 0.10.0 is available
---
 pom.xml          | 1 +
 poms/bom/pom.xml | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/pom.xml b/pom.xml
index 6db6930..c546a2d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -74,6 +74,7 @@
         <fommil.netlib.core.version>1.1.2</fommil.netlib.core.version><!-- Mess in Weka transitive deps -->
         <jodatime.version>2.10.6</jodatime.version><!-- Mess in transitive dependencies of Spark and Splunk -->
         <github-api.version>1.111</github-api.version><!-- Used in a Groovy script bellow -->
+        <google.cloud.graalvm.support.version>0.6.0</google.cloud.graalvm.support.version> <!-- TODO: Remove this https://github.com/apache/camel-quarkus/issues/2979 -->
         <guava.version>29.0-jre</guava.version>
         <graalvm.version>21.2.0</graalvm.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.graalvm.nativeimage:svm -->
         <grpc.version>1.38.1</grpc.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:io.grpc:grpc-core -->
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index c4ef88a..a065586 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -5742,6 +5742,11 @@
                 </exclusions>
             </dependency>
             <dependency>
+                <groupId>com.google.cloud</groupId>
+                <artifactId>google-cloud-graalvm-support</artifactId>
+                <version>${google.cloud.graalvm.support.version}</version>
+            </dependency>
+            <dependency>
                 <groupId>com.google.code.gson</groupId>
                 <artifactId>gson</artifactId>
                 <version>${gson.version}</version>

[camel-quarkus] 05/05: Temporarily disable xchange tests #3016

Posted by ja...@apache.org.
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

commit fb36bc6ca368719cd678fea70333871995e1adc5
Author: James Netherton <ja...@gmail.com>
AuthorDate: Wed Aug 18 17:23:09 2021 +0100

    Temporarily disable xchange tests #3016
---
 .../java/org/apache/camel/quarkus/component/xchange/it/XchangeIT.java   | 2 ++
 .../java/org/apache/camel/quarkus/component/xchange/it/XchangeTest.java | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/integration-tests/xchange/src/test/java/org/apache/camel/quarkus/component/xchange/it/XchangeIT.java b/integration-tests/xchange/src/test/java/org/apache/camel/quarkus/component/xchange/it/XchangeIT.java
index 2928901..a26db13 100644
--- a/integration-tests/xchange/src/test/java/org/apache/camel/quarkus/component/xchange/it/XchangeIT.java
+++ b/integration-tests/xchange/src/test/java/org/apache/camel/quarkus/component/xchange/it/XchangeIT.java
@@ -16,8 +16,10 @@
  */
 package org.apache.camel.quarkus.component.xchange.it;
 
+import io.quarkus.test.junit.DisabledOnNativeImage;
 import io.quarkus.test.junit.NativeImageTest;
 
+@DisabledOnNativeImage("https://github.com/apache/camel-quarkus/issues/3016")
 @NativeImageTest
 class XchangeIT extends XchangeTest {
 
diff --git a/integration-tests/xchange/src/test/java/org/apache/camel/quarkus/component/xchange/it/XchangeTest.java b/integration-tests/xchange/src/test/java/org/apache/camel/quarkus/component/xchange/it/XchangeTest.java
index a541952..f41be80 100644
--- a/integration-tests/xchange/src/test/java/org/apache/camel/quarkus/component/xchange/it/XchangeTest.java
+++ b/integration-tests/xchange/src/test/java/org/apache/camel/quarkus/component/xchange/it/XchangeTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.quarkus.component.xchange.it;
 
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.RestAssured;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
@@ -27,6 +28,7 @@ import static org.hamcrest.Matchers.greaterThan;
 import static org.hamcrest.Matchers.hasItems;
 import static org.hamcrest.Matchers.not;
 
+@Disabled("https://github.com/apache/camel-quarkus/issues/3016")
 @QuarkusTest
 class XchangeTest {
 

[camel-quarkus] 02/05: Register SASL security provider for kudu

Posted by ja...@apache.org.
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

commit 2f78326132a15ac4b9cc20871e0dcd6208d036b5
Author: James Netherton <ja...@gmail.com>
AuthorDate: Tue Aug 3 15:36:58 2021 +0100

    Register SASL security provider for kudu
---
 .../camel/quarkus/component/kudu/deployment/KuduProcessor.java      | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/extensions/kudu/deployment/src/main/java/org/apache/camel/quarkus/component/kudu/deployment/KuduProcessor.java b/extensions/kudu/deployment/src/main/java/org/apache/camel/quarkus/component/kudu/deployment/KuduProcessor.java
index cab0cc1..ea8c820 100644
--- a/extensions/kudu/deployment/src/main/java/org/apache/camel/quarkus/component/kudu/deployment/KuduProcessor.java
+++ b/extensions/kudu/deployment/src/main/java/org/apache/camel/quarkus/component/kudu/deployment/KuduProcessor.java
@@ -20,6 +20,7 @@ import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.builditem.ExtensionSslNativeSupportBuildItem;
 import io.quarkus.deployment.builditem.FeatureBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.NativeImageSecurityProviderBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
 
 class KuduProcessor {
@@ -37,6 +38,11 @@ class KuduProcessor {
     }
 
     @BuildStep
+    NativeImageSecurityProviderBuildItem saslSecurityProvider() {
+        return new NativeImageSecurityProviderBuildItem("com.sun.security.sasl.Provider");
+    }
+
+    @BuildStep
     void reflection(BuildProducer<ReflectiveClassBuildItem> reflectiveClass) {
         reflectiveClass.produce(new ReflectiveClassBuildItem(true, false,
                 "org.apache.kudu.tserver.Tserver$ResourceMetricsPB",