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/08 06:18:14 UTC
[camel-quarkus] branch quarkus-main updated (56c589d6c3 -> b30f83dc13)
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 56c589d6c3 Disable jta-jpa example testing due to #4945
discard fe83210be1 Disable MyBatis testing due to #4945
discard 707d863d42 Upgrade Quarkus to 3.2.0.CR1
add 76c0b26dd3 Ref #4959: Delegate complexity to quarkus-groovy
add 7d57181bf5 Use GitHub SCM URL because https://gitbox.apache.org/repos/asf?p=camel-quarkus.git redirects to GitHub anyway
add 8869ae2a29 Fix formatting in the release guide
add 6bf765ac80 Add ,subs="attributes+" to code snippets on CXF extension page so that {javaxOrJakartaPackagePrefix} gets resolved
add 7b30b3cc15 Be more precise about the WS standards coverage on the CXF extension page
add 3ddf9a368f Updated CHANGELOG.md
add 516bb524b1 Bump unboundid-ldapsdk from 6.0.8 to 6.0.9
new bb9845f0c5 Upgrade Quarkus to 3.2.0.CR1
new efaa345c17 Disable MyBatis testing due to #4945
new b30f83dc13 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 (56c589d6c3)
\
N -- N -- N refs/heads/quarkus-main (b30f83dc13)
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 | 8 ++
.../pages/contributor-guide/release-guide.adoc | 5 +-
.../ROOT/pages/reference/extensions/cxf-soap.adoc | 12 +-
.../cxf-soap/runtime/src/main/doc/usage.adoc | 12 +-
extensions/groovy-dsl/deployment/pom.xml | 4 +
extensions/groovy-dsl/runtime/pom.xml | 4 +
.../groovy/runtime/graal/GroovySubstitutions.java | 149 ---------------------
.../graal/SubstituteGroovyRoutesBuilderLoader.java | 34 -----
extensions/groovy/deployment/pom.xml | 4 +-
extensions/groovy/runtime/pom.xml | 4 +-
pom.xml | 7 +-
poms/bom/pom.xml | 14 ++
poms/bom/src/main/generated/flattened-full-pom.xml | 16 ++-
.../src/main/generated/flattened-reduced-pom.xml | 16 ++-
.../generated/flattened-reduced-verbose-pom.xml | 16 ++-
15 files changed, 97 insertions(+), 208 deletions(-)
delete mode 100644 extensions/groovy-dsl/runtime/src/main/java/org/apache/camel/quarkus/dsl/groovy/runtime/graal/GroovySubstitutions.java
delete mode 100644 extensions/groovy-dsl/runtime/src/main/java/org/apache/camel/quarkus/dsl/groovy/runtime/graal/SubstituteGroovyRoutesBuilderLoader.java
[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 efaa345c173c39c65d46fd1acb49c124b66b6284
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 bb9845f0c5c404795d069a85240a803a9a0a494a
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 | 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 +++++-
6 files changed, 24 insertions(+), 8 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 16718ba3c0..30381ef2f2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,7 +60,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/ -->
@@ -108,7 +108,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 -->
@@ -137,7 +137,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>
@@ -209,7 +209,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} -->
[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 b30f83dc13a971cd70aa49825e7c4fecf2241ab0
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