From 6b702b85be0c74bd737a3a37262eb7dc15a38b6b Mon Sep 17 00:00:00 2001 From: lburgazzoli Date: Mon, 9 Mar 2020 15:00:38 +0100 Subject: [PATCH 1/2] chore(catalog): remove modules that do not exist anymore --- .../maven/processors/CatalogProcessor3x.java | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/processors/CatalogProcessor3x.java b/tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/processors/CatalogProcessor3x.java index 3b183b84c..c0fc4b8f6 100644 --- a/tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/processors/CatalogProcessor3x.java +++ b/tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/processors/CatalogProcessor3x.java @@ -115,7 +115,6 @@ public void process(MavenProject project, CamelCatalog catalog, CamelCatalogSpec specBuilder.putArtifact("org.apache.camel.k", "camel-k-loader-js"); specBuilder.putArtifact("org.apache.camel.k", "camel-k-loader-xml"); specBuilder.putArtifact("org.apache.camel.k", "camel-k-loader-java"); - specBuilder.putArtifact("org.apache.camel.k", "camel-k-loader-knative"); specBuilder.putArtifact( new CamelArtifact.Builder() @@ -153,7 +152,6 @@ public void process(MavenProject project, CamelCatalog catalog, CamelCatalogSpec .groupId("org.apache.camel.k") .artifactId("camel-k-runtime-knative") .addDependencies(MavenArtifact.from("org.apache.camel.k", "camel-k-loader-yaml")) - .addDependencies(MavenArtifact.from("org.apache.camel.k", "camel-k-loader-knative")) .addDependencies(MavenArtifact.from("org.apache.camel.k", "camel-knative-api")) .addDependencies(MavenArtifact.from("org.apache.camel.k", "camel-knative")) .addDependencies(MavenArtifact.from("org.apache.camel.k", "camel-knative-http")) @@ -218,13 +216,6 @@ private static void processLoaders(CamelCatalog catalog, CamelCatalogSpec.Builde .putMetadata("native", "false") .build() ); - specBuilder.putLoader( - "knative-source", - CamelLoader.fromArtifact("org.apache.camel.k", "camel-k-quarkus-loader-knative") - .addDependency("org.apache.camel.k", "camel-k-quarkus-knative") - .putMetadata("native", "true") - .build() - ); } else { specBuilder.putLoader( "yaml", @@ -262,13 +253,6 @@ private static void processLoaders(CamelCatalog catalog, CamelCatalogSpec.Builde .addLanguage("java") .build() ); - specBuilder.putLoader( - "knative-source", - CamelLoader.fromArtifact("org.apache.camel.k", "camel-k-loader-knative") - .addDependency("org.apache.camel.k", "camel-k-runtime-knative") - .build() - ); - } } private static void processComponents(org.apache.camel.catalog.CamelCatalog catalog, Map artifacts) { From a3d73f8e45edde73063463dab956e59a4d4cdf29 Mon Sep 17 00:00:00 2001 From: lburgazzoli Date: Mon, 9 Mar 2020 15:15:01 +0100 Subject: [PATCH 2/2] Add cron capability #255 --- .../apache/camel/k/tooling/maven/GenerateCatalogMojo.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateCatalogMojo.java b/tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateCatalogMojo.java index b4994ec8a..d914df718 100644 --- a/tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateCatalogMojo.java +++ b/tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateCatalogMojo.java @@ -123,6 +123,9 @@ public void execute() throws MojoExecutionException, MojoFailureException { catalog.setRuntimeProvider(new DefaultRuntimeProvider()); runtimeSpec.applicationClass("org.apache.camel.k.main.Application"); runtimeSpec.addDependency("org.apache.camel.k", "camel-k-runtime-main"); + runtimeSpec.putCapability( + "cron", + CamelCapability.forArtifact("org.apache.camel.k", "camel-k-runtime-cron")); runtimeSpec.putCapability( "health", CamelCapability.forArtifact("org.apache.camel.k", "camel-k-runtime-health")); @@ -137,6 +140,9 @@ public void execute() throws MojoExecutionException, MojoFailureException { catalog.setRuntimeProvider(new QuarkusRuntimeProvider()); runtimeSpec.applicationClass("io.quarkus.runner.GeneratedMain"); runtimeSpec.addDependency("org.apache.camel.k", "camel-k-runtime-quarkus"); + runtimeSpec.putCapability( + "cron", + CamelCapability.forArtifact("org.apache.camel.k", "camel-k-runtime-cron")); runtimeSpec.putCapability( "health", CamelCapability.forArtifact("org.apache.camel.quarkus", "camel-quarkus-microprofile-health"));