This is an automated email from the ASF dual-hosted git repository. claudio4j pushed a commit to branch camel-quarkus-3 in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
The following commit(s) were added to refs/heads/camel-quarkus-3 by this push: new 4f5c40a1 Fix: make camel-k-runtime build works with CEQ 3 (#1074) 4f5c40a1 is described below commit 4f5c40a10fa74effbedc93889d393bbb2e424da3 Author: Claudio Miranda <clau...@claudius.com.br> AuthorDate: Tue Jul 18 16:42:22 2023 -0300 Fix: make camel-k-runtime build works with CEQ 3 (#1074) - Some api changes required due to quarkus 3 NativeImageTest to QuarkusIntegrationTest Use of ExtendedCamelContext and PluginHelper - Change imports from javax to jakarta - Remove RuntimeYamlDeserializationDefaultTest (CAMEL-19007) - Excluded snakeyaml from some tests/examples dependencies as mvn enforcer complained --- .../src/main/java/org/apache/camel/k/Runtime.java | 8 ++-- .../k/core/quarkus/deployment/CoreProcessor.java | 2 +- .../deployment/support/DeploymentSupport.java | 1 + .../apache/camel/k/listener/ContextConfigurer.java | 1 + .../apache/camel/k/listener/SourcesConfigurer.java | 1 + .../apache/camel/k/support/DelegatingRuntime.java | 6 ++- .../apache/camel/k/support/PropertiesSupport.java | 6 +-- .../org/apache/camel/k/support/RouteBuilders.java | 1 + .../org/apache/camel/k/support/RuntimeSupport.java | 9 +--- .../java/org/apache/camel/k/support/Sources.java | 2 +- .../org/apache/camel/k/support/SourcesSupport.java | 10 ++-- .../org/apache/camel/k/support/NameCustomizer.java | 2 +- .../KnativeSinkBindingContextCustomizer.java | 1 + .../k/quarkus/deployment/RuntimeProcessor.java | 1 + .../org/apache/camel/k/quarkus/Application.java | 6 +-- .../k/quarkus/ApplicationConfigSourceProvider.java | 1 + .../camel/k/quarkus/ApplicationProducers.java | 6 +-- .../camel/k/quarkus/ApplicationRecorder.java | 1 + examples/cron/pom.xml | 6 +++ examples/kamelets-discovery/pom.xml | 6 +++ examples/kamelets/pom.xml | 6 +++ examples/knative/pom.xml | 6 +++ examples/yaml/pom.xml | 6 +++ .../k/core/quarkus/deployment/Application.java | 18 +++---- .../camel/k/core/quarkus/deployment/CoreIT.java | 6 +-- .../camel/k/core/quarkus/deployment/CoreTest.java | 2 +- itests/camel-k-itests-cron/pom.xml | 6 +++ .../k/quarkus/cron/deployment/Application.java | 14 +++--- .../camel/k/quarkus/cron/deployment/CronIT.java | 4 +- itests/camel-k-itests-kamelet/pom.xml | 6 +++ .../org/apache/camel/k/quarkus/it/Application.java | 26 +++++----- .../org/apache/camel/k/quarkus/it/RuntimeIT.java | 4 +- .../org/apache/camel/k/quarkus/it/RuntimeTest.java | 2 +- .../k/quarkus/it/KnativeConsumerApplication.java | 16 +++---- .../camel/k/quarkus/it/KnativeConsumerIT.java | 4 +- .../camel/k/quarkus/it/KnativeConsumerTest.java | 2 +- .../pom.xml | 6 +++ .../it/KnativeEnvFromPropertiesApplication.java | 16 +++---- .../k/quarkus/it/KnativeEnvFromPropertiesIT.java | 4 +- .../k/quarkus/it/KnativeEnvFromPropertiesTest.java | 2 +- .../pom.xml | 6 +++ .../it/KnativeEnvFromRegistryApplication.java | 18 +++---- .../k/quarkus/it/KnativeEnvFromRegistryIT.java | 4 +- .../k/quarkus/it/KnativeEnvFromRegistryTest.java | 2 +- .../k/quarkus/it/KnativeProducerApplication.java | 16 +++---- .../camel/k/quarkus/it/KnativeProducerIT.java | 4 +- .../camel/k/quarkus/it/KnativeProducerTest.java | 2 +- itests/camel-k-itests-knative-sinkbinding/pom.xml | 6 +++ .../quarkus/it/KnativeSinkBindingApplication.java | 18 +++---- .../camel/k/quarkus/it/KnativeSinkBindingIT.java | 4 +- .../camel/k/quarkus/it/KnativeSinkBindingTest.java | 2 +- itests/camel-k-itests-knative/pom.xml | 6 +++ .../camel/k/quarkus/it/KnativeApplication.java | 16 +++---- .../org/apache/camel/k/quarkus/it/KnativeIT.java | 4 +- .../org/apache/camel/k/quarkus/it/KnativeTest.java | 2 +- .../camel/k/loader/yaml/quarkus/Application.java | 18 +++---- .../k/loader/yaml/quarkus/GroovyLoaderTest.java | 6 +-- .../camel/k/loader/jsh/quarkus/Application.java | 18 +++---- .../apache/camel/k/loader/jsh/JavaLoaderTest.java | 6 +-- .../camel/k/loader/js/quarkus/Application.java | 18 +++---- .../k/loader/js/quarkus/JavaScriptLoaderIT.java | 4 +- .../k/loader/js/quarkus/JavaScriptLoaderTest.java | 2 +- .../k/loader/jsh/quarkus/it/JshApplication.java | 18 +++---- .../camel/k/loader/jsh/it/JshLoaderTest.java | 6 +-- .../camel/k/loader/kotlin/quarkus/Application.java | 18 +++---- .../k/loader/kotlin/quarkus/KotlinLoaderTest.java | 6 +-- itests/camel-k-itests-loader-polyglot/pom.xml | 8 +++- .../k/itests/polyglot/quarkus/Application.java | 18 +++---- .../k/itests/polyglot/quarkus/PolyglotIT.java | 4 +- .../k/itests/polyglot/quarkus/PolyglotTest.java | 2 +- .../camel/k/loader/xml/quarkus/Application.java | 18 +++---- .../camel/k/loader/xml/quarkus/XmlLoaderIT.java | 4 +- .../camel/k/loader/xml/quarkus/XmlLoaderTest.java | 2 +- itests/camel-k-itests-loader-yaml/pom.xml | 6 +++ .../camel/k/loader/yaml/quarkus/Application.java | 18 +++---- .../camel/k/loader/yaml/quarkus/YamlLoaderIT.java | 4 +- .../k/loader/yaml/quarkus/YamlLoaderTest.java | 2 +- .../apache/camel/k/quarkus/master/Application.java | 16 +++---- .../apache/camel/k/quarkus/master/MasterIT.java | 4 +- .../org/apache/camel/k/quarkus/it/Application.java | 2 +- .../camel/k/quarkus/it/RuntimeWithXmlIT.java | 4 +- .../camel/k/quarkus/it/RuntimeWithXmlTest.java | 2 +- itests/camel-k-itests-runtime-yaml/pom.xml | 6 +++ .../org/apache/camel/k/quarkus/it/Application.java | 4 +- .../camel/k/quarkus/it/RuntimeWithYamlIT.java | 4 +- .../camel/k/quarkus/it/RuntimeWithYamlTest.java | 2 +- itests/camel-k-itests-runtime/pom.xml | 6 +++ .../org/apache/camel/k/quarkus/it/Application.java | 44 ++++++++--------- .../k/quarkus/it/RuntimeCustomizerFallbackIT.java | 4 +- .../quarkus/it/RuntimeCustomizerFallbackTest.java | 2 +- .../camel/k/quarkus/it/RuntimeCustomizerIT.java | 4 +- .../camel/k/quarkus/it/RuntimeCustomizerTest.java | 2 +- .../org/apache/camel/k/quarkus/it/RuntimeIT.java | 4 +- .../org/apache/camel/k/quarkus/it/RuntimeTest.java | 2 +- .../it/RuntimeYamlDeserializationDefaultIT.java | 23 --------- .../it/RuntimeYamlDeserializationDefaultTest.java | 55 ---------------------- .../camel/k/loader/support/LoaderSupport.java | 10 ++-- .../camel/k/runtime/support/RuntimeInspector.java | 31 ++++++------ support/camel-k-runtime-bom/pom.xml | 5 -- 99 files changed, 399 insertions(+), 386 deletions(-) diff --git a/camel-k-core/api/src/main/java/org/apache/camel/k/Runtime.java b/camel-k-core/api/src/main/java/org/apache/camel/k/Runtime.java index 9b301a63..35a33b7a 100644 --- a/camel-k-core/api/src/main/java/org/apache/camel/k/Runtime.java +++ b/camel-k-core/api/src/main/java/org/apache/camel/k/Runtime.java @@ -21,6 +21,7 @@ import java.util.Map; import java.util.Properties; import org.apache.camel.CamelContext; +import org.apache.camel.ExtendedCamelContext; import org.apache.camel.Ordered; import org.apache.camel.RoutesBuilder; import org.apache.camel.RuntimeCamelException; @@ -34,12 +35,11 @@ public interface Runtime extends HasCamelContext, AutoCloseable { * Returns the camel context adapting it to the specialized type. * * @see HasCamelContext#getCamelContext() - * @see CamelContext#adapt(Class) * - * @return the camel context. + * @return the extended camel context. */ - default <T extends CamelContext> T getCamelContext(Class<T> type) { - return getCamelContext().adapt(type); + default ExtendedCamelContext getExtendedCamelContext() { + return getCamelContext().getCamelContextExtension(); } /** diff --git a/camel-k-core/deployment/src/main/java/org/apache/camel/k/core/quarkus/deployment/CoreProcessor.java b/camel-k-core/deployment/src/main/java/org/apache/camel/k/core/quarkus/deployment/CoreProcessor.java index 4938081b..fd7b5b28 100644 --- a/camel-k-core/deployment/src/main/java/org/apache/camel/k/core/quarkus/deployment/CoreProcessor.java +++ b/camel-k-core/deployment/src/main/java/org/apache/camel/k/core/quarkus/deployment/CoreProcessor.java @@ -38,6 +38,7 @@ import static org.apache.camel.k.core.quarkus.deployment.support.DeploymentSuppo import static org.apache.camel.k.core.quarkus.deployment.support.DeploymentSupport.stream; public class CoreProcessor { + @BuildStep List<CamelServicePatternBuildItem> servicePatterns() { return List.of( @@ -65,7 +66,6 @@ public class CoreProcessor { List<ServiceProviderBuildItem> registerServices(CombinedIndexBuildItem combinedIndexBuildItem) { final IndexView view = combinedIndexBuildItem.getIndex(); final String serviceType = "org.apache.camel.k.Runtime$Listener"; - return stream(getAllKnownImplementors(view, serviceType)) .map(i -> new ServiceProviderBuildItem(serviceType, i.name().toString())) .collect(Collectors.toList()); diff --git a/camel-k-core/deployment/src/main/java/org/apache/camel/k/core/quarkus/deployment/support/DeploymentSupport.java b/camel-k-core/deployment/src/main/java/org/apache/camel/k/core/quarkus/deployment/support/DeploymentSupport.java index 327e4853..9871eb89 100644 --- a/camel-k-core/deployment/src/main/java/org/apache/camel/k/core/quarkus/deployment/support/DeploymentSupport.java +++ b/camel-k-core/deployment/src/main/java/org/apache/camel/k/core/quarkus/deployment/support/DeploymentSupport.java @@ -30,6 +30,7 @@ import org.jboss.jandex.DotName; import org.jboss.jandex.IndexView; public final class DeploymentSupport { + private DeploymentSupport() { } diff --git a/camel-k-core/support/src/main/java/org/apache/camel/k/listener/ContextConfigurer.java b/camel-k-core/support/src/main/java/org/apache/camel/k/listener/ContextConfigurer.java index 30fc1e57..0df4f6dd 100644 --- a/camel-k-core/support/src/main/java/org/apache/camel/k/listener/ContextConfigurer.java +++ b/camel-k-core/support/src/main/java/org/apache/camel/k/listener/ContextConfigurer.java @@ -20,6 +20,7 @@ import org.apache.camel.k.Runtime; import org.apache.camel.k.support.RuntimeSupport; public class ContextConfigurer extends AbstractPhaseListener { + public ContextConfigurer() { super(Runtime.Phase.ConfigureContext); } diff --git a/camel-k-core/support/src/main/java/org/apache/camel/k/listener/SourcesConfigurer.java b/camel-k-core/support/src/main/java/org/apache/camel/k/listener/SourcesConfigurer.java index 44885901..69c6743e 100644 --- a/camel-k-core/support/src/main/java/org/apache/camel/k/listener/SourcesConfigurer.java +++ b/camel-k-core/support/src/main/java/org/apache/camel/k/listener/SourcesConfigurer.java @@ -30,6 +30,7 @@ import org.apache.camel.util.ObjectHelper; @Configurer public class SourcesConfigurer extends AbstractPhaseListener { + public static final String CAMEL_K_PREFIX = "camel.k."; public static final String CAMEL_K_SOURCES_PREFIX = "camel.k.sources["; diff --git a/camel-k-core/support/src/main/java/org/apache/camel/k/support/DelegatingRuntime.java b/camel-k-core/support/src/main/java/org/apache/camel/k/support/DelegatingRuntime.java index c853d771..3390d752 100644 --- a/camel-k-core/support/src/main/java/org/apache/camel/k/support/DelegatingRuntime.java +++ b/camel-k-core/support/src/main/java/org/apache/camel/k/support/DelegatingRuntime.java @@ -20,11 +20,13 @@ import java.util.Map; import java.util.Properties; import org.apache.camel.CamelContext; +import org.apache.camel.ExtendedCamelContext; import org.apache.camel.RoutesBuilder; import org.apache.camel.k.Runtime; import org.apache.camel.spi.Registry; public class DelegatingRuntime implements Runtime { + private final Runtime runtime; public DelegatingRuntime(Runtime runtime) { @@ -32,8 +34,8 @@ public class DelegatingRuntime implements Runtime { } @Override - public <T extends CamelContext> T getCamelContext(Class<T> type) { - return runtime.getCamelContext(type); + public ExtendedCamelContext getExtendedCamelContext() { + return runtime.getExtendedCamelContext(); } @Override diff --git a/camel-k-core/support/src/main/java/org/apache/camel/k/support/PropertiesSupport.java b/camel-k-core/support/src/main/java/org/apache/camel/k/support/PropertiesSupport.java index 43a93e41..bff12e21 100644 --- a/camel-k-core/support/src/main/java/org/apache/camel/k/support/PropertiesSupport.java +++ b/camel-k-core/support/src/main/java/org/apache/camel/k/support/PropertiesSupport.java @@ -26,10 +26,12 @@ import org.apache.camel.Component; import org.apache.camel.ExtendedCamelContext; import org.apache.camel.spi.PropertiesComponent; import org.apache.camel.spi.PropertyConfigurer; +import org.apache.camel.support.PluginHelper; import org.apache.camel.support.PropertyBindingSupport; import org.apache.camel.support.service.ServiceHelper; public final class PropertiesSupport { + private PropertiesSupport() { } @@ -71,9 +73,7 @@ public final class PropertiesSupport { } // see if there is a configurer for it - configurer = context.adapt(ExtendedCamelContext.class) - .getConfigurerResolver() - .resolvePropertyConfigurer(name, context); + configurer = PluginHelper.getConfigurerResolver(context.getCamelContextExtension()).resolvePropertyConfigurer(name, context); } PropertyBindingSupport.build() diff --git a/camel-k-core/support/src/main/java/org/apache/camel/k/support/RouteBuilders.java b/camel-k-core/support/src/main/java/org/apache/camel/k/support/RouteBuilders.java index fbb67bcf..c04985f4 100644 --- a/camel-k-core/support/src/main/java/org/apache/camel/k/support/RouteBuilders.java +++ b/camel-k-core/support/src/main/java/org/apache/camel/k/support/RouteBuilders.java @@ -26,6 +26,7 @@ import org.apache.camel.util.function.ThrowingBiConsumer; import org.apache.camel.util.function.ThrowingConsumer; public final class RouteBuilders { + private RouteBuilders() { } diff --git a/camel-k-core/support/src/main/java/org/apache/camel/k/support/RuntimeSupport.java b/camel-k-core/support/src/main/java/org/apache/camel/k/support/RuntimeSupport.java index e947eda9..745f5437 100644 --- a/camel-k-core/support/src/main/java/org/apache/camel/k/support/RuntimeSupport.java +++ b/camel-k-core/support/src/main/java/org/apache/camel/k/support/RuntimeSupport.java @@ -51,7 +51,6 @@ import org.apache.camel.util.ObjectHelper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - public final class RuntimeSupport { private static final Logger LOGGER = LoggerFactory.getLogger(RuntimeSupport.class); @@ -137,7 +136,7 @@ public final class RuntimeSupport { public static ContextCustomizer lookupCustomizerByID(CamelContext context, String customizerId) { ContextCustomizer customizer = context.getRegistry().lookupByNameAndType(customizerId, ContextCustomizer.class); if (customizer == null) { - customizer = context.adapt(ExtendedCamelContext.class) + customizer = context.getCamelContextExtension() .getFactoryFinder(Constants.CONTEXT_CUSTOMIZER_RESOURCE_PATH) .newInstance(customizerId, ContextCustomizer.class) .orElseThrow(() -> new RuntimeException("Error creating instance for customizer: " + customizerId)); @@ -152,7 +151,6 @@ public final class RuntimeSupport { public static Set<String> lookupCustomizerIDs(CamelContext context) { Set<String> customizers = new TreeSet<>(); - String customizerIDs = System.getenv().getOrDefault(Constants.ENV_CAMEL_K_CUSTOMIZERS, ""); if (ObjectHelper.isEmpty(customizerIDs)) { // TODO: getPropertiesComponent().resolveProperty() throws exception instead @@ -167,7 +165,6 @@ public final class RuntimeSupport { customizers.add(customizerId); } } - return customizers; } @@ -178,7 +175,7 @@ public final class RuntimeSupport { // ********************************* public static List<RouteBuilderLifecycleStrategy> loadInterceptors(CamelContext context, Source source) { - ExtendedCamelContext ecc = context.adapt(ExtendedCamelContext.class); + ExtendedCamelContext ecc = context.getCamelContextExtension(); List<RouteBuilderLifecycleStrategy> answer = new ArrayList<>(); for (String id : source.getInterceptors()) { @@ -271,7 +268,6 @@ public final class RuntimeSupport { try { Path confPath = Paths.get(conf); - if (Files.exists(confPath) && !Files.isDirectory(confPath)) { try (Reader reader = Files.newBufferedReader(confPath)) { Properties p = new Properties(); @@ -320,7 +316,6 @@ public final class RuntimeSupport { LOGGER.info("Cannot transform {} into UTF-8 text, skipping.", file); } } - return FileVisitResult.CONTINUE; } }; diff --git a/camel-k-core/support/src/main/java/org/apache/camel/k/support/Sources.java b/camel-k-core/support/src/main/java/org/apache/camel/k/support/Sources.java index 181656d0..7c34b488 100644 --- a/camel-k-core/support/src/main/java/org/apache/camel/k/support/Sources.java +++ b/camel-k-core/support/src/main/java/org/apache/camel/k/support/Sources.java @@ -39,6 +39,7 @@ import org.apache.camel.util.ObjectHelper; import org.apache.camel.util.URISupport; public final class Sources { + private Sources() { } @@ -74,7 +75,6 @@ public final class Sources { if (definition.getLocation() == null && definition.getContent() == null) { throw new IllegalArgumentException("Either the source location or the source content should be set"); } - return new Source() { @Override public String getLocation() { diff --git a/camel-k-core/support/src/main/java/org/apache/camel/k/support/SourcesSupport.java b/camel-k-core/support/src/main/java/org/apache/camel/k/support/SourcesSupport.java index 67e00952..84ac7161 100644 --- a/camel-k-core/support/src/main/java/org/apache/camel/k/support/SourcesSupport.java +++ b/camel-k-core/support/src/main/java/org/apache/camel/k/support/SourcesSupport.java @@ -35,12 +35,14 @@ import org.apache.camel.k.listener.SourcesConfigurer; import org.apache.camel.model.RouteDefinition; import org.apache.camel.model.RouteTemplateDefinition; import org.apache.camel.spi.Resource; +import org.apache.camel.support.PluginHelper; import org.apache.camel.util.ObjectHelper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; public final class SourcesSupport { - private static final Logger LOGGER = LoggerFactory.getLogger(SourcesConfigurer.class); + + private static final Logger LOGGER = LoggerFactory.getLogger(SourcesSupport.class); private SourcesSupport() { } @@ -153,7 +155,7 @@ public final class SourcesSupport { } if (hasErrorHandlerFactory(builder)){ LOGGER.debug("Setting default error handler builder factory as type {}", builder.getErrorHandlerFactory().getClass()); - runtime.getCamelContext().adapt(ExtendedCamelContext.class).setErrorHandlerFactory(builder.getErrorHandlerFactory()); + runtime.getExtendedCamelContext().setErrorHandlerFactory(builder.getErrorHandlerFactory()); } } }); @@ -164,8 +166,8 @@ public final class SourcesSupport { try { final Resource resource = Sources.asResource(runtime.getCamelContext(), source); - final ExtendedCamelContext ecc = runtime.getCamelContext(ExtendedCamelContext.class); - final Collection<RoutesBuilder> builders = ecc.getRoutesLoader().findRoutesBuilders(resource); + final ExtendedCamelContext ecc = runtime.getExtendedCamelContext(); + final Collection<RoutesBuilder> builders = PluginHelper.getRoutesLoader(ecc).findRoutesBuilders(resource); builders.stream() .map(RouteBuilder.class::cast) diff --git a/camel-k-core/support/src/test/java/org/apache/camel/k/support/NameCustomizer.java b/camel-k-core/support/src/test/java/org/apache/camel/k/support/NameCustomizer.java index c99dea3b..043f447e 100644 --- a/camel-k-core/support/src/test/java/org/apache/camel/k/support/NameCustomizer.java +++ b/camel-k-core/support/src/test/java/org/apache/camel/k/support/NameCustomizer.java @@ -40,6 +40,6 @@ public final class NameCustomizer implements ContextCustomizer { @Override public void apply(CamelContext camelContexty) { - camelContexty.adapt(ModelCamelContext.class).setNameStrategy(new ExplicitCamelContextNameStrategy(name)); + camelContexty.setNameStrategy(new ExplicitCamelContextNameStrategy(name)); } } diff --git a/camel-k-knative/impl/src/main/java/org/apache/camel/k/knative/customizer/KnativeSinkBindingContextCustomizer.java b/camel-k-knative/impl/src/main/java/org/apache/camel/k/knative/customizer/KnativeSinkBindingContextCustomizer.java index e9d208a2..a63c1d3f 100644 --- a/camel-k-knative/impl/src/main/java/org/apache/camel/k/knative/customizer/KnativeSinkBindingContextCustomizer.java +++ b/camel-k-knative/impl/src/main/java/org/apache/camel/k/knative/customizer/KnativeSinkBindingContextCustomizer.java @@ -33,6 +33,7 @@ import org.apache.camel.util.ObjectHelper; @Configurer @Customizer("sinkbinding") public class KnativeSinkBindingContextCustomizer implements ContextCustomizer { + private String name; private Knative.Type type; private String kind; diff --git a/camel-k-runtime/deployment/src/main/java/org/apache/camel/k/quarkus/deployment/RuntimeProcessor.java b/camel-k-runtime/deployment/src/main/java/org/apache/camel/k/quarkus/deployment/RuntimeProcessor.java index 895aaff3..c627f06b 100644 --- a/camel-k-runtime/deployment/src/main/java/org/apache/camel/k/quarkus/deployment/RuntimeProcessor.java +++ b/camel-k-runtime/deployment/src/main/java/org/apache/camel/k/quarkus/deployment/RuntimeProcessor.java @@ -37,6 +37,7 @@ import org.apache.camel.quarkus.core.deployment.main.spi.CamelRoutesCollectorBui import org.apache.camel.quarkus.core.deployment.spi.CamelRuntimeTaskBuildItem; public class RuntimeProcessor { + @Record(ExecutionTime.STATIC_INIT) @BuildStep CamelMainListenerBuildItem mainListener(ApplicationRecorder recorder) { diff --git a/camel-k-runtime/runtime/src/main/java/org/apache/camel/k/quarkus/Application.java b/camel-k-runtime/runtime/src/main/java/org/apache/camel/k/quarkus/Application.java index 1002fb59..fe92ec85 100644 --- a/camel-k-runtime/runtime/src/main/java/org/apache/camel/k/quarkus/Application.java +++ b/camel-k-runtime/runtime/src/main/java/org/apache/camel/k/quarkus/Application.java @@ -36,6 +36,7 @@ import org.apache.camel.main.RoutesCollector; import org.apache.camel.spi.Resource; public final class Application { + private Application() { } @@ -103,11 +104,6 @@ public final class Application { invokeListeners(org.apache.camel.k.Runtime.Phase.ConfigureContext); } - @Override - public void configure(CamelContext context) { - // no-op - } - @Override public void beforeStart(BaseMainSupport main) { invokeListeners(org.apache.camel.k.Runtime.Phase.Starting); diff --git a/camel-k-runtime/runtime/src/main/java/org/apache/camel/k/quarkus/ApplicationConfigSourceProvider.java b/camel-k-runtime/runtime/src/main/java/org/apache/camel/k/quarkus/ApplicationConfigSourceProvider.java index 73da198c..a6f6628e 100644 --- a/camel-k-runtime/runtime/src/main/java/org/apache/camel/k/quarkus/ApplicationConfigSourceProvider.java +++ b/camel-k-runtime/runtime/src/main/java/org/apache/camel/k/quarkus/ApplicationConfigSourceProvider.java @@ -27,6 +27,7 @@ import org.eclipse.microprofile.config.spi.ConfigSource; import org.eclipse.microprofile.config.spi.ConfigSourceProvider; public class ApplicationConfigSourceProvider implements ConfigSourceProvider { + @Override public Iterable<ConfigSource> getConfigSources(ClassLoader forClassLoader) { final Map<String, String> sysProperties = new HashMap<>(); diff --git a/camel-k-runtime/runtime/src/main/java/org/apache/camel/k/quarkus/ApplicationProducers.java b/camel-k-runtime/runtime/src/main/java/org/apache/camel/k/quarkus/ApplicationProducers.java index 3e18fc34..cf914f96 100644 --- a/camel-k-runtime/runtime/src/main/java/org/apache/camel/k/quarkus/ApplicationProducers.java +++ b/camel-k-runtime/runtime/src/main/java/org/apache/camel/k/quarkus/ApplicationProducers.java @@ -16,9 +16,9 @@ */ package org.apache.camel.k.quarkus; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; -import javax.inject.Singleton; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Singleton; import io.quarkus.arc.Unremovable; import org.apache.camel.k.Runtime; diff --git a/camel-k-runtime/runtime/src/main/java/org/apache/camel/k/quarkus/ApplicationRecorder.java b/camel-k-runtime/runtime/src/main/java/org/apache/camel/k/quarkus/ApplicationRecorder.java index 082b1858..64542bfb 100644 --- a/camel-k-runtime/runtime/src/main/java/org/apache/camel/k/quarkus/ApplicationRecorder.java +++ b/camel-k-runtime/runtime/src/main/java/org/apache/camel/k/quarkus/ApplicationRecorder.java @@ -29,6 +29,7 @@ import org.slf4j.LoggerFactory; @Recorder public class ApplicationRecorder { + public void version(String version) { LoggerFactory.getLogger(Runtime.class).info("Apache Camel K Runtime {}", version); } diff --git a/examples/cron/pom.xml b/examples/cron/pom.xml index 6fe4b8a4..091be5b1 100644 --- a/examples/cron/pom.xml +++ b/examples/cron/pom.xml @@ -37,6 +37,12 @@ <dependency> <groupId>org.apache.camel.k</groupId> <artifactId>camel-k-runtime</artifactId> + <exclusions> + <exclusion> + <groupId>org.snakeyaml</groupId> + <artifactId>snakeyaml-engine</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.camel.k</groupId> diff --git a/examples/kamelets-discovery/pom.xml b/examples/kamelets-discovery/pom.xml index aad36e80..d80405fe 100644 --- a/examples/kamelets-discovery/pom.xml +++ b/examples/kamelets-discovery/pom.xml @@ -37,6 +37,12 @@ <dependency> <groupId>org.apache.camel.k</groupId> <artifactId>camel-k-runtime</artifactId> + <exclusions> + <exclusion> + <groupId>org.snakeyaml</groupId> + <artifactId>snakeyaml-engine</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.camel.quarkus</groupId> diff --git a/examples/kamelets/pom.xml b/examples/kamelets/pom.xml index ca719294..ea8e0675 100644 --- a/examples/kamelets/pom.xml +++ b/examples/kamelets/pom.xml @@ -37,6 +37,12 @@ <dependency> <groupId>org.apache.camel.k</groupId> <artifactId>camel-k-runtime</artifactId> + <exclusions> + <exclusion> + <groupId>org.snakeyaml</groupId> + <artifactId>snakeyaml-engine</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.camel</groupId> diff --git a/examples/knative/pom.xml b/examples/knative/pom.xml index a298c7ea..eb1d85a8 100644 --- a/examples/knative/pom.xml +++ b/examples/knative/pom.xml @@ -37,6 +37,12 @@ <dependency> <groupId>org.apache.camel.k</groupId> <artifactId>camel-k-runtime</artifactId> + <exclusions> + <exclusion> + <groupId>org.snakeyaml</groupId> + <artifactId>snakeyaml-engine</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.camel.quarkus</groupId> diff --git a/examples/yaml/pom.xml b/examples/yaml/pom.xml index 7a4c4a69..d4c56979 100644 --- a/examples/yaml/pom.xml +++ b/examples/yaml/pom.xml @@ -37,6 +37,12 @@ <dependency> <groupId>org.apache.camel.k</groupId> <artifactId>camel-k-runtime</artifactId> + <exclusions> + <exclusion> + <groupId>org.snakeyaml</groupId> + <artifactId>snakeyaml-engine</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.camel</groupId> diff --git a/itests/camel-k-itests-core/src/main/java/org/apache/camel/k/core/quarkus/deployment/Application.java b/itests/camel-k-itests-core/src/main/java/org/apache/camel/k/core/quarkus/deployment/Application.java index 78e00f50..43090eca 100644 --- a/itests/camel-k-itests-core/src/main/java/org/apache/camel/k/core/quarkus/deployment/Application.java +++ b/itests/camel-k-itests-core/src/main/java/org/apache/camel/k/core/quarkus/deployment/Application.java @@ -18,15 +18,15 @@ package org.apache.camel.k.core.quarkus.deployment; import java.util.ServiceLoader; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.json.Json; -import javax.json.JsonArrayBuilder; -import javax.json.JsonObject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.json.Json; +import jakarta.json.JsonArrayBuilder; +import jakarta.json.JsonObject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.apache.camel.CamelContext; import org.apache.camel.k.Runtime; diff --git a/itests/camel-k-itests-core/src/test/java/org/apache/camel/k/core/quarkus/deployment/CoreIT.java b/itests/camel-k-itests-core/src/test/java/org/apache/camel/k/core/quarkus/deployment/CoreIT.java index 0f7c6147..4b32322a 100644 --- a/itests/camel-k-itests-core/src/test/java/org/apache/camel/k/core/quarkus/deployment/CoreIT.java +++ b/itests/camel-k-itests-core/src/test/java/org/apache/camel/k/core/quarkus/deployment/CoreIT.java @@ -16,8 +16,8 @@ */ package org.apache.camel.k.core.quarkus.deployment; -import io.quarkus.test.junit.NativeImageTest; +import io.quarkus.test.junit.QuarkusIntegrationTest; -@NativeImageTest -public class CoreIT extends CoreTest { +@QuarkusIntegrationTest +public class CoreIT extends org.apache.camel.k.core.quarkus.deployment.CoreTest { } \ No newline at end of file diff --git a/itests/camel-k-itests-core/src/test/java/org/apache/camel/k/core/quarkus/deployment/CoreTest.java b/itests/camel-k-itests-core/src/test/java/org/apache/camel/k/core/quarkus/deployment/CoreTest.java index 983d0ec2..22c883ba 100644 --- a/itests/camel-k-itests-core/src/test/java/org/apache/camel/k/core/quarkus/deployment/CoreTest.java +++ b/itests/camel-k-itests-core/src/test/java/org/apache/camel/k/core/quarkus/deployment/CoreTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.k.core.quarkus.deployment; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import io.quarkus.test.junit.QuarkusTest; import io.restassured.RestAssured; diff --git a/itests/camel-k-itests-cron/pom.xml b/itests/camel-k-itests-cron/pom.xml index 6f8555de..ec299fa0 100644 --- a/itests/camel-k-itests-cron/pom.xml +++ b/itests/camel-k-itests-cron/pom.xml @@ -31,6 +31,12 @@ <dependency> <groupId>org.apache.camel.k</groupId> <artifactId>camel-k-runtime</artifactId> + <exclusions> + <exclusion> + <groupId>org.snakeyaml</groupId> + <artifactId>snakeyaml-engine</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.camel.k</groupId> diff --git a/itests/camel-k-itests-cron/src/main/java/org/apache/camel/k/quarkus/cron/deployment/Application.java b/itests/camel-k-itests-cron/src/main/java/org/apache/camel/k/quarkus/cron/deployment/Application.java index ab1d359b..cd879242 100644 --- a/itests/camel-k-itests-cron/src/main/java/org/apache/camel/k/quarkus/cron/deployment/Application.java +++ b/itests/camel-k-itests-cron/src/main/java/org/apache/camel/k/quarkus/cron/deployment/Application.java @@ -19,12 +19,12 @@ package org.apache.camel.k.quarkus.cron.deployment; import java.nio.charset.StandardCharsets; import java.util.concurrent.atomic.AtomicBoolean; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.apache.camel.CamelContext; import org.apache.camel.ExtendedCamelContext; @@ -50,7 +50,7 @@ public class Application { @Path("/find-cron-interceptor") @Produces(MediaType.TEXT_PLAIN) public String findCronInterceptor() { - return context.adapt(ExtendedCamelContext.class) + return context.getCamelContextExtension() .getFactoryFinder(Constants.SOURCE_LOADER_INTERCEPTOR_RESOURCE_PATH) .findClass("cron") .map(Class::getName) diff --git a/itests/camel-k-itests-cron/src/test/java/org/apache/camel/k/quarkus/cron/deployment/CronIT.java b/itests/camel-k-itests-cron/src/test/java/org/apache/camel/k/quarkus/cron/deployment/CronIT.java index ea435b8b..df07fe8f 100644 --- a/itests/camel-k-itests-cron/src/test/java/org/apache/camel/k/quarkus/cron/deployment/CronIT.java +++ b/itests/camel-k-itests-cron/src/test/java/org/apache/camel/k/quarkus/cron/deployment/CronIT.java @@ -16,8 +16,8 @@ */ package org.apache.camel.k.quarkus.cron.deployment; -import io.quarkus.test.junit.NativeImageTest; +import io.quarkus.test.junit.QuarkusIntegrationTest; -@NativeImageTest +@QuarkusIntegrationTest public class CronIT extends CronTest { } \ No newline at end of file diff --git a/itests/camel-k-itests-kamelet/pom.xml b/itests/camel-k-itests-kamelet/pom.xml index 76fe9d20..6ec11f7b 100644 --- a/itests/camel-k-itests-kamelet/pom.xml +++ b/itests/camel-k-itests-kamelet/pom.xml @@ -31,6 +31,12 @@ <dependency> <groupId>org.apache.camel.k</groupId> <artifactId>camel-k-runtime</artifactId> + <exclusions> + <exclusion> + <groupId>org.snakeyaml</groupId> + <artifactId>snakeyaml-engine</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> diff --git a/itests/camel-k-itests-kamelet/src/main/java/org/apache/camel/k/quarkus/it/Application.java b/itests/camel-k-itests-kamelet/src/main/java/org/apache/camel/k/quarkus/it/Application.java index 0636b57d..5385e145 100644 --- a/itests/camel-k-itests-kamelet/src/main/java/org/apache/camel/k/quarkus/it/Application.java +++ b/itests/camel-k-itests-kamelet/src/main/java/org/apache/camel/k/quarkus/it/Application.java @@ -18,22 +18,22 @@ package org.apache.camel.k.quarkus.it; import java.util.stream.Collectors; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.json.Json; -import javax.json.JsonObject; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.json.Json; +import jakarta.json.JsonObject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import io.quarkus.runtime.annotations.RegisterForReflection; import org.apache.camel.CamelContext; import org.apache.camel.FluentProducerTemplate; -import org.apache.camel.model.ModelCamelContext; +import org.apache.camel.model.Model; import org.apache.camel.model.RouteTemplateDefinition; @RegisterForReflection(targets = { String.class }) @@ -49,7 +49,7 @@ public class Application { @Path("/inspect") @Produces(MediaType.APPLICATION_JSON) public JsonObject inspect() { - var templates = context.adapt(ModelCamelContext.class).getRouteTemplateDefinitions(); + var templates = context.getCamelContextExtension().getContextPlugin(Model.class).getRouteTemplateDefinitions(); var ids = templates.stream().map(RouteTemplateDefinition::getId).collect(Collectors.toList()); return Json.createObjectBuilder() diff --git a/itests/camel-k-itests-kamelet/src/test/java/org/apache/camel/k/quarkus/it/RuntimeIT.java b/itests/camel-k-itests-kamelet/src/test/java/org/apache/camel/k/quarkus/it/RuntimeIT.java index 29f1c174..3c60518d 100644 --- a/itests/camel-k-itests-kamelet/src/test/java/org/apache/camel/k/quarkus/it/RuntimeIT.java +++ b/itests/camel-k-itests-kamelet/src/test/java/org/apache/camel/k/quarkus/it/RuntimeIT.java @@ -16,8 +16,8 @@ */ package org.apache.camel.k.quarkus.it; -import io.quarkus.test.junit.NativeImageTest; +import io.quarkus.test.junit.QuarkusIntegrationTest; -@NativeImageTest +@QuarkusIntegrationTest public class RuntimeIT extends RuntimeTest { } \ No newline at end of file diff --git a/itests/camel-k-itests-kamelet/src/test/java/org/apache/camel/k/quarkus/it/RuntimeTest.java b/itests/camel-k-itests-kamelet/src/test/java/org/apache/camel/k/quarkus/it/RuntimeTest.java index 165a60e7..195643e3 100644 --- a/itests/camel-k-itests-kamelet/src/test/java/org/apache/camel/k/quarkus/it/RuntimeTest.java +++ b/itests/camel-k-itests-kamelet/src/test/java/org/apache/camel/k/quarkus/it/RuntimeTest.java @@ -18,7 +18,7 @@ package org.apache.camel.k.quarkus.it; import java.util.Locale; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import io.quarkus.test.junit.QuarkusTest; import io.restassured.RestAssured; diff --git a/itests/camel-k-itests-knative-consumer/src/main/java/org/apache/camel/k/quarkus/it/KnativeConsumerApplication.java b/itests/camel-k-itests-knative-consumer/src/main/java/org/apache/camel/k/quarkus/it/KnativeConsumerApplication.java index 87c63ee5..30df79f5 100644 --- a/itests/camel-k-itests-knative-consumer/src/main/java/org/apache/camel/k/quarkus/it/KnativeConsumerApplication.java +++ b/itests/camel-k-itests-knative-consumer/src/main/java/org/apache/camel/k/quarkus/it/KnativeConsumerApplication.java @@ -16,14 +16,14 @@ */ package org.apache.camel.k.quarkus.it; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.json.Json; -import javax.json.JsonObject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.json.Json; +import jakarta.json.JsonObject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.apache.camel.CamelContext; import org.apache.camel.component.knative.KnativeComponent; diff --git a/itests/camel-k-itests-knative-consumer/src/test/java/org/apache/camel/k/quarkus/it/KnativeConsumerIT.java b/itests/camel-k-itests-knative-consumer/src/test/java/org/apache/camel/k/quarkus/it/KnativeConsumerIT.java index e5725b17..2eaf662d 100644 --- a/itests/camel-k-itests-knative-consumer/src/test/java/org/apache/camel/k/quarkus/it/KnativeConsumerIT.java +++ b/itests/camel-k-itests-knative-consumer/src/test/java/org/apache/camel/k/quarkus/it/KnativeConsumerIT.java @@ -16,8 +16,8 @@ */ package org.apache.camel.k.quarkus.it; -import io.quarkus.test.junit.NativeImageTest; +import io.quarkus.test.junit.QuarkusIntegrationTest; -@NativeImageTest +@QuarkusIntegrationTest public class KnativeConsumerIT extends KnativeConsumerTest { } \ No newline at end of file diff --git a/itests/camel-k-itests-knative-consumer/src/test/java/org/apache/camel/k/quarkus/it/KnativeConsumerTest.java b/itests/camel-k-itests-knative-consumer/src/test/java/org/apache/camel/k/quarkus/it/KnativeConsumerTest.java index 9f6becf7..90cd7b75 100644 --- a/itests/camel-k-itests-knative-consumer/src/test/java/org/apache/camel/k/quarkus/it/KnativeConsumerTest.java +++ b/itests/camel-k-itests-knative-consumer/src/test/java/org/apache/camel/k/quarkus/it/KnativeConsumerTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.k.quarkus.it; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import io.quarkus.test.junit.QuarkusTest; import io.restassured.RestAssured; diff --git a/itests/camel-k-itests-knative-env-from-properties/pom.xml b/itests/camel-k-itests-knative-env-from-properties/pom.xml index 3c5f75df..eae72c8c 100644 --- a/itests/camel-k-itests-knative-env-from-properties/pom.xml +++ b/itests/camel-k-itests-knative-env-from-properties/pom.xml @@ -31,6 +31,12 @@ <dependency> <groupId>org.apache.camel.k</groupId> <artifactId>camel-k-runtime</artifactId> + <exclusions> + <exclusion> + <groupId>org.snakeyaml</groupId> + <artifactId>snakeyaml-engine</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.camel.k</groupId> diff --git a/itests/camel-k-itests-knative-env-from-properties/src/main/java/org/apache/camel/k/quarkus/it/KnativeEnvFromPropertiesApplication.java b/itests/camel-k-itests-knative-env-from-properties/src/main/java/org/apache/camel/k/quarkus/it/KnativeEnvFromPropertiesApplication.java index 9a1539f1..05b2c905 100644 --- a/itests/camel-k-itests-knative-env-from-properties/src/main/java/org/apache/camel/k/quarkus/it/KnativeEnvFromPropertiesApplication.java +++ b/itests/camel-k-itests-knative-env-from-properties/src/main/java/org/apache/camel/k/quarkus/it/KnativeEnvFromPropertiesApplication.java @@ -18,14 +18,14 @@ package org.apache.camel.k.quarkus.it; import java.util.Objects; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.json.bind.JsonbBuilder; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.json.bind.JsonbBuilder; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import io.quarkus.runtime.annotations.RegisterForReflection; import org.apache.camel.CamelContext; diff --git a/itests/camel-k-itests-knative-env-from-properties/src/test/java/org/apache/camel/k/quarkus/it/KnativeEnvFromPropertiesIT.java b/itests/camel-k-itests-knative-env-from-properties/src/test/java/org/apache/camel/k/quarkus/it/KnativeEnvFromPropertiesIT.java index 5f7fda44..b5c2a182 100644 --- a/itests/camel-k-itests-knative-env-from-properties/src/test/java/org/apache/camel/k/quarkus/it/KnativeEnvFromPropertiesIT.java +++ b/itests/camel-k-itests-knative-env-from-properties/src/test/java/org/apache/camel/k/quarkus/it/KnativeEnvFromPropertiesIT.java @@ -16,8 +16,8 @@ */ package org.apache.camel.k.quarkus.it; -import io.quarkus.test.junit.NativeImageTest; +import io.quarkus.test.junit.QuarkusIntegrationTest; -@NativeImageTest +@QuarkusIntegrationTest public class KnativeEnvFromPropertiesIT extends KnativeEnvFromPropertiesTest { } \ No newline at end of file diff --git a/itests/camel-k-itests-knative-env-from-properties/src/test/java/org/apache/camel/k/quarkus/it/KnativeEnvFromPropertiesTest.java b/itests/camel-k-itests-knative-env-from-properties/src/test/java/org/apache/camel/k/quarkus/it/KnativeEnvFromPropertiesTest.java index 5dead2ce..c1a63e83 100644 --- a/itests/camel-k-itests-knative-env-from-properties/src/test/java/org/apache/camel/k/quarkus/it/KnativeEnvFromPropertiesTest.java +++ b/itests/camel-k-itests-knative-env-from-properties/src/test/java/org/apache/camel/k/quarkus/it/KnativeEnvFromPropertiesTest.java @@ -19,7 +19,7 @@ package org.apache.camel.k.quarkus.it; import java.time.ZonedDateTime; import java.time.format.DateTimeFormatter; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import io.quarkus.test.junit.QuarkusTest; import io.restassured.RestAssured; diff --git a/itests/camel-k-itests-knative-env-from-registry/pom.xml b/itests/camel-k-itests-knative-env-from-registry/pom.xml index e7c1c41a..aa82ad52 100644 --- a/itests/camel-k-itests-knative-env-from-registry/pom.xml +++ b/itests/camel-k-itests-knative-env-from-registry/pom.xml @@ -31,6 +31,12 @@ <dependency> <groupId>org.apache.camel.k</groupId> <artifactId>camel-k-runtime</artifactId> + <exclusions> + <exclusion> + <groupId>org.snakeyaml</groupId> + <artifactId>snakeyaml-engine</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.camel.quarkus</groupId> diff --git a/itests/camel-k-itests-knative-env-from-registry/src/main/java/org/apache/camel/k/quarkus/it/KnativeEnvFromRegistryApplication.java b/itests/camel-k-itests-knative-env-from-registry/src/main/java/org/apache/camel/k/quarkus/it/KnativeEnvFromRegistryApplication.java index 38da020b..7023a12a 100644 --- a/itests/camel-k-itests-knative-env-from-registry/src/main/java/org/apache/camel/k/quarkus/it/KnativeEnvFromRegistryApplication.java +++ b/itests/camel-k-itests-knative-env-from-registry/src/main/java/org/apache/camel/k/quarkus/it/KnativeEnvFromRegistryApplication.java @@ -18,14 +18,14 @@ package org.apache.camel.k.quarkus.it; import java.util.Objects; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.json.bind.JsonbBuilder; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.json.bind.JsonbBuilder; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import io.quarkus.runtime.annotations.RegisterForReflection; import org.apache.camel.CamelContext; @@ -65,7 +65,7 @@ public class KnativeEnvFromRegistryApplication { return template.to("direct:process").withBody(payload).request(String.class); } - @javax.enterprise.inject.Produces + @jakarta.enterprise.inject.Produces KnativeEnvironment environment( @ConfigProperty(name = "camel.knative.listening.port") int port) { diff --git a/itests/camel-k-itests-knative-env-from-registry/src/test/java/org/apache/camel/k/quarkus/it/KnativeEnvFromRegistryIT.java b/itests/camel-k-itests-knative-env-from-registry/src/test/java/org/apache/camel/k/quarkus/it/KnativeEnvFromRegistryIT.java index be32ca0e..33c5ea15 100644 --- a/itests/camel-k-itests-knative-env-from-registry/src/test/java/org/apache/camel/k/quarkus/it/KnativeEnvFromRegistryIT.java +++ b/itests/camel-k-itests-knative-env-from-registry/src/test/java/org/apache/camel/k/quarkus/it/KnativeEnvFromRegistryIT.java @@ -16,8 +16,8 @@ */ package org.apache.camel.k.quarkus.it; -import io.quarkus.test.junit.NativeImageTest; +import io.quarkus.test.junit.QuarkusIntegrationTest; -@NativeImageTest +@QuarkusIntegrationTest public class KnativeEnvFromRegistryIT extends KnativeEnvFromRegistryTest { } \ No newline at end of file diff --git a/itests/camel-k-itests-knative-env-from-registry/src/test/java/org/apache/camel/k/quarkus/it/KnativeEnvFromRegistryTest.java b/itests/camel-k-itests-knative-env-from-registry/src/test/java/org/apache/camel/k/quarkus/it/KnativeEnvFromRegistryTest.java index ebad9e84..345ea8d8 100644 --- a/itests/camel-k-itests-knative-env-from-registry/src/test/java/org/apache/camel/k/quarkus/it/KnativeEnvFromRegistryTest.java +++ b/itests/camel-k-itests-knative-env-from-registry/src/test/java/org/apache/camel/k/quarkus/it/KnativeEnvFromRegistryTest.java @@ -19,7 +19,7 @@ package org.apache.camel.k.quarkus.it; import java.time.ZonedDateTime; import java.time.format.DateTimeFormatter; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import io.quarkus.test.junit.QuarkusTest; import io.restassured.RestAssured; diff --git a/itests/camel-k-itests-knative-producer/src/main/java/org/apache/camel/k/quarkus/it/KnativeProducerApplication.java b/itests/camel-k-itests-knative-producer/src/main/java/org/apache/camel/k/quarkus/it/KnativeProducerApplication.java index 32c28b34..2c541852 100644 --- a/itests/camel-k-itests-knative-producer/src/main/java/org/apache/camel/k/quarkus/it/KnativeProducerApplication.java +++ b/itests/camel-k-itests-knative-producer/src/main/java/org/apache/camel/k/quarkus/it/KnativeProducerApplication.java @@ -16,14 +16,14 @@ */ package org.apache.camel.k.quarkus.it; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.json.Json; -import javax.json.JsonObject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.json.Json; +import jakarta.json.JsonObject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.apache.camel.CamelContext; import org.apache.camel.component.knative.KnativeComponent; diff --git a/itests/camel-k-itests-knative-producer/src/test/java/org/apache/camel/k/quarkus/it/KnativeProducerIT.java b/itests/camel-k-itests-knative-producer/src/test/java/org/apache/camel/k/quarkus/it/KnativeProducerIT.java index 4606c20b..53ace05b 100644 --- a/itests/camel-k-itests-knative-producer/src/test/java/org/apache/camel/k/quarkus/it/KnativeProducerIT.java +++ b/itests/camel-k-itests-knative-producer/src/test/java/org/apache/camel/k/quarkus/it/KnativeProducerIT.java @@ -16,8 +16,8 @@ */ package org.apache.camel.k.quarkus.it; -import io.quarkus.test.junit.NativeImageTest; +import io.quarkus.test.junit.QuarkusIntegrationTest; -@NativeImageTest +@QuarkusIntegrationTest public class KnativeProducerIT extends KnativeProducerTest { } \ No newline at end of file diff --git a/itests/camel-k-itests-knative-producer/src/test/java/org/apache/camel/k/quarkus/it/KnativeProducerTest.java b/itests/camel-k-itests-knative-producer/src/test/java/org/apache/camel/k/quarkus/it/KnativeProducerTest.java index 8227e2e4..a4d8128c 100644 --- a/itests/camel-k-itests-knative-producer/src/test/java/org/apache/camel/k/quarkus/it/KnativeProducerTest.java +++ b/itests/camel-k-itests-knative-producer/src/test/java/org/apache/camel/k/quarkus/it/KnativeProducerTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.k.quarkus.it; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import io.quarkus.test.junit.QuarkusTest; import io.restassured.RestAssured; diff --git a/itests/camel-k-itests-knative-sinkbinding/pom.xml b/itests/camel-k-itests-knative-sinkbinding/pom.xml index 1ec2c92a..d5932e18 100644 --- a/itests/camel-k-itests-knative-sinkbinding/pom.xml +++ b/itests/camel-k-itests-knative-sinkbinding/pom.xml @@ -31,6 +31,12 @@ <dependency> <groupId>org.apache.camel.k</groupId> <artifactId>camel-k-runtime</artifactId> + <exclusions> + <exclusion> + <groupId>org.snakeyaml</groupId> + <artifactId>snakeyaml-engine</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.camel.k</groupId> diff --git a/itests/camel-k-itests-knative-sinkbinding/src/main/java/org/apache/camel/k/quarkus/it/KnativeSinkBindingApplication.java b/itests/camel-k-itests-knative-sinkbinding/src/main/java/org/apache/camel/k/quarkus/it/KnativeSinkBindingApplication.java index 9367adf7..25b017a0 100644 --- a/itests/camel-k-itests-knative-sinkbinding/src/main/java/org/apache/camel/k/quarkus/it/KnativeSinkBindingApplication.java +++ b/itests/camel-k-itests-knative-sinkbinding/src/main/java/org/apache/camel/k/quarkus/it/KnativeSinkBindingApplication.java @@ -16,15 +16,15 @@ */ package org.apache.camel.k.quarkus.it; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.json.Json; -import javax.json.JsonObject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.json.Json; +import jakarta.json.JsonObject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.apache.camel.CamelContext; import org.apache.camel.component.knative.spi.KnativeResource; diff --git a/itests/camel-k-itests-knative-sinkbinding/src/test/java/org/apache/camel/k/quarkus/it/KnativeSinkBindingIT.java b/itests/camel-k-itests-knative-sinkbinding/src/test/java/org/apache/camel/k/quarkus/it/KnativeSinkBindingIT.java index 4f3c8b09..c5531062 100644 --- a/itests/camel-k-itests-knative-sinkbinding/src/test/java/org/apache/camel/k/quarkus/it/KnativeSinkBindingIT.java +++ b/itests/camel-k-itests-knative-sinkbinding/src/test/java/org/apache/camel/k/quarkus/it/KnativeSinkBindingIT.java @@ -16,8 +16,8 @@ */ package org.apache.camel.k.quarkus.it; -import io.quarkus.test.junit.NativeImageTest; +import io.quarkus.test.junit.QuarkusIntegrationTest; -@NativeImageTest +@QuarkusIntegrationTest public class KnativeSinkBindingIT extends KnativeSinkBindingTest { } \ No newline at end of file diff --git a/itests/camel-k-itests-knative-sinkbinding/src/test/java/org/apache/camel/k/quarkus/it/KnativeSinkBindingTest.java b/itests/camel-k-itests-knative-sinkbinding/src/test/java/org/apache/camel/k/quarkus/it/KnativeSinkBindingTest.java index 9a2b962e..66e5e686 100644 --- a/itests/camel-k-itests-knative-sinkbinding/src/test/java/org/apache/camel/k/quarkus/it/KnativeSinkBindingTest.java +++ b/itests/camel-k-itests-knative-sinkbinding/src/test/java/org/apache/camel/k/quarkus/it/KnativeSinkBindingTest.java @@ -18,7 +18,7 @@ package org.apache.camel.k.quarkus.it; import java.util.Map; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import io.quarkus.test.common.QuarkusTestResource; import io.quarkus.test.common.QuarkusTestResourceLifecycleManager; diff --git a/itests/camel-k-itests-knative/pom.xml b/itests/camel-k-itests-knative/pom.xml index e4d75aa6..fb046352 100644 --- a/itests/camel-k-itests-knative/pom.xml +++ b/itests/camel-k-itests-knative/pom.xml @@ -31,6 +31,12 @@ <dependency> <groupId>org.apache.camel.k</groupId> <artifactId>camel-k-runtime</artifactId> + <exclusions> + <exclusion> + <groupId>org.snakeyaml</groupId> + <artifactId>snakeyaml-engine</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.camel.quarkus</groupId> diff --git a/itests/camel-k-itests-knative/src/main/java/org/apache/camel/k/quarkus/it/KnativeApplication.java b/itests/camel-k-itests-knative/src/main/java/org/apache/camel/k/quarkus/it/KnativeApplication.java index e64d8ca6..a3091a90 100644 --- a/itests/camel-k-itests-knative/src/main/java/org/apache/camel/k/quarkus/it/KnativeApplication.java +++ b/itests/camel-k-itests-knative/src/main/java/org/apache/camel/k/quarkus/it/KnativeApplication.java @@ -16,14 +16,14 @@ */ package org.apache.camel.k.quarkus.it; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.json.Json; -import javax.json.JsonObject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.json.Json; +import jakarta.json.JsonObject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import io.quarkus.runtime.annotations.RegisterForReflection; import org.apache.camel.CamelContext; diff --git a/itests/camel-k-itests-knative/src/test/java/org/apache/camel/k/quarkus/it/KnativeIT.java b/itests/camel-k-itests-knative/src/test/java/org/apache/camel/k/quarkus/it/KnativeIT.java index cfd8081c..535c7a87 100644 --- a/itests/camel-k-itests-knative/src/test/java/org/apache/camel/k/quarkus/it/KnativeIT.java +++ b/itests/camel-k-itests-knative/src/test/java/org/apache/camel/k/quarkus/it/KnativeIT.java @@ -16,8 +16,8 @@ */ package org.apache.camel.k.quarkus.it; -import io.quarkus.test.junit.NativeImageTest; +import io.quarkus.test.junit.QuarkusIntegrationTest; -@NativeImageTest +@QuarkusIntegrationTest public class KnativeIT extends KnativeTest { } \ No newline at end of file diff --git a/itests/camel-k-itests-knative/src/test/java/org/apache/camel/k/quarkus/it/KnativeTest.java b/itests/camel-k-itests-knative/src/test/java/org/apache/camel/k/quarkus/it/KnativeTest.java index 2ceb4d10..d5ed2d57 100644 --- a/itests/camel-k-itests-knative/src/test/java/org/apache/camel/k/quarkus/it/KnativeTest.java +++ b/itests/camel-k-itests-knative/src/test/java/org/apache/camel/k/quarkus/it/KnativeTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.k.quarkus.it; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import io.quarkus.test.junit.QuarkusTest; import io.restassured.RestAssured; diff --git a/itests/camel-k-itests-loader-groovy/src/main/java/org/apache/camel/k/loader/yaml/quarkus/Application.java b/itests/camel-k-itests-loader-groovy/src/main/java/org/apache/camel/k/loader/yaml/quarkus/Application.java index cda4b300..4c1eaf00 100644 --- a/itests/camel-k-itests-loader-groovy/src/main/java/org/apache/camel/k/loader/yaml/quarkus/Application.java +++ b/itests/camel-k-itests-loader-groovy/src/main/java/org/apache/camel/k/loader/yaml/quarkus/Application.java @@ -16,15 +16,15 @@ */ package org.apache.camel.k.loader.yaml.quarkus; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.json.JsonObject; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.apache.camel.CamelContext; import org.apache.camel.k.loader.support.LoaderSupport; diff --git a/itests/camel-k-itests-loader-groovy/src/test/java/org/apache/camel/k/loader/yaml/quarkus/GroovyLoaderTest.java b/itests/camel-k-itests-loader-groovy/src/test/java/org/apache/camel/k/loader/yaml/quarkus/GroovyLoaderTest.java index f4b182d9..0170dba7 100644 --- a/itests/camel-k-itests-loader-groovy/src/test/java/org/apache/camel/k/loader/yaml/quarkus/GroovyLoaderTest.java +++ b/itests/camel-k-itests-loader-groovy/src/test/java/org/apache/camel/k/loader/yaml/quarkus/GroovyLoaderTest.java @@ -19,9 +19,9 @@ package org.apache.camel.k.loader.yaml.quarkus; import java.io.IOException; import java.io.InputStream; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; -import io.quarkus.test.junit.DisabledOnNativeImage; +import io.quarkus.test.junit.DisabledOnIntegrationTest; import io.quarkus.test.junit.QuarkusTest; import io.restassured.RestAssured; import io.restassured.path.json.JsonPath; @@ -31,7 +31,7 @@ import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; -@DisabledOnNativeImage +@DisabledOnIntegrationTest @QuarkusTest public class GroovyLoaderTest { String code; diff --git a/itests/camel-k-itests-loader-java/src/main/java/org/apache/camel/k/loader/jsh/quarkus/Application.java b/itests/camel-k-itests-loader-java/src/main/java/org/apache/camel/k/loader/jsh/quarkus/Application.java index 274ec07a..d768fa19 100644 --- a/itests/camel-k-itests-loader-java/src/main/java/org/apache/camel/k/loader/jsh/quarkus/Application.java +++ b/itests/camel-k-itests-loader-java/src/main/java/org/apache/camel/k/loader/jsh/quarkus/Application.java @@ -16,15 +16,15 @@ */ package org.apache.camel.k.loader.jsh.quarkus; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.json.JsonObject; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.apache.camel.CamelContext; import org.apache.camel.k.loader.support.LoaderSupport; diff --git a/itests/camel-k-itests-loader-java/src/test/java/org/apache/camel/k/loader/jsh/JavaLoaderTest.java b/itests/camel-k-itests-loader-java/src/test/java/org/apache/camel/k/loader/jsh/JavaLoaderTest.java index 0cb21cac..5ad522b5 100644 --- a/itests/camel-k-itests-loader-java/src/test/java/org/apache/camel/k/loader/jsh/JavaLoaderTest.java +++ b/itests/camel-k-itests-loader-java/src/test/java/org/apache/camel/k/loader/jsh/JavaLoaderTest.java @@ -19,9 +19,9 @@ package org.apache.camel.k.loader.jsh; import java.io.IOException; import java.io.InputStream; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; -import io.quarkus.test.junit.DisabledOnNativeImage; +import io.quarkus.test.junit.DisabledOnIntegrationTest; import io.quarkus.test.junit.QuarkusTest; import io.restassured.RestAssured; import io.restassured.path.json.JsonPath; @@ -30,7 +30,7 @@ import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; -@DisabledOnNativeImage +@DisabledOnIntegrationTest @QuarkusTest public class JavaLoaderTest { @Test diff --git a/itests/camel-k-itests-loader-js/src/main/java/org/apache/camel/k/loader/js/quarkus/Application.java b/itests/camel-k-itests-loader-js/src/main/java/org/apache/camel/k/loader/js/quarkus/Application.java index 1ac548ac..3042178d 100644 --- a/itests/camel-k-itests-loader-js/src/main/java/org/apache/camel/k/loader/js/quarkus/Application.java +++ b/itests/camel-k-itests-loader-js/src/main/java/org/apache/camel/k/loader/js/quarkus/Application.java @@ -16,15 +16,15 @@ */ package org.apache.camel.k.loader.js.quarkus; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.json.JsonObject; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.apache.camel.CamelContext; import org.apache.camel.k.loader.support.LoaderSupport; diff --git a/itests/camel-k-itests-loader-js/src/test/java/org/apache/camel/k/loader/js/quarkus/JavaScriptLoaderIT.java b/itests/camel-k-itests-loader-js/src/test/java/org/apache/camel/k/loader/js/quarkus/JavaScriptLoaderIT.java index 26376695..676fb1dd 100644 --- a/itests/camel-k-itests-loader-js/src/test/java/org/apache/camel/k/loader/js/quarkus/JavaScriptLoaderIT.java +++ b/itests/camel-k-itests-loader-js/src/test/java/org/apache/camel/k/loader/js/quarkus/JavaScriptLoaderIT.java @@ -16,8 +16,8 @@ */ package org.apache.camel.k.loader.js.quarkus; -import io.quarkus.test.junit.NativeImageTest; +import io.quarkus.test.junit.QuarkusIntegrationTest; -@NativeImageTest +@QuarkusIntegrationTest public class JavaScriptLoaderIT extends JavaScriptLoaderTest { } \ No newline at end of file diff --git a/itests/camel-k-itests-loader-js/src/test/java/org/apache/camel/k/loader/js/quarkus/JavaScriptLoaderTest.java b/itests/camel-k-itests-loader-js/src/test/java/org/apache/camel/k/loader/js/quarkus/JavaScriptLoaderTest.java index eb875726..9dfe8886 100644 --- a/itests/camel-k-itests-loader-js/src/test/java/org/apache/camel/k/loader/js/quarkus/JavaScriptLoaderTest.java +++ b/itests/camel-k-itests-loader-js/src/test/java/org/apache/camel/k/loader/js/quarkus/JavaScriptLoaderTest.java @@ -19,7 +19,7 @@ package org.apache.camel.k.loader.js.quarkus; import java.io.IOException; import java.io.InputStream; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import io.quarkus.test.junit.QuarkusTest; import io.restassured.RestAssured; diff --git a/itests/camel-k-itests-loader-jsh/src/main/java/org/apache/camel/k/loader/jsh/quarkus/it/JshApplication.java b/itests/camel-k-itests-loader-jsh/src/main/java/org/apache/camel/k/loader/jsh/quarkus/it/JshApplication.java index 33db01d2..751b85fc 100644 --- a/itests/camel-k-itests-loader-jsh/src/main/java/org/apache/camel/k/loader/jsh/quarkus/it/JshApplication.java +++ b/itests/camel-k-itests-loader-jsh/src/main/java/org/apache/camel/k/loader/jsh/quarkus/it/JshApplication.java @@ -16,15 +16,15 @@ */ package org.apache.camel.k.loader.jsh.quarkus.it; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.json.JsonObject; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.apache.camel.CamelContext; import org.apache.camel.k.loader.support.LoaderSupport; diff --git a/itests/camel-k-itests-loader-jsh/src/test/java/org/apache/camel/k/loader/jsh/it/JshLoaderTest.java b/itests/camel-k-itests-loader-jsh/src/test/java/org/apache/camel/k/loader/jsh/it/JshLoaderTest.java index 5a7e3c2a..f940a53e 100644 --- a/itests/camel-k-itests-loader-jsh/src/test/java/org/apache/camel/k/loader/jsh/it/JshLoaderTest.java +++ b/itests/camel-k-itests-loader-jsh/src/test/java/org/apache/camel/k/loader/jsh/it/JshLoaderTest.java @@ -19,9 +19,9 @@ package org.apache.camel.k.loader.jsh.it; import java.io.IOException; import java.io.InputStream; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; -import io.quarkus.test.junit.DisabledOnNativeImage; +import io.quarkus.test.junit.DisabledOnIntegrationTest; import io.quarkus.test.junit.QuarkusTest; import io.restassured.RestAssured; import io.restassured.path.json.JsonPath; @@ -29,7 +29,7 @@ import org.apache.camel.util.IOHelper; import org.junit.jupiter.api.Test; //@Disabled -@DisabledOnNativeImage +@DisabledOnIntegrationTest @QuarkusTest public class JshLoaderTest { @Test diff --git a/itests/camel-k-itests-loader-kotlin/src/main/java/org/apache/camel/k/loader/kotlin/quarkus/Application.java b/itests/camel-k-itests-loader-kotlin/src/main/java/org/apache/camel/k/loader/kotlin/quarkus/Application.java index f5420801..5559b35c 100644 --- a/itests/camel-k-itests-loader-kotlin/src/main/java/org/apache/camel/k/loader/kotlin/quarkus/Application.java +++ b/itests/camel-k-itests-loader-kotlin/src/main/java/org/apache/camel/k/loader/kotlin/quarkus/Application.java @@ -16,15 +16,15 @@ */ package org.apache.camel.k.loader.kotlin.quarkus; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.json.JsonObject; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.apache.camel.CamelContext; import org.apache.camel.k.loader.support.LoaderSupport; diff --git a/itests/camel-k-itests-loader-kotlin/src/test/java/org/apache/camel/k/loader/kotlin/quarkus/KotlinLoaderTest.java b/itests/camel-k-itests-loader-kotlin/src/test/java/org/apache/camel/k/loader/kotlin/quarkus/KotlinLoaderTest.java index 8ce44c4a..7f7514a0 100644 --- a/itests/camel-k-itests-loader-kotlin/src/test/java/org/apache/camel/k/loader/kotlin/quarkus/KotlinLoaderTest.java +++ b/itests/camel-k-itests-loader-kotlin/src/test/java/org/apache/camel/k/loader/kotlin/quarkus/KotlinLoaderTest.java @@ -19,9 +19,9 @@ package org.apache.camel.k.loader.kotlin.quarkus; import java.io.IOException; import java.io.InputStream; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; -import io.quarkus.test.junit.DisabledOnNativeImage; +import io.quarkus.test.junit.DisabledOnIntegrationTest; import io.quarkus.test.junit.QuarkusTest; import io.restassured.RestAssured; import io.restassured.path.json.JsonPath; @@ -32,7 +32,7 @@ import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; @Disabled("https://github.com/quarkusio/quarkus/issues/11549") -@DisabledOnNativeImage +@DisabledOnIntegrationTest @QuarkusTest public class KotlinLoaderTest { @Test diff --git a/itests/camel-k-itests-loader-polyglot/pom.xml b/itests/camel-k-itests-loader-polyglot/pom.xml index d901b847..72eb3cff 100644 --- a/itests/camel-k-itests-loader-polyglot/pom.xml +++ b/itests/camel-k-itests-loader-polyglot/pom.xml @@ -30,7 +30,13 @@ <dependencies> <dependency> <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-itests-loader-inspector</artifactId> + <artifactId>camel-k-itests-loader-inspector</artifactId><exclusions> + <exclusion> + <groupId>org.snakeyaml</groupId> + <artifactId>snakeyaml-engine</artifactId> + </exclusion> + </exclusions> + </dependency> <!-- camel quarkus --> diff --git a/itests/camel-k-itests-loader-polyglot/src/main/java/org/apache/camel/k/itests/polyglot/quarkus/Application.java b/itests/camel-k-itests-loader-polyglot/src/main/java/org/apache/camel/k/itests/polyglot/quarkus/Application.java index 65c2cea3..0cb3b414 100644 --- a/itests/camel-k-itests-loader-polyglot/src/main/java/org/apache/camel/k/itests/polyglot/quarkus/Application.java +++ b/itests/camel-k-itests-loader-polyglot/src/main/java/org/apache/camel/k/itests/polyglot/quarkus/Application.java @@ -16,15 +16,15 @@ */ package org.apache.camel.k.itests.polyglot.quarkus; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.json.JsonObject; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.apache.camel.CamelContext; import org.apache.camel.k.loader.support.LoaderSupport; diff --git a/itests/camel-k-itests-loader-polyglot/src/test/java/org/apache/camel/k/itests/polyglot/quarkus/PolyglotIT.java b/itests/camel-k-itests-loader-polyglot/src/test/java/org/apache/camel/k/itests/polyglot/quarkus/PolyglotIT.java index f6927b9f..a3566511 100644 --- a/itests/camel-k-itests-loader-polyglot/src/test/java/org/apache/camel/k/itests/polyglot/quarkus/PolyglotIT.java +++ b/itests/camel-k-itests-loader-polyglot/src/test/java/org/apache/camel/k/itests/polyglot/quarkus/PolyglotIT.java @@ -16,8 +16,8 @@ */ package org.apache.camel.k.itests.polyglot.quarkus; -import io.quarkus.test.junit.NativeImageTest; +import io.quarkus.test.junit.QuarkusIntegrationTest; -@NativeImageTest +@QuarkusIntegrationTest public class PolyglotIT extends PolyglotTest { } \ No newline at end of file diff --git a/itests/camel-k-itests-loader-polyglot/src/test/java/org/apache/camel/k/itests/polyglot/quarkus/PolyglotTest.java b/itests/camel-k-itests-loader-polyglot/src/test/java/org/apache/camel/k/itests/polyglot/quarkus/PolyglotTest.java index 6c7d59ab..cec2359e 100644 --- a/itests/camel-k-itests-loader-polyglot/src/test/java/org/apache/camel/k/itests/polyglot/quarkus/PolyglotTest.java +++ b/itests/camel-k-itests-loader-polyglot/src/test/java/org/apache/camel/k/itests/polyglot/quarkus/PolyglotTest.java @@ -20,7 +20,7 @@ import java.io.IOException; import java.io.InputStream; import java.util.Map; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import io.quarkus.test.junit.QuarkusTest; import io.restassured.RestAssured; diff --git a/itests/camel-k-itests-loader-xml/src/main/java/org/apache/camel/k/loader/xml/quarkus/Application.java b/itests/camel-k-itests-loader-xml/src/main/java/org/apache/camel/k/loader/xml/quarkus/Application.java index 087174b2..679abbe8 100644 --- a/itests/camel-k-itests-loader-xml/src/main/java/org/apache/camel/k/loader/xml/quarkus/Application.java +++ b/itests/camel-k-itests-loader-xml/src/main/java/org/apache/camel/k/loader/xml/quarkus/Application.java @@ -16,15 +16,15 @@ */ package org.apache.camel.k.loader.xml.quarkus; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.json.JsonObject; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.apache.camel.CamelContext; import org.apache.camel.k.loader.support.LoaderSupport; diff --git a/itests/camel-k-itests-loader-xml/src/test/java/org/apache/camel/k/loader/xml/quarkus/XmlLoaderIT.java b/itests/camel-k-itests-loader-xml/src/test/java/org/apache/camel/k/loader/xml/quarkus/XmlLoaderIT.java index 8b41787b..f3283d13 100644 --- a/itests/camel-k-itests-loader-xml/src/test/java/org/apache/camel/k/loader/xml/quarkus/XmlLoaderIT.java +++ b/itests/camel-k-itests-loader-xml/src/test/java/org/apache/camel/k/loader/xml/quarkus/XmlLoaderIT.java @@ -16,8 +16,8 @@ */ package org.apache.camel.k.loader.xml.quarkus; -import io.quarkus.test.junit.NativeImageTest; +import io.quarkus.test.junit.QuarkusIntegrationTest; -@NativeImageTest +@QuarkusIntegrationTest public class XmlLoaderIT extends XmlLoaderTest { } \ No newline at end of file diff --git a/itests/camel-k-itests-loader-xml/src/test/java/org/apache/camel/k/loader/xml/quarkus/XmlLoaderTest.java b/itests/camel-k-itests-loader-xml/src/test/java/org/apache/camel/k/loader/xml/quarkus/XmlLoaderTest.java index 9d40a71d..8018521a 100644 --- a/itests/camel-k-itests-loader-xml/src/test/java/org/apache/camel/k/loader/xml/quarkus/XmlLoaderTest.java +++ b/itests/camel-k-itests-loader-xml/src/test/java/org/apache/camel/k/loader/xml/quarkus/XmlLoaderTest.java @@ -19,7 +19,7 @@ package org.apache.camel.k.loader.xml.quarkus; import java.io.IOException; import java.io.InputStream; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import io.quarkus.test.junit.QuarkusTest; import io.restassured.RestAssured; diff --git a/itests/camel-k-itests-loader-yaml/pom.xml b/itests/camel-k-itests-loader-yaml/pom.xml index c0fec833..72a4b197 100644 --- a/itests/camel-k-itests-loader-yaml/pom.xml +++ b/itests/camel-k-itests-loader-yaml/pom.xml @@ -31,6 +31,12 @@ <dependency> <groupId>org.apache.camel.k</groupId> <artifactId>camel-k-itests-loader-inspector</artifactId> + <exclusions> + <exclusion> + <groupId>org.snakeyaml</groupId> + <artifactId>snakeyaml-engine</artifactId> + </exclusion> + </exclusions> </dependency> <!-- camel quarkus --> diff --git a/itests/camel-k-itests-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/quarkus/Application.java b/itests/camel-k-itests-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/quarkus/Application.java index 6b145aff..df1891b0 100644 --- a/itests/camel-k-itests-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/quarkus/Application.java +++ b/itests/camel-k-itests-loader-yaml/src/main/java/org/apache/camel/k/loader/yaml/quarkus/Application.java @@ -16,15 +16,15 @@ */ package org.apache.camel.k.loader.yaml.quarkus; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.json.JsonObject; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.json.JsonObject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.apache.camel.CamelContext; import org.apache.camel.k.loader.support.LoaderSupport; diff --git a/itests/camel-k-itests-loader-yaml/src/test/java/org/apache/camel/k/loader/yaml/quarkus/YamlLoaderIT.java b/itests/camel-k-itests-loader-yaml/src/test/java/org/apache/camel/k/loader/yaml/quarkus/YamlLoaderIT.java index fc418308..2cfcc3ed 100644 --- a/itests/camel-k-itests-loader-yaml/src/test/java/org/apache/camel/k/loader/yaml/quarkus/YamlLoaderIT.java +++ b/itests/camel-k-itests-loader-yaml/src/test/java/org/apache/camel/k/loader/yaml/quarkus/YamlLoaderIT.java @@ -16,8 +16,8 @@ */ package org.apache.camel.k.loader.yaml.quarkus; -import io.quarkus.test.junit.NativeImageTest; +import io.quarkus.test.junit.QuarkusIntegrationTest; -@NativeImageTest +@QuarkusIntegrationTest public class YamlLoaderIT extends YamlLoaderTest { } \ No newline at end of file diff --git a/itests/camel-k-itests-loader-yaml/src/test/java/org/apache/camel/k/loader/yaml/quarkus/YamlLoaderTest.java b/itests/camel-k-itests-loader-yaml/src/test/java/org/apache/camel/k/loader/yaml/quarkus/YamlLoaderTest.java index 466b9a43..1d3d2f9f 100644 --- a/itests/camel-k-itests-loader-yaml/src/test/java/org/apache/camel/k/loader/yaml/quarkus/YamlLoaderTest.java +++ b/itests/camel-k-itests-loader-yaml/src/test/java/org/apache/camel/k/loader/yaml/quarkus/YamlLoaderTest.java @@ -19,7 +19,7 @@ package org.apache.camel.k.loader.yaml.quarkus; import java.io.IOException; import java.io.InputStream; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import io.quarkus.test.junit.QuarkusTest; import io.restassured.RestAssured; diff --git a/itests/camel-k-itests-master/src/main/java/org/apache/camel/k/quarkus/master/Application.java b/itests/camel-k-itests-master/src/main/java/org/apache/camel/k/quarkus/master/Application.java index b90a67c3..52a4e17e 100644 --- a/itests/camel-k-itests-master/src/main/java/org/apache/camel/k/quarkus/master/Application.java +++ b/itests/camel-k-itests-master/src/main/java/org/apache/camel/k/quarkus/master/Application.java @@ -16,14 +16,14 @@ */ package org.apache.camel.k.quarkus.master; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.json.Json; -import javax.json.JsonObject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.json.Json; +import jakarta.json.JsonObject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.apache.camel.CamelContext; import org.apache.camel.component.kubernetes.cluster.KubernetesClusterService; diff --git a/itests/camel-k-itests-master/src/test/java/org/apache/camel/k/quarkus/master/MasterIT.java b/itests/camel-k-itests-master/src/test/java/org/apache/camel/k/quarkus/master/MasterIT.java index 97a79250..5e627f8b 100644 --- a/itests/camel-k-itests-master/src/test/java/org/apache/camel/k/quarkus/master/MasterIT.java +++ b/itests/camel-k-itests-master/src/test/java/org/apache/camel/k/quarkus/master/MasterIT.java @@ -16,8 +16,8 @@ */ package org.apache.camel.k.quarkus.master; -import io.quarkus.test.junit.NativeImageTest; +import io.quarkus.test.junit.QuarkusIntegrationTest; -@NativeImageTest +@QuarkusIntegrationTest public class MasterIT extends MasterTest { } \ No newline at end of file diff --git a/itests/camel-k-itests-runtime-xml/src/main/java/org/apache/camel/k/quarkus/it/Application.java b/itests/camel-k-itests-runtime-xml/src/main/java/org/apache/camel/k/quarkus/it/Application.java index 9ec72e3b..6f0d740d 100644 --- a/itests/camel-k-itests-runtime-xml/src/main/java/org/apache/camel/k/quarkus/it/Application.java +++ b/itests/camel-k-itests-runtime-xml/src/main/java/org/apache/camel/k/quarkus/it/Application.java @@ -16,7 +16,7 @@ */ package org.apache.camel.k.quarkus.it; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class Application { diff --git a/itests/camel-k-itests-runtime-xml/src/test/java/org/apache/camel/k/quarkus/it/RuntimeWithXmlIT.java b/itests/camel-k-itests-runtime-xml/src/test/java/org/apache/camel/k/quarkus/it/RuntimeWithXmlIT.java index 391784d4..de9f9a5e 100644 --- a/itests/camel-k-itests-runtime-xml/src/test/java/org/apache/camel/k/quarkus/it/RuntimeWithXmlIT.java +++ b/itests/camel-k-itests-runtime-xml/src/test/java/org/apache/camel/k/quarkus/it/RuntimeWithXmlIT.java @@ -16,8 +16,8 @@ */ package org.apache.camel.k.quarkus.it; -import io.quarkus.test.junit.NativeImageTest; +import io.quarkus.test.junit.QuarkusIntegrationTest; -@NativeImageTest +@QuarkusIntegrationTest public class RuntimeWithXmlIT extends RuntimeWithXmlTest { } \ No newline at end of file diff --git a/itests/camel-k-itests-runtime-xml/src/test/java/org/apache/camel/k/quarkus/it/RuntimeWithXmlTest.java b/itests/camel-k-itests-runtime-xml/src/test/java/org/apache/camel/k/quarkus/it/RuntimeWithXmlTest.java index 1140719f..cc773a06 100644 --- a/itests/camel-k-itests-runtime-xml/src/test/java/org/apache/camel/k/quarkus/it/RuntimeWithXmlTest.java +++ b/itests/camel-k-itests-runtime-xml/src/test/java/org/apache/camel/k/quarkus/it/RuntimeWithXmlTest.java @@ -18,7 +18,7 @@ package org.apache.camel.k.quarkus.it; import java.util.Map; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import io.quarkus.test.common.QuarkusTestResource; import io.quarkus.test.common.QuarkusTestResourceLifecycleManager; diff --git a/itests/camel-k-itests-runtime-yaml/pom.xml b/itests/camel-k-itests-runtime-yaml/pom.xml index 3ae79915..ca4f02ac 100644 --- a/itests/camel-k-itests-runtime-yaml/pom.xml +++ b/itests/camel-k-itests-runtime-yaml/pom.xml @@ -31,6 +31,12 @@ <dependency> <groupId>org.apache.camel.k</groupId> <artifactId>camel-k-runtime</artifactId> + <exclusions> + <exclusion> + <groupId>org.snakeyaml</groupId> + <artifactId>snakeyaml-engine</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.camel.k</groupId> diff --git a/itests/camel-k-itests-runtime-yaml/src/main/java/org/apache/camel/k/quarkus/it/Application.java b/itests/camel-k-itests-runtime-yaml/src/main/java/org/apache/camel/k/quarkus/it/Application.java index 72b98451..ea2bca79 100644 --- a/itests/camel-k-itests-runtime-yaml/src/main/java/org/apache/camel/k/quarkus/it/Application.java +++ b/itests/camel-k-itests-runtime-yaml/src/main/java/org/apache/camel/k/quarkus/it/Application.java @@ -16,8 +16,8 @@ */ package org.apache.camel.k.quarkus.it; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; import io.quarkus.arc.Unremovable; import org.apache.camel.component.knative.spi.Knative; diff --git a/itests/camel-k-itests-runtime-yaml/src/test/java/org/apache/camel/k/quarkus/it/RuntimeWithYamlIT.java b/itests/camel-k-itests-runtime-yaml/src/test/java/org/apache/camel/k/quarkus/it/RuntimeWithYamlIT.java index f81bc38c..316e5a73 100644 --- a/itests/camel-k-itests-runtime-yaml/src/test/java/org/apache/camel/k/quarkus/it/RuntimeWithYamlIT.java +++ b/itests/camel-k-itests-runtime-yaml/src/test/java/org/apache/camel/k/quarkus/it/RuntimeWithYamlIT.java @@ -16,8 +16,8 @@ */ package org.apache.camel.k.quarkus.it; -import io.quarkus.test.junit.NativeImageTest; +import io.quarkus.test.junit.QuarkusIntegrationTest; -@NativeImageTest +@QuarkusIntegrationTest public class RuntimeWithYamlIT extends RuntimeWithYamlTest { } \ No newline at end of file diff --git a/itests/camel-k-itests-runtime-yaml/src/test/java/org/apache/camel/k/quarkus/it/RuntimeWithYamlTest.java b/itests/camel-k-itests-runtime-yaml/src/test/java/org/apache/camel/k/quarkus/it/RuntimeWithYamlTest.java index 058747b9..a6b3098a 100644 --- a/itests/camel-k-itests-runtime-yaml/src/test/java/org/apache/camel/k/quarkus/it/RuntimeWithYamlTest.java +++ b/itests/camel-k-itests-runtime-yaml/src/test/java/org/apache/camel/k/quarkus/it/RuntimeWithYamlTest.java @@ -18,7 +18,7 @@ package org.apache.camel.k.quarkus.it; import java.util.Map; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import io.quarkus.test.common.QuarkusTestResource; import io.quarkus.test.common.QuarkusTestResourceLifecycleManager; diff --git a/itests/camel-k-itests-runtime/pom.xml b/itests/camel-k-itests-runtime/pom.xml index 6b314cca..90b17850 100644 --- a/itests/camel-k-itests-runtime/pom.xml +++ b/itests/camel-k-itests-runtime/pom.xml @@ -31,6 +31,12 @@ <dependency> <groupId>org.apache.camel.k</groupId> <artifactId>camel-k-runtime</artifactId> + <exclusions> + <exclusion> + <groupId>org.snakeyaml</groupId> + <artifactId>snakeyaml-engine</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.camel.quarkus</groupId> diff --git a/itests/camel-k-itests-runtime/src/main/java/org/apache/camel/k/quarkus/it/Application.java b/itests/camel-k-itests-runtime/src/main/java/org/apache/camel/k/quarkus/it/Application.java index 2ad044aa..23370b61 100644 --- a/itests/camel-k-itests-runtime/src/main/java/org/apache/camel/k/quarkus/it/Application.java +++ b/itests/camel-k-itests-runtime/src/main/java/org/apache/camel/k/quarkus/it/Application.java @@ -19,15 +19,15 @@ package org.apache.camel.k.quarkus.it; import java.util.Collections; import java.util.Map; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.json.Json; -import javax.json.JsonObject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.json.Json; +import jakarta.json.JsonObject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.apache.camel.CamelContext; import org.apache.camel.component.properties.PropertiesComponent; @@ -50,22 +50,22 @@ public class Application { public JsonObject inspect() { return Json.createObjectBuilder() .add( - "camel-context", - instance(CamelContext.class).map(Object::getClass).map(Class::getName).orElse("")) + "camel-context", + instance(CamelContext.class).map(Object::getClass).map(Class::getName).orElse("")) .add( - "camel-k-runtime", - instance(Runtime.class).map(Object::getClass).map(Class::getName).orElse("")) + "camel-k-runtime", + instance(Runtime.class).map(Object::getClass).map(Class::getName).orElse("")) .add( - "routes-collector", - instance(CamelMain.class).map(BaseMainSupport::getRoutesCollector).map(Object::getClass).map(Class::getName).orElse("")) + "routes-collector", + instance(CamelMain.class).map(BaseMainSupport::getRoutesCollector).map(Object::getClass).map(Class::getName).orElse("")) .add( - "global-options", - Json.createObjectBuilder( - (Map)instance(CamelMain.class) - .map(BaseMainSupport::getCamelContext) - .map(CamelContext::getGlobalOptions) - .orElseGet(Collections::emptyMap)) - .build()) + "global-options", + Json.createObjectBuilder( + (Map) instance(CamelMain.class) + .map(BaseMainSupport::getCamelContext) + .map(CamelContext::getGlobalOptions) + .orElseGet(Collections::emptyMap)) + .build()) .build(); } diff --git a/itests/camel-k-itests-runtime/src/test/java/org/apache/camel/k/quarkus/it/RuntimeCustomizerFallbackIT.java b/itests/camel-k-itests-runtime/src/test/java/org/apache/camel/k/quarkus/it/RuntimeCustomizerFallbackIT.java index d0de133f..33505b1d 100644 --- a/itests/camel-k-itests-runtime/src/test/java/org/apache/camel/k/quarkus/it/RuntimeCustomizerFallbackIT.java +++ b/itests/camel-k-itests-runtime/src/test/java/org/apache/camel/k/quarkus/it/RuntimeCustomizerFallbackIT.java @@ -16,8 +16,8 @@ */ package org.apache.camel.k.quarkus.it; -import io.quarkus.test.junit.NativeImageTest; +import io.quarkus.test.junit.QuarkusIntegrationTest; -@NativeImageTest +@QuarkusIntegrationTest public class RuntimeCustomizerFallbackIT extends RuntimeCustomizerFallbackTest { } \ No newline at end of file diff --git a/itests/camel-k-itests-runtime/src/test/java/org/apache/camel/k/quarkus/it/RuntimeCustomizerFallbackTest.java b/itests/camel-k-itests-runtime/src/test/java/org/apache/camel/k/quarkus/it/RuntimeCustomizerFallbackTest.java index cde4494b..b72217eb 100644 --- a/itests/camel-k-itests-runtime/src/test/java/org/apache/camel/k/quarkus/it/RuntimeCustomizerFallbackTest.java +++ b/itests/camel-k-itests-runtime/src/test/java/org/apache/camel/k/quarkus/it/RuntimeCustomizerFallbackTest.java @@ -18,7 +18,7 @@ package org.apache.camel.k.quarkus.it; import java.util.Map; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.junit.QuarkusTestProfile; diff --git a/itests/camel-k-itests-runtime/src/test/java/org/apache/camel/k/quarkus/it/RuntimeCustomizerIT.java b/itests/camel-k-itests-runtime/src/test/java/org/apache/camel/k/quarkus/it/RuntimeCustomizerIT.java index 3bcbabb6..33b5e741 100644 --- a/itests/camel-k-itests-runtime/src/test/java/org/apache/camel/k/quarkus/it/RuntimeCustomizerIT.java +++ b/itests/camel-k-itests-runtime/src/test/java/org/apache/camel/k/quarkus/it/RuntimeCustomizerIT.java @@ -16,8 +16,8 @@ */ package org.apache.camel.k.quarkus.it; -import io.quarkus.test.junit.NativeImageTest; +import io.quarkus.test.junit.QuarkusIntegrationTest; -@NativeImageTest +@QuarkusIntegrationTest public class RuntimeCustomizerIT extends RuntimeCustomizerTest { } \ No newline at end of file diff --git a/itests/camel-k-itests-runtime/src/test/java/org/apache/camel/k/quarkus/it/RuntimeCustomizerTest.java b/itests/camel-k-itests-runtime/src/test/java/org/apache/camel/k/quarkus/it/RuntimeCustomizerTest.java index 7965d940..2d97104a 100644 --- a/itests/camel-k-itests-runtime/src/test/java/org/apache/camel/k/quarkus/it/RuntimeCustomizerTest.java +++ b/itests/camel-k-itests-runtime/src/test/java/org/apache/camel/k/quarkus/it/RuntimeCustomizerTest.java @@ -18,7 +18,7 @@ package org.apache.camel.k.quarkus.it; import java.util.Map; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.junit.QuarkusTestProfile; diff --git a/itests/camel-k-itests-runtime/src/test/java/org/apache/camel/k/quarkus/it/RuntimeIT.java b/itests/camel-k-itests-runtime/src/test/java/org/apache/camel/k/quarkus/it/RuntimeIT.java index 29f1c174..3c60518d 100644 --- a/itests/camel-k-itests-runtime/src/test/java/org/apache/camel/k/quarkus/it/RuntimeIT.java +++ b/itests/camel-k-itests-runtime/src/test/java/org/apache/camel/k/quarkus/it/RuntimeIT.java @@ -16,8 +16,8 @@ */ package org.apache.camel.k.quarkus.it; -import io.quarkus.test.junit.NativeImageTest; +import io.quarkus.test.junit.QuarkusIntegrationTest; -@NativeImageTest +@QuarkusIntegrationTest public class RuntimeIT extends RuntimeTest { } \ No newline at end of file diff --git a/itests/camel-k-itests-runtime/src/test/java/org/apache/camel/k/quarkus/it/RuntimeTest.java b/itests/camel-k-itests-runtime/src/test/java/org/apache/camel/k/quarkus/it/RuntimeTest.java index 19fea587..76b0e8a4 100644 --- a/itests/camel-k-itests-runtime/src/test/java/org/apache/camel/k/quarkus/it/RuntimeTest.java +++ b/itests/camel-k-itests-runtime/src/test/java/org/apache/camel/k/quarkus/it/RuntimeTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.k.quarkus.it; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import io.quarkus.test.junit.QuarkusTest; import io.restassured.path.json.JsonPath; diff --git a/itests/camel-k-itests-runtime/src/test/java/org/apache/camel/k/quarkus/it/RuntimeYamlDeserializationDefaultIT.java b/itests/camel-k-itests-runtime/src/test/java/org/apache/camel/k/quarkus/it/RuntimeYamlDeserializationDefaultIT.java deleted file mode 100644 index ebd1ae46..00000000 --- a/itests/camel-k-itests-runtime/src/test/java/org/apache/camel/k/quarkus/it/RuntimeYamlDeserializationDefaultIT.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.camel.k.quarkus.it; - -import io.quarkus.test.junit.NativeImageTest; - -@NativeImageTest -public class RuntimeYamlDeserializationDefaultIT extends RuntimeYamlDeserializationDefaultTest { -} \ No newline at end of file diff --git a/itests/camel-k-itests-runtime/src/test/java/org/apache/camel/k/quarkus/it/RuntimeYamlDeserializationDefaultTest.java b/itests/camel-k-itests-runtime/src/test/java/org/apache/camel/k/quarkus/it/RuntimeYamlDeserializationDefaultTest.java deleted file mode 100644 index e593f31f..00000000 --- a/itests/camel-k-itests-runtime/src/test/java/org/apache/camel/k/quarkus/it/RuntimeYamlDeserializationDefaultTest.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.camel.k.quarkus.it; - -import java.util.Map; - -import javax.ws.rs.core.MediaType; - -import io.quarkus.test.junit.QuarkusTest; -import io.quarkus.test.junit.QuarkusTestProfile; -import io.quarkus.test.junit.TestProfile; -import io.restassured.path.json.JsonPath; -import org.junit.jupiter.api.Test; - -import static io.restassured.RestAssured.given; -import static org.assertj.core.api.Assertions.assertThat; - -@TestProfile(RuntimeYamlDeserializationDefaultTest.Profile.class) -@QuarkusTest -public class RuntimeYamlDeserializationDefaultTest { - @Test - public void testContextCustomizerFromProperties() { - JsonPath p = given() - .accept(MediaType.APPLICATION_JSON) - .get("/test/inspect") - .then() - .statusCode(200) - .extract() - .body() - .jsonPath(); - - assertThat(p.getMap("global-options")).containsEntry("CamelYamlDslDeserializationMode", "FLOW"); - } - - public static class Profile implements QuarkusTestProfile { - @Override - public Map<String, String> getConfigOverrides() { - return Map.of(); - } - } -} diff --git a/support/camel-k-itests-support/camel-k-itests-loader-inspector/src/main/java/org/apache/camel/k/loader/support/LoaderSupport.java b/support/camel-k-itests-support/camel-k-itests-loader-inspector/src/main/java/org/apache/camel/k/loader/support/LoaderSupport.java index 43ae0470..2785556d 100644 --- a/support/camel-k-itests-support/camel-k-itests-loader-inspector/src/main/java/org/apache/camel/k/loader/support/LoaderSupport.java +++ b/support/camel-k-itests-support/camel-k-itests-loader-inspector/src/main/java/org/apache/camel/k/loader/support/LoaderSupport.java @@ -19,15 +19,16 @@ package org.apache.camel.k.loader.support; import java.nio.charset.StandardCharsets; import java.util.Collection; -import javax.json.Json; -import javax.json.JsonArrayBuilder; -import javax.json.JsonObject; +import jakarta.json.Json; +import jakarta.json.JsonArrayBuilder; +import jakarta.json.JsonObject; import org.apache.camel.CamelContext; import org.apache.camel.ExtendedCamelContext; import org.apache.camel.RoutesBuilder; import org.apache.camel.k.Runtime; import org.apache.camel.spi.RoutesLoader; +import org.apache.camel.support.PluginHelper; import org.apache.camel.support.ResourceHelper; public final class LoaderSupport { @@ -36,7 +37,8 @@ public final class LoaderSupport { public static JsonObject inspectSource(CamelContext context, String location, byte[] code) throws Exception { final Runtime runtime = Runtime.on(context); - final RoutesLoader loader = context.adapt(ExtendedCamelContext.class).getRoutesLoader(); + final ExtendedCamelContext ecc = runtime.getExtendedCamelContext(); + final RoutesLoader loader = PluginHelper.getRoutesLoader(ecc); final Collection<RoutesBuilder> builders = loader.findRoutesBuilders(ResourceHelper.fromBytes(location, code)); for (RoutesBuilder builder: builders) { diff --git a/support/camel-k-itests-support/camel-k-itests-runtime-inspector/src/main/java/org/apache/camel/k/runtime/support/RuntimeInspector.java b/support/camel-k-itests-support/camel-k-itests-runtime-inspector/src/main/java/org/apache/camel/k/runtime/support/RuntimeInspector.java index 68af219a..57214dc1 100644 --- a/support/camel-k-itests-support/camel-k-itests-runtime-inspector/src/main/java/org/apache/camel/k/runtime/support/RuntimeInspector.java +++ b/support/camel-k-itests-support/camel-k-itests-runtime-inspector/src/main/java/org/apache/camel/k/runtime/support/RuntimeInspector.java @@ -20,21 +20,22 @@ import java.util.Collection; import java.util.List; import java.util.stream.Collectors; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.json.Json; -import javax.json.JsonArray; -import javax.json.JsonObject; -import javax.json.bind.Jsonb; -import javax.json.bind.JsonbBuilder; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.json.Json; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; +import jakarta.json.bind.Jsonb; +import jakarta.json.bind.JsonbBuilder; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.apache.camel.CamelContext; import org.apache.camel.Route; +import org.apache.camel.model.Model; import org.apache.camel.model.ModelCamelContext; import org.apache.camel.model.RouteDefinition; import org.apache.camel.model.ToDefinition; @@ -61,11 +62,11 @@ public class RuntimeInspector { .map(Route::getId) .collect(Collectors.toList()))) .add("route-definitions", Json.createArrayBuilder( - camelContext.adapt(ModelCamelContext.class).getRouteDefinitions().stream() + camelContext.getCamelContextExtension().getContextPlugin(Model.class).getRouteDefinitions().stream() .map(RouteDefinition::getId) .collect(Collectors.toList()))) .add("rest-definitions", Json.createArrayBuilder( - camelContext.adapt(ModelCamelContext.class).getRestDefinitions().stream() + camelContext.getCamelContextExtension().getContextPlugin(Model.class).getRestDefinitions().stream() .map(RestDefinition::getId) .collect(Collectors.toList()))) .build(); @@ -96,7 +97,7 @@ public class RuntimeInspector { @Path("/route-outputs/{name}") @Produces(MediaType.APPLICATION_JSON) public JsonArray routeOutputs(@PathParam("name") String name) { - RouteDefinition def = camelContext.adapt(ModelCamelContext.class).getRouteDefinition(name); + RouteDefinition def = camelContext.getCamelContextExtension().getContextPlugin(Model.class).getRouteDefinition(name); if (def == null) { throw new IllegalArgumentException("RouteDefinition with name: " + name + " not found"); } diff --git a/support/camel-k-runtime-bom/pom.xml b/support/camel-k-runtime-bom/pom.xml index 137d6332..a58f332a 100644 --- a/support/camel-k-runtime-bom/pom.xml +++ b/support/camel-k-runtime-bom/pom.xml @@ -156,11 +156,6 @@ <artifactId>camel-k-knative-impl</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-kamelet-reify</artifactId> - <version>${project.version}</version> - </dependency> <dependency> <groupId>org.apache.camel.k</groupId> <artifactId>camel-k-maven-plugin</artifactId>