fix: CamelContext.getVersion() always returns an empty string

fixes #247
apache · Oct 14, 2019 · 7537436 · 7537436
1 parent 4152d3d
commit 7537436
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 1 deletion.
diff --git a/...deployment/src/main/java/org/apache/camel/quarkus/core/deployment/SubstrateProcessor.java b/...deployment/src/main/java/org/apache/camel/quarkus/core/deployment/SubstrateProcessor.java
@@ -128,7 +128,7 @@ void process(CombinedIndexBuildItem combinedIndex) {
                 .map(ai -> ai.target().asMethod())
                 .forEach(this::addReflectiveMethod);
 
-            CamelSupport.resources(applicationArchivesBuildItem, "META-INF/maven/org.apache.camel/camel-core")
+            CamelSupport.resources(applicationArchivesBuildItem, "META-INF/maven/org.apache.camel/camel-base")
                 .forEach(this::addResource);
             CamelSupport.resources(applicationArchivesBuildItem, CamelSupport.CAMEL_SERVICE_BASE_PATH)
                 .forEach(this::addCamelService);

diff --git a/integration-tests/core/test/src/main/java/org/apache/camel/quarkus/core/CamelServlet.java b/integration-tests/core/test/src/main/java/org/apache/camel/quarkus/core/CamelServlet.java
@@ -16,6 +16,8 @@
  */
 package org.apache.camel.quarkus.core;
 
+import java.util.Set;
+
 import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Inject;
 import javax.json.Json;
@@ -71,4 +73,12 @@ public boolean lookupContext() {
     public boolean lookupMain() {
         return registry.findByType(CamelMain.class).size() == 1;
     }
+
+    @Path("/context/version")
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public String contextVersion() {
+        Set<CamelContext> camelContexts = registry.findByType(CamelContext.class);
+        return camelContexts.isEmpty() ? "" : camelContexts.iterator().next().getVersion();
+    }
 }
diff --git a/integration-tests/core/test/src/test/java/org/apache/camel/quarkus/core/CamelTest.java b/integration-tests/core/test/src/test/java/org/apache/camel/quarkus/core/CamelTest.java
@@ -24,6 +24,7 @@
 import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.Matchers.is;
+import static org.hamcrest.core.IsNot.not;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
@@ -44,4 +45,9 @@ public void testCamelBeanBuildItem() {
         assertTrue(response.jsonPath().getBoolean("show-all"));
         assertTrue(response.jsonPath().getBoolean("multi-line"));
     }
+
+    @Test
+    public void testCamelContextVersion() {
+        RestAssured.when().get("/test/context/version").then().body(not(""));
+    }
 }