Update to camel-quarkus 1.4.0 and quarkus 1.10.0.Final
diff --git a/pom.xml b/pom.xml
index 9826b0a..87ff60f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,9 +41,9 @@
<camel-version>3.6.0</camel-version>
<!-- quarkus -->
- <camel-quarkus-version>1.3.0</camel-quarkus-version>
+ <camel-quarkus-version>1.4.0</camel-quarkus-version>
<graalvm-version>20.2.0</graalvm-version>
- <quarkus-version>1.9.0.Final</quarkus-version>
+ <quarkus-version>1.10.0.Final</quarkus-version>
<!-- camel-k -->
<joor-version>0.9.13</joor-version>
@@ -667,16 +667,6 @@
<artifactId>camel-k-itests-runtime-inspector</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-itests-runtime-bootstrap</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-itests-runtime-bootstrap-deployment</artifactId>
- <version>${project.version}</version>
- </dependency>
<!-- support -->
<dependency>
diff --git a/support/camel-k-itests-support/camel-k-itests-runtime-bootstrap/deployment/pom.xml b/support/camel-k-itests-support/camel-k-itests-runtime-bootstrap/deployment/pom.xml
deleted file mode 100644
index a7a92be..0000000
--- a/support/camel-k-itests-support/camel-k-itests-runtime-bootstrap/deployment/pom.xml
+++ /dev/null
@@ -1,59 +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-itests-runtime-bootstrap-parent</artifactId>
- <version>1.6.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>camel-k-itests-runtime-bootstrap-deployment</artifactId>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-core-deployment</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-itests-runtime-bootstrap</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/support/camel-k-itests-support/camel-k-itests-runtime-bootstrap/deployment/src/main/java/org/apache/camel/k/quarkus/it/bootstrap/deployment/TestBootstrapProcessor.java b/support/camel-k-itests-support/camel-k-itests-runtime-bootstrap/deployment/src/main/java/org/apache/camel/k/quarkus/it/bootstrap/deployment/TestBootstrapProcessor.java
deleted file mode 100644
index 7453854..0000000
--- a/support/camel-k-itests-support/camel-k-itests-runtime-bootstrap/deployment/src/main/java/org/apache/camel/k/quarkus/it/bootstrap/deployment/TestBootstrapProcessor.java
+++ /dev/null
@@ -1,55 +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.it.bootstrap.deployment;
-
-import io.quarkus.deployment.annotations.BuildProducer;
-import io.quarkus.deployment.annotations.BuildStep;
-import io.quarkus.deployment.annotations.ExecutionTime;
-import io.quarkus.deployment.annotations.Produce;
-import io.quarkus.deployment.annotations.Record;
-import io.quarkus.deployment.builditem.FeatureBuildItem;
-import io.quarkus.deployment.builditem.RawCommandLineArgumentsBuildItem;
-import io.quarkus.deployment.builditem.ServiceStartBuildItem;
-import io.quarkus.deployment.builditem.ShutdownContextBuildItem;
-import org.apache.camel.k.quarkus.it.bootstrap.TestBoostrapRecorder;
-import org.apache.camel.quarkus.core.CamelConfigFlags;
-import org.apache.camel.quarkus.core.deployment.spi.CamelBootstrapCompletedBuildItem;
-import org.apache.camel.quarkus.core.deployment.spi.CamelRuntimeBuildItem;
-
-public class TestBootstrapProcessor {
-
- @BuildStep
- FeatureBuildItem feature() {
- return new FeatureBuildItem("camel.k.quarkus.it.bootstrap");
- }
-
- @BuildStep(onlyIf = { CamelConfigFlags.BootstrapEnabled.class })
- @Record(value = ExecutionTime.RUNTIME_INIT)
- @Produce(CamelBootstrapCompletedBuildItem.class)
- void boot(
- TestBoostrapRecorder testRecorder,
- CamelRuntimeBuildItem runtime,
- RawCommandLineArgumentsBuildItem commandLineArguments,
- ShutdownContextBuildItem shutdown,
- BuildProducer<ServiceStartBuildItem> serviceStartBuildItems) {
-
- testRecorder.addShutdownTask(shutdown, runtime.runtime());
- testRecorder.start(runtime.runtime(), commandLineArguments);
-
- serviceStartBuildItems.produce(new ServiceStartBuildItem("camel-k-itests"));
- }
-}
diff --git a/support/camel-k-itests-support/camel-k-itests-runtime-bootstrap/pom.xml b/support/camel-k-itests-support/camel-k-itests-runtime-bootstrap/pom.xml
deleted file mode 100644
index 2514abe..0000000
--- a/support/camel-k-itests-support/camel-k-itests-runtime-bootstrap/pom.xml
+++ /dev/null
@@ -1,36 +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-itests-support</artifactId>
- <version>1.6.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <packaging>pom</packaging>
-
- <artifactId>camel-k-itests-runtime-bootstrap-parent</artifactId>
-
- <modules>
- <module>runtime</module>
- <module>deployment</module>
- </modules>
-
-</project>
diff --git a/support/camel-k-itests-support/camel-k-itests-runtime-bootstrap/runtime/pom.xml b/support/camel-k-itests-support/camel-k-itests-runtime-bootstrap/runtime/pom.xml
deleted file mode 100644
index 4e9d612..0000000
--- a/support/camel-k-itests-support/camel-k-itests-runtime-bootstrap/runtime/pom.xml
+++ /dev/null
@@ -1,82 +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-itests-runtime-bootstrap-parent</artifactId>
- <version>1.6.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>camel-k-itests-runtime-bootstrap</artifactId>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-core</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/support/camel-k-itests-support/camel-k-itests-runtime-bootstrap/runtime/src/main/java/org/apache/camel/k/quarkus/it/bootstrap/TestBoostrapRecorder.java b/support/camel-k-itests-support/camel-k-itests-runtime-bootstrap/runtime/src/main/java/org/apache/camel/k/quarkus/it/bootstrap/TestBoostrapRecorder.java
deleted file mode 100644
index a03b6a2..0000000
--- a/support/camel-k-itests-support/camel-k-itests-runtime-bootstrap/runtime/src/main/java/org/apache/camel/k/quarkus/it/bootstrap/TestBoostrapRecorder.java
+++ /dev/null
@@ -1,52 +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.it.bootstrap;
-
-import java.util.function.Supplier;
-
-import io.quarkus.runtime.RuntimeValue;
-import io.quarkus.runtime.ShutdownContext;
-import io.quarkus.runtime.annotations.Recorder;
-import org.apache.camel.quarkus.core.CamelBootstrapRecorder;
-import org.apache.camel.quarkus.core.CamelRuntime;
-import org.jboss.logging.Logger;
-
-@Recorder
-public class TestBoostrapRecorder {
- public void addShutdownTask(ShutdownContext shutdown, RuntimeValue<CamelRuntime> runtime) {
- shutdown.addShutdownTask(new Runnable() {
- @Override
- public void run() {
- try {
- runtime.getValue().stop();
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
- }
- });
- }
-
- public void start(RuntimeValue<CamelRuntime> runtime, Supplier<String[]> arguments) {
- try {
- Logger logger = Logger.getLogger(CamelBootstrapRecorder.class);
- logger.infof("test bootstrap runtime: %s", runtime.getValue().getClass().getName());
- logger.infof("test bootstrap runtime: runtime won't be started automatically for testing purpose");
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
- }
-}
diff --git a/support/camel-k-itests-support/pom.xml b/support/camel-k-itests-support/pom.xml
index f9fe5a1..13c266d 100644
--- a/support/camel-k-itests-support/pom.xml
+++ b/support/camel-k-itests-support/pom.xml
@@ -31,7 +31,6 @@
<modules>
<module>camel-k-itests-loader-inspector</module>
- <module>camel-k-itests-runtime-bootstrap</module>
<module>camel-k-itests-runtime-inspector</module>
</modules>
