You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ji...@apache.org on 2025/04/23 06:43:55 UTC
(camel-quarkus) 03/05: Regen files + fixed comp error in core
This is an automated email from the ASF dual-hosted git repository.
jiriondrusek pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit fdac46e5542a8cefebccdd20f800dfbabdc2130d
Author: Jiri Ondrusek <on...@gmail.com>
AuthorDate: Tue Apr 22 16:12:35 2025 +0200
Regen files + fixed comp error in core
---
.../quarkus/core/deployment/main/CamelMainHelper.java | 2 +-
.../core/CamelQuarkusPackageScanClassResolver.java | 2 +-
.../core/CamelQuarkusPackageScanResourceResolver.java | 2 +-
...sSupportCustomTypeConverterBulkConverterLoader.java | 6 +-----
.../converters/MyLoaderConverterLoader.java | 8 +++++++-
poms/bom/src/main/generated/flattened-full-pom.xml | 18 +++++++++---------
poms/bom/src/main/generated/flattened-reduced-pom.xml | 16 ++++++++--------
.../main/generated/flattened-reduced-verbose-pom.xml | 16 ++++++++--------
8 files changed, 36 insertions(+), 34 deletions(-)
diff --git a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/main/CamelMainHelper.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/main/CamelMainHelper.java
index 26e077ec2d..effdcbfa7c 100644
--- a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/main/CamelMainHelper.java
+++ b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/main/CamelMainHelper.java
@@ -19,9 +19,9 @@ package org.apache.camel.quarkus.core.deployment.main;
import java.util.function.Consumer;
import java.util.stream.Stream;
-import org.apache.camel.impl.engine.DefaultPackageScanResourceResolver;
import org.apache.camel.quarkus.core.deployment.util.CamelSupport;
import org.apache.camel.spi.Resource;
+import org.apache.camel.support.scan.DefaultPackageScanResourceResolver;
import org.apache.camel.util.AntPathMatcher;
public final class CamelMainHelper {
diff --git a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelQuarkusPackageScanClassResolver.java b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelQuarkusPackageScanClassResolver.java
index 8d38e2c061..bfd529279f 100644
--- a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelQuarkusPackageScanClassResolver.java
+++ b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelQuarkusPackageScanClassResolver.java
@@ -19,9 +19,9 @@ package org.apache.camel.quarkus.core;
import java.util.Objects;
import java.util.Set;
-import org.apache.camel.impl.engine.DefaultPackageScanClassResolver;
import org.apache.camel.spi.PackageScanClassResolver;
import org.apache.camel.spi.PackageScanFilter;
+import org.apache.camel.support.scan.DefaultPackageScanClassResolver;
/**
* Custom {@link PackageScanClassResolver} where classes / packages known to be scanned can be computed at build time
diff --git a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelQuarkusPackageScanResourceResolver.java b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelQuarkusPackageScanResourceResolver.java
index 798d7892c5..d8b6cf8d99 100644
--- a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelQuarkusPackageScanResourceResolver.java
+++ b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelQuarkusPackageScanResourceResolver.java
@@ -31,12 +31,12 @@ import java.util.Collections;
import java.util.stream.Stream;
import io.quarkus.runtime.ImageMode;
-import org.apache.camel.impl.engine.DefaultPackageScanResourceResolver;
import org.apache.camel.spi.PackageScanResourceResolver;
import org.apache.camel.spi.Resource;
import org.apache.camel.spi.ResourceLoader;
import org.apache.camel.support.PluginHelper;
import org.apache.camel.support.ResourceHelper;
+import org.apache.camel.support.scan.DefaultPackageScanResourceResolver;
import org.apache.camel.util.AntPathMatcher;
import org.apache.camel.util.ObjectHelper;
import org.jboss.logging.Logger;
diff --git a/integration-tests-support/custom-type-converter/runtime/src/generated/java/org/apache/camel/quarkus/it/support/typeconverter/converters/CamelQuarkusIntegrationTestsSupportCustomTypeConverterBulkConverterLoader.java b/integration-tests-support/custom-type-converter/runtime/src/generated/java/org/apache/camel/quarkus/it/support/typeconverter/converters/CamelQuarkusIntegrationTestsSupportCustomTypeConverterBulkConverterLoader.java
index f0d5e1ec1f..e6249cf3ef 100644
--- a/integration-tests-support/custom-type-converter/runtime/src/generated/java/org/apache/camel/quarkus/it/support/typeconverter/converters/CamelQuarkusIntegrationTestsSupportCustomTypeConverterBulkConverterLoader.java
+++ b/integration-tests-support/custom-type-converter/runtime/src/generated/java/org/apache/camel/quarkus/it/support/typeconverter/converters/CamelQuarkusIntegrationTestsSupportCustomTypeConverterBulkConverterLoader.java
@@ -54,11 +54,7 @@ public final class CamelQuarkusIntegrationTestsSupportCustomTypeConverterBulkCon
public <T> T convertTo(Class<?> from, Class<T> to, Exchange exchange, Object value) throws TypeConversionException {
try {
Object obj = doConvertTo(from, to, exchange, value);
- if (obj == Void.class) {;
- return null;
- } else {
- return (T) obj;
- }
+ return (T) obj;
} catch (TypeConversionException e) {
throw e;
} catch (Exception e) {
diff --git a/integration-tests-support/custom-type-converter/runtime/src/generated/java/org/apache/camel/quarkus/it/support/typeconverter/converters/MyLoaderConverterLoader.java b/integration-tests-support/custom-type-converter/runtime/src/generated/java/org/apache/camel/quarkus/it/support/typeconverter/converters/MyLoaderConverterLoader.java
index 7a1e5851ee..ecbfbe20f0 100644
--- a/integration-tests-support/custom-type-converter/runtime/src/generated/java/org/apache/camel/quarkus/it/support/typeconverter/converters/MyLoaderConverterLoader.java
+++ b/integration-tests-support/custom-type-converter/runtime/src/generated/java/org/apache/camel/quarkus/it/support/typeconverter/converters/MyLoaderConverterLoader.java
@@ -45,7 +45,13 @@ public final class MyLoaderConverterLoader implements TypeConverterLoader, Camel
private void registerConverters(TypeConverterRegistry registry) {
addTypeConverter(registry, org.apache.camel.quarkus.it.support.typeconverter.pairs.MyLoaderPair.class, java.lang.String.class, false,
- (type, exchange, value) -> org.apache.camel.quarkus.it.support.typeconverter.converters.MyLoaderConverter.toMyPair((java.lang.String) value));
+ (type, exchange, value) -> {
+ Object answer = org.apache.camel.quarkus.it.support.typeconverter.converters.MyLoaderConverter.toMyPair((java.lang.String) value);
+ if (false && answer == null) {
+ answer = Void.class;
+ }
+ return answer;
+ });
}
private static void addTypeConverter(TypeConverterRegistry registry, Class<?> toType, Class<?> fromType, boolean allowNull, SimpleTypeConverter.ConversionMethod method) {
diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml
index b3d97dfedd..51ab96079a 100644
--- a/poms/bom/src/main/generated/flattened-full-pom.xml
+++ b/poms/bom/src/main/generated/flattened-full-pom.xml
@@ -7014,7 +7014,7 @@
<dependency>
<groupId>io.projectreactor.netty</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>reactor-netty</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>1.2.4</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>1.2.5</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
<dependency>
<groupId>io.quarkiverse.freemarker</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
@@ -7551,7 +7551,7 @@
<dependency>
<groupId>org.springframework</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>spring-aop</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>6.2.5</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>6.2.6</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<exclusions>
<exclusion>
<groupId>org.springframework</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
@@ -7566,7 +7566,7 @@
<dependency>
<groupId>org.springframework</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>spring-expression</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>6.2.5</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>6.2.6</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<exclusions>
<exclusion>
<groupId>org.springframework</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
@@ -7577,7 +7577,7 @@
<dependency>
<groupId>org.springframework</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>spring-jdbc</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>6.2.5</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>6.2.6</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<exclusions>
<exclusion>
<groupId>org.springframework</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
@@ -7592,7 +7592,7 @@
<dependency>
<groupId>org.springframework</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>spring-jms</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>6.2.5</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>6.2.6</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<exclusions>
<exclusion>
<groupId>org.springframework</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
@@ -7607,7 +7607,7 @@
<dependency>
<groupId>org.springframework</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>spring-messaging</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>6.2.5</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>6.2.6</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<exclusions>
<exclusion>
<groupId>org.springframework</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
@@ -7622,7 +7622,7 @@
<dependency>
<groupId>org.springframework</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>spring-orm</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>6.2.5</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>6.2.6</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<exclusions>
<exclusion>
<groupId>org.springframework</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
@@ -7637,7 +7637,7 @@
<dependency>
<groupId>org.springframework</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>spring-tx</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>6.2.5</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>6.2.6</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<exclusions>
<exclusion>
<groupId>org.springframework</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
@@ -7652,7 +7652,7 @@
<dependency>
<groupId>org.springframework</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>spring-web</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>6.2.5</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>6.2.6</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<exclusions>
<exclusion>
<groupId>org.springframework</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 b3cf59d1e0..4b90c22296 100644
--- a/poms/bom/src/main/generated/flattened-reduced-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml
@@ -6979,7 +6979,7 @@
<dependency>
<groupId>io.projectreactor.netty</groupId>
<artifactId>reactor-netty</artifactId>
- <version>1.2.4</version>
+ <version>1.2.5</version>
</dependency>
<dependency>
<groupId>io.quarkiverse.freemarker</groupId>
@@ -7491,7 +7491,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
- <version>6.2.5</version>
+ <version>6.2.6</version>
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
@@ -7506,7 +7506,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-expression</artifactId>
- <version>6.2.5</version>
+ <version>6.2.6</version>
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
@@ -7517,7 +7517,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
- <version>6.2.5</version>
+ <version>6.2.6</version>
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
@@ -7532,7 +7532,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jms</artifactId>
- <version>6.2.5</version>
+ <version>6.2.6</version>
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
@@ -7547,7 +7547,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-messaging</artifactId>
- <version>6.2.5</version>
+ <version>6.2.6</version>
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
@@ -7562,7 +7562,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
- <version>6.2.5</version>
+ <version>6.2.6</version>
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
@@ -7577,7 +7577,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
- <version>6.2.5</version>
+ <version>6.2.6</version>
<exclusions>
<exclusion>
<groupId>org.springframework</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 77c44fb803..a8c0763ccb 100644
--- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
@@ -6979,7 +6979,7 @@
<dependency>
<groupId>io.projectreactor.netty</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>reactor-netty</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>1.2.4</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>1.2.5</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
<dependency>
<groupId>io.quarkiverse.freemarker</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
@@ -7491,7 +7491,7 @@
<dependency>
<groupId>org.springframework</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>spring-aop</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>6.2.5</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>6.2.6</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<exclusions>
<exclusion>
<groupId>org.springframework</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
@@ -7506,7 +7506,7 @@
<dependency>
<groupId>org.springframework</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>spring-expression</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>6.2.5</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>6.2.6</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<exclusions>
<exclusion>
<groupId>org.springframework</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
@@ -7517,7 +7517,7 @@
<dependency>
<groupId>org.springframework</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>spring-jdbc</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>6.2.5</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>6.2.6</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<exclusions>
<exclusion>
<groupId>org.springframework</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
@@ -7532,7 +7532,7 @@
<dependency>
<groupId>org.springframework</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>spring-jms</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>6.2.5</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>6.2.6</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<exclusions>
<exclusion>
<groupId>org.springframework</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
@@ -7547,7 +7547,7 @@
<dependency>
<groupId>org.springframework</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>spring-messaging</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>6.2.5</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>6.2.6</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<exclusions>
<exclusion>
<groupId>org.springframework</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
@@ -7562,7 +7562,7 @@
<dependency>
<groupId>org.springframework</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>spring-tx</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>6.2.5</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>6.2.6</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<exclusions>
<exclusion>
<groupId>org.springframework</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
@@ -7577,7 +7577,7 @@
<dependency>
<groupId>org.springframework</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>spring-web</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>6.2.5</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>6.2.6</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<exclusions>
<exclusion>
<groupId>org.springframework</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->