This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/main by this push: new 020a71becf Remove quarkus.camel.native.resources.*-patterns config properties 020a71becf is described below commit 020a71becf1945b5e90b37ebc43bde594078c08c Author: ShravaniP <spatn...@redhat.com> AuthorDate: Thu Sep 7 15:14:40 2023 +0530 Remove quarkus.camel.native.resources.*-patterns config properties --- .../ROOT/pages/reference/extensions/core.adoc | 12 ----------- .../core/deployment/CamelNativeImageProcessor.java | 16 --------------- .../org/apache/camel/quarkus/core/CamelConfig.java | 24 ---------------------- 3 files changed, 52 deletions(-) diff --git a/docs/modules/ROOT/pages/reference/extensions/core.adoc b/docs/modules/ROOT/pages/reference/extensions/core.adoc index bb6b9f352e..08a263e7f8 100644 --- a/docs/modules/ROOT/pages/reference/extensions/core.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/core.adoc @@ -225,18 +225,6 @@ Used for inclusive filtering scanning of RouteBuilder classes. The exclusive fil | `string` | -|icon:lock[title=Fixed at build time] [[quarkus.camel.native.resources.exclude-patterns]]`link:#quarkus.camel.native.resources.exclude-patterns[quarkus.camel.native.resources.exclude-patterns]` - -Replaced by `quarkus.native.resources.excludes` in Camel Quarkus 2.0.0. Using this property throws an exception at build time. -| `string` -| - -|icon:lock[title=Fixed at build time] [[quarkus.camel.native.resources.include-patterns]]`link:#quarkus.camel.native.resources.include-patterns[quarkus.camel.native.resources.include-patterns]` - -Replaced by `quarkus.native.resources.includes` in Camel Quarkus 2.0.0. Using this property throws an exception at build time. -| `string` -| - |icon:lock[title=Fixed at build time] [[quarkus.camel.native.reflection.exclude-patterns]]`link:#quarkus.camel.native.reflection.exclude-patterns[quarkus.camel.native.reflection.exclude-patterns]` A comma separated list of Ant-path style patterns to match class names that should be *excluded* from registering for reflection. Use the class name format as returned by the `java.lang.Class.getName()` method: package segments delimited by period `.` and inner classes by dollar sign `$`. diff --git a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelNativeImageProcessor.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelNativeImageProcessor.java index 6b3cdf78d1..3319d86b62 100644 --- a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelNativeImageProcessor.java +++ b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelNativeImageProcessor.java @@ -46,7 +46,6 @@ import org.apache.camel.impl.engine.DefaultDataFormatResolver; import org.apache.camel.impl.engine.DefaultLanguageResolver; import org.apache.camel.quarkus.core.CamelConfig; import org.apache.camel.quarkus.core.CamelConfig.ReflectionConfig; -import org.apache.camel.quarkus.core.CamelConfig.ResourcesConfig; import org.apache.camel.quarkus.core.CamelConfigFlags; import org.apache.camel.quarkus.core.deployment.spi.CamelRoutesBuilderClassBuildItem; import org.apache.camel.quarkus.core.deployment.spi.CamelServiceBuildItem; @@ -224,21 +223,6 @@ public class CamelNativeImageProcessor { return resources; } - @BuildStep - void embedSelectResourcesInNativeExecutable(CamelConfig config, ApplicationArchivesBuildItem archives, - BuildProducer<NativeImageResourceBuildItem> resources) { - - final ResourcesConfig resourcesConfig = config.native_.resources; - 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."); - } - if (resourcesConfig.excludePatterns.isPresent()) { - throw new IllegalStateException( - "quarkus.camel.native.resources.exclude-patterns configuration property was removed in Camel Quarkus 2.0.0. Use quarkus.native.resources.excludes instead."); - } - } - @BuildStep void reflection(CamelConfig config, ApplicationArchivesBuildItem archives, BuildProducer<ReflectiveClassBuildItem> reflectiveClasses) { diff --git a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelConfig.java b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelConfig.java index 6b91193c3b..a03ca09958 100644 --- a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelConfig.java +++ b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelConfig.java @@ -213,11 +213,6 @@ public class CamelConfig { @ConfigGroup public static class NativeConfig { - /** - * Build time configuration options for resources inclusion in the native executable. - */ - @ConfigItem - public ResourcesConfig resources; /** * Register classes for reflection. @@ -227,25 +222,6 @@ public class CamelConfig { } - @ConfigGroup - public static class ResourcesConfig { - - /** - * 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; - - /** - * 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; - - } - @ConfigGroup public static class ReflectionConfig {