This is an automated email from the ASF dual-hosted git repository. lburgazzoli pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/master by this push: new 0223c2b Determine the Camel version at build time 0223c2b is described below commit 0223c2b172c8aceeadbae9bdac32446ea55c991d Author: Peter Palaga <ppal...@redhat.com> AuthorDate: Mon Jan 20 09:19:18 2020 +0100 Determine the Camel version at build time --- .../org/apache/camel/quarkus/core/deployment/BuildProcessor.java | 3 ++- .../org/apache/camel/quarkus/core/deployment/CamelSupport.java | 8 ++++++++ .../main/java/org/apache/camel/quarkus/core/CamelRecorder.java | 5 +++-- .../java/org/apache/camel/quarkus/core/FastCamelContext.java | 9 ++++++++- 4 files changed, 21 insertions(+), 4 deletions(-) diff --git a/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/BuildProcessor.java b/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/BuildProcessor.java index 380a727..110896f 100644 --- a/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/BuildProcessor.java +++ b/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/BuildProcessor.java @@ -357,7 +357,8 @@ class BuildProcessor { contextFactory.getContextFactory(), xmlLoader.getLoader(), factoryFinderResolverBuildItem.getFactoryFinderResolver(), - beanContainer.getValue()); + beanContainer.getValue(), + CamelSupport.getCamelVersion()); return new CamelContextBuildItem(context); } diff --git a/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelSupport.java b/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelSupport.java index 296229d..66897ac 100644 --- a/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelSupport.java +++ b/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelSupport.java @@ -24,12 +24,14 @@ import java.nio.file.Files; import java.nio.file.Path; import java.util.AbstractMap; import java.util.HashSet; +import java.util.Objects; import java.util.Properties; import java.util.Set; import java.util.stream.Collectors; import java.util.stream.Stream; import io.quarkus.deployment.builditem.ApplicationArchivesBuildItem; +import org.apache.camel.CamelContext; import org.apache.camel.quarkus.core.deployment.util.PathFilter; import org.jboss.jandex.ClassInfo; @@ -87,4 +89,10 @@ public final class CamelSupport { return Stream.of(items).collect(Collectors.toCollection(HashSet::new)); } + public static String getCamelVersion() { + final String result = CamelContext.class.getPackage().getImplementationVersion(); + Objects.requireNonNull(result, "Could not determine Camel version"); + return result; + } + } diff --git a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelRecorder.java b/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelRecorder.java index 5a5824d..2dbf2ef 100644 --- a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelRecorder.java +++ b/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelRecorder.java @@ -61,8 +61,9 @@ public class CamelRecorder { RuntimeValue<ModelJAXBContextFactory> contextFactory, RuntimeValue<XmlRoutesLoader> xmlLoader, RuntimeValue<FactoryFinderResolver> factoryFinderResolver, - BeanContainer beanContainer) { - FastCamelContext context = new FastCamelContext(factoryFinderResolver.getValue()); + BeanContainer beanContainer, + String version) { + FastCamelContext context = new FastCamelContext(factoryFinderResolver.getValue(), version); context.setRegistry(registry.getValue()); context.setTypeConverterRegistry(typeConverterRegistry.getValue()); context.setLoadTypeConverters(false); diff --git a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastCamelContext.java b/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastCamelContext.java index 1eb3d3d..0d10ed7 100644 --- a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastCamelContext.java +++ b/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastCamelContext.java @@ -105,9 +105,11 @@ import org.apache.camel.spi.ValidatorRegistry; public class FastCamelContext extends AbstractCamelContext { private Model model; + private final String version; - public FastCamelContext(FactoryFinderResolver factoryFinderResolver) { + public FastCamelContext(FactoryFinderResolver factoryFinderResolver, String version) { super(false); + this.version = version; setFactoryFinderResolver(factoryFinderResolver); setTracing(Boolean.FALSE); setDebugging(Boolean.FALSE); @@ -143,6 +145,11 @@ public class FastCamelContext extends AbstractCamelContext { } @Override + public String getVersion() { + return version; + } + + @Override protected Registry createRegistry() { throw new UnsupportedOperationException(); }