You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by lb...@apache.org on 2019/06/07 10:54:30 UTC
[camel-k-runtime] 01/02: Fix camel-k catalog generator
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-k-runtime.git
commit 1c3ed1337363872b07a3c903d260f13803870dc0
Author: lburgazzoli <lb...@gmail.com>
AuthorDate: Wed Jun 5 17:34:46 2019 +0200
Fix camel-k catalog generator
---
.../camel/k/tooling/maven/processors/CatalogProcessor_3_x.java | 4 +++-
.../camel/k/tooling/maven/processors/CataloProcessor3Test.java | 5 ++++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/processors/CatalogProcessor_3_x.java b/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/processors/CatalogProcessor_3_x.java
index 82301eb..2596740 100644
--- a/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/processors/CatalogProcessor_3_x.java
+++ b/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/processors/CatalogProcessor_3_x.java
@@ -156,7 +156,9 @@ public class CatalogProcessor_3_x implements CatalogProcessor {
CamelArtifact artifact = new CamelArtifact();
artifact.setGroupId("org.apache.camel.k");
artifact.setArtifactId("camel-k-runtime-health");
- artifact.addDependency("org.apache.camel", "camel-netty4-http");
+ artifact.addDependency("org.apache.camel", "camel-servlet");
+ artifact.addDependency("org.apache.camel.k", "camel-k-runtime-servlet");
+
artifacts.put(artifact.getArtifactId(), artifact);
}
diff --git a/camel-k-maven-plugin/src/test/java/org/apache/camel/k/tooling/maven/processors/CataloProcessor3Test.java b/camel-k-maven-plugin/src/test/java/org/apache/camel/k/tooling/maven/processors/CataloProcessor3Test.java
index 0d6e28c..cdf55fc 100644
--- a/camel-k-maven-plugin/src/test/java/org/apache/camel/k/tooling/maven/processors/CataloProcessor3Test.java
+++ b/camel-k-maven-plugin/src/test/java/org/apache/camel/k/tooling/maven/processors/CataloProcessor3Test.java
@@ -97,7 +97,10 @@ public class CataloProcessor3Test extends AbstractCataloProcessorTest {
});
assertThat(artifactMap.get("camel-k-runtime-health")).satisfies(a -> {
assertThat(a.getDependencies()).anyMatch(
- d -> d.getGroupId().equals("org.apache.camel") && d.getArtifactId().equals("camel-netty4-http")
+ d -> d.getGroupId().equals("org.apache.camel") && d.getArtifactId().equals("camel-servlet")
+ );
+ assertThat(a.getDependencies()).anyMatch(
+ d -> d.getGroupId().equals("org.apache.camel.k") && d.getArtifactId().equals("camel-k-runtime-servlet")
);
});
assertThat(artifactMap.get("camel-k-runtime-servlet")).satisfies(a -> {