This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git
from 64ec6197cf9 CAMEL-21941 - Upgrade Camel Kamelets and Camel Jbang to version 4.11.0 (#17715) add 46e73b6f52e CAMEL-21944: camel-jbang - Classpath scan custom JARs for beans and p… (#17716) No new revisions were added by this update. Summary of changes: bom/camel-bom/pom.xml | 5 + catalog/camel-allcomponents/pom.xml | 5 + .../org/apache/camel/catalog/others.properties | 1 + .../org/apache/camel/catalog/others/jandex.json | 9 +- .../bindy/util/AnnotationModuleLoaderTest.java | 2 +- .../pom.xml | 17 +-- .../org/apache/camel/jandex-class-resolver | 2 + .../services/org/apache/camel/other.properties | 7 + .../src/generated/resources/jandex.json} | 9 +- components/camel-jandex/src/main/docs/jandex.adoc | 15 ++ .../jandex/JandexPackageScanClassResolver.java | 154 +++++++++++++++++++++ .../camel/component/jcr/JcrConverterTest.java | 2 +- .../component/salesforce/api/utils/JsonUtils.java | 2 +- .../org/apache/camel/spring/SpringTestSupport.java | 6 +- .../DefaultPackageResolverConfigureTest.java | 2 +- .../scan/DefaultPackageScanClassResolverTest.java | 2 +- .../camel/spring/scan/PackageScanFiltersTest.java | 10 +- .../camel/spring/config/PackageResolverTest.xml | 2 +- .../test/ExcludingPackageScanClassResolver.java | 6 +- components/pom.xml | 1 + .../camel/impl/engine/SimpleCamelContext.java | 3 + .../java/org/apache/camel/impl/scan/package.html | 27 ---- .../org/apache/camel/impl/DefaultCamelContext.java | 4 +- .../transformer/AnnotationTransformerLoader.java | 8 +- .../xml/AbstractCamelContextFactoryBeanTest.java | 2 +- .../org/apache/camel/converter/ConverterTest.java | 2 +- .../java/org/apache/camel/converter/JaxpTest.java | 2 +- .../apache/camel/converter/StringSourceTest.java | 2 +- .../apache/camel/model/ModelSanityCheckerTest.java | 2 +- .../scan/AnnotatedWithAnyPackageScanFilter.java | 7 +- .../scan/AnnotatedWithPackageScanFilter.java | 6 +- .../scan/AssignableToPackageScanFilter.java | 7 +- .../support/scan}/BasePackageScanResolver.java | 2 +- .../support}/scan/CompositePackageScanFilter.java | 2 +- .../scan}/DefaultPackageScanClassResolver.java | 6 +- .../scan}/DefaultPackageScanResourceResolver.java | 12 +- .../support}/scan/InvertingPackageScanFilter.java | 2 +- .../PackageScanJarResource.java} | 50 +++---- .../scan}/WebSpherePackageScanClassResolver.java | 3 +- .../modules/others/examples/json/jandex.json | 1 + docs/components/modules/others/nav.adoc | 1 + docs/components/modules/others/pages/jandex.adoc | 1 + .../ROOT/pages/camel-4x-upgrade-guide-4_12.adoc | 12 ++ .../modules/ROOT/pages/camel-jbang.adoc | 6 + .../camel/dsl/jbang/core/commands/Export.java | 1 + .../dsl/jbang/core/commands/ExportBaseCommand.java | 7 +- .../apache/camel/dsl/jbang/core/commands/Run.java | 9 ++ .../core/commands/kubernetes/KubernetesExport.java | 2 + .../core/commands/kubernetes/KubernetesRun.java | 11 +- .../java/org/apache/camel/main/KameletMain.java | 18 ++- .../download/BasePackageScanDownloadListener.java | 146 ++++++++++++++++++- .../injection/AnnotationDependencyInjection.java | 11 ++ .../camel-main-known-dependencies.properties | 1 + parent/pom.xml | 5 + 54 files changed, 512 insertions(+), 128 deletions(-) copy components/camel-spring-parent/camel-spring-cloud-config/src/generated/resources/spring-cloud-config.json => catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/jandex.json (52%) copy components/{camel-azure/camel-azure-schema-registry => camel-jandex}/pom.xml (83%) create mode 100644 components/camel-jandex/src/generated/resources/META-INF/services/org/apache/camel/jandex-class-resolver create mode 100644 components/camel-jandex/src/generated/resources/META-INF/services/org/apache/camel/other.properties copy components/{camel-spring-parent/camel-spring-cloud-config/src/generated/resources/spring-cloud-config.json => camel-jandex/src/generated/resources/jandex.json} (52%) create mode 100644 components/camel-jandex/src/main/docs/jandex.adoc create mode 100644 components/camel-jandex/src/main/java/org/apache/camel/jandex/JandexPackageScanClassResolver.java delete mode 100644 core/camel-base/src/main/java/org/apache/camel/impl/scan/package.html rename core/{camel-base/src/main/java/org/apache/camel/impl => camel-support/src/main/java/org/apache/camel/support}/scan/AnnotatedWithAnyPackageScanFilter.java (93%) rename core/{camel-base/src/main/java/org/apache/camel/impl => camel-support/src/main/java/org/apache/camel/support}/scan/AnnotatedWithPackageScanFilter.java (93%) rename core/{camel-base/src/main/java/org/apache/camel/impl => camel-support/src/main/java/org/apache/camel/support}/scan/AssignableToPackageScanFilter.java (95%) rename core/{camel-base-engine/src/main/java/org/apache/camel/impl/engine => camel-support/src/main/java/org/apache/camel/support/scan}/BasePackageScanResolver.java (99%) rename core/{camel-base/src/main/java/org/apache/camel/impl => camel-support/src/main/java/org/apache/camel/support}/scan/CompositePackageScanFilter.java (97%) rename core/{camel-base-engine/src/main/java/org/apache/camel/impl/engine => camel-support/src/main/java/org/apache/camel/support/scan}/DefaultPackageScanClassResolver.java (98%) rename core/{camel-base-engine/src/main/java/org/apache/camel/impl/engine => camel-support/src/main/java/org/apache/camel/support/scan}/DefaultPackageScanResourceResolver.java (97%) rename core/{camel-base/src/main/java/org/apache/camel/impl => camel-support/src/main/java/org/apache/camel/support}/scan/InvertingPackageScanFilter.java (97%) copy core/camel-support/src/main/java/org/apache/camel/support/{CachedResource.java => scan/PackageScanJarResource.java} (58%) rename core/{camel-base-engine/src/main/java/org/apache/camel/impl/engine => camel-support/src/main/java/org/apache/camel/support/scan}/WebSpherePackageScanClassResolver.java (98%) create mode 120000 docs/components/modules/others/examples/json/jandex.json create mode 120000 docs/components/modules/others/pages/jandex.adoc