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/12/11 09:33:12 UTC
(camel-quarkus) branch quarkus-main updated (23b32ef71b -> 47f0159281)
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 23b32ef71b Upgrade Quarkus to 3.7.0.CR1
add a642f261cc Regen SBOM from commit 9b7ff3f98c4937a476de11263d0a190ccfaee697 (#5602)
add 859a6e568c Upgrade Quarkus to 3.6.1
add fe111eebcb Set io.netty.tryReflectionSetAccessible=false for jfr & google-bigquery native modules #5603
new 8ef9f8e0a6 Upgrade Quarkus to 3.7.0.CR1
new 47f0159281 Workaround openstack4j incompatibility with Jackson 2.16.x #5604
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 (23b32ef71b)
\
N -- N -- N refs/heads/quarkus-main (47f0159281)
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:
camel-quarkus-sbom/camel-quarkus-sbom.json | 1405 ++------------------
camel-quarkus-sbom/camel-quarkus-sbom.xml | 671 ++--------
extensions/openstack/runtime/pom.xml | 11 +
.../OSBadBooleanDeserializerSubstitutions.java | 71 +
.../src/main/resources/application.properties | 4 +-
.../jfr/src/main/resources/application.properties | 3 +
6 files changed, 275 insertions(+), 1890 deletions(-)
create mode 100644 extensions/openstack/runtime/src/main/java/org/apache/camel/quarkus/component/openstack/graal/OSBadBooleanDeserializerSubstitutions.java
copy {integration-test-groups/aws2-quarkus-client/aws2-ddb => integration-tests/google-bigquery}/src/main/resources/application.properties (87%)
(camel-quarkus) 01/02: Upgrade Quarkus to 3.7.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 8ef9f8e0a6ea6c23be304958c9ad7ae437eb848e
Author: James Netherton <ja...@gmail.com>
AuthorDate: Fri Nov 24 11:19:53 2023 +0000
Upgrade Quarkus to 3.7.0.CR1
---
docs/antora.yml | 2 +-
pom.xml | 10 +++++-----
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 +-
.../java/org/apache/camel/quarkus/test/AfterEachCallback.java | 1 -
.../java/org/apache/camel/quarkus/test/BeforeEachCallback.java | 1 -
.../test/userTestCases/AdviceInDoBeforeEachMethodsTest.java | 6 +++---
8 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/docs/antora.yml b/docs/antora.yml
index ba7003e53e..081038d2af 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -31,7 +31,7 @@ asciidoc:
camel-version: 4.2.0 # replace ${camel.version}
camel-docs-version: 4.0.x
camel-quarkus-version: 3.7.0 # replace ${camel-quarkus.version}
- quarkus-version: 3.6.1 # replace ${quarkus.version}
+ quarkus-version: 999-SNAPSHOT # replace ${quarkus.version}
graalvm-version: 23.0.1 # replace ${graalvm.version}
graalvm-docs-version: jdk21 # replace ${graalvm-docs.version}
mapstruct-version: 1.5.5.Final # replace ${mapstruct.version}
diff --git a/pom.xml b/pom.xml
index 48aad503c0..8cfb3b8a0b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,7 +61,7 @@
<quarkiverse-mybatis.version>2.2.0</quarkiverse-mybatis.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/mybatis/quarkus-mybatis-parent/ -->
<quarkiverse-pooled-jms.version>2.3.0</quarkiverse-pooled-jms.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/messaginghub/quarkus-pooled-jms-parent/ -->
<quarkiverse-tika.version>2.0.2</quarkiverse-tika.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/tika/quarkus-tika-parent/ -->
- <quarkus.version>3.6.1</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>4.0.0</quarkus-hazelcast-client.version><!-- https://repo1.maven.org/maven2/com/hazelcast/quarkus-hazelcast-client-bom/ -->
<quarkus-qpid-jms.version>2.5.0</quarkus-qpid-jms.version><!-- This should be in sync with quarkus-platform https://repo1.maven.org/maven2/org/amqphub/quarkus/quarkus-qpid-jms-bom/ -->
@@ -104,7 +104,7 @@
<graalvm.version>23.0.1</graalvm.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.graalvm.sdk:graal-sdk -->
<graalvm-docs.version>jdk21</graalvm-docs.version><!-- @sync io.quarkus:quarkus-documentation:${quarkus.version} prop:graal-community.tag-for-documentation -->
<groovy.version>4.0.16</groovy.version><!-- @sync io.quarkiverse.groovy:quarkus-groovy-parent:${quarkiverse-groovy.version} prop:groovy.version -->
- <grpc.version>1.59.0</grpc.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:io.grpc:grpc-core -->
+ <grpc.version>1.59.1</grpc.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:io.grpc:grpc-core -->
<hapi.version>${hapi-version}</hapi.version>
<hapi-base.version>${hapi-base-version}</hapi-base.version>
<hapi-fhir.version>${hapi-fhir-version}</hapi-fhir.version>
@@ -114,7 +114,7 @@
<icu4j.version>${icu4j-version}</icu4j.version>
<immutables.version>2.9.3</immutables.version>
<influxdb.version>${influx-java-driver-version}</influxdb.version>
- <jackson.version>2.15.3</jackson.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:com.fasterxml.jackson.core:jackson-core -->
+ <jackson.version>2.16.0</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 -->
@@ -143,11 +143,11 @@
<okio.version>${squareup-okio-version}</okio.version>
<opencensus.version>0.31.0</opencensus.version><!-- Mess in Google cloud. Keep in sync with version used in com.google.http-client:google-http-client -->
<perfmark-api.version>0.26.0</perfmark-api.version><!-- @sync io.grpc:grpc-netty-shaded:${grpc.version} dep:io.perfmark:perfmark-api -->
- <protobuf.version>3.24.4</protobuf.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:com.google.protobuf:protobuf-java -->
+ <protobuf.version>3.25.0</protobuf.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:com.google.protobuf:protobuf-java -->
<reactor-core.version>3.4.33</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.10.2</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.12.0</smallrye.reactive.messaging.camel.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:io.smallrye.reactive:smallrye-reactive-messaging-provider -->
<snakeyaml.version>2.2</snakeyaml.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.yaml:snakeyaml -->
<snakeyaml-engine.version>${snakeyaml-engine-version}</snakeyaml-engine.version><!-- Resolve conflict between camel-snakeyaml & kubernetes-client -->
<spring.version>${spring-version}</spring.version>
diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml
index e5c1936548..19f3d106ab 100644
--- a/poms/bom/src/main/generated/flattened-full-pom.xml
+++ b/poms/bom/src/main/generated/flattened-full-pom.xml
@@ -6359,7 +6359,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.10.2</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>4.12.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
<dependency>
<groupId>io.swagger.core.v3</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 51f0453347..95073f449d 100644
--- a/poms/bom/src/main/generated/flattened-reduced-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml
@@ -6339,7 +6339,7 @@
<dependency>
<groupId>io.smallrye.reactive</groupId>
<artifactId>smallrye-reactive-messaging-camel</artifactId>
- <version>4.10.2</version>
+ <version>4.12.0</version>
</dependency>
<dependency>
<groupId>io.swagger.core.v3</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 00a5043bd0..01990eee3d 100644
--- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
@@ -6339,7 +6339,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.10.2</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>4.12.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
<dependency>
<groupId>io.swagger.core.v3</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
diff --git a/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/AfterEachCallback.java b/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/AfterEachCallback.java
index eb4e43a089..7f67fdbadd 100644
--- a/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/AfterEachCallback.java
+++ b/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/AfterEachCallback.java
@@ -27,7 +27,6 @@ public class AfterEachCallback implements QuarkusTestAfterEachCallback {
CamelQuarkusTestSupport testInstance = (CamelQuarkusTestSupport) context.getTestInstance();
try {
- testInstance.tearDown();
testInstance.doAfterEach(context);
} catch (Exception e) {
throw new RuntimeException(e);
diff --git a/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/BeforeEachCallback.java b/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/BeforeEachCallback.java
index 93ac9e34e7..f7903726b0 100644
--- a/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/BeforeEachCallback.java
+++ b/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/BeforeEachCallback.java
@@ -36,7 +36,6 @@ public class BeforeEachCallback implements QuarkusTestBeforeEachCallback {
try {
testInstance.internalBeforeEach(mockContext);
testInstance.internalBeforeAll(mockContext);
- testInstance.setUp();
testInstance.doBeforeEach(context);
} catch (Exception e) {
throw new RuntimeException(e);
diff --git a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/userTestCases/AdviceInDoBeforeEachMethodsTest.java b/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/userTestCases/AdviceInDoBeforeEachMethodsTest.java
index ae5b16d6eb..0af7cf9800 100644
--- a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/userTestCases/AdviceInDoBeforeEachMethodsTest.java
+++ b/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/userTestCases/AdviceInDoBeforeEachMethodsTest.java
@@ -17,7 +17,6 @@
package org.apache.camel.quarkus.test.userTestCases;
import io.quarkus.test.junit.QuarkusTest;
-import io.quarkus.test.junit.callback.QuarkusTestMethodContext;
import jakarta.inject.Inject;
import org.apache.camel.CamelContext;
import org.apache.camel.EndpointInject;
@@ -28,6 +27,7 @@ import org.apache.camel.builder.AdviceWithRouteBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.quarkus.test.CamelQuarkusTestSupport;
+import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
/**
@@ -56,8 +56,8 @@ public class AdviceInDoBeforeEachMethodsTest extends CamelQuarkusTestSupport {
};
}
- @Override
- protected void doBeforeEach(QuarkusTestMethodContext context) throws Exception {
+ @BeforeEach
+ protected void applyAdvice() throws Exception {
AdviceWith.adviceWith(this.context, "sampleRoute",
AdviceInDoBeforeEachMethodsTest::enhanceRoute);
}
(camel-quarkus) 02/02: Workaround openstack4j incompatibility with Jackson 2.16.x #5604
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 47f01592810b61afc714fb11c086bc16a426a8de
Author: James Netherton <ja...@gmail.com>
AuthorDate: Mon Dec 11 08:53:29 2023 +0000
Workaround openstack4j incompatibility with Jackson 2.16.x #5604
---
extensions/openstack/runtime/pom.xml | 11 ++++
.../OSBadBooleanDeserializerSubstitutions.java | 71 ++++++++++++++++++++++
2 files changed, 82 insertions(+)
diff --git a/extensions/openstack/runtime/pom.xml b/extensions/openstack/runtime/pom.xml
index f8f4521943..4d3411bfd6 100644
--- a/extensions/openstack/runtime/pom.xml
+++ b/extensions/openstack/runtime/pom.xml
@@ -52,6 +52,17 @@
<groupId>io.quarkus</groupId>
<artifactId>quarkus-jackson</artifactId>
</dependency>
+ <!-- TODO: Remove this https://github.com/apache/camel-quarkus/issues/5604 -->
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.graalvm.sdk</groupId>
+ <artifactId>graal-sdk</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/extensions/openstack/runtime/src/main/java/org/apache/camel/quarkus/component/openstack/graal/OSBadBooleanDeserializerSubstitutions.java b/extensions/openstack/runtime/src/main/java/org/apache/camel/quarkus/component/openstack/graal/OSBadBooleanDeserializerSubstitutions.java
new file mode 100644
index 0000000000..a099d8a6b1
--- /dev/null
+++ b/extensions/openstack/runtime/src/main/java/org/apache/camel/quarkus/component/openstack/graal/OSBadBooleanDeserializerSubstitutions.java
@@ -0,0 +1,71 @@
+package org.apache.camel.quarkus.component.openstack.graal;
+
+import java.io.IOException;
+
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.JsonToken;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.util.ClassUtil;
+import com.oracle.svm.core.annotate.Alias;
+import com.oracle.svm.core.annotate.Substitute;
+import com.oracle.svm.core.annotate.TargetClass;
+import org.openstack4j.core.transport.internal.OSBadBooleanDeserializer;
+
+/**
+ * TODO: Remove this https://github.com/apache/camel-quarkus/issues/5604
+ *
+ * Mostly a replica of the original OSBadBooleanDeserializer.deserialize but with references to
+ * deprecated & removed Jackson methods replaced.
+ */
+@TargetClass(OSBadBooleanDeserializer.class)
+final class OSBadBooleanDeserializerSubstitutions {
+
+ @Substitute
+ public Boolean deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException, JsonProcessingException {
+ JsonToken t = jp.getCurrentToken();
+ if (t == JsonToken.VALUE_TRUE) {
+ return Boolean.TRUE;
+ }
+ if (t == JsonToken.VALUE_FALSE) {
+ return Boolean.FALSE;
+ }
+ // [JACKSON-78]: should accept ints too, (0 == false, otherwise true)
+ if (t == JsonToken.VALUE_NUMBER_INT) {
+ // 11-Jan-2012, tatus: May be outside of int...
+ if (jp.getNumberType() == JsonParser.NumberType.INT) {
+ return (jp.getIntValue() == 0) ? Boolean.FALSE : Boolean.TRUE;
+ }
+ return Boolean.valueOf(_parseBooleanFromNumber(jp, ctxt));
+ }
+ if (t == JsonToken.VALUE_NULL) {
+ return null;
+ }
+ // And finally, let's allow Strings to be converted too
+ if (t == JsonToken.VALUE_STRING) {
+ String text = jp.getText().trim();
+ if ("true".equalsIgnoreCase(text)) {
+ return Boolean.TRUE;
+ }
+ if ("false".equalsIgnoreCase(text)) {
+ return Boolean.FALSE;
+ }
+ if (text.length() == 0) {
+ return null;
+ }
+ throw ctxt.weirdStringException(text, Boolean.class, "only \"true\" or \"false\" recognized");
+ }
+
+ ctxt.handleUnexpectedToken(Boolean.class, ctxt.getParser());
+ // Otherwise, no can do:
+ throw JsonMappingException.from(ctxt.getParser(),
+ String.format("Cannot deserialize instance of %s out of %s token",
+ ClassUtil.nameOf(Boolean.class), t));
+ }
+
+ @Alias
+ protected final boolean _parseBooleanFromNumber(JsonParser jp, DeserializationContext ctxt) {
+ return true;
+ }
+}