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 2022/08/26 10:36:52 UTC
[camel-quarkus] branch quarkus-main updated (d0ba16e104 -> cf1e4231f3)
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 d0ba16e104 Upgrade Quarkus to 2.13.0.CR1
add 005de05ebe Updated CHANGELOG.md
add 91baca89de Upgrade to Quarkiverse CXF 1.5.0.CR1
add fd28c9f0a3 Make nightly branch sync workflows report failures if the build was cancelled
add 5d35f2176f file: experiment disabling filter test #3584
add 57542847f3 Fix small typo
add 8b4070c036 Fix potential NPE in change feed result checking
add 74736d4c81 Updated CHANGELOG.md
add 3e1922408d Upgrade Quarkus to 2.12.0.Final
add da19a75bbe Filter out non-service endpoints in Salesforce testGetRestResources
add 141c3b3f36 Log warning instead of throw exception for Debezium MongoDB container script execution failure
add 88aef1f991 Adapt Dropbox tests to new authentication mechanism
add c67919c1f8 Updated CHANGELOG.md
new cf1e4231f3 Upgrade Quarkus to 2.13.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 (d0ba16e104)
\
N -- N -- N refs/heads/quarkus-main (cf1e4231f3)
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/camel-master-cron.yaml | 4 +-
.github/workflows/quarkus-master-cron.yaml | 4 +-
CHANGELOG.md | 24 ++
extensions-support/cxf-wss/deployment/pom.xml | 66 -----
extensions-support/cxf-wss/pom.xml | 39 ---
extensions-support/cxf-wss/runtime/pom.xml | 67 -----
.../main/resources/META-INF/quarkus-extension.yaml | 28 ---
extensions-support/pom.xml | 1 -
.../cxf/soap/deployment/CxfSoapProcessor.java | 46 +---
extensions/cxf-soap/runtime/pom.xml | 15 --
.../cxf/soap/graal/CxfSoapSubstitutions.java | 41 ----
.../storage/blob/it/AzureStorageBlobResource.java | 11 +-
integration-tests/cxf-soap/pom.xml | 9 +-
.../it/mongodb/DebeziumMongodbTestResource.java | 6 +-
integration-tests/dropbox/README.adoc | 9 +
.../component/dropbox/it/DropboxResource.java | 35 ++-
.../quarkus/component/dropbox/it/DropboxTest.java | 4 +
.../camel/quarkus/component/file/it/FileTest.java | 2 +
integration-tests/google-pubsub/README.adoc | 2 +-
.../component/salesforce/SalesforceTest.java | 1 +
pom.xml | 4 +-
poms/bom/pom.xml | 62 +----
poms/bom/src/main/generated/flattened-full-pom.xml | 272 ++++++++++++++++-----
.../src/main/generated/flattened-reduced-pom.xml | 272 ++++++++++++++++-----
.../generated/flattened-reduced-verbose-pom.xml | 272 ++++++++++++++++-----
25 files changed, 740 insertions(+), 556 deletions(-)
delete mode 100644 extensions-support/cxf-wss/deployment/pom.xml
delete mode 100644 extensions-support/cxf-wss/pom.xml
delete mode 100644 extensions-support/cxf-wss/runtime/pom.xml
delete mode 100644 extensions-support/cxf-wss/runtime/src/main/resources/META-INF/quarkus-extension.yaml
delete mode 100644 extensions/cxf-soap/runtime/src/main/java/org/apache/camel/quarkus/component/cxf/soap/graal/CxfSoapSubstitutions.java
[camel-quarkus] 01/01: Upgrade Quarkus to 2.13.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 cf1e4231f33cd2204ae77dcb772af4f3792ab02e
Author: James Netherton <ja...@gmail.com>
AuthorDate: Fri Aug 19 07:40:15 2022 +0100
Upgrade Quarkus to 2.13.0.CR1
---
docs/antora.yml | 2 +-
extensions/avro-rpc/runtime/pom.xml | 5 --
.../avro/rpc/GenericDatumReaderSubstitute.java | 56 ----------------------
pom.xml | 4 +-
poms/bom/src/main/generated/flattened-full-pom.xml | 4 +-
.../src/main/generated/flattened-reduced-pom.xml | 4 +-
.../generated/flattened-reduced-verbose-pom.xml | 4 +-
7 files changed, 9 insertions(+), 70 deletions(-)
diff --git a/docs/antora.yml b/docs/antora.yml
index 79ad960d4c..33197c8d7b 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -31,7 +31,7 @@ asciidoc:
target-maven-version: 3.8.6 # replace ${target-maven-version}
camel-version: 3.18.1 # replace ${camel.version}
camel-docs-version: 3.18.x # replace ${camel.docs.components.version}
- quarkus-version: 2.12.0.Final # replace ${quarkus.version}
+ quarkus-version: 999-SNAPSHOT # replace ${quarkus.version}
graalvm-version: 22.2.0 # replace ${graalvm.version}
graalvm-docs-version: 22.2
# attributes used in xrefs to other Antora components
diff --git a/extensions/avro-rpc/runtime/pom.xml b/extensions/avro-rpc/runtime/pom.xml
index 9fc673c168..f2e6494ed6 100644
--- a/extensions/avro-rpc/runtime/pom.xml
+++ b/extensions/avro-rpc/runtime/pom.xml
@@ -64,11 +64,6 @@
<groupId>org.apache.avro</groupId>
<artifactId>avro-ipc-netty</artifactId>
</dependency>
- <dependency>
- <groupId>org.graalvm.nativeimage</groupId>
- <artifactId>svm</artifactId>
- <scope>provided</scope>
- </dependency>
</dependencies>
<build>
diff --git a/extensions/avro-rpc/runtime/src/main/java/org/apache/camel/quarkus/component/avro/rpc/GenericDatumReaderSubstitute.java b/extensions/avro-rpc/runtime/src/main/java/org/apache/camel/quarkus/component/avro/rpc/GenericDatumReaderSubstitute.java
deleted file mode 100644
index 5ecb7c54f8..0000000000
--- a/extensions/avro-rpc/runtime/src/main/java/org/apache/camel/quarkus/component/avro/rpc/GenericDatumReaderSubstitute.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.quarkus.component.avro.rpc;
-
-import java.util.IdentityHashMap;
-import java.util.Map;
-
-import com.oracle.svm.core.annotate.Alias;
-import com.oracle.svm.core.annotate.Inject;
-import com.oracle.svm.core.annotate.RecomputeFieldValue;
-import com.oracle.svm.core.annotate.Substitute;
-import com.oracle.svm.core.annotate.TargetClass;
-import org.apache.avro.Schema;
-import org.apache.avro.generic.GenericDatumReader;
-
-@TargetClass(value = GenericDatumReader.class)
-public final class GenericDatumReaderSubstitute {
-
- @Inject
- @RecomputeFieldValue(kind = RecomputeFieldValue.Kind.Reset)
- private Map<Schema, Class> stringClassCache;
-
- @Alias
- protected Class findStringClass(Schema schema) {
- return null;
- }
-
- @Substitute
- private Class getStringClass(Schema s) {
- if (stringClassCache == null) {
- stringClassCache = new IdentityHashMap<>();
- }
-
- Class c = stringClassCache.get(s);
-
- if (c == null) {
- c = findStringClass(s);
- stringClassCache.put(s, c);
- }
- return c;
- }
-}
diff --git a/pom.xml b/pom.xml
index 2c407f86b0..1ed3d9d1f4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,7 +58,7 @@
<quarkiverse-minio.version>2.9.1</quarkiverse-minio.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/minio/quarkus-minio-parent/ -->
<quarkiverse-mybatis.version>1.0.4</quarkiverse-mybatis.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/mybatis/quarkus-mybatis-parent/ -->
<quarkiverse-tika.version>1.0.3</quarkiverse-tika.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/tika/quarkus-tika-parent/ -->
- <quarkus.version>2.12.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>3.0.0</quarkus-hazelcast-client.version><!-- https://repo1.maven.org/maven2/com/hazelcast/quarkus-hazelcast-client-bom/ -->
<quarkus-qpid-jms.version>0.36.0</quarkus-qpid-jms.version><!-- https://repo1.maven.org/maven2/org/amqphub/quarkus/quarkus-qpid-jms-bom/ -->
@@ -67,7 +67,7 @@
<ahc.version>${ahc-version}</ahc.version>
<animal-sniffer.version>1.18</animal-sniffer.version>
<antlr3.version>3.5.2</antlr3.version><!-- Spark, Stringtemplate and probably others -->
- <avro.version>1.11.0</avro.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.apache.avro:avro -->
+ <avro.version>1.11.1</avro.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.apache.avro:avro -->
<awssdk.version>2.17.220</awssdk.version><!-- @sync io.quarkiverse.amazonservices:quarkus-amazon-services-parent:${quarkiverse-amazonservices.version} prop:awssdk.version -->
<assertj.version>3.23.1</assertj.version><!-- @sync io.quarkus:quarkus-build-parent:${quarkus.version} prop:assertj.version -->
<aws-java-sdk.version>1.11.714</aws-java-sdk.version>
diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml
index 6683cfa41c..6d67c6f0ee 100644
--- a/poms/bom/src/main/generated/flattened-full-pom.xml
+++ b/poms/bom/src/main/generated/flattened-full-pom.xml
@@ -9983,12 +9983,12 @@
<dependency>
<groupId>org.apache.avro</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>avro-ipc-jetty</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>1.11.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>1.11.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
<dependency>
<groupId>org.apache.avro</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>avro-ipc-netty</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>1.11.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>1.11.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<exclusions>
<exclusion>
<groupId>javax.annotation</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml
index f2164393fb..0aac136c7b 100644
--- a/poms/bom/src/main/generated/flattened-reduced-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml
@@ -9983,12 +9983,12 @@
<dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro-ipc-jetty</artifactId>
- <version>1.11.0</version>
+ <version>1.11.1</version>
</dependency>
<dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro-ipc-netty</artifactId>
- <version>1.11.0</version>
+ <version>1.11.1</version>
<exclusions>
<exclusion>
<groupId>javax.annotation</groupId>
diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
index 6251841469..6679b3a100 100644
--- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
@@ -9983,12 +9983,12 @@
<dependency>
<groupId>org.apache.avro</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>avro-ipc-jetty</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>1.11.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>1.11.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
<dependency>
<groupId>org.apache.avro</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>avro-ipc-netty</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>1.11.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>1.11.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<exclusions>
<exclusion>
<groupId>javax.annotation</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->