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/07 06:50:36 UTC
[camel-quarkus] branch quarkus-main updated (5d3b481f94 -> 56c589d6c3)
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 5d3b481f94 Disable jta-jpa example testing due to #4945
discard 67ab0e5608 Disable MyBatis testing due to #4945
discard 20f753d3b1 Upgrade Quarkus to 3.2.0.CR1
add 3139de8f64 Use correct package for cxf-soap-server tests
add c7605738bf Updated CHANGELOG.md
add f64e786366 Ref #4960: Upgrade Groovy to 4.0.12 (#4963)
new 707d863d42 Upgrade Quarkus to 3.2.0.CR1
new fe83210be1 Disable MyBatis testing due to #4945
new 56c589d6c3 Disable jta-jpa example testing due to #4945
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 (5d3b481f94)
\
N -- N -- N refs/heads/quarkus-main (56c589d6c3)
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 3 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 | 19 ++
docs/pom.xml | 18 +-
.../aws2-quarkus-client/aws2-ddb/pom.xml | 8 +-
.../aws2-quarkus-client/aws2-s3/pom.xml | 8 +-
.../aws2-quarkus-client/aws2-ses/pom.xml | 8 +-
.../aws2-quarkus-client/aws2-sqs-sns/pom.xml | 8 +-
.../aws2-quarkus-client/aws2-sqs/pom.xml | 8 +-
integration-test-groups/aws2/aws2-s3/pom.xml | 8 +-
.../component/cxf/soap/server/it/Java2wsIT.java | 2 +-
.../component/cxf/soap/server/it/Java2wsTest.java | 2 +-
integration-tests-jvm/xml-grouped/pom.xml | 8 +-
integration-tests/aws2-grouped/pom.xml | 8 +-
.../aws2-quarkus-client-grouped/pom.xml | 28 ++-
integration-tests/azure-grouped/pom.xml | 8 +-
integration-tests/compression-grouped/pom.xml | 8 +-
integration-tests/cxf-soap-grouped/pom.xml | 8 +-
integration-tests/dataformats-json-grouped/pom.xml | 8 +-
integration-tests/foundation-grouped/pom.xml | 8 +-
integration-tests/grpc/pom.xml | 36 ++--
integration-tests/mongodb-grouped/pom.xml | 8 +-
integration-tests/xml-grouped/pom.xml | 8 +-
pom.xml | 52 +++---
poms/bom/pom.xml | 2 +-
poms/bom/src/main/generated/flattened-full-pom.xml | 192 ++++++++++++---------
.../src/main/generated/flattened-reduced-pom.xml | 5 +
.../generated/flattened-reduced-verbose-pom.xml | 5 +
poms/build-parent/pom.xml | 19 +-
tooling/scripts/copy-tests.groovy | 10 +-
tooling/scripts/group-tests.groovy | 18 +-
tooling/scripts/report-build-status.groovy | 16 +-
tooling/scripts/sanity-checks.groovy | 3 +-
tooling/scripts/update-antora-config.groovy | 2 +-
tooling/scripts/update-antora-yaml.groovy | 2 +-
tooling/scripts/validate-extension-metadata.groovy | 3 +-
34 files changed, 327 insertions(+), 227 deletions(-)
[camel-quarkus] 03/03: Disable jta-jpa example testing due to #4945
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 56c589d6c3f39eb79213d392c3b7c27aaa6baa95
Author: James Netherton <ja...@gmail.com>
AuthorDate: Mon Jun 5 08:24:04 2023 +0100
Disable jta-jpa example testing due to #4945
---
.github/workflows/quarkus-master-cron.yaml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.github/workflows/quarkus-master-cron.yaml b/.github/workflows/quarkus-master-cron.yaml
index ed16c129cf..bef4dd1494 100644
--- a/.github/workflows/quarkus-master-cron.yaml
+++ b/.github/workflows/quarkus-master-cron.yaml
@@ -403,6 +403,7 @@ jobs:
git clone --depth 1 --branch ${EXAMPLES_BRANCH} https://github.com/apache/camel-quarkus-examples.git \
&& cd camel-quarkus-examples \
&& echo "Current Examples commit:" $(git rev-parse HEAD) \
+ && sed -i '0,/<\/properties>/s/<\/properties>/ <skipTests>true<\/skipTests>\n <\/properties>/' jta-jpa/pom.xml \
&& ./mvnw ${CQ_MAVEN_ARGS} ${BRANCH_OPTIONS} org.l2x6.cq:cq-maven-plugin:2.10.0:examples-set-platform -Dcq.camel-quarkus.version=${CQ_VERSION} \
&& ./mvnw-for-each.sh ${CQ_MAVEN_ARGS} ${BRANCH_OPTIONS} -Pnative,docker clean verify
- name: Report Build Failure
[camel-quarkus] 02/03: Disable MyBatis testing due to #4945
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 fe83210be1ac08cce5b583cfbe1d08df57e580aa
Author: James Netherton <ja...@gmail.com>
AuthorDate: Mon Jun 5 07:54:03 2023 +0100
Disable MyBatis testing due to #4945
---
.../apache/camel/quarkus/component/mybatis/it/MyBatisConsumerTest.java | 2 ++
.../java/org/apache/camel/quarkus/component/mybatis/it/MyBatisIT.java | 2 ++
.../java/org/apache/camel/quarkus/component/mybatis/it/MyBatisTest.java | 2 ++
3 files changed, 6 insertions(+)
diff --git a/integration-tests/mybatis/src/test/java/org/apache/camel/quarkus/component/mybatis/it/MyBatisConsumerTest.java b/integration-tests/mybatis/src/test/java/org/apache/camel/quarkus/component/mybatis/it/MyBatisConsumerTest.java
index f1e8f4673b..a5c451ffcf 100644
--- a/integration-tests/mybatis/src/test/java/org/apache/camel/quarkus/component/mybatis/it/MyBatisConsumerTest.java
+++ b/integration-tests/mybatis/src/test/java/org/apache/camel/quarkus/component/mybatis/it/MyBatisConsumerTest.java
@@ -27,11 +27,13 @@ import io.restassured.RestAssured;
import io.restassured.path.json.JsonPath;
import org.apache.camel.quarkus.component.mybatis.it.entity.Account;
import org.awaitility.Awaitility;
+import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import static io.restassured.RestAssured.given;
import static org.hamcrest.Matchers.is;
+@Disabled("https://github.com/apache/camel-quarkus/issues/4945")
@QuarkusTest
@QuarkusTestResource(H2DatabaseTestResource.class)
public class MyBatisConsumerTest {
diff --git a/integration-tests/mybatis/src/test/java/org/apache/camel/quarkus/component/mybatis/it/MyBatisIT.java b/integration-tests/mybatis/src/test/java/org/apache/camel/quarkus/component/mybatis/it/MyBatisIT.java
index 5fe3170c5b..98ced5e24d 100644
--- a/integration-tests/mybatis/src/test/java/org/apache/camel/quarkus/component/mybatis/it/MyBatisIT.java
+++ b/integration-tests/mybatis/src/test/java/org/apache/camel/quarkus/component/mybatis/it/MyBatisIT.java
@@ -17,7 +17,9 @@
package org.apache.camel.quarkus.component.mybatis.it;
import io.quarkus.test.junit.QuarkusIntegrationTest;
+import org.junit.jupiter.api.Disabled;
+@Disabled("https://github.com/apache/camel-quarkus/issues/4945")
@QuarkusIntegrationTest
public class MyBatisIT extends MyBatisTest {
}
diff --git a/integration-tests/mybatis/src/test/java/org/apache/camel/quarkus/component/mybatis/it/MyBatisTest.java b/integration-tests/mybatis/src/test/java/org/apache/camel/quarkus/component/mybatis/it/MyBatisTest.java
index e9f9bcc457..d88a74f2fd 100644
--- a/integration-tests/mybatis/src/test/java/org/apache/camel/quarkus/component/mybatis/it/MyBatisTest.java
+++ b/integration-tests/mybatis/src/test/java/org/apache/camel/quarkus/component/mybatis/it/MyBatisTest.java
@@ -28,10 +28,12 @@ import io.quarkus.test.junit.QuarkusTest;
import io.restassured.RestAssured;
import io.restassured.http.ContentType;
import org.apache.camel.quarkus.component.mybatis.it.entity.Account;
+import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import static org.hamcrest.Matchers.equalTo;
+@Disabled("https://github.com/apache/camel-quarkus/issues/4945")
@QuarkusTest
@QuarkusTestResource(H2DatabaseTestResource.class)
public class MyBatisTest {
[camel-quarkus] 01/03: 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 707d863d423a1b8eed9d41adb454aca3baf62470
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 | 2 +-
pom.xml | 6 +++---
poms/bom/src/main/generated/flattened-full-pom.xml | 2 +-
poms/bom/src/main/generated/flattened-reduced-pom.xml | 2 +-
poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/docs/antora.yml b/docs/antora.yml
index c3024802fd..871fc97c52 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -30,7 +30,7 @@ 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}
diff --git a/pom.xml b/pom.xml
index 730209ac59..7df12c95b3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,7 +59,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/ -->
@@ -107,7 +107,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 -->
@@ -136,7 +136,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>
diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml
index 98bd4a5255..70583ad083 100644
--- a/poms/bom/src/main/generated/flattened-full-pom.xml
+++ b/poms/bom/src/main/generated/flattened-full-pom.xml
@@ -6210,7 +6210,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 20fdb8bcf7..4363f63d06 100644
--- a/poms/bom/src/main/generated/flattened-reduced-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml
@@ -6210,7 +6210,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 45acd578ea..8e56afd585 100644
--- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
@@ -6210,7 +6210,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} -->