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 2024/03/22 15:40:37 UTC
(camel-quarkus) branch quarkus-main updated (902689043e -> ac5b88a8c8)
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 902689043e Upgrade Quarkus to 3.10.0.CR1
new ac5b88a8c8 Upgrade Quarkus to 3.10.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 (902689043e)
\
N -- N -- N refs/heads/quarkus-main (ac5b88a8c8)
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:
.../camel/quarkus/component/joor/deployment/JoorProcessor.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
(camel-quarkus) 01/01: Upgrade Quarkus to 3.10.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 ac5b88a8c8644a69945622efefa400349a70a27c
Author: James Netherton <ja...@gmail.com>
AuthorDate: Wed Mar 13 19:00:20 2024 +0000
Upgrade Quarkus to 3.10.0.CR1
---
.../camel/quarkus/component/joor/deployment/JoorProcessor.java | 6 +++---
integration-tests/quartz-clustered/pom.xml | 4 ++++
pom.xml | 4 ++--
3 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/extensions/joor/deployment/src/main/java/org/apache/camel/quarkus/component/joor/deployment/JoorProcessor.java b/extensions/joor/deployment/src/main/java/org/apache/camel/quarkus/component/joor/deployment/JoorProcessor.java
index a7832e7508..b97ce0b86d 100644
--- a/extensions/joor/deployment/src/main/java/org/apache/camel/quarkus/component/joor/deployment/JoorProcessor.java
+++ b/extensions/joor/deployment/src/main/java/org/apache/camel/quarkus/component/joor/deployment/JoorProcessor.java
@@ -30,7 +30,7 @@ import io.quarkus.deployment.annotations.ExecutionTime;
import io.quarkus.deployment.annotations.Record;
import io.quarkus.deployment.builditem.FeatureBuildItem;
import io.quarkus.deployment.builditem.GeneratedClassBuildItem;
-import io.quarkus.deployment.pkg.PackageConfig;
+import io.quarkus.deployment.pkg.NativeConfig;
import io.quarkus.deployment.pkg.builditem.CurateOutcomeBuildItem;
import io.quarkus.maven.dependency.ResolvedDependency;
import io.quarkus.paths.PathCollection;
@@ -196,11 +196,11 @@ class JoorProcessor {
*/
public static final class CompileAtBuildTime implements BooleanSupplier {
JoorExpressionConfig config;
- PackageConfig packageConfig;
+ NativeConfig nativeConfig;
@Override
public boolean getAsBoolean() {
- return config.compileAtBuildTime || packageConfig.type.equalsIgnoreCase(PackageConfig.BuiltInType.NATIVE.name());
+ return config.compileAtBuildTime || nativeConfig.enabled();
}
}
}
diff --git a/integration-tests/quartz-clustered/pom.xml b/integration-tests/quartz-clustered/pom.xml
index ac242fb6ab..c479624e7c 100644
--- a/integration-tests/quartz-clustered/pom.xml
+++ b/integration-tests/quartz-clustered/pom.xml
@@ -59,6 +59,10 @@
<groupId>io.quarkus</groupId>
<artifactId>quarkus-flyway</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.flywaydb</groupId>
+ <artifactId>flyway-database-postgresql</artifactId>
+ </dependency>
<!-- test dependencies -->
<dependency>
diff --git a/pom.xml b/pom.xml
index 12c8c0f198..8b3adc5d75 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,7 +61,7 @@
<quarkiverse-mybatis.version>2.2.2</quarkiverse-mybatis.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/mybatis/quarkus-mybatis-parent/ -->
<quarkiverse-pooled-jms.version>2.3.1</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.9.0</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.6.1</quarkus-qpid-jms.version><!-- This should be in sync with quarkus-platform https://repo1.maven.org/maven2/org/amqphub/quarkus/quarkus-qpid-jms-bom/ -->
@@ -113,7 +113,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.16.1</jackson.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:com.fasterxml.jackson.core:jackson-core -->
+ <jackson.version>2.17.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 -->