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/03 15:20:55 UTC
[camel-quarkus] branch quarkus-main updated (8dbac99 -> 7ce3117)
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 8dbac99 Temporarily disable JavaScriptDslTest #2968
discard 1dce801 Upgrade Quarkus to 2.2.0.CR1
add cb05578 Use quarkus-grpc-common instead of quarkus-grpc in the gRPC extension
add 94af70e Updated CHANGELOG.md
new 1a08765 Upgrade Quarkus to 2.2.0.CR1
new 208f018 Temporarily work around Infinispan SASL issues #2975
new 92559de Temporarily work around Kudu SASL issues related to #2975
new 28bf22f Temporarily disable XmlsecurityIT #2977
new 245ae74 Temporarily disable quarkiverse-google-cloud extensions native builds #2979
new 7ce3117 Temporarily disable spring-rabbitmq native build #2980
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 (8dbac99)
\
N -- N -- N refs/heads/quarkus-main (7ce3117)
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 6 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:
CHANGELOG.md | 2 +
docs/modules/ROOT/pages/migration-guide/2.2.0.adoc | 10 +
docs/modules/ROOT/pages/migration-guide/index.adoc | 1 +
.../ROOT/pages/reference/extensions/grpc.adoc | 37 ---
extensions/grpc/deployment/pom.xml | 2 +-
.../component/grpc/deployment/GrpcProcessor.java | 38 +--
extensions/grpc/runtime/pom.xml | 8 +-
.../grpc/runtime/src/main/doc/configuration.adoc | 33 ---
.../quarkus/grpc/runtime/CamelGrpcRecorder.java | 174 ++++++++++++--
.../runtime/QuarkusBindableServiceFactory.java | 5 +-
...stitutions.java => CamelGrpcSubstitutions.java} | 27 ++-
.../infinispan/deployment/InfinispanProcessor.java | 7 +
.../component/kudu/deployment/KuduProcessor.java | 6 +
integration-tests/google-bigquery/pom.xml | 2 +
integration-tests/google-pubsub/pom.xml | 2 +
integration-tests/google-storage/pom.xml | 3 +-
integration-tests/grpc/README.adoc | 38 +++
integration-tests/grpc/pom.xml | 110 ++++++++-
.../quarkus/component/grpc/it/GrpcResource.java | 112 ++++++++-
.../camel/quarkus/component/grpc/it/GrpcRoute.java | 97 ++++++--
.../src/main/resources/application.properties | 2 +-
.../grpc/src/main/resources/certs/ca-openssl.conf | 18 ++
.../grpc/src/main/resources/certs/ca.key | 27 +++
.../grpc/src/main/resources/certs/ca.pem | 20 ++
.../grpc/src/main/resources/certs/client.key | 28 +++
.../grpc/src/main/resources/certs/client.pem | 20 ++
.../grpc/src/main/resources/certs/server.key | 28 +++
.../grpc/src/main/resources/certs/server.pem | 20 ++
.../component/grpc/it/GrpcServerTestResource.java | 22 +-
.../camel/quarkus/component/grpc/it/GrpcTest.java | 266 ++++++++++++++++++++-
.../apache/camel/quarkus/js/JavaScriptDslIT.java | 2 -
.../apache/camel/quarkus/js/JavaScriptDslTest.java | 2 -
integration-tests/spring-rabbitmq/pom.xml | 2 +
.../component/xmlsecurity/it/XmlsecurityIT.java | 2 +
pom.xml | 20 +-
poms/build-parent/pom.xml | 10 +
36 files changed, 1030 insertions(+), 173 deletions(-)
create mode 100644 docs/modules/ROOT/pages/migration-guide/2.2.0.adoc
delete mode 100644 extensions/grpc/runtime/src/main/doc/configuration.adoc
rename extensions/grpc/runtime/src/main/java/org/apache/camel/quarkus/grpc/runtime/graal/{GrpcSubstitutions.java => CamelGrpcSubstitutions.java} (59%)
create mode 100644 integration-tests/grpc/README.adoc
copy integration-tests/{json-validator => grpc}/src/main/resources/application.properties (94%)
create mode 100644 integration-tests/grpc/src/main/resources/certs/ca-openssl.conf
create mode 100644 integration-tests/grpc/src/main/resources/certs/ca.key
create mode 100644 integration-tests/grpc/src/main/resources/certs/ca.pem
create mode 100644 integration-tests/grpc/src/main/resources/certs/client.key
create mode 100644 integration-tests/grpc/src/main/resources/certs/client.pem
create mode 100644 integration-tests/grpc/src/main/resources/certs/server.key
create mode 100644 integration-tests/grpc/src/main/resources/certs/server.pem
[camel-quarkus] 01/06: 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 1a08765af3bc7043ba7465be34d34bed8b12c568
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 | 18 +++++++++---------
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/docs/antora.yml b/docs/antora.yml
index 0d387a8..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.0.Final # replace ${quarkus.version}
+ quarkus-version: 999-SNAPSHOT # replace ${quarkus.version}
diff --git a/pom.xml b/pom.xml
index 4c669b8..9aa967b 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.0.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 -->
@@ -585,7 +585,7 @@
<executions>
<execution>
<id>default-test</id>
- <phase /><!-- unbound here to speedup -Dquickly build; bound to a phase in camel-quarkus-build-parent-it -->
+ <phase/><!-- unbound here to speedup -Dquickly build; bound to a phase in camel-quarkus-build-parent-it -->
</execution>
</executions>
</plugin>
@@ -596,7 +596,7 @@
<executions>
<execution>
<id>attach-descriptor</id>
- <phase /><!-- skip to save time -->
+ <phase/><!-- skip to save time -->
</execution>
</executions>
</plugin>
@@ -630,7 +630,7 @@
<requireJavaVersion>
<version>11</version>
</requireJavaVersion>
- <dependencyConvergence />
+ <dependencyConvergence/>
<requireMavenVersion>
<version>${supported-maven-versions}</version>
</requireMavenVersion>
@@ -849,7 +849,7 @@
<executions>
<execution>
<id>camel-quarkus-enforcer-rules</id>
- <phase /><!-- Speedup the check-format profile by skipping the enforcer -->
+ <phase/><!-- Speedup the check-format profile by skipping the enforcer -->
</execution>
</executions>
</plugin>
@@ -872,7 +872,7 @@
<executions>
<execution>
<id>source-release-assembly</id>
- <phase /><!-- fix https://github.com/apache/camel-quarkus/issues/844 -->
+ <phase/><!-- fix https://github.com/apache/camel-quarkus/issues/844 -->
</execution>
<execution>
<id>camel-quarkus-source-release-assembly</id>
[camel-quarkus] 04/06: 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 28bf22f912579a36cbd8654292da2c1020a5212b
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] 03/06: 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 92559de4d849a8b8ec7c377ed497ee5ec1d627dc
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] 05/06: 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 245ae74d3094c9b36dc98a77e1ad0f638df0e4cd
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>
[camel-quarkus] 02/06: 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 208f018c7481dd09af3c17f9430286547b698a21
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] 06/06: Temporarily disable spring-rabbitmq native
build #2980
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 7ce3117910296504483002c4397c68dadb805521
Author: James Netherton <ja...@gmail.com>
AuthorDate: Tue Aug 3 16:17:48 2021 +0100
Temporarily disable spring-rabbitmq native build #2980
---
integration-tests/spring-rabbitmq/pom.xml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/integration-tests/spring-rabbitmq/pom.xml b/integration-tests/spring-rabbitmq/pom.xml
index e077c7e..6f9c275 100644
--- a/integration-tests/spring-rabbitmq/pom.xml
+++ b/integration-tests/spring-rabbitmq/pom.xml
@@ -108,6 +108,7 @@
</dependency>
</dependencies>
+ <!-- TODO: Reinstate the native build - https://github.com/apache/camel-quarkus/issues/2980
<profiles>
<profile>
<id>native</id>
@@ -137,5 +138,6 @@
</build>
</profile>
</profiles>
+ -->
</project>