You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gi...@apache.org on 2021/12/02 06:31:52 UTC
[camel-quarkus] branch quarkus-main updated (d183a78 -> 5fe45b9)
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a change to branch quarkus-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git.
discard d183a78 Upgrade Quarkus to 2.6.0.CR1
add ed6675f Updated CHANGELOG.md
add cb9c920 :white_check_mark: Kafka Oauth Integration test with Strimzi and Keycloak (#3336)
add 46e33bf Fix bash syntax error in CI integration tests step
new 5fe45b9 Upgrade Quarkus to 2.6.0.CR1
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 (d183a78)
\
N -- N -- N refs/heads/quarkus-main (5fe45b9)
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 1 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:
.github/workflows/ci-build.yaml | 6 +-
CHANGELOG.md | 2 +
.../main/resources/META-INF/quarkus-extension.yaml | 3 +-
integration-tests/{kafka => kafka-oauth}/pom.xml | 85 +++---
.../quarkus/kafka/oauth/it/KafkaOauthResource.java | 19 +-
.../camel/quarkus/kafka/oauth}/it/Routes.java | 25 +-
.../src/main/resources/application.properties | 27 +-
.../camel/quarkus/kafka/oauth/it/KafkaIT.java | 5 +-
.../kafka/oauth/it/KafkaKeycloakTestResource.java} | 49 ++--
.../camel/quarkus/kafka/oauth/it/KafkaTest.java | 16 +-
.../kafka/oauth/it/container/KafkaContainer.java | 106 +++++++
.../oauth/it/container/KeycloakContainer.java | 80 +++++
.../src/test/resources/certificates/README.md | 44 ++-
.../test/resources/certificates/ca-truststore.p12 | Bin 0 -> 1639 bytes
.../src/test/resources/certificates/gen-ca.sh | 24 +-
.../resources/certificates/gen-keycloak-certs.sh | 31 ++
.../certificates/keycloak.server.keystore.p12 | Bin 0 -> 5565 bytes
.../src/test/resources/kafkaServer.properties | 177 ++++++++++++
.../keycloak/realms/kafka-authz-realm.json | 321 +++++++++++++++++++++
.../resources/keycloak/scripts/keycloak-ssl.cli | 6 +-
integration-tests/pom.xml | 1 +
pom.xml | 1 +
tooling/scripts/test-categories.yaml | 1 +
23 files changed, 904 insertions(+), 125 deletions(-)
copy integration-tests/{kafka => kafka-oauth}/pom.xml (75%)
copy integration-test-groups/aws2-quarkus-client/aws2-sqs-sns/src/main/java/org/apache/camel/quarkus/component/aws2/sqs/it/Aws2SqsQuarkusClientInvoker.java => integration-tests/kafka-oauth/src/main/java/org/apache/camel/quarkus/kafka/oauth/it/KafkaOauthResource.java (71%)
copy integration-tests/{optaplanner/src/main/java/org/apache/camel/quarkus/component/optaplanner => kafka-oauth/src/main/java/org/apache/camel/quarkus/kafka/oauth}/it/Routes.java (62%)
copy integration-tests/{kafka => kafka-oauth}/src/main/resources/application.properties (58%)
copy integration-test-groups/aws2/aws2-s3/src/test/java/org/apache/camel/quarkus/component/aws2/Aws2S3IT.java => integration-tests/kafka-oauth/src/test/java/org/apache/camel/quarkus/kafka/oauth/it/KafkaIT.java (90%)
copy integration-tests/{google-storage/src/test/java/org/apache/camel/quarkus/component/google/storage/it/GoogleStorageTestResource.java => kafka-oauth/src/test/java/org/apache/camel/quarkus/kafka/oauth/it/KafkaKeycloakTestResource.java} (50%)
copy integration-test-groups/foundation/scheduler/src/test/java/org/apache/camel/quarkus/component/scheduler/it/SchedulerTest.java => integration-tests/kafka-oauth/src/test/java/org/apache/camel/quarkus/kafka/oauth/it/KafkaTest.java (71%)
create mode 100644 integration-tests/kafka-oauth/src/test/java/org/apache/camel/quarkus/kafka/oauth/it/container/KafkaContainer.java
create mode 100644 integration-tests/kafka-oauth/src/test/java/org/apache/camel/quarkus/kafka/oauth/it/container/KeycloakContainer.java
copy extensions-jvm/jclouds/runtime/src/main/resources/META-INF/quarkus-extension.yaml => integration-tests/kafka-oauth/src/test/resources/certificates/README.md (56%)
create mode 100644 integration-tests/kafka-oauth/src/test/resources/certificates/ca-truststore.p12
copy extensions-support/commons-logging/runtime/src/main/resources/META-INF/quarkus-extension.yaml => integration-tests/kafka-oauth/src/test/resources/certificates/gen-ca.sh (68%)
mode change 100644 => 100755
create mode 100755 integration-tests/kafka-oauth/src/test/resources/certificates/gen-keycloak-certs.sh
create mode 100644 integration-tests/kafka-oauth/src/test/resources/certificates/keycloak.server.keystore.p12
create mode 100644 integration-tests/kafka-oauth/src/test/resources/kafkaServer.properties
create mode 100644 integration-tests/kafka-oauth/src/test/resources/keycloak/realms/kafka-authz-realm.json
copy extensions-core/core/runtime/src/main/resources/META-INF/services/io.quarkus.dev.spi.HotReplacementSetup => integration-tests/kafka-oauth/src/test/resources/keycloak/scripts/keycloak-ssl.cli (68%)
[camel-quarkus] 01/01: Upgrade Quarkus to 2.6.0.CR1
Posted by gi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch quarkus-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 5fe45b98410c10e9f786306b541a871c309a4553
Author: James Netherton <ja...@gmail.com>
AuthorDate: Thu Nov 11 14:04:24 2021 +0000
Upgrade Quarkus to 2.6.0.CR1
---
docs/antora.yml | 4 ++--
.../quarkus/component/csimple/deployment/CSimpleProcessor.java | 5 +++--
pom.xml | 6 +++---
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/docs/antora.yml b/docs/antora.yml
index bc1bbc6..9619c08 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -25,9 +25,9 @@ nav:
asciidoc:
attributes:
min-maven-version: 3.6.2 # replace ${min-maven-version}
- target-maven-version: 3.8.1 # replace ${target-maven-version}
+ target-maven-version: 3.8.4 # replace ${target-maven-version}
camel-version: 3.13.0 # replace ${camel.version}
- quarkus-version: 2.5.0.Final # replace ${quarkus.version}
+ quarkus-version: 999-SNAPSHOT # replace ${quarkus.version}
# attributes used in xrefs to other Antora components
cq-camel-components: 3.13.x@components # replace ${camel.docs.components.xref}
quarkus-examples-version: latest
diff --git a/extensions/csimple/deployment/src/main/java/org/apache/camel/quarkus/component/csimple/deployment/CSimpleProcessor.java b/extensions/csimple/deployment/src/main/java/org/apache/camel/quarkus/component/csimple/deployment/CSimpleProcessor.java
index 72229a3..c5266fd 100644
--- a/extensions/csimple/deployment/src/main/java/org/apache/camel/quarkus/component/csimple/deployment/CSimpleProcessor.java
+++ b/extensions/csimple/deployment/src/main/java/org/apache/camel/quarkus/component/csimple/deployment/CSimpleProcessor.java
@@ -310,8 +310,9 @@ class CSimpleProcessor {
csimpleClassesDir.toFile(),
StandardCharsets.UTF_8.name(),
Collections.emptyList(),
- "1.8",
- "1.8",
+ null,
+ "11",
+ "11",
Collections.emptyList(),
Collections.emptyList());
}
diff --git a/pom.xml b/pom.xml
index cd15b4b..0a0016e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,7 +50,7 @@
<optaplanner.version>8.9.1.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.3.0</quarkiverse-minio.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/minio/quarkus-minio-parent/ -->
- <quarkus.version>2.5.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-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.30.0</quarkus-qpid-jms.version><!-- https://repo1.maven.org/maven2/org/amqphub/quarkus/quarkus-qpid-jms-bom/ -->
@@ -105,7 +105,7 @@
<json-smart.version>2.4.7</json-smart.version>
<kafka.version>2.8.1</kafka.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.apache.kafka:kafka-clients -->
<kudu.version>${kudu-version}</kudu.version>
- <kotlin.version>1.5.31</kotlin.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.jetbrains.kotlin:kotlin-stdlib -->
+ <kotlin.version>1.6.0</kotlin.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.jetbrains.kotlin:kotlin-stdlib -->
<libthrift.version>${libthrift-version}</libthrift.version> <!-- Spark -->
<metrics.version>${metrics-version}</metrics.version><!-- Spark -->
<mvel2.version>${mvel-version}</mvel2.version>
@@ -193,7 +193,7 @@
<!-- maven-enforcer-plugin -->
<min-maven-version>3.6.2</min-maven-version>
- <target-maven-version>3.8.1</target-maven-version><!-- @sync io.quarkus:quarkus-build-parent:${quarkus.version} prop:proposed-maven-version -->
+ <target-maven-version>3.8.4</target-maven-version><!-- @sync io.quarkus:quarkus-build-parent:${quarkus.version} prop:proposed-maven-version -->
<supported-maven-versions>[${min-maven-version},)</supported-maven-versions>
<!-- maven-release-plugin -->