Merge pull request #256 from lburgazzoli/cleanup-catalog-generator

Improve catalog
apache · Mar 9, 2020 · 4b73393 · 4b73393
2 parents 8df3496 + a3d73f8
commit 4b73393
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 16 deletions.
diff --git a/...el-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateCatalogMojo.java b/...el-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"));

diff --git a/...-plugin/src/main/java/org/apache/camel/k/tooling/maven/processors/CatalogProcessor3x.java b/...-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<String, CamelArtifact> artifacts) {