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 2020/09/16 10:56:41 UTC
[camel-k-runtime] branch master updated: Create an extension fot
camel-k-runtime-master #470
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
The following commit(s) were added to refs/heads/master by this push:
new b5ff497 Create an extension fot camel-k-runtime-master #470
b5ff497 is described below
commit b5ff4976230044cea0b312f317670d36181c2656
Author: lburgazzoli <lb...@gmail.com>
AuthorDate: Wed Sep 16 10:24:57 2020 +0200
Create an extension fot camel-k-runtime-master #470
---
.github/workflows/ci-build.yml | 2 +-
.../quarkus/deployment/DeploymentProcessor.java | 15 +-
.../core/quarkus/deployment/DeploymentSupport.java | 32 ++--
.../camel-k-quarkus-itests-master/pom.xml | 163 +++++++++++++++++++++
.../apache/camel/k/quarkus/master/Application.java | 49 +++++++
.../src/main/resources/application.properties | 33 +++++
.../apache/camel/k/quarkus/master/MasterIT.java | 23 +++
.../apache/camel/k/quarkus/master/MasterTest.java | 40 +++++
camel-k-quarkus/camel-k-quarkus-itests/pom.xml | 1 +
.../camel-k-quarkus-master/deployment/pom.xml | 67 +++++++++
.../camel/k/quarkus/master/deployment/Feature.java | 29 ++++
.../pom.xml | 16 +-
.../camel-k-quarkus-master/runtime/pom.xml | 94 ++++++++++++
camel-k-quarkus/pom.xml | 1 +
camel-k-runtime-bom/pom.xml | 11 +-
pom.xml | 12 +-
.../src/it/generate-catalog-main/verify.groovy | 2 +
.../src/it/generate-catalog-quarkus/verify.groovy | 2 +
.../camel/k/tooling/maven/GenerateCatalogMojo.java | 8 +
19 files changed, 565 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
index c66ea21..27e16ac 100644
--- a/.github/workflows/ci-build.yml
+++ b/.github/workflows/ci-build.yml
@@ -100,7 +100,6 @@ jobs:
with:
version: ${{ matrix.java }}
- name: Build on ${{ matrix.java }}
- if: contains( github.event.pull_request.labels.*.name, 'depends-on/camel/master') == 'false' && contains( github.event.pull_request.labels.*.name, 'depends-on/quarkus/master') == 'false'
run: |
./mvnw -V -B -ntp clean install
build-native:
@@ -112,6 +111,7 @@ jobs:
native-image-project:
- :camel-k-quarkus-itests-core
- :camel-k-quarkus-itests-cron
+ - :camel-k-quarkus-itests-master
- :camel-k-quarkus-itests-kamelet
- :camel-k-quarkus-itests-knative
- :camel-k-quarkus-itests-loader-xml
diff --git a/camel-k-quarkus/camel-k-quarkus-core/deployment/src/main/java/org/apache/camel/k/core/quarkus/deployment/DeploymentProcessor.java b/camel-k-quarkus/camel-k-quarkus-core/deployment/src/main/java/org/apache/camel/k/core/quarkus/deployment/DeploymentProcessor.java
index 2884b8a..8091756 100644
--- a/camel-k-quarkus/camel-k-quarkus-core/deployment/src/main/java/org/apache/camel/k/core/quarkus/deployment/DeploymentProcessor.java
+++ b/camel-k-quarkus/camel-k-quarkus-core/deployment/src/main/java/org/apache/camel/k/core/quarkus/deployment/DeploymentProcessor.java
@@ -27,6 +27,7 @@ import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
import io.quarkus.deployment.builditem.nativeimage.ServiceProviderBuildItem;
import org.apache.camel.k.Constants;
+import org.apache.camel.k.ContextCustomizer;
import org.apache.camel.k.SourceDefinition;
import org.apache.camel.k.core.quarkus.RuntimeRecorder;
import org.apache.camel.quarkus.core.deployment.spi.CamelContextCustomizerBuildItem;
@@ -57,9 +58,17 @@ public class DeploymentProcessor {
}
@BuildStep
- List<ReflectiveClassBuildItem> registerClasses() {
- return List.of(
- new ReflectiveClassBuildItem(true, false, SourceDefinition.class)
+ List<ReflectiveClassBuildItem> registerClasses(CombinedIndexBuildItem index) {
+ return List.of(
+ new ReflectiveClassBuildItem(
+ true,
+ false,
+ SourceDefinition.class),
+ new ReflectiveClassBuildItem(
+ true,
+ false,
+ getAllKnownImplementors(index.getIndex(), ContextCustomizer.class, ci -> ci.name().toString())
+ .toArray(String[]::new))
);
}
diff --git a/camel-k-quarkus/camel-k-quarkus-core/deployment/src/main/java/org/apache/camel/k/core/quarkus/deployment/DeploymentSupport.java b/camel-k-quarkus/camel-k-quarkus-core/deployment/src/main/java/org/apache/camel/k/core/quarkus/deployment/DeploymentSupport.java
index 5715ba2..768fd26 100644
--- a/camel-k-quarkus/camel-k-quarkus-core/deployment/src/main/java/org/apache/camel/k/core/quarkus/deployment/DeploymentSupport.java
+++ b/camel-k-quarkus/camel-k-quarkus-core/deployment/src/main/java/org/apache/camel/k/core/quarkus/deployment/DeploymentSupport.java
@@ -35,62 +35,62 @@ public final class DeploymentSupport {
public static Iterable<ClassInfo> getAllKnownImplementors(IndexView view, String name) {
return view.getAllKnownImplementors(DotName.createSimple(name));
}
- public static <T> Iterable<T> getAllKnownImplementors(IndexView view, String name, Function<ClassInfo, T> mapper) {
- return stream(getAllKnownImplementors(view, name)).map(mapper).collect(Collectors.toList());
+ public static <T> Stream<T> getAllKnownImplementors(IndexView view, String name, Function<ClassInfo, T> mapper) {
+ return stream(getAllKnownImplementors(view, name)).map(mapper);
}
public static Iterable<ClassInfo> getAllKnownImplementors(IndexView view, Class<?> type) {
return view.getAllKnownImplementors(DotName.createSimple(type.getName()));
}
- public static <T> Iterable<T> getAllKnownImplementors(IndexView view, Class<?> type, Function<ClassInfo, T> mapper) {
- return stream(getAllKnownImplementors(view, type)).map(mapper).collect(Collectors.toList());
+ public static <T> Stream<T> getAllKnownImplementors(IndexView view, Class<?> type, Function<ClassInfo, T> mapper) {
+ return stream(getAllKnownImplementors(view, type)).map(mapper);
}
public static Iterable<ClassInfo> getAllKnownImplementors(IndexView view, DotName type) {
return view.getAllKnownImplementors(type);
}
- public static <T> Iterable<T> getAllKnownImplementors(IndexView view, DotName type, Function<ClassInfo, T> mapper) {
- return stream(getAllKnownImplementors(view, type)).map(mapper).collect(Collectors.toList());
+ public static <T> Stream<T> getAllKnownImplementors(IndexView view, DotName type, Function<ClassInfo, T> mapper) {
+ return stream(getAllKnownImplementors(view, type)).map(mapper);
}
public static Iterable<ClassInfo> getAllKnownSubclasses(IndexView view, String name) {
return view.getAllKnownSubclasses(DotName.createSimple(name));
}
- public static <T> Iterable<T> getAllKnownSubclasses(IndexView view, String name, Function<ClassInfo, T> mapper) {
- return stream(getAllKnownSubclasses(view, name)).map(mapper).collect(Collectors.toList());
+ public static <T> Stream<T> getAllKnownSubclasses(IndexView view, String name, Function<ClassInfo, T> mapper) {
+ return stream(getAllKnownSubclasses(view, name)).map(mapper);
}
public static Iterable<ClassInfo> getAllKnownSubclasses(IndexView view, Class<?> type) {
return view.getAllKnownSubclasses(DotName.createSimple(type.getName()));
}
- public static <T> Iterable<T> getAllKnownSubclasses(IndexView view, Class<?> type, Function<ClassInfo, T> mapper) {
- return stream(getAllKnownSubclasses(view, type)).map(mapper).collect(Collectors.toList());
+ public static <T> Stream<T> getAllKnownSubclasses(IndexView view, Class<?> type, Function<ClassInfo, T> mapper) {
+ return stream(getAllKnownSubclasses(view, type)).map(mapper);
}
public static Iterable<ClassInfo> getAllKnownSubclasses(IndexView view, DotName type) {
return view.getAllKnownSubclasses(type);
}
- public static <T> Iterable<T> getAllKnownSubclasses(IndexView view, DotName type, Function<ClassInfo, T> mapper) {
- return stream(getAllKnownSubclasses(view, type)).map(mapper).collect(Collectors.toList());
+ public static <T> Stream<T> getAllKnownSubclasses(IndexView view, DotName type, Function<ClassInfo, T> mapper) {
+ return stream(getAllKnownSubclasses(view, type)).map(mapper);
}
public static Iterable<ClassInfo> getAnnotated(IndexView view, String name) {
return getAnnotated(view, DotName.createSimple(name));
}
- public static <T> Iterable<T> getAnnotated(IndexView view, String name, Function<ClassInfo, T> mapper) {
- return stream(getAnnotated(view, name)).map(mapper).collect(Collectors.toList());
+ public static <T> Stream<T> getAnnotated(IndexView view, String name, Function<ClassInfo, T> mapper) {
+ return stream(getAnnotated(view, name)).map(mapper);
}
public static Iterable<ClassInfo> getAnnotated(IndexView view, Class<?> type) {
return getAnnotated(view, DotName.createSimple(type.getName()));
}
- public static <T> Iterable<T> getAnnotated(IndexView view, Class<?> type, Function<ClassInfo, T> mapper) {
- return stream(getAnnotated(view, type)).map(mapper).collect(Collectors.toList());
+ public static <T> Stream<T> getAnnotated(IndexView view, Class<?> type, Function<ClassInfo, T> mapper) {
+ return stream(getAnnotated(view, type)).map(mapper);
}
public static Iterable<ClassInfo> getAnnotated(IndexView view, DotName type) {
diff --git a/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-master/pom.xml b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-master/pom.xml
new file mode 100644
index 0000000..2d783cf
--- /dev/null
+++ b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-master/pom.xml
@@ -0,0 +1,163 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <groupId>org.apache.camel.k</groupId>
+ <artifactId>camel-k-quarkus-itests</artifactId>
+ <version>1.5.1-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>camel-k-quarkus-itests-master</artifactId>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.camel.k</groupId>
+ <artifactId>camel-k-runtime-quarkus</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.k</groupId>
+ <artifactId>camel-k-quarkus-master</artifactId>
+ </dependency>
+
+ <!-- quarkus dependencies -->
+ <dependency>
+ <groupId>io.quarkus</groupId>
+ <artifactId>quarkus-jsonb</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.quarkus</groupId>
+ <artifactId>quarkus-resteasy</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.quarkus</groupId>
+ <artifactId>quarkus-resteasy-jsonb</artifactId>
+ </dependency>
+
+ <!-- test dependencies -->
+ <dependency>
+ <groupId>io.quarkus</groupId>
+ <artifactId>quarkus-junit5</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>io.rest-assured</groupId>
+ <artifactId>rest-assured</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>${build-helper-maven-plugin-version}</version>
+ <executions>
+ <execution>
+ <id>reserve-network-port</id>
+ <goals>
+ <goal>reserve-network-port</goal>
+ </goals>
+ <phase>process-resources</phase>
+ <configuration>
+ <portNames>
+ <portName>test.http.port.jvm</portName>
+ <portName>test.http.port.native</portName>
+ </portNames>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>io.quarkus</groupId>
+ <artifactId>quarkus-maven-plugin</artifactId>
+ <version>${quarkus-version}</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>build</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemProperties>
+ <quarkus.http.test-port>${test.http.port.jvm}</quarkus.http.test-port>
+ <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>native</id>
+ <activation>
+ <property>
+ <name>native</name>
+ </property>
+ </activation>
+ <properties>
+ <quarkus.package.type>native</quarkus.package.type>
+ <quarkus.native.additional-build-args>--language:js</quarkus.native.additional-build-args>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
+ </goals>
+ <configuration>
+ <systemProperties>
+ <quarkus.http.test-port>${test.http.port.native}</quarkus.http.test-port>
+ <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
+ </systemProperties>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+
+</project>
diff --git a/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-master/src/main/java/org/apache/camel/k/quarkus/master/Application.java b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-master/src/main/java/org/apache/camel/k/quarkus/master/Application.java
new file mode 100644
index 0000000..3135739
--- /dev/null
+++ b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-master/src/main/java/org/apache/camel/k/quarkus/master/Application.java
@@ -0,0 +1,49 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.k.quarkus.master;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Inject;
+import javax.json.Json;
+import javax.json.JsonObject;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.component.kubernetes.cluster.KubernetesClusterService;
+
+@Path("/test")
+@ApplicationScoped
+public class Application {
+ @Inject
+ CamelContext context;
+
+ @GET
+ @Path("/inspect")
+ @Produces(MediaType.APPLICATION_JSON)
+ public JsonObject findCronInterceptor() {
+ KubernetesClusterService service = context.hasService(KubernetesClusterService.class);
+
+ return Json.createObjectBuilder()
+ .add("cluster-service", service != null ? service.getClass().getName() : "")
+ .add("cluster-service-cm", service != null ? service.getConfigMapName() : "")
+
+ .build();
+ }
+}
diff --git a/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-master/src/main/resources/application.properties b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-master/src/main/resources/application.properties
new file mode 100644
index 0000000..9537015
--- /dev/null
+++ b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-master/src/main/resources/application.properties
@@ -0,0 +1,33 @@
+## ---------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements. See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ---------------------------------------------------------------------------
+
+#
+# Quarkus
+#
+quarkus.log.console.enable = true
+quarkus.banner.enabled = false
+
+#
+# Quarkus :: Camel
+#
+quarkus.camel.routes-discovery.enabled = false
+
+#
+# Camel K
+#
+camel.k.customizer.master.enabled = true
+camel.k.customizer.master.config-map-name = camel-k-cm
\ No newline at end of file
diff --git a/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-master/src/test/java/org/apache/camel/k/quarkus/master/MasterIT.java b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-master/src/test/java/org/apache/camel/k/quarkus/master/MasterIT.java
new file mode 100644
index 0000000..97a7925
--- /dev/null
+++ b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-master/src/test/java/org/apache/camel/k/quarkus/master/MasterIT.java
@@ -0,0 +1,23 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.k.quarkus.master;
+
+import io.quarkus.test.junit.NativeImageTest;
+
+@NativeImageTest
+public class MasterIT extends MasterTest {
+}
\ No newline at end of file
diff --git a/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-master/src/test/java/org/apache/camel/k/quarkus/master/MasterTest.java b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-master/src/test/java/org/apache/camel/k/quarkus/master/MasterTest.java
new file mode 100644
index 0000000..3db2a72
--- /dev/null
+++ b/camel-k-quarkus/camel-k-quarkus-itests/camel-k-quarkus-itests-master/src/test/java/org/apache/camel/k/quarkus/master/MasterTest.java
@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.k.quarkus.master;
+
+import io.quarkus.test.junit.QuarkusTest;
+import io.restassured.path.json.JsonPath;
+import org.apache.camel.component.kubernetes.cluster.KubernetesClusterService;
+import org.junit.jupiter.api.Test;
+
+import static io.restassured.RestAssured.when;
+import static org.assertj.core.api.Assertions.assertThat;
+
+@QuarkusTest
+public class MasterTest {
+ @Test
+ public void hasClusterService() {
+ JsonPath path = when()
+ .get("/test/inspect")
+ .then()
+ .statusCode(200)
+ .extract().jsonPath();
+
+ assertThat(path.getString("cluster-service")).isEqualTo(KubernetesClusterService.class.getName());
+ assertThat(path.getString("cluster-service-cm")).isEqualTo("camel-k-cm");
+ }
+}
diff --git a/camel-k-quarkus/camel-k-quarkus-itests/pom.xml b/camel-k-quarkus/camel-k-quarkus-itests/pom.xml
index 1f0d076..bc50525 100644
--- a/camel-k-quarkus/camel-k-quarkus-itests/pom.xml
+++ b/camel-k-quarkus/camel-k-quarkus-itests/pom.xml
@@ -31,6 +31,7 @@
<modules>
<module>camel-k-quarkus-itests-core</module>
<module>camel-k-quarkus-itests-cron</module>
+ <module>camel-k-quarkus-itests-master</module>
<module>camel-k-quarkus-itests-kamelet</module>
<module>camel-k-quarkus-itests-knative</module>
<module>camel-k-quarkus-itests-loader-support</module>
diff --git a/camel-k-quarkus/camel-k-quarkus-master/deployment/pom.xml b/camel-k-quarkus/camel-k-quarkus-master/deployment/pom.xml
new file mode 100644
index 0000000..1806f96
--- /dev/null
+++ b/camel-k-quarkus/camel-k-quarkus-master/deployment/pom.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <groupId>org.apache.camel.k</groupId>
+ <artifactId>camel-k-quarkus-master-parent</artifactId>
+ <version>1.5.1-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>camel-k-quarkus-master-deployment</artifactId>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.camel.k</groupId>
+ <artifactId>camel-k-quarkus-core-deployment</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.k</groupId>
+ <artifactId>camel-k-quarkus-master</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.quarkus</groupId>
+ <artifactId>camel-quarkus-master-deployment</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.quarkus</groupId>
+ <artifactId>camel-quarkus-kubernetes-deployment</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <annotationProcessorPaths>
+ <path>
+ <groupId>io.quarkus</groupId>
+ <artifactId>quarkus-extension-processor</artifactId>
+ <version>${quarkus-version}</version>
+ </path>
+ </annotationProcessorPaths>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
diff --git a/camel-k-quarkus/camel-k-quarkus-master/deployment/src/main/java/org/apache/camel/k/quarkus/master/deployment/Feature.java b/camel-k-quarkus/camel-k-quarkus-master/deployment/src/main/java/org/apache/camel/k/quarkus/master/deployment/Feature.java
new file mode 100644
index 0000000..bae6854
--- /dev/null
+++ b/camel-k-quarkus/camel-k-quarkus-master/deployment/src/main/java/org/apache/camel/k/quarkus/master/deployment/Feature.java
@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.k.quarkus.master.deployment;
+
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.builditem.FeatureBuildItem;
+
+public class Feature {
+ private static final String FEATURE = "camel-k-runtime-master";
+
+ @BuildStep
+ FeatureBuildItem feature() {
+ return new FeatureBuildItem(FEATURE);
+ }
+}
diff --git a/camel-k-quarkus/camel-k-quarkus-itests/pom.xml b/camel-k-quarkus/camel-k-quarkus-master/pom.xml
similarity index 64%
copy from camel-k-quarkus/camel-k-quarkus-itests/pom.xml
copy to camel-k-quarkus/camel-k-quarkus-master/pom.xml
index 1f0d076..7071c22 100644
--- a/camel-k-quarkus/camel-k-quarkus-itests/pom.xml
+++ b/camel-k-quarkus/camel-k-quarkus-master/pom.xml
@@ -26,21 +26,11 @@
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
- <artifactId>camel-k-quarkus-itests</artifactId>
+ <artifactId>camel-k-quarkus-master-parent</artifactId>
<modules>
- <module>camel-k-quarkus-itests-core</module>
- <module>camel-k-quarkus-itests-cron</module>
- <module>camel-k-quarkus-itests-kamelet</module>
- <module>camel-k-quarkus-itests-knative</module>
- <module>camel-k-quarkus-itests-loader-support</module>
- <module>camel-k-quarkus-itests-loader-groovy</module>
- <module>camel-k-quarkus-itests-loader-kotlin</module>
- <module>camel-k-quarkus-itests-loader-java</module>
- <module>camel-k-quarkus-itests-loader-js</module>
- <module>camel-k-quarkus-itests-loader-xml</module>
- <module>camel-k-quarkus-itests-loader-yaml</module>
- <module>camel-k-quarkus-itests-polyglot</module>
+ <module>runtime</module>
+ <module>deployment</module>
</modules>
</project>
diff --git a/camel-k-quarkus/camel-k-quarkus-master/runtime/pom.xml b/camel-k-quarkus/camel-k-quarkus-master/runtime/pom.xml
new file mode 100644
index 0000000..6dfc960
--- /dev/null
+++ b/camel-k-quarkus/camel-k-quarkus-master/runtime/pom.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <groupId>org.apache.camel.k</groupId>
+ <artifactId>camel-k-quarkus-master-parent</artifactId>
+ <version>1.5.1-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>camel-k-quarkus-master</artifactId>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.camel.k</groupId>
+ <artifactId>camel-k-quarkus-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.k</groupId>
+ <artifactId>camel-k-runtime-master</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.quarkus</groupId>
+ <artifactId>camel-quarkus-master</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.quarkus</groupId>
+ <artifactId>camel-quarkus-kubernetes</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>io.quarkus</groupId>
+ <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+ <version>${quarkus-version}</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>extension-descriptor</goal>
+ </goals>
+ <configuration>
+ <deployment>${project.groupId}:${project.artifactId}-deployment:${project.version}</deployment>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <annotationProcessorPaths>
+ <path>
+ <groupId>io.quarkus</groupId>
+ <artifactId>quarkus-extension-processor</artifactId>
+ <version>${quarkus-version}</version>
+ </path>
+ </annotationProcessorPaths>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.jboss.jandex</groupId>
+ <artifactId>jandex-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>make-index</id>
+ <goals>
+ <goal>jandex</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
diff --git a/camel-k-quarkus/pom.xml b/camel-k-quarkus/pom.xml
index e201c25..2919325 100644
--- a/camel-k-quarkus/pom.xml
+++ b/camel-k-quarkus/pom.xml
@@ -59,6 +59,7 @@
<module>camel-k-quarkus-kamelet</module>
<module>camel-k-quarkus-knative</module>
<module>camel-k-quarkus-cron</module>
+ <module>camel-k-quarkus-master</module>
<module>camel-k-runtime-quarkus</module>
diff --git a/camel-k-runtime-bom/pom.xml b/camel-k-runtime-bom/pom.xml
index 7fe92ac..3803eb9 100644
--- a/camel-k-runtime-bom/pom.xml
+++ b/camel-k-runtime-bom/pom.xml
@@ -306,7 +306,16 @@
<artifactId>camel-k-quarkus-cron-deployment</artifactId>
<version>${project.version}</version>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.camel.k</groupId>
+ <artifactId>camel-k-quarkus-master</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.k</groupId>
+ <artifactId>camel-k-quarkus-master-deployment</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<!-- loaders -->
<dependency>
diff --git a/pom.xml b/pom.xml
index 8788418..fb3c0fe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -535,7 +535,17 @@
</dependency>
<dependency>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-quarkus-knative-cron</artifactId>
+ <artifactId>camel-k-quarkus-cron-deployment</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.k</groupId>
+ <artifactId>camel-k-quarkus-master</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.k</groupId>
+ <artifactId>camel-k-quarkus-master-deployment</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/tooling/camel-k-maven-plugin/src/it/generate-catalog-main/verify.groovy b/tooling/camel-k-maven-plugin/src/it/generate-catalog-main/verify.groovy
index 442d980..6ad2b0d 100644
--- a/tooling/camel-k-maven-plugin/src/it/generate-catalog-main/verify.groovy
+++ b/tooling/camel-k-maven-plugin/src/it/generate-catalog-main/verify.groovy
@@ -36,6 +36,8 @@ new File(basedir, "catalog.yaml").withReader {
assert catalog.spec.runtime.capabilities['circuit-breaker'].dependencies[0].artifactId == 'camel-microprofile-fault-tolerance'
assert catalog.spec.runtime.capabilities['tracing'].dependencies[0].groupId == 'org.apache.camel.k'
assert catalog.spec.runtime.capabilities['tracing'].dependencies[0].artifactId == 'camel-k-runtime-tracing'
+ assert catalog.spec.runtime.capabilities['master'].dependencies[0].groupId == 'org.apache.camel.k'
+ assert catalog.spec.runtime.capabilities['master'].dependencies[0].artifactId == 'camel-k-runtime-master'
assert catalog.metadata.labels['camel.apache.org/runtime.version'] == runtimeVersion
diff --git a/tooling/camel-k-maven-plugin/src/it/generate-catalog-quarkus/verify.groovy b/tooling/camel-k-maven-plugin/src/it/generate-catalog-quarkus/verify.groovy
index 7a80bcc..5212f45 100644
--- a/tooling/camel-k-maven-plugin/src/it/generate-catalog-quarkus/verify.groovy
+++ b/tooling/camel-k-maven-plugin/src/it/generate-catalog-quarkus/verify.groovy
@@ -37,6 +37,8 @@ new File(basedir, "catalog.yaml").withReader {
assert catalog.spec.runtime.capabilities['circuit-breaker'].dependencies[0].artifactId == 'camel-quarkus-microprofile-fault-tolerance'
assert catalog.spec.runtime.capabilities['tracing'].dependencies[0].groupId == 'org.apache.camel.quarkus'
assert catalog.spec.runtime.capabilities['tracing'].dependencies[0].artifactId == 'camel-quarkus-opentracing'
+ assert catalog.spec.runtime.capabilities['master'].dependencies[0].groupId == 'org.apache.camel.quarkus'
+ assert catalog.spec.runtime.capabilities['master'].dependencies[0].artifactId == 'camel-quarkus-master'
assert catalog.metadata.labels['camel.apache.org/runtime.version'] == runtimeVersion
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 a6d3233..dec5ecb 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
@@ -145,6 +145,10 @@ public class GenerateCatalogMojo extends AbstractMojo {
"tracing",
CamelCapability.forArtifact(
"org.apache.camel.k", "camel-k-runtime-tracing"));
+ runtimeSpec.putCapability(
+ "master",
+ CamelCapability.forArtifact(
+ "org.apache.camel.k", "camel-k-runtime-master"));
break;
case "quarkus":
catalog.setRuntimeProvider(new QuarkusRuntimeProvider());
@@ -176,6 +180,10 @@ public class GenerateCatalogMojo extends AbstractMojo {
"tracing",
CamelCapability.forArtifact(
"org.apache.camel.quarkus", "camel-quarkus-opentracing"));
+ runtimeSpec.putCapability(
+ "master",
+ CamelCapability.forArtifact(
+ "org.apache.camel.quarkus", "camel-quarkus-master"));
break;
default:
throw new IllegalArgumentException("catalog.runtime parameter value [" + runtime + "] is not supported!");