This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
commit d9a7370e853be1ed5bfc2a1b8b133b03f0826bb9 Author: Andrea Cosentino <[email protected]> AuthorDate: Fri Nov 18 15:12:25 2022 +0100 Preparing for Camel K Runtime 1.16.0 - Use Camel-quarkus knative Signed-off-by: Andrea Cosentino <[email protected]> --- camel-k-knative/consumer/deployment/pom.xml | 67 ------------- .../deployment/KnativeConsumerFeature.java | 29 ------ .../deployment/KnativeConsumerProcessor.java | 40 -------- camel-k-knative/consumer/pom.xml | 37 ------- camel-k-knative/consumer/runtime/pom.xml | 102 ------------------- .../knative/consumer/KnativeConsumerRecorder.java | 44 --------- camel-k-knative/deployment/pom.xml | 68 ------------- .../quarkus/knative/deployment/KnativeFeature.java | 29 ------ .../knative/deployment/KnativeProcessor.java | 68 ------------- camel-k-knative/impl/pom.xml | 110 --------------------- ...tiveSinkBindingContextCustomizerConfigurer.java | 67 ------------- ....customizer.KnativeSinkBindingContextCustomizer | 2 - .../KnativeSinkBindingContextCustomizer.java | 107 -------------------- .../knative/KnativeSourceLoaderInterceptor.java | 53 ---------- camel-k-knative/pom.xml | 39 -------- camel-k-knative/producer/deployment/pom.xml | 67 ------------- .../deployment/KnativeProducerFeature.java | 29 ------ .../deployment/KnativeProducerProcessor.java | 40 -------- camel-k-knative/producer/pom.xml | 37 ------- camel-k-knative/producer/runtime/pom.xml | 102 ------------------- .../knative/producer/KnativeProducerRecorder.java | 46 --------- camel-k-knative/runtime/pom.xml | 103 ------------------- .../camel/k/quarkus/knative/KnativeRecorder.java | 28 ------ .../camel/k/resume/kafka/KafkaResumeFactory.java | 4 - examples/knative/pom.xml | 8 +- itests/camel-k-itests-knative-consumer/pom.xml | 34 +------ .../pom.xml | 25 ++--- .../pom.xml | 12 +-- itests/camel-k-itests-knative-producer/pom.xml | 36 +------ itests/camel-k-itests-knative-sinkbinding/pom.xml | 21 +--- .../camel-k-itests-knative-source-groovy/pom.xml | 25 ++--- itests/camel-k-itests-knative-source-java/pom.xml | 25 ++--- itests/camel-k-itests-knative-source-js/pom.xml | 25 ++--- itests/camel-k-itests-knative-source-xml/pom.xml | 25 ++--- itests/camel-k-itests-knative-source-yaml/pom.xml | 25 ++--- itests/camel-k-itests-knative/pom.xml | 25 ++--- itests/camel-k-itests-runtime-yaml/pom.xml | 38 ++----- pom.xml | 56 ----------- .../src/it/generate-catalog/verify.groovy | 13 +-- .../camel/k/tooling/maven/GenerateCatalogMojo.java | 18 ---- support/camel-k-runtime-bom/pom.xml | 25 ----- 41 files changed, 72 insertions(+), 1682 deletions(-) diff --git a/camel-k-knative/consumer/deployment/pom.xml b/camel-k-knative/consumer/deployment/pom.xml deleted file mode 100644 index 4ea7baeb..00000000 --- a/camel-k-knative/consumer/deployment/pom.xml +++ /dev/null @@ -1,67 +0,0 @@ -<?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-knative-consumer-parent</artifactId> - <version>1.16.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - - <artifactId>camel-k-knative-consumer-deployment</artifactId> - - <dependencies> - <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-knative-consumer</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-cloudevents-deployment</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-core-deployment</artifactId> - </dependency> - <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-vertx-http-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-knative/consumer/deployment/src/main/java/org/apache/camel/k/quarkus/knative/consumer/deployment/KnativeConsumerFeature.java b/camel-k-knative/consumer/deployment/src/main/java/org/apache/camel/k/quarkus/knative/consumer/deployment/KnativeConsumerFeature.java deleted file mode 100644 index 667deae4..00000000 --- a/camel-k-knative/consumer/deployment/src/main/java/org/apache/camel/k/quarkus/knative/consumer/deployment/KnativeConsumerFeature.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * 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.knative.consumer.deployment; - -import io.quarkus.deployment.annotations.BuildStep; -import io.quarkus.deployment.builditem.FeatureBuildItem; - -public class KnativeConsumerFeature { - public static final String FEATURE = "camel-k-knative-consumer"; - - @BuildStep - FeatureBuildItem feature() { - return new FeatureBuildItem(FEATURE); - } -} diff --git a/camel-k-knative/consumer/deployment/src/main/java/org/apache/camel/k/quarkus/knative/consumer/deployment/KnativeConsumerProcessor.java b/camel-k-knative/consumer/deployment/src/main/java/org/apache/camel/k/quarkus/knative/consumer/deployment/KnativeConsumerProcessor.java deleted file mode 100644 index 17638783..00000000 --- a/camel-k-knative/consumer/deployment/src/main/java/org/apache/camel/k/quarkus/knative/consumer/deployment/KnativeConsumerProcessor.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * 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.knative.consumer.deployment; - -import io.quarkus.deployment.annotations.BuildStep; -import io.quarkus.deployment.annotations.ExecutionTime; -import io.quarkus.deployment.annotations.Record; -import io.quarkus.vertx.http.deployment.VertxWebRouterBuildItem; -import org.apache.camel.k.quarkus.knative.consumer.KnativeConsumerRecorder; -import org.apache.camel.quarkus.core.deployment.spi.CamelRuntimeBeanBuildItem; -import org.apache.camel.spi.ComponentCustomizer; - -public class KnativeConsumerProcessor { - @Record(ExecutionTime.RUNTIME_INIT) - @BuildStep - CamelRuntimeBeanBuildItem knativeComponentCustomizer( - KnativeConsumerRecorder recorder, - VertxWebRouterBuildItem router) { - - return new CamelRuntimeBeanBuildItem( - KnativeConsumerFeature.FEATURE + "-customizer", - ComponentCustomizer.class.getName(), - recorder.createKnativeConsumerFactoryCustomizer(router.getHttpRouter()) - ); - } -} diff --git a/camel-k-knative/consumer/pom.xml b/camel-k-knative/consumer/pom.xml deleted file mode 100644 index 9e479405..00000000 --- a/camel-k-knative/consumer/pom.xml +++ /dev/null @@ -1,37 +0,0 @@ -<?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-knative-parent</artifactId> - <version>1.16.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <packaging>pom</packaging> - - <artifactId>camel-k-knative-consumer-parent</artifactId> - - <modules> - <module>runtime</module> - <module>deployment</module> - </modules> - - -</project> diff --git a/camel-k-knative/consumer/runtime/pom.xml b/camel-k-knative/consumer/runtime/pom.xml deleted file mode 100644 index b017c358..00000000 --- a/camel-k-knative/consumer/runtime/pom.xml +++ /dev/null @@ -1,102 +0,0 @@ -<?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-knative-consumer-parent</artifactId> - <version>1.16.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - - <artifactId>camel-k-knative-consumer</artifactId> - - <dependencies> - <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-vertx-http</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-core</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-knative-api</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-knative</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-knative-http</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-cloudevents</artifactId> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-extension-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-knative/consumer/runtime/src/main/java/org/apache/camel/k/quarkus/knative/consumer/KnativeConsumerRecorder.java b/camel-k-knative/consumer/runtime/src/main/java/org/apache/camel/k/quarkus/knative/consumer/KnativeConsumerRecorder.java deleted file mode 100644 index cea933a7..00000000 --- a/camel-k-knative/consumer/runtime/src/main/java/org/apache/camel/k/quarkus/knative/consumer/KnativeConsumerRecorder.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * 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.knative.consumer; - -import io.quarkus.runtime.RuntimeValue; -import io.quarkus.runtime.annotations.Recorder; -import io.vertx.ext.web.Router; -import org.apache.camel.Component; -import org.apache.camel.component.knative.KnativeComponent; -import org.apache.camel.component.knative.http.KnativeHttpConsumerFactory; -import org.apache.camel.spi.ComponentCustomizer; - -@Recorder -public class KnativeConsumerRecorder { - public RuntimeValue<ComponentCustomizer> createKnativeConsumerFactoryCustomizer(RuntimeValue<Router> router) { - KnativeHttpConsumerFactory factory = new KnativeHttpConsumerFactory(); - factory.setRouter(router.getValue()); - - ComponentCustomizer cf = new ComponentCustomizer() { - @Override - public void configure(String name, Component target) { - if (target instanceof KnativeComponent) { - ((KnativeComponent) target).setConsumerFactory(factory); - } - } - }; - - return new RuntimeValue<>(cf); - } -} diff --git a/camel-k-knative/deployment/pom.xml b/camel-k-knative/deployment/pom.xml deleted file mode 100644 index ae28a62b..00000000 --- a/camel-k-knative/deployment/pom.xml +++ /dev/null @@ -1,68 +0,0 @@ -<?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-knative-parent</artifactId> - <version>1.16.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - - <artifactId>camel-k-knative-deployment</artifactId> - - <dependencies> - <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-knative</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-core-deployment</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-cloudevents-deployment</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-core-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-knative/deployment/src/main/java/org/apache/camel/k/quarkus/knative/deployment/KnativeFeature.java b/camel-k-knative/deployment/src/main/java/org/apache/camel/k/quarkus/knative/deployment/KnativeFeature.java deleted file mode 100644 index edc4062b..00000000 --- a/camel-k-knative/deployment/src/main/java/org/apache/camel/k/quarkus/knative/deployment/KnativeFeature.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * 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.knative.deployment; - -import io.quarkus.deployment.annotations.BuildStep; -import io.quarkus.deployment.builditem.FeatureBuildItem; - -public class KnativeFeature { - private static final String FEATURE = "camel-k-knative"; - - @BuildStep - FeatureBuildItem feature() { - return new FeatureBuildItem(FEATURE); - } -} diff --git a/camel-k-knative/deployment/src/main/java/org/apache/camel/k/quarkus/knative/deployment/KnativeProcessor.java b/camel-k-knative/deployment/src/main/java/org/apache/camel/k/quarkus/knative/deployment/KnativeProcessor.java deleted file mode 100644 index 4e3cccb3..00000000 --- a/camel-k-knative/deployment/src/main/java/org/apache/camel/k/quarkus/knative/deployment/KnativeProcessor.java +++ /dev/null @@ -1,68 +0,0 @@ -/* - * 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.knative.deployment; - -import java.util.List; - -import io.quarkus.arc.deployment.UnremovableBeanBuildItem; -import io.quarkus.deployment.annotations.BuildStep; -import io.quarkus.deployment.annotations.ExecutionTime; -import io.quarkus.deployment.annotations.Record; -import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem; -import org.apache.camel.component.knative.KnativeComponent; -import org.apache.camel.component.knative.KnativeConstants; -import org.apache.camel.component.knative.spi.KnativeEnvironment; -import org.apache.camel.component.knative.spi.KnativeResource; -import org.apache.camel.k.quarkus.knative.KnativeRecorder; -import org.apache.camel.quarkus.core.deployment.spi.CamelRuntimeBeanBuildItem; -import org.apache.camel.quarkus.core.deployment.spi.CamelServiceFilter; -import org.apache.camel.quarkus.core.deployment.spi.CamelServiceFilterBuildItem; - -public class KnativeProcessor { - @BuildStep - List<UnremovableBeanBuildItem> unremovableBeans() { - return List.of( - UnremovableBeanBuildItem.beanTypes(KnativeEnvironment.class) - ); - } - - @BuildStep - List<ReflectiveClassBuildItem> reflectiveClasses() { - return List.of( - new ReflectiveClassBuildItem(true, false, KnativeEnvironment.class), - new ReflectiveClassBuildItem(true, false, KnativeResource.class) - ); - } - - @BuildStep - List<CamelServiceFilterBuildItem> servicesFilters() { - return List.of( - new CamelServiceFilterBuildItem(CamelServiceFilter.forComponent(KnativeConstants.SCHEME)), - new CamelServiceFilterBuildItem(CamelServiceFilter.forPathEndingWith(CamelServiceFilter.CAMEL_SERVICE_BASE_PATH + "/knative/transport/http")) - ); - } - - @Record(ExecutionTime.RUNTIME_INIT) - @BuildStep - CamelRuntimeBeanBuildItem knativeComponent(KnativeRecorder recorder) { - return new CamelRuntimeBeanBuildItem( - KnativeConstants.SCHEME, - KnativeComponent.class.getName(), - recorder.createKnativeComponent() - ); - } -} diff --git a/camel-k-knative/impl/pom.xml b/camel-k-knative/impl/pom.xml deleted file mode 100644 index a9428459..00000000 --- a/camel-k-knative/impl/pom.xml +++ /dev/null @@ -1,110 +0,0 @@ -<?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-knative-parent</artifactId> - <version>1.16.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - - <artifactId>camel-k-knative-impl</artifactId> - - <dependencies> - <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-core-support</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-knative</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-knative-http</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-apt</artifactId> - <optional>true</optional> - </dependency> - <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-annotations</artifactId> - <optional>true</optional> - </dependency> - </dependencies> - - <build> - <plugins> - <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> - <plugin> - <groupId>org.apache.camel</groupId> - <artifactId>camel-package-maven-plugin</artifactId> - <version>${camel-version}</version> - <executions> - <execution> - <id>generate-configurer</id> - <phase>process-classes</phase> - <goals> - <goal>generate-configurer</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <executions> - <execution> - <phase>generate-sources</phase> - <goals> - <goal>add-source</goal> - <goal>add-resource</goal> - </goals> - <configuration> - <sources> - <source>src/generated/java</source> - </sources> - <resources> - <resource> - <directory>src/generated/resources</directory> - </resource> - </resources> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - -</project> diff --git a/camel-k-knative/impl/src/generated/java/org/apache/camel/k/knative/customizer/KnativeSinkBindingContextCustomizerConfigurer.java b/camel-k-knative/impl/src/generated/java/org/apache/camel/k/knative/customizer/KnativeSinkBindingContextCustomizerConfigurer.java deleted file mode 100644 index 791d8489..00000000 --- a/camel-k-knative/impl/src/generated/java/org/apache/camel/k/knative/customizer/KnativeSinkBindingContextCustomizerConfigurer.java +++ /dev/null @@ -1,67 +0,0 @@ -/* Generated by camel build tools - do NOT edit this file! */ -package org.apache.camel.k.knative.customizer; - -import java.util.Map; - -import org.apache.camel.CamelContext; -import org.apache.camel.spi.ExtendedPropertyConfigurerGetter; -import org.apache.camel.spi.PropertyConfigurerGetter; -import org.apache.camel.spi.ConfigurerStrategy; -import org.apache.camel.spi.GeneratedPropertyConfigurer; -import org.apache.camel.util.CaseInsensitiveMap; -import org.apache.camel.k.knative.customizer.KnativeSinkBindingContextCustomizer; - -/** - * Generated by camel build tools - do NOT edit this file! - */ -@SuppressWarnings("unchecked") -public class KnativeSinkBindingContextCustomizerConfigurer extends org.apache.camel.support.component.PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter { - - @Override - public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) { - org.apache.camel.k.knative.customizer.KnativeSinkBindingContextCustomizer target = (org.apache.camel.k.knative.customizer.KnativeSinkBindingContextCustomizer) obj; - switch (ignoreCase ? name.toLowerCase() : name) { - case "apiversion": - case "ApiVersion": target.setApiVersion(property(camelContext, java.lang.String.class, value)); return true; - case "kind": - case "Kind": target.setKind(property(camelContext, java.lang.String.class, value)); return true; - case "name": - case "Name": target.setName(property(camelContext, java.lang.String.class, value)); return true; - case "type": - case "Type": target.setType(property(camelContext, org.apache.camel.component.knative.spi.Knative.Type.class, value)); return true; - default: return false; - } - } - - @Override - public Class<?> getOptionType(String name, boolean ignoreCase) { - switch (ignoreCase ? name.toLowerCase() : name) { - case "apiversion": - case "ApiVersion": return java.lang.String.class; - case "kind": - case "Kind": return java.lang.String.class; - case "name": - case "Name": return java.lang.String.class; - case "type": - case "Type": return org.apache.camel.component.knative.spi.Knative.Type.class; - default: return null; - } - } - - @Override - public Object getOptionValue(Object obj, String name, boolean ignoreCase) { - org.apache.camel.k.knative.customizer.KnativeSinkBindingContextCustomizer target = (org.apache.camel.k.knative.customizer.KnativeSinkBindingContextCustomizer) obj; - switch (ignoreCase ? name.toLowerCase() : name) { - case "apiversion": - case "ApiVersion": return target.getApiVersion(); - case "kind": - case "Kind": return target.getKind(); - case "name": - case "Name": return target.getName(); - case "type": - case "Type": return target.getType(); - default: return null; - } - } -} - diff --git a/camel-k-knative/impl/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.k.knative.customizer.KnativeSinkBindingContextCustomizer b/camel-k-knative/impl/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.k.knative.customizer.KnativeSinkBindingContextCustomizer deleted file mode 100644 index b25ae52e..00000000 --- a/camel-k-knative/impl/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.k.knative.customizer.KnativeSinkBindingContextCustomizer +++ /dev/null @@ -1,2 +0,0 @@ -# Generated by camel build tools - do NOT edit this file! -class=org.apache.camel.k.knative.customizer.KnativeSinkBindingContextCustomizerConfigurer diff --git a/camel-k-knative/impl/src/main/java/org/apache/camel/k/knative/customizer/KnativeSinkBindingContextCustomizer.java b/camel-k-knative/impl/src/main/java/org/apache/camel/k/knative/customizer/KnativeSinkBindingContextCustomizer.java deleted file mode 100644 index e9d208a2..00000000 --- a/camel-k-knative/impl/src/main/java/org/apache/camel/k/knative/customizer/KnativeSinkBindingContextCustomizer.java +++ /dev/null @@ -1,107 +0,0 @@ -/* - * 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.knative.customizer; - -import java.io.IOException; -import java.io.Reader; -import java.io.StringReader; -import java.util.HashMap; - -import com.fasterxml.jackson.core.type.TypeReference; -import org.apache.camel.CamelContext; -import org.apache.camel.component.knative.spi.Knative; -import org.apache.camel.component.knative.spi.KnativeResource; -import org.apache.camel.k.ContextCustomizer; -import org.apache.camel.k.annotation.Customizer; -import org.apache.camel.spi.Configurer; -import org.apache.camel.util.ObjectHelper; - -@Configurer -@Customizer("sinkbinding") -public class KnativeSinkBindingContextCustomizer implements ContextCustomizer { - private String name; - private Knative.Type type; - private String kind; - private String apiVersion; - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public Knative.Type getType() { - return type; - } - - public void setType(Knative.Type type) { - this.type = type; - } - - public String getKind() { - return kind; - } - - public void setKind(String kind) { - this.kind = kind; - } - - public String getApiVersion() { - return apiVersion; - } - - public void setApiVersion(String apiVersion) { - this.apiVersion = apiVersion; - } - - @Override - public void apply(CamelContext camelContext) { - final String kSinkUrl = camelContext.resolvePropertyPlaceholders("{{k.sink:}}"); - final String kCeOverride = camelContext.resolvePropertyPlaceholders("{{k.ce.overrides:}}"); - - if (ObjectHelper.isNotEmpty(kSinkUrl)) { - // create a synthetic service definition to target the K_SINK url - KnativeResource resource = new KnativeResource(); - resource.setEndpointKind(Knative.EndpointKind.sink); - resource.setType(type); - resource.setName(name); - resource.setUrl(kSinkUrl); - resource.setObjectApiVersion(apiVersion); - resource.setObjectKind(kind); - if (type == Knative.Type.event) { - resource.setObjectName(name); - } - - if (ObjectHelper.isNotEmpty(kCeOverride)) { - try (Reader reader = new StringReader(kCeOverride)) { - // assume K_CE_OVERRIDES is defined as simple key/val json - Knative.MAPPER.readValue( - reader, - new TypeReference<HashMap<String, String>>() { - } - ).forEach(resource::addCeOverride); - } catch (IOException e) { - throw new RuntimeException(e); - } - } - - camelContext.getRegistry().bind(name, resource); - } - } -} diff --git a/camel-k-knative/impl/src/main/java/org/apache/camel/k/loader/knative/KnativeSourceLoaderInterceptor.java b/camel-k-knative/impl/src/main/java/org/apache/camel/k/loader/knative/KnativeSourceLoaderInterceptor.java deleted file mode 100644 index 93cfdcfc..00000000 --- a/camel-k-knative/impl/src/main/java/org/apache/camel/k/loader/knative/KnativeSourceLoaderInterceptor.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * 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.loader.knative; - -import java.util.List; - -import org.apache.camel.CamelContext; -import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.builder.RouteBuilderLifecycleStrategy; -import org.apache.camel.k.annotation.LoaderInterceptor; -import org.apache.camel.model.RouteDefinition; -import org.apache.camel.model.ToDefinition; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -@LoaderInterceptor("knative-source") -public class KnativeSourceLoaderInterceptor implements RouteBuilderLifecycleStrategy { - private static final Logger LOGGER = LoggerFactory.getLogger(KnativeSourceLoaderInterceptor.class); - - @Override - public void afterConfigure(RouteBuilder builder) { - final CamelContext camelContext = builder.getContext(); - final List<RouteDefinition> definitions = builder.getRouteCollection().getRoutes(); - - if (definitions.size() == 1) { - final String sinkName = camelContext.resolvePropertyPlaceholders("{{knative.sink:sink}}"); - final String sinkUri = String.format("knative://endpoint/%s", sinkName); - final RouteDefinition definition = definitions.get(0); - - LOGGER.info("Add sink:{} to route:{}", sinkUri, definition.getId()); - - // assuming that route is linear like there's no content based routing - // or ant other EIP that would branch the flow - definition.getOutputs().add(new ToDefinition(sinkUri)); - } else { - LOGGER.warn("Cannot determine route to enrich. the knative enpoint need to explicitly be defined"); - } - } -} diff --git a/camel-k-knative/pom.xml b/camel-k-knative/pom.xml deleted file mode 100644 index 617887ef..00000000 --- a/camel-k-knative/pom.xml +++ /dev/null @@ -1,39 +0,0 @@ -<?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-runtime-project</artifactId> - <version>1.16.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <packaging>pom</packaging> - - <artifactId>camel-k-knative-parent</artifactId> - - <modules> - <module>impl</module> - <module>producer</module> - <module>consumer</module> - <module>runtime</module> - <module>deployment</module> - </modules> - -</project> diff --git a/camel-k-knative/producer/deployment/pom.xml b/camel-k-knative/producer/deployment/pom.xml deleted file mode 100644 index 2a8c4be0..00000000 --- a/camel-k-knative/producer/deployment/pom.xml +++ /dev/null @@ -1,67 +0,0 @@ -<?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-knative-producer-parent</artifactId> - <version>1.16.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - - <artifactId>camel-k-knative-producer-deployment</artifactId> - - <dependencies> - <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-knative-producer</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-cloudevents-deployment</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-core-deployment</artifactId> - </dependency> - <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-vertx-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-knative/producer/deployment/src/main/java/org/apache/camel/k/quarkus/knative/producer/deployment/KnativeProducerFeature.java b/camel-k-knative/producer/deployment/src/main/java/org/apache/camel/k/quarkus/knative/producer/deployment/KnativeProducerFeature.java deleted file mode 100644 index 15a4d2fa..00000000 --- a/camel-k-knative/producer/deployment/src/main/java/org/apache/camel/k/quarkus/knative/producer/deployment/KnativeProducerFeature.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * 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.knative.producer.deployment; - -import io.quarkus.deployment.annotations.BuildStep; -import io.quarkus.deployment.builditem.FeatureBuildItem; - -public class KnativeProducerFeature { - public static final String FEATURE = "camel-k-knative-producer"; - - @BuildStep - FeatureBuildItem feature() { - return new FeatureBuildItem(FEATURE); - } -} diff --git a/camel-k-knative/producer/deployment/src/main/java/org/apache/camel/k/quarkus/knative/producer/deployment/KnativeProducerProcessor.java b/camel-k-knative/producer/deployment/src/main/java/org/apache/camel/k/quarkus/knative/producer/deployment/KnativeProducerProcessor.java deleted file mode 100644 index 3b7bd4e2..00000000 --- a/camel-k-knative/producer/deployment/src/main/java/org/apache/camel/k/quarkus/knative/producer/deployment/KnativeProducerProcessor.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * 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.knative.producer.deployment; - -import io.quarkus.deployment.annotations.BuildStep; -import io.quarkus.deployment.annotations.ExecutionTime; -import io.quarkus.deployment.annotations.Record; -import io.quarkus.vertx.core.deployment.CoreVertxBuildItem; -import org.apache.camel.k.quarkus.knative.producer.KnativeProducerRecorder; -import org.apache.camel.quarkus.core.deployment.spi.CamelRuntimeBeanBuildItem; -import org.apache.camel.spi.ComponentCustomizer; - -public class KnativeProducerProcessor { - @Record(ExecutionTime.RUNTIME_INIT) - @BuildStep - CamelRuntimeBeanBuildItem knativeComponentCustomizer( - KnativeProducerRecorder recorder, - CoreVertxBuildItem vertx) { - - return new CamelRuntimeBeanBuildItem( - KnativeProducerFeature.FEATURE + "-customizer", - ComponentCustomizer.class.getName(), - recorder.createKnativeProducerFactoryCustomizer(vertx.getVertx()) - ); - } -} diff --git a/camel-k-knative/producer/pom.xml b/camel-k-knative/producer/pom.xml deleted file mode 100644 index 55b977c4..00000000 --- a/camel-k-knative/producer/pom.xml +++ /dev/null @@ -1,37 +0,0 @@ -<?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-knative-parent</artifactId> - <version>1.16.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <packaging>pom</packaging> - - <artifactId>camel-k-knative-producer-parent</artifactId> - - <modules> - <module>runtime</module> - <module>deployment</module> - </modules> - - -</project> diff --git a/camel-k-knative/producer/runtime/pom.xml b/camel-k-knative/producer/runtime/pom.xml deleted file mode 100644 index 6d30da41..00000000 --- a/camel-k-knative/producer/runtime/pom.xml +++ /dev/null @@ -1,102 +0,0 @@ -<?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-knative-producer-parent</artifactId> - <version>1.16.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - - <artifactId>camel-k-knative-producer</artifactId> - - <dependencies> - <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-vertx</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-core</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-knative</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-knative-api</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-knative-http</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-cloudevents</artifactId> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-extension-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-knative/producer/runtime/src/main/java/org/apache/camel/k/quarkus/knative/producer/KnativeProducerRecorder.java b/camel-k-knative/producer/runtime/src/main/java/org/apache/camel/k/quarkus/knative/producer/KnativeProducerRecorder.java deleted file mode 100644 index 07aa27c6..00000000 --- a/camel-k-knative/producer/runtime/src/main/java/org/apache/camel/k/quarkus/knative/producer/KnativeProducerRecorder.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * 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.knative.producer; - -import java.util.function.Supplier; - -import io.quarkus.runtime.RuntimeValue; -import io.quarkus.runtime.annotations.Recorder; -import io.vertx.core.Vertx; -import org.apache.camel.Component; -import org.apache.camel.component.knative.KnativeComponent; -import org.apache.camel.component.knative.http.KnativeHttpProducerFactory; -import org.apache.camel.spi.ComponentCustomizer; - -@Recorder -public class KnativeProducerRecorder { - public RuntimeValue<ComponentCustomizer> createKnativeProducerFactoryCustomizer(Supplier<Vertx> vertx) { - KnativeHttpProducerFactory factory = new KnativeHttpProducerFactory(); - factory.setVertx(vertx.get()); - - ComponentCustomizer cf = new ComponentCustomizer() { - @Override - public void configure(String name, Component target) { - if (target instanceof KnativeComponent) { - ((KnativeComponent) target).setProducerFactory(factory); - } - } - }; - - return new RuntimeValue<>(cf); - } -} diff --git a/camel-k-knative/runtime/pom.xml b/camel-k-knative/runtime/pom.xml deleted file mode 100644 index 77a10de3..00000000 --- a/camel-k-knative/runtime/pom.xml +++ /dev/null @@ -1,103 +0,0 @@ -<?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-knative-parent</artifactId> - <version>1.16.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - - <artifactId>camel-k-knative</artifactId> - - <dependencies> - <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-core</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-core</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-knative-api</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-knative</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-knative-impl</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-cloudevents</artifactId> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-extension-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-knative/runtime/src/main/java/org/apache/camel/k/quarkus/knative/KnativeRecorder.java b/camel-k-knative/runtime/src/main/java/org/apache/camel/k/quarkus/knative/KnativeRecorder.java deleted file mode 100644 index f27531c3..00000000 --- a/camel-k-knative/runtime/src/main/java/org/apache/camel/k/quarkus/knative/KnativeRecorder.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * 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.knative; - -import io.quarkus.runtime.RuntimeValue; -import io.quarkus.runtime.annotations.Recorder; -import org.apache.camel.component.knative.KnativeComponent; - -@Recorder -public class KnativeRecorder { - public RuntimeValue<KnativeComponent> createKnativeComponent() { - return new RuntimeValue<>(new KnativeComponent()); - } -} diff --git a/camel-k-resume-kafka/impl/src/main/java/org/apache/camel/k/resume/kafka/KafkaResumeFactory.java b/camel-k-resume-kafka/impl/src/main/java/org/apache/camel/k/resume/kafka/KafkaResumeFactory.java index d2ce1a63..13748af3 100644 --- a/camel-k-resume-kafka/impl/src/main/java/org/apache/camel/k/resume/kafka/KafkaResumeFactory.java +++ b/camel-k-resume-kafka/impl/src/main/java/org/apache/camel/k/resume/kafka/KafkaResumeFactory.java @@ -19,7 +19,6 @@ package org.apache.camel.k.resume.kafka; import org.apache.camel.processor.resume.kafka.KafkaResumeStrategyConfiguration; import org.apache.camel.processor.resume.kafka.KafkaResumeStrategyConfigurationBuilder; -import org.apache.camel.processor.resume.kafka.MultiNodeKafkaResumeStrategy; import org.apache.camel.processor.resume.kafka.SingleNodeKafkaResumeStrategy; import org.apache.camel.resume.Cacheable; import org.apache.camel.resume.ResumeStrategy; @@ -44,9 +43,6 @@ public final class KafkaResumeFactory { case "org.apache.camel.processor.resume.kafka.SingleNodeKafkaResumeStrategy": { return new SingleNodeKafkaResumeStrategy<>(resumeStrategyConfiguration); } - case "org.apache.camel.processor.resume.kafka.MultiNodeKafkaResumeStrategy": { - return new MultiNodeKafkaResumeStrategy<>(resumeStrategyConfiguration); - } default: { throw new UnsupportedOperationException(String.format("The strategy %s is not a valid strategy", name)); } diff --git a/examples/knative/pom.xml b/examples/knative/pom.xml index 5bb48d09..7de0216e 100644 --- a/examples/knative/pom.xml +++ b/examples/knative/pom.xml @@ -39,12 +39,12 @@ <artifactId>camel-k-runtime</artifactId> </dependency> <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-knative</artifactId> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-knative</artifactId> </dependency> <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-knative-consumer</artifactId> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-knative-consumer</artifactId> </dependency> <dependency> <groupId>org.apache.camel</groupId> diff --git a/itests/camel-k-itests-knative-consumer/pom.xml b/itests/camel-k-itests-knative-consumer/pom.xml index 0fe29486..0aadc8ed 100644 --- a/itests/camel-k-itests-knative-consumer/pom.xml +++ b/itests/camel-k-itests-knative-consumer/pom.xml @@ -33,12 +33,12 @@ <artifactId>camel-k-runtime</artifactId> </dependency> <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-knative</artifactId> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-knative</artifactId> </dependency> <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-knative-consumer</artifactId> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-knative-consumer</artifactId> </dependency> <!-- camel quarkus --> @@ -86,32 +86,6 @@ </exclusion> </exclusions> </dependency> - <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-knative-deployment</artifactId> - <version>${project.version}</version> - <type>pom</type> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>*</groupId> - <artifactId>*</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-knative-consumer-deployment</artifactId> - <version>${project.version}</version> - <type>pom</type> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>*</groupId> - <artifactId>*</artifactId> - </exclusion> - </exclusions> - </dependency> </dependencies> <profiles> diff --git a/itests/camel-k-itests-knative-env-from-properties/pom.xml b/itests/camel-k-itests-knative-env-from-properties/pom.xml index 3ba822f9..3caf0400 100644 --- a/itests/camel-k-itests-knative-env-from-properties/pom.xml +++ b/itests/camel-k-itests-knative-env-from-properties/pom.xml @@ -33,16 +33,16 @@ <artifactId>camel-k-runtime</artifactId> </dependency> <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-knative</artifactId> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-knative</artifactId> </dependency> <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-knative-producer</artifactId> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-knative-producer</artifactId> </dependency> <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-knative-consumer</artifactId> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-knative-consumer</artifactId> </dependency> <dependency> @@ -100,19 +100,6 @@ </exclusion> </exclusions> </dependency> - <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-knative</artifactId> - <version>${project.version}</version> - <type>pom</type> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>*</groupId> - <artifactId>*</artifactId> - </exclusion> - </exclusions> - </dependency> </dependencies> <build> diff --git a/itests/camel-k-itests-knative-env-from-registry/pom.xml b/itests/camel-k-itests-knative-env-from-registry/pom.xml index 474ea5d4..18daade0 100644 --- a/itests/camel-k-itests-knative-env-from-registry/pom.xml +++ b/itests/camel-k-itests-knative-env-from-registry/pom.xml @@ -33,16 +33,16 @@ <artifactId>camel-k-runtime</artifactId> </dependency> <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-knative</artifactId> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-knative</artifactId> </dependency> <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-knative-producer</artifactId> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-knative-producer</artifactId> </dependency> <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-knative-consumer</artifactId> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-knative-consumer</artifactId> </dependency> <!-- camel quarkus --> diff --git a/itests/camel-k-itests-knative-producer/pom.xml b/itests/camel-k-itests-knative-producer/pom.xml index 6a3a97ab..0a949d38 100644 --- a/itests/camel-k-itests-knative-producer/pom.xml +++ b/itests/camel-k-itests-knative-producer/pom.xml @@ -33,14 +33,14 @@ <artifactId>camel-k-runtime</artifactId> </dependency> <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-knative</artifactId> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-knative</artifactId> </dependency> <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-knative-producer</artifactId> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-knative-producer</artifactId> </dependency> - + <!-- camel quarkus --> <dependency> <groupId>io.quarkus</groupId> @@ -86,32 +86,6 @@ </exclusion> </exclusions> </dependency> - <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-knative-deployment</artifactId> - <version>${project.version}</version> - <type>pom</type> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>*</groupId> - <artifactId>*</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-knative-producer-deployment</artifactId> - <version>${project.version}</version> - <type>pom</type> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>*</groupId> - <artifactId>*</artifactId> - </exclusion> - </exclusions> - </dependency> </dependencies> <profiles> diff --git a/itests/camel-k-itests-knative-sinkbinding/pom.xml b/itests/camel-k-itests-knative-sinkbinding/pom.xml index e7b8a906..8419d394 100644 --- a/itests/camel-k-itests-knative-sinkbinding/pom.xml +++ b/itests/camel-k-itests-knative-sinkbinding/pom.xml @@ -33,12 +33,12 @@ <artifactId>camel-k-runtime</artifactId> </dependency> <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-knative</artifactId> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-knative</artifactId> </dependency> <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-knative-producer</artifactId> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-knative-producer</artifactId> </dependency> <dependency> @@ -96,19 +96,6 @@ </exclusion> </exclusions> </dependency> - <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-knative</artifactId> - <version>${project.version}</version> - <type>pom</type> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>*</groupId> - <artifactId>*</artifactId> - </exclusion> - </exclusions> - </dependency> </dependencies> <profiles> diff --git a/itests/camel-k-itests-knative-source-groovy/pom.xml b/itests/camel-k-itests-knative-source-groovy/pom.xml index 2d26a18f..13bb4c2e 100644 --- a/itests/camel-k-itests-knative-source-groovy/pom.xml +++ b/itests/camel-k-itests-knative-source-groovy/pom.xml @@ -33,16 +33,16 @@ <artifactId>camel-k-runtime</artifactId> </dependency> <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-knative</artifactId> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-knative</artifactId> </dependency> <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-knative-producer</artifactId> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-knative-producer</artifactId> </dependency> <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-knative-consumer</artifactId> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-knative-consumer</artifactId> </dependency> <!-- camel quarkus --> @@ -108,19 +108,6 @@ </exclusion> </exclusions> </dependency> - <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-knative</artifactId> - <version>${project.version}</version> - <type>pom</type> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>*</groupId> - <artifactId>*</artifactId> - </exclusion> - </exclusions> - </dependency> </dependencies> <build> diff --git a/itests/camel-k-itests-knative-source-java/pom.xml b/itests/camel-k-itests-knative-source-java/pom.xml index 2eb0a990..aa9f39a6 100644 --- a/itests/camel-k-itests-knative-source-java/pom.xml +++ b/itests/camel-k-itests-knative-source-java/pom.xml @@ -33,16 +33,16 @@ <artifactId>camel-k-runtime</artifactId> </dependency> <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-knative</artifactId> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-knative</artifactId> </dependency> <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-knative-producer</artifactId> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-knative-producer</artifactId> </dependency> <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-knative-consumer</artifactId> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-knative-consumer</artifactId> </dependency> <!-- camel quarkus --> @@ -108,19 +108,6 @@ </exclusion> </exclusions> </dependency> - <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-knative</artifactId> - <version>${project.version}</version> - <type>pom</type> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>*</groupId> - <artifactId>*</artifactId> - </exclusion> - </exclusions> - </dependency> </dependencies> <build> diff --git a/itests/camel-k-itests-knative-source-js/pom.xml b/itests/camel-k-itests-knative-source-js/pom.xml index c5f18853..5a9fba53 100644 --- a/itests/camel-k-itests-knative-source-js/pom.xml +++ b/itests/camel-k-itests-knative-source-js/pom.xml @@ -33,16 +33,16 @@ <artifactId>camel-k-runtime</artifactId> </dependency> <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-knative</artifactId> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-knative</artifactId> </dependency> <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-knative-producer</artifactId> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-knative-producer</artifactId> </dependency> <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-knative-consumer</artifactId> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-knative-consumer</artifactId> </dependency> <!-- camel quarkus --> @@ -108,19 +108,6 @@ </exclusion> </exclusions> </dependency> - <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-knative</artifactId> - <version>${project.version}</version> - <type>pom</type> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>*</groupId> - <artifactId>*</artifactId> - </exclusion> - </exclusions> - </dependency> </dependencies> <build> diff --git a/itests/camel-k-itests-knative-source-xml/pom.xml b/itests/camel-k-itests-knative-source-xml/pom.xml index 3ef19f71..ae63b556 100644 --- a/itests/camel-k-itests-knative-source-xml/pom.xml +++ b/itests/camel-k-itests-knative-source-xml/pom.xml @@ -33,16 +33,16 @@ <artifactId>camel-k-runtime</artifactId> </dependency> <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-knative</artifactId> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-knative</artifactId> </dependency> <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-knative-producer</artifactId> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-knative-producer</artifactId> </dependency> <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-knative-consumer</artifactId> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-knative-consumer</artifactId> </dependency> <!-- camel quarkus --> @@ -108,19 +108,6 @@ </exclusion> </exclusions> </dependency> - <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-knative</artifactId> - <version>${project.version}</version> - <type>pom</type> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>*</groupId> - <artifactId>*</artifactId> - </exclusion> - </exclusions> - </dependency> </dependencies> <build> diff --git a/itests/camel-k-itests-knative-source-yaml/pom.xml b/itests/camel-k-itests-knative-source-yaml/pom.xml index cfb77874..ae0f2e36 100644 --- a/itests/camel-k-itests-knative-source-yaml/pom.xml +++ b/itests/camel-k-itests-knative-source-yaml/pom.xml @@ -33,16 +33,16 @@ <artifactId>camel-k-runtime</artifactId> </dependency> <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-knative</artifactId> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-knative</artifactId> </dependency> <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-knative-producer</artifactId> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-knative-producer</artifactId> </dependency> <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-knative-consumer</artifactId> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-knative-consumer</artifactId> </dependency> <dependency> @@ -109,19 +109,6 @@ </exclusion> </exclusions> </dependency> - <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-knative</artifactId> - <version>${project.version}</version> - <type>pom</type> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>*</groupId> - <artifactId>*</artifactId> - </exclusion> - </exclusions> - </dependency> </dependencies> <build> diff --git a/itests/camel-k-itests-knative/pom.xml b/itests/camel-k-itests-knative/pom.xml index 16690f3b..a39d87c7 100644 --- a/itests/camel-k-itests-knative/pom.xml +++ b/itests/camel-k-itests-knative/pom.xml @@ -33,16 +33,16 @@ <artifactId>camel-k-runtime</artifactId> </dependency> <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-knative</artifactId> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-knative</artifactId> </dependency> <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-knative-producer</artifactId> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-knative-producer</artifactId> </dependency> <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-knative-consumer</artifactId> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-knative-consumer</artifactId> </dependency> <dependency> @@ -100,19 +100,6 @@ </exclusion> </exclusions> </dependency> - <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-knative</artifactId> - <version>${project.version}</version> - <type>pom</type> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>*</groupId> - <artifactId>*</artifactId> - </exclusion> - </exclusions> - </dependency> </dependencies> <profiles> diff --git a/itests/camel-k-itests-runtime-yaml/pom.xml b/itests/camel-k-itests-runtime-yaml/pom.xml index c4d41e90..fa439bc2 100644 --- a/itests/camel-k-itests-runtime-yaml/pom.xml +++ b/itests/camel-k-itests-runtime-yaml/pom.xml @@ -33,16 +33,16 @@ <artifactId>camel-k-runtime</artifactId> </dependency> <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-knative</artifactId> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-knative</artifactId> </dependency> <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-knative-producer</artifactId> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-knative-producer</artifactId> </dependency> <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-knative-consumer</artifactId> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-knative-consumer</artifactId> </dependency> <dependency> <groupId>org.apache.camel.k</groupId> @@ -131,32 +131,6 @@ </exclusion> </exclusions> </dependency> - <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-knative-producer-deployment</artifactId> - <version>${project.version}</version> - <type>pom</type> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>*</groupId> - <artifactId>*</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-knative-consumer-deployment</artifactId> - <version>${project.version}</version> - <type>pom</type> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>*</groupId> - <artifactId>*</artifactId> - </exclusion> - </exclusions> - </dependency> </dependencies> <build> diff --git a/pom.xml b/pom.xml index 02a9c113..10c97342 100644 --- a/pom.xml +++ b/pom.xml @@ -380,7 +380,6 @@ <module>camel-k-cron</module> <module>camel-k-cloudevents</module> - <module>camel-k-knative</module> <module>camel-k-master</module> <module>camel-k-webhook</module> <module>camel-k-runtime</module> @@ -422,26 +421,6 @@ <artifactId>camel-cloudevents</artifactId> <version>${camel-version}</version> </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-knative-api</artifactId> - <version>${camel-version}</version> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-knative</artifactId> - <version>${camel-version}</version> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-knative-http</artifactId> - <version>${camel-version}</version> - </dependency> - <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-knative-test</artifactId> - <version>${project.version}</version> - </dependency> <!-- runtime --> <dependency> @@ -489,41 +468,6 @@ <artifactId>camel-k-master-deployment</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-knative-impl</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-knative</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-knative-deployment</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-knative-producer</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-knative-producer-deployment</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-knative-consumer</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-knative-consumer-deployment</artifactId> - <version>${project.version}</version> - </dependency> <dependency> <groupId>org.apache.camel.k</groupId> <artifactId>camel-k-cron-impl</artifactId> diff --git a/support/camel-k-maven-plugin/src/it/generate-catalog/verify.groovy b/support/camel-k-maven-plugin/src/it/generate-catalog/verify.groovy index a40d8888..d175d750 100644 --- a/support/camel-k-maven-plugin/src/it/generate-catalog/verify.groovy +++ b/support/camel-k-maven-plugin/src/it/generate-catalog/verify.groovy @@ -74,20 +74,9 @@ new File(basedir, "catalog.yaml").withReader { assert v.version == null } - catalog.spec.artifacts['camel-k-knative'].with { + catalog.spec.artifacts['camel-quarkus-knative'].with { assert dependencies == null assert requiredCapabilities == null assert schemes.size() == 1 - - schemes[0].with { - assert id == 'knative' - assert consumer.requiredCapabilities == null - assert consumer.dependencies[0].groupId == 'org.apache.camel.k' - assert consumer.dependencies[0].artifactId == 'camel-k-knative-consumer' - - assert producer.requiredCapabilities == null - assert producer.dependencies[0].groupId == 'org.apache.camel.k' - assert producer.dependencies[0].artifactId == 'camel-k-knative-producer' - } } } diff --git a/support/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateCatalogMojo.java b/support/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateCatalogMojo.java index 4c30700f..98d608df 100644 --- a/support/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateCatalogMojo.java +++ b/support/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateCatalogMojo.java @@ -331,24 +331,6 @@ public class GenerateCatalogMojo extends AbstractMojo { specBuilder.putAllArtifacts(artifacts); - - specBuilder.putArtifact( - new CamelArtifact.Builder() - .groupId("org.apache.camel.k") - .artifactId("camel-k-knative") - .addScheme(new CamelScheme.Builder() - .id("knative") - .http(true) - .consumer(new CamelScopedArtifact.Builder() - .addDependency("org.apache.camel.k", "camel-k-knative-consumer") - .build()) - .producer(new CamelScopedArtifact.Builder() - .addDependency("org.apache.camel.k", "camel-k-knative-producer") - .build()) - .build()) - .build() - ); - // required for Jolokia 1.7.1 specBuilder.putArtifact( new CamelArtifact.Builder() diff --git a/support/camel-k-runtime-bom/pom.xml b/support/camel-k-runtime-bom/pom.xml index 1e9ef13a..01a62a55 100644 --- a/support/camel-k-runtime-bom/pom.xml +++ b/support/camel-k-runtime-bom/pom.xml @@ -140,11 +140,6 @@ <artifactId>camel-k-cloudevents-deployment</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-knative-api</artifactId> - <version>${project.version}</version> - </dependency> <dependency> <groupId>org.apache.camel.k</groupId> <artifactId>camel-k-webhook-impl</artifactId> @@ -155,26 +150,6 @@ <artifactId>camel-k-webhook</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-knative-impl</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-knative</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-knative-producer</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-knative-consumer</artifactId> - <version>${project.version}</version> - </dependency> <dependency> <groupId>org.apache.camel.k</groupId> <artifactId>camel-k-cron-impl</artifactId>
