aldettinger commented on a change in pull request #2813:
URL: https://github.com/apache/camel-quarkus/pull/2813#discussion_r655420470
##########
File path: docs/modules/ROOT/pages/migration-guide/2.0.0.adoc
##########
@@ -19,3 +19,8 @@ The empty `camel-quarkus-main` artifact was removed
completely in Camel Quarkus
As long as your application depends on any other Camel Quarkus extension, it
is enough to remove the `camel-quarkus-main` dependency.
This is because all Camel Quarkus extensions transitively depend on
`camel-quarkus-core` where the the original `camel-quarkus-main` functionality
is hosted now.
+
+== `quarkus.camel.native.resources.*` replaced by
`quarkus.native.resources.includes`
+
+The `quarkus.camel.native.resources.include-patterns` and
`quarkus.camel.native.resources.exclude-patterns` configuration properties were
removed in Camel Quarkus 2.0.0.
+Please use `quarkus.native.resources.includes` and
`quarkus.native.resources.includes` instead respectively.
Review comment:
Maybe a typo ?
includes and quarkus.native.resources.**excludes** instead
##########
File path:
extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelConfig.java
##########
@@ -212,25 +212,15 @@
public static class ResourcesConfig {
/**
- * A comma separated list of Ant-path style patterns to match resources
- * that should be <strong>excluded</strong> from the native
executable. By default,
- * resources not selected by quarkus itself are ignored. Then,
inclusion
- * of additional resources could be triggered with
- * <code>includePatterns</code>. When the inclusion patterns is too
- * large, eviction of previously selected resources could be triggered
- * with <code>excludePatterns</code>.
+ * Replaced by {@code quarkus.native.resources.excludes} in Camel
Quarkus 2.0.0.
+ * Using this property throws an exception at build time.
*/
@ConfigItem
public Optional<List<String>> excludePatterns;
/**
- * A comma separated list of Ant-path style patterns to match resources
- * that should be <strong>included</strong> in the native executable.
By default,
- * resources not selected by quarkus itself are ignored. Then,
inclusion
- * of additional resources could be triggered with
- * <code>includePatterns</code>. When the inclusion patterns is too
- * large, eviction of previously selected resources could be triggered
- * with <code>excludePatterns</code>.
+ * Replaced by {@code quarkus.native.resources.includes} in Camel
Quarkus 2.0.0.
+ * Using this property throws an exception at build time.
*/
@ConfigItem
public Optional<List<String>> includePatterns;
Review comment:
My understanding is that we are going to break in camel-quarkus 2.0.0,
so maybe we could remove those config items ?
##########
File path:
extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelNativeImageProcessor.java
##########
@@ -217,31 +217,13 @@ void embedSelectResourcesInNativeExecutable(CamelConfig
config, ApplicationArchi
BuildProducer<NativeImageResourceBuildItem> resources) {
final ResourcesConfig resourcesConfig = config.native_.resources;
- if (!resourcesConfig.includePatterns.isPresent()) {
- LOGGER.debug("Not scanning resources for native inclusion as
include-patterns is not set");
- return;
+ if (resourcesConfig.includePatterns.isPresent()) {
+ throw new IllegalStateException(
+ "quarkus.camel.native.resources.include-patterns
configuration property was removed in Camel Quarkus 2.0.0. Use
quarkus.native.resources.includes instead.");
Review comment:
If we break in camel-quarkus 2.0, then maybe it's a good candidate for
the migration guide ?
##########
File path:
integration-tests/geocoder/src/main/java/org/apache/camel/quarkus/component/geocoder/it/MockApiService.java
##########
@@ -21,8 +21,10 @@
import javax.enterprise.context.ApplicationScoped;
import com.google.maps.GeoApiContext;
+import io.quarkus.runtime.annotations.RegisterForReflection;
@ApplicationScoped
+@RegisterForReflection(targets = GeoApiContext.Builder.class)
Review comment:
It's actually really cleaner written that way. So, we can remove
quarkus.camel.native.reflection at all ?
##########
File path:
extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelConfig.java
##########
@@ -212,25 +212,15 @@
public static class ResourcesConfig {
/**
- * A comma separated list of Ant-path style patterns to match resources
- * that should be <strong>excluded</strong> from the native
executable. By default,
- * resources not selected by quarkus itself are ignored. Then,
inclusion
- * of additional resources could be triggered with
- * <code>includePatterns</code>. When the inclusion patterns is too
- * large, eviction of previously selected resources could be triggered
- * with <code>excludePatterns</code>.
+ * Replaced by {@code quarkus.native.resources.excludes} in Camel
Quarkus 2.0.0.
+ * Using this property throws an exception at build time.
*/
@ConfigItem
public Optional<List<String>> excludePatterns;
/**
- * A comma separated list of Ant-path style patterns to match resources
- * that should be <strong>included</strong> in the native executable.
By default,
- * resources not selected by quarkus itself are ignored. Then,
inclusion
- * of additional resources could be triggered with
- * <code>includePatterns</code>. When the inclusion patterns is too
- * large, eviction of previously selected resources could be triggered
- * with <code>excludePatterns</code>.
+ * Replaced by {@code quarkus.native.resources.includes} in Camel
Quarkus 2.0.0.
+ * Using this property throws an exception at build time.
*/
@ConfigItem
public Optional<List<String>> includePatterns;
Review comment:
So, could we remove the includePatterns field then ?
##########
File path:
extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelConfig.java
##########
@@ -212,25 +212,15 @@
public static class ResourcesConfig {
/**
- * A comma separated list of Ant-path style patterns to match resources
- * that should be <strong>excluded</strong> from the native
executable. By default,
- * resources not selected by quarkus itself are ignored. Then,
inclusion
- * of additional resources could be triggered with
- * <code>includePatterns</code>. When the inclusion patterns is too
- * large, eviction of previously selected resources could be triggered
- * with <code>excludePatterns</code>.
+ * Replaced by {@code quarkus.native.resources.excludes} in Camel
Quarkus 2.0.0.
+ * Using this property throws an exception at build time.
*/
@ConfigItem
public Optional<List<String>> excludePatterns;
/**
- * A comma separated list of Ant-path style patterns to match resources
- * that should be <strong>included</strong> in the native executable.
By default,
- * resources not selected by quarkus itself are ignored. Then,
inclusion
- * of additional resources could be triggered with
- * <code>includePatterns</code>. When the inclusion patterns is too
- * large, eviction of previously selected resources could be triggered
- * with <code>excludePatterns</code>.
+ * Replaced by {@code quarkus.native.resources.includes} in Camel
Quarkus 2.0.0.
+ * Using this property throws an exception at build time.
*/
@ConfigItem
public Optional<List<String>> includePatterns;
Review comment:
ok, got it now :+1:
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
