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/06 13:47:53 UTC
[camel-quarkus] branch quarkus-main updated (5dfe7c8 -> f1bd834)
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a change to branch quarkus-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git.
discard 5dfe7c8 Temporarily disable quarkiverse-google-cloud extensions native builds #2979
discard da63ae3 Temporarily disable XmlsecurityIT #2977
discard b1c338d Temporarily work around Kudu SASL issues related to #2975
discard 7868ea8 Temporarily work around Infinispan SASL issues #2975
discard baa7a6d Upgrade Quarkus to 2.2.0.CR1
new e216adc Upgrade Quarkus to 2.2.0.CR1
new 68e2c75 Temporarily work around Infinispan SASL issues #2975
new 11f1e82 Temporarily work around Kudu SASL issues related to #2975
new 8b2e1d9 Temporarily disable XmlsecurityIT #2977
new f1bd834 Temporarily disable quarkiverse-google-cloud extensions native builds #2979
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (5dfe7c8)
\
N -- N -- N refs/heads/quarkus-main (f1bd834)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
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:
pom.xml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
[camel-quarkus] 02/05: Temporarily work around Infinispan SASL
issues #2975
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch quarkus-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 68e2c75367a565dfe992b1c3b5777c66db45c193
Author: James Netherton <ja...@gmail.com>
AuthorDate: Tue Aug 3 15:36:19 2021 +0100
Temporarily work around Infinispan SASL issues #2975
---
.../component/infinispan/deployment/InfinispanProcessor.java | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/extensions/infinispan/deployment/src/main/java/org/apache/camel/quarkus/component/infinispan/deployment/InfinispanProcessor.java b/extensions/infinispan/deployment/src/main/java/org/apache/camel/quarkus/component/infinispan/deployment/InfinispanProcessor.java
index f305db1..7aa33fd 100644
--- a/extensions/infinispan/deployment/src/main/java/org/apache/camel/quarkus/component/infinispan/deployment/InfinispanProcessor.java
+++ b/extensions/infinispan/deployment/src/main/java/org/apache/camel/quarkus/component/infinispan/deployment/InfinispanProcessor.java
@@ -18,6 +18,7 @@ package org.apache.camel.quarkus.component.infinispan.deployment;
import io.quarkus.deployment.annotations.BuildStep;
import io.quarkus.deployment.builditem.FeatureBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.NativeImageSecurityProviderBuildItem;
class InfinispanProcessor {
@@ -27,4 +28,10 @@ class InfinispanProcessor {
FeatureBuildItem feature() {
return new FeatureBuildItem(FEATURE);
}
+
+ // TODO: Remove this - https://github.com/apache/camel-quarkus/issues/2975
+ @BuildStep
+ NativeImageSecurityProviderBuildItem saslSecurityProvider() {
+ return new NativeImageSecurityProviderBuildItem("com.sun.security.sasl.Provider");
+ }
}
[camel-quarkus] 03/05: Temporarily work around Kudu SASL issues
related to #2975
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch quarkus-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 11f1e820f9f66340c55a625ff115908b1ecac300
Author: James Netherton <ja...@gmail.com>
AuthorDate: Tue Aug 3 15:36:58 2021 +0100
Temporarily work around Kudu SASL issues related to #2975
---
.../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",
[camel-quarkus] 04/05: Temporarily disable XmlsecurityIT #2977
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch quarkus-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 8b2e1d915707d30dfb24b38a1b74a2324fdbca10
Author: James Netherton <ja...@gmail.com>
AuthorDate: Tue Aug 3 15:37:31 2021 +0100
Temporarily disable XmlsecurityIT #2977
---
.../apache/camel/quarkus/component/xmlsecurity/it/XmlsecurityIT.java | 2 ++
1 file changed, 2 insertions(+)
diff --git a/integration-tests/xmlsecurity/src/test/java/org/apache/camel/quarkus/component/xmlsecurity/it/XmlsecurityIT.java b/integration-tests/xmlsecurity/src/test/java/org/apache/camel/quarkus/component/xmlsecurity/it/XmlsecurityIT.java
index 4367220..9ea34c5 100644
--- a/integration-tests/xmlsecurity/src/test/java/org/apache/camel/quarkus/component/xmlsecurity/it/XmlsecurityIT.java
+++ b/integration-tests/xmlsecurity/src/test/java/org/apache/camel/quarkus/component/xmlsecurity/it/XmlsecurityIT.java
@@ -16,8 +16,10 @@
*/
package org.apache.camel.quarkus.component.xmlsecurity.it;
+import io.quarkus.test.junit.DisabledOnNativeImage;
import io.quarkus.test.junit.NativeImageTest;
+@DisabledOnNativeImage("https://github.com/apache/camel-quarkus/issues/2977")
@NativeImageTest
class XmlsecurityIT extends XmlsecurityTest {
[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 quarkus-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit e216adc1915920b543bcbea53031c6503659746a
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..67cdace 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: 999-SNAPSHOT # replace ${quarkus.version}
diff --git a/pom.xml b/pom.xml
index 1095da1..4c8f231 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>999-SNAPSHOT</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.8.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] 05/05: Temporarily disable quarkiverse-google-cloud
extensions native builds #2979
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch quarkus-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit f1bd83407560b4ddada91e7307539dfdb7e49875
Author: James Netherton <ja...@gmail.com>
AuthorDate: Tue Aug 3 15:38:11 2021 +0100
Temporarily disable quarkiverse-google-cloud extensions native builds #2979
---
integration-tests/google-bigquery/pom.xml | 2 ++
integration-tests/google-pubsub/pom.xml | 2 ++
integration-tests/google-storage/pom.xml | 3 ++-
3 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/integration-tests/google-bigquery/pom.xml b/integration-tests/google-bigquery/pom.xml
index db24375..21f3a48 100644
--- a/integration-tests/google-bigquery/pom.xml
+++ b/integration-tests/google-bigquery/pom.xml
@@ -75,6 +75,7 @@
</dependency>
</dependencies>
+ <!-- TODO: Reinstate the native build - https://github.com/apache/camel-quarkus/issues/2979
<profiles>
<profile>
<id>native</id>
@@ -104,5 +105,6 @@
</build>
</profile>
</profiles>
+ -->
</project>
diff --git a/integration-tests/google-pubsub/pom.xml b/integration-tests/google-pubsub/pom.xml
index af7b3bc..4c65813 100644
--- a/integration-tests/google-pubsub/pom.xml
+++ b/integration-tests/google-pubsub/pom.xml
@@ -72,6 +72,7 @@
</dependency>
</dependencies>
+ <!-- TODO: Reinstate the native build - https://github.com/apache/camel-quarkus/issues/2979
<profiles>
<profile>
<id>native</id>
@@ -101,5 +102,6 @@
</build>
</profile>
</profiles>
+ -->
</project>
diff --git a/integration-tests/google-storage/pom.xml b/integration-tests/google-storage/pom.xml
index 93eb9d2..82b04ed 100644
--- a/integration-tests/google-storage/pom.xml
+++ b/integration-tests/google-storage/pom.xml
@@ -110,6 +110,7 @@
</dependency>
</dependencies>
+ <!-- TODO: Reinstate the native build - https://github.com/apache/camel-quarkus/issues/2979
<profiles>
<profile>
<id>native</id>
@@ -139,5 +140,5 @@
</build>
</profile>
</profiles>
-
+ -->
</project>