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 2023/06/13 06:25:07 UTC
[camel-quarkus] branch quarkus-main updated (60c0a75196 -> c5fa870e49)
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 60c0a75196 Upgrade Quarkus to 3.2.0.CR1
add 411cd10e8f Add GitHub Actions workflows to label issues and assign a milestone
add 0aac72b97e Updated CHANGELOG.md
add 0c1e690613 Bump wiremock from 3.0.0-beta-8 to 3.0.0-beta-9
new c39438dbc4 Upgrade Quarkus to 3.2.0.CR1
new c5fa870e49 Disable integration tests that use kubernetes-client due to #4957
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 (60c0a75196)
\
N -- N -- N refs/heads/quarkus-main (c5fa870e49)
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 2 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:
.../ISSUE_TEMPLATE/bug_report.yaml | 23 +--
.../ISSUE_TEMPLATE/config.yml | 20 +--
.../ISSUE_TEMPLATE/enhancement_request.yaml | 22 ++-
.../ISSUE_TEMPLATE/task_housekeeping.yaml | 24 +--
.github/auto-label-configuration.yaml | 121 ++++++++++++++
.github/workflows/assign-issue-milestone.yaml | 143 ++++++++++++++++
.github/workflows/label-issue.yaml | 183 +++++++++++++++++++++
CHANGELOG.md | 2 +
integration-tests/kubernetes/pom.xml | 2 +
integration-tests/master-openshift/pom.xml | 2 +
pom.xml | 2 +-
11 files changed, 496 insertions(+), 48 deletions(-)
copy extensions-support/commons-logging/runtime/src/main/resources/META-INF/quarkus-extension.yaml => .github/ISSUE_TEMPLATE/bug_report.yaml (71%)
copy extensions-support/commons-logging/runtime/src/main/resources/META-INF/quarkus-extension.yaml => .github/ISSUE_TEMPLATE/config.yml (70%)
copy .asf.yaml => .github/ISSUE_TEMPLATE/enhancement_request.yaml (74%)
copy .asf.yaml => .github/ISSUE_TEMPLATE/task_housekeeping.yaml (69%)
create mode 100644 .github/auto-label-configuration.yaml
create mode 100644 .github/workflows/assign-issue-milestone.yaml
create mode 100644 .github/workflows/label-issue.yaml
[camel-quarkus] 02/02: Disable integration tests that use kubernetes-client due to #4957
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 c5fa870e49f0f3c737e0118b09e59adf15e93be7
Author: James Netherton <ja...@gmail.com>
AuthorDate: Tue Jun 13 07:24:53 2023 +0100
Disable integration tests that use kubernetes-client due to #4957
---
integration-tests/kubernetes/pom.xml | 2 ++
integration-tests/master-openshift/pom.xml | 2 ++
2 files changed, 4 insertions(+)
diff --git a/integration-tests/kubernetes/pom.xml b/integration-tests/kubernetes/pom.xml
index 7b6d9c68c7..3d2afee88c 100644
--- a/integration-tests/kubernetes/pom.xml
+++ b/integration-tests/kubernetes/pom.xml
@@ -75,6 +75,7 @@
<profiles>
+ <!-- https://github.com/apache/camel-quarkus/issues/4957
<profile>
<id>native</id>
<activation>
@@ -102,6 +103,7 @@
</plugins>
</build>
</profile>
+ -->
<profile>
<id>virtualDependencies</id>
<activation>
diff --git a/integration-tests/master-openshift/pom.xml b/integration-tests/master-openshift/pom.xml
index 23cd59a20b..5bcf7261d1 100644
--- a/integration-tests/master-openshift/pom.xml
+++ b/integration-tests/master-openshift/pom.xml
@@ -149,6 +149,7 @@
</plugins>
</build>
</profile>
+ <!-- https://github.com/apache/camel-quarkus/issues/4957
<profile>
<id>native</id>
<activation>
@@ -186,6 +187,7 @@
</plugins>
</build>
</profile>
+ -->
<profile>
<id>virtualDependencies</id>
<activation>
[camel-quarkus] 01/02: Upgrade Quarkus to 3.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 c39438dbc4f59648d67df95de499a0064dbf23d0
Author: James Netherton <ja...@gmail.com>
AuthorDate: Tue May 30 08:05:35 2023 +0100
Upgrade Quarkus to 3.2.0.CR1
---
docs/antora.yml | 4 ++--
extensions-jvm/drill/deployment/pom.xml | 4 ++++
extensions-jvm/drill/runtime/pom.xml | 4 ++++
.../quarkus/component/jta/MockTransactionManagerProducer.java | 2 +-
pom.xml | 8 ++++----
poms/bom/pom.xml | 4 ++++
poms/bom/src/main/generated/flattened-full-pom.xml | 6 +++++-
poms/bom/src/main/generated/flattened-reduced-pom.xml | 6 +++++-
poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 6 +++++-
9 files changed, 34 insertions(+), 10 deletions(-)
diff --git a/docs/antora.yml b/docs/antora.yml
index c3024802fd..001cce4822 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -30,11 +30,11 @@ asciidoc:
# Project versions
camel-version: 4.0.0-M3 # replace ${camel.version}
camel-docs-version: ""
- quarkus-version: 3.1.0.Final # replace ${quarkus.version}
+ quarkus-version: 999-SNAPSHOT # replace ${quarkus.version}
graalvm-version: 22.3.2 # replace ${graalvm.version}
graalvm-docs-version: 22.3
min-maven-version: 3.8.2 # replace ${min-maven-version}
- target-maven-version: 3.9.1 # replace ${target-maven-version}
+ target-maven-version: 3.9.2 # replace ${target-maven-version}
# Attributes used in xrefs to other Antora components
cq-camel-components: components
diff --git a/extensions-jvm/drill/deployment/pom.xml b/extensions-jvm/drill/deployment/pom.xml
index 07eaa0cae8..76332b36bf 100644
--- a/extensions-jvm/drill/deployment/pom.xml
+++ b/extensions-jvm/drill/deployment/pom.xml
@@ -30,6 +30,10 @@
<name>Camel Quarkus :: Drill :: Deployment</name>
<dependencies>
+ <dependency>
+ <groupId>io.quarkiverse.cxf</groupId>
+ <artifactId>quarkus-cxf-woodstox-deployment</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-core-deployment</artifactId>
diff --git a/extensions-jvm/drill/runtime/pom.xml b/extensions-jvm/drill/runtime/pom.xml
index 2ae8376baf..6091cbc77b 100644
--- a/extensions-jvm/drill/runtime/pom.xml
+++ b/extensions-jvm/drill/runtime/pom.xml
@@ -35,6 +35,10 @@
</properties>
<dependencies>
+ <dependency>
+ <groupId>io.quarkiverse.cxf</groupId>
+ <artifactId>quarkus-cxf-woodstox</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-core</artifactId>
diff --git a/extensions/jta/deployment/src/test/java/org/apache/camel/quarkus/component/jta/MockTransactionManagerProducer.java b/extensions/jta/deployment/src/test/java/org/apache/camel/quarkus/component/jta/MockTransactionManagerProducer.java
index d4b96ade0c..520ecf0e04 100644
--- a/extensions/jta/deployment/src/test/java/org/apache/camel/quarkus/component/jta/MockTransactionManagerProducer.java
+++ b/extensions/jta/deployment/src/test/java/org/apache/camel/quarkus/component/jta/MockTransactionManagerProducer.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.quarkus.component.jta;
-import io.quarkus.arc.Priority;
+import jakarta.annotation.Priority;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.enterprise.inject.Alternative;
import jakarta.enterprise.inject.Produces;
diff --git a/pom.xml b/pom.xml
index 1e61f3176f..6c44b889f3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,7 +61,7 @@
<quarkiverse-mybatis.version>2.0.0</quarkiverse-mybatis.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/mybatis/quarkus-mybatis-parent/ -->
<quarkiverse-pooled-jms.version>2.0.1</quarkiverse-pooled-jms.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/messaginghub/quarkus-pooled-jms-parent/ -->
<quarkiverse-tika.version>2.0.0</quarkiverse-tika.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/tika/quarkus-tika-parent/ -->
- <quarkus.version>3.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-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>2.2.0</quarkus-qpid-jms.version><!-- https://repo1.maven.org/maven2/org/amqphub/quarkus/quarkus-qpid-jms-bom/ -->
@@ -109,7 +109,7 @@
<ibm.mq.client.version>9.3.2.1</ibm.mq.client.version>
<influxdb.version>${influx-java-driver-version}</influxdb.version>
<io-netty-iouring.version>0.0.16.Final</io-netty-iouring.version><!-- @sync org.asynchttpclient:async-http-client-project:${ahc.version} prop:netty.iouring -->
- <jackson.version>2.15.0</jackson.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:com.fasterxml.jackson.core:jackson-core -->
+ <jackson.version>2.15.2</jackson.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:com.fasterxml.jackson.core:jackson-core -->
<jakarta.jms-api.version>${jakarta-jms-api-version}</jakarta.jms-api.version>
<java-json-tools.json-patch.version>${json-patch-version}</java-json-tools.json-patch.version><!-- A replacement for com.github.fge:json-patch -->
<jodatime.version>${jodatime2-version}</jodatime.version><!-- Mess in transitive dependencies of Splunk -->
@@ -138,7 +138,7 @@
<reactor-core.version>3.4.27</reactor-core.version><!-- @sync com.azure:azure-core:${azure-core.version} dep:io.projectreactor:reactor-core -->
<reactor-netty.version>${reactor-netty-version}</reactor-netty.version>
<retrofit.version>2.9.0</retrofit.version><!-- @sync org.influxdb:influxdb-java:${influxdb.version} dep:com.squareup.retrofit2:retrofit -->
- <smallrye.reactive.messaging.camel.version>4.5.0</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>4.6.0</smallrye.reactive.messaging.camel.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:io.smallrye.reactive:smallrye-reactive-messaging-provider -->
<spring.version>${spring-version}</spring.version>
<snakeyaml.version>2.0</snakeyaml.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.yaml:snakeyaml -->
<tablesaw.version>0.43.1</tablesaw.version>
@@ -210,7 +210,7 @@
<!-- maven-enforcer-plugin -->
<min-maven-version>3.8.2</min-maven-version>
- <target-maven-version>3.9.1</target-maven-version><!-- @sync io.quarkus:quarkus-build-parent:${quarkus.version} prop:proposed-maven-version -->
+ <target-maven-version>3.9.2</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 -->
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index 5536f4ffb3..8709b1b9f4 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -1825,6 +1825,10 @@
<artifactId>camel-microprofile-health</artifactId>
<version>${camel.version}</version>
<exclusions>
+ <exclusion>
+ <groupId>org.eclipse.parsson</groupId>
+ <artifactId>jakarta.json</artifactId>
+ </exclusion>
<exclusion>
<groupId>org.glassfish</groupId>
<artifactId>jakarta.json</artifactId>
diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml
index 5a1a6f9712..8655042896 100644
--- a/poms/bom/src/main/generated/flattened-full-pom.xml
+++ b/poms/bom/src/main/generated/flattened-full-pom.xml
@@ -1763,6 +1763,10 @@
<artifactId>camel-microprofile-health</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>4.0.0-M3</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<exclusions>
+ <exclusion>
+ <groupId>org.eclipse.parsson</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>jakarta.json</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </exclusion>
<exclusion>
<groupId>org.glassfish</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>jakarta.json</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
@@ -6220,7 +6224,7 @@
<dependency>
<groupId>io.smallrye.reactive</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>smallrye-reactive-messaging-camel</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>4.5.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>4.6.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
<dependency>
<groupId>jakarta.jms</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 2d7a6cf304..bdb24c41d0 100644
--- a/poms/bom/src/main/generated/flattened-reduced-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml
@@ -1763,6 +1763,10 @@
<artifactId>camel-microprofile-health</artifactId>
<version>4.0.0-M3</version>
<exclusions>
+ <exclusion>
+ <groupId>org.eclipse.parsson</groupId>
+ <artifactId>jakarta.json</artifactId>
+ </exclusion>
<exclusion>
<groupId>org.glassfish</groupId>
<artifactId>jakarta.json</artifactId>
@@ -6220,7 +6224,7 @@
<dependency>
<groupId>io.smallrye.reactive</groupId>
<artifactId>smallrye-reactive-messaging-camel</artifactId>
- <version>4.5.0</version>
+ <version>4.6.0</version>
</dependency>
<dependency>
<groupId>jakarta.jms</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 77bb6bab43..b6e91ae7e6 100644
--- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
@@ -1763,6 +1763,10 @@
<artifactId>camel-microprofile-health</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>4.0.0-M3</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<exclusions>
+ <exclusion>
+ <groupId>org.eclipse.parsson</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>jakarta.json</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </exclusion>
<exclusion>
<groupId>org.glassfish</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>jakarta.json</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
@@ -6220,7 +6224,7 @@
<dependency>
<groupId>io.smallrye.reactive</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>smallrye-reactive-messaging-camel</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>4.5.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>4.6.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
<dependency>
<groupId>jakarta.jms</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->