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/11/26 15:47:32 UTC
[camel-quarkus] branch quarkus-main updated (8208215 -> f4e6f11)
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 8208215 Upgrade Quarkus to 2.6.0.CR1
add 85665e9 Updated CHANGELOG.md
add f2be8e5 Remove camel-quarkus-support-common
add 958e2f6 Ban com.google.code.findbugs:jsr305 unconditionally #3335
add f9f97cd Updated CHANGELOG.md
add ca22f2d Fix misalignment of protobuf dependencies
new f4e6f11 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 (8208215)
\
N -- N -- N refs/heads/quarkus-main (f4e6f11)
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:
CHANGELOG.md | 14 ++++
catalog/pom.xml | 13 ----
docs/antora.yml | 2 +-
extensions-core/core/deployment/pom.xml | 5 --
.../quarkus/core/deployment/CamelProcessor.java | 2 +-
.../quarkus/core/deployment/ConsumeProcessor.java | 2 +-
.../core/deployment/InjectionPointsProcessor.java | 2 +-
extensions-core/core/runtime/pom.xml | 4 --
.../camel/quarkus/core}/CamelCapabilities.java | 2 +-
extensions-support/common/deployment/pom.xml | 58 ----------------
extensions-support/common/pom.xml | 39 -----------
extensions-support/common/runtime/pom.xml | 75 ---------------------
.../main/resources/META-INF/quarkus-extension.yaml | 27 --------
.../google-http-client/runtime/pom.xml | 6 ++
extensions-support/pom.xml | 1 -
extensions/cassandraql/runtime/pom.xml | 6 ++
.../csimple/deployment/CSimpleXmlProcessor.java | 2 +-
extensions/google-pubsub/deployment/pom.xml | 6 ++
extensions/google-pubsub/runtime/pom.xml | 6 ++
extensions/grpc/deployment/pom.xml | 6 ++
extensions/grpc/runtime/pom.xml | 4 ++
extensions/opentelemetry/runtime/pom.xml | 6 ++
integration-tests/xchange/pom.xml | 6 ++
pom.xml | 9 ++-
poms/bom/pom.xml | 77 +++++++++++++++++++---
25 files changed, 140 insertions(+), 240 deletions(-)
rename {extensions-support/common/runtime/src/main/java/org/apache/camel/quarkus/support/common => extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core}/CamelCapabilities.java (96%)
delete mode 100644 extensions-support/common/deployment/pom.xml
delete mode 100644 extensions-support/common/pom.xml
delete mode 100644 extensions-support/common/runtime/pom.xml
delete mode 100644 extensions-support/common/runtime/src/main/resources/META-INF/quarkus-extension.yaml
[camel-quarkus] 01/01: Upgrade Quarkus to 2.6.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 f4e6f1150cbaf08b360ef222c1a4d4e1091ec658
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 5f2cff6..e475116 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 -->