You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by lb...@apache.org on 2020/06/03 09:08:48 UTC
[camel-k-runtime] 05/12: Remove deployment processor for
camel-k-quarkus-loader-xml as the same bits have been implemented in
camel-quarkus
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
commit fbd4b5d7e2b5a96de231f2c98246838f45e02add
Author: lburgazzoli <lb...@gmail.com>
AuthorDate: Fri May 29 15:10:46 2020 +0200
Remove deployment processor for camel-k-quarkus-loader-xml as the same bits have been implemented in camel-quarkus
---
camel-k-loader-xml/pom.xml | 6 ----
.../camel-k-quarkus-core/runtime/pom.xml | 10 ------
.../camel-k-quarkus-loader-xml/deployment/pom.xml | 4 +++
.../quarkus/deployment/DeploymentProcessor.java | 37 --------------------
.../camel-k-quarkus-loader-xml/runtime/pom.xml | 4 +++
.../k/loader/xml/quarkus/XmlLoaderRecorder.java | 40 ----------------------
6 files changed, 8 insertions(+), 93 deletions(-)
diff --git a/camel-k-loader-xml/pom.xml b/camel-k-loader-xml/pom.xml
index 764a069..084634a 100644
--- a/camel-k-loader-xml/pom.xml
+++ b/camel-k-loader-xml/pom.xml
@@ -60,12 +60,6 @@
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>${jaxb-api.version}</version>
- </dependency>
-
<!-- ****************************** -->
<!-- -->
<!-- TESTS -->
diff --git a/camel-k-quarkus/camel-k-quarkus-core/runtime/pom.xml b/camel-k-quarkus/camel-k-quarkus-core/runtime/pom.xml
index cddd7d6..e358bf1 100644
--- a/camel-k-quarkus/camel-k-quarkus-core/runtime/pom.xml
+++ b/camel-k-quarkus/camel-k-quarkus-core/runtime/pom.xml
@@ -39,12 +39,6 @@
<dependency>
<groupId>org.apache.camel.k</groupId>
<artifactId>camel-k-runtime-core</artifactId>
- <exclusions>
- <exclusion>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
@@ -55,10 +49,6 @@
<artifactId>quarkus-development-mode-spi</artifactId>
<version>${quarkus.version}</version>
</dependency>
- <dependency>
- <groupId>org.jboss.spec.javax.xml.bind</groupId>
- <artifactId>jboss-jaxb-api_2.3_spec</artifactId>
- </dependency>
</dependencies>
<build>
diff --git a/camel-k-quarkus/camel-k-quarkus-loader-xml/deployment/pom.xml b/camel-k-quarkus/camel-k-quarkus-loader-xml/deployment/pom.xml
index 18c6ad9..6acac23 100644
--- a/camel-k-quarkus/camel-k-quarkus-loader-xml/deployment/pom.xml
+++ b/camel-k-quarkus/camel-k-quarkus-loader-xml/deployment/pom.xml
@@ -41,6 +41,10 @@
<dependencies>
<dependency>
+ <groupId>org.apache.camel.quarkus</groupId>
+ <artifactId>camel-quarkus-xml-io-deployment</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.camel.k</groupId>
<artifactId>camel-k-quarkus-loader-xml</artifactId>
</dependency>
diff --git a/camel-k-quarkus/camel-k-quarkus-loader-xml/deployment/src/main/java/org/apache/camel/k/loader/xml/quarkus/deployment/DeploymentProcessor.java b/camel-k-quarkus/camel-k-quarkus-loader-xml/deployment/src/main/java/org/apache/camel/k/loader/xml/quarkus/deployment/DeploymentProcessor.java
deleted file mode 100644
index 26b0389..0000000
--- a/camel-k-quarkus/camel-k-quarkus-loader-xml/deployment/src/main/java/org/apache/camel/k/loader/xml/quarkus/deployment/DeploymentProcessor.java
+++ /dev/null
@@ -1,37 +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.xml.quarkus.deployment;
-
-import io.quarkus.deployment.annotations.BuildStep;
-import io.quarkus.deployment.annotations.ExecutionTime;
-import io.quarkus.deployment.annotations.Record;
-import org.apache.camel.k.loader.xml.quarkus.XmlLoaderRecorder;
-import org.apache.camel.quarkus.core.deployment.spi.CamelRoutesLoaderBuildItems;
-
-public class DeploymentProcessor {
- @BuildStep
- @Record(value = ExecutionTime.STATIC_INIT, optional = true)
- CamelRoutesLoaderBuildItems.Xml xmlLoader(XmlLoaderRecorder recorder) {
- return new CamelRoutesLoaderBuildItems.Xml(recorder.newXMLIORoutesDefinitionLoader());
- }
-
- @BuildStep
- @Record(value = ExecutionTime.STATIC_INIT)
- void initXmlReifiers(XmlLoaderRecorder recorder) {
- recorder.initXmlReifiers();
- }
-}
diff --git a/camel-k-quarkus/camel-k-quarkus-loader-xml/runtime/pom.xml b/camel-k-quarkus/camel-k-quarkus-loader-xml/runtime/pom.xml
index c1f4f4a..4eb3c85 100644
--- a/camel-k-quarkus/camel-k-quarkus-loader-xml/runtime/pom.xml
+++ b/camel-k-quarkus/camel-k-quarkus-loader-xml/runtime/pom.xml
@@ -29,6 +29,10 @@
<dependencies>
<dependency>
+ <groupId>org.apache.camel.quarkus</groupId>
+ <artifactId>camel-quarkus-xml-io</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.camel.k</groupId>
<artifactId>camel-k-quarkus-core</artifactId>
</dependency>
diff --git a/camel-k-quarkus/camel-k-quarkus-loader-xml/runtime/src/main/java/org/apache/camel/k/loader/xml/quarkus/XmlLoaderRecorder.java b/camel-k-quarkus/camel-k-quarkus-loader-xml/runtime/src/main/java/org/apache/camel/k/loader/xml/quarkus/XmlLoaderRecorder.java
deleted file mode 100644
index e7b141a..0000000
--- a/camel-k-quarkus/camel-k-quarkus-loader-xml/runtime/src/main/java/org/apache/camel/k/loader/xml/quarkus/XmlLoaderRecorder.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.loader.xml.quarkus;
-
-import io.quarkus.runtime.RuntimeValue;
-import io.quarkus.runtime.annotations.Recorder;
-import org.apache.camel.model.ValidateDefinition;
-import org.apache.camel.model.validator.PredicateValidatorDefinition;
-import org.apache.camel.reifier.ProcessorReifier;
-import org.apache.camel.reifier.ValidateReifier;
-import org.apache.camel.reifier.validator.PredicateValidatorReifier;
-import org.apache.camel.reifier.validator.ValidatorReifier;
-import org.apache.camel.spi.XMLRoutesDefinitionLoader;
-import org.apache.camel.xml.in.ModelParserXMLRoutesDefinitionLoader;
-
-@Recorder
-public class XmlLoaderRecorder {
- public RuntimeValue<XMLRoutesDefinitionLoader> newXMLIORoutesDefinitionLoader() {
- return new RuntimeValue<>(new ModelParserXMLRoutesDefinitionLoader());
- }
-
- public void initXmlReifiers() {
- ProcessorReifier.registerReifier(ValidateDefinition.class, ValidateReifier::new);
- ValidatorReifier.registerReifier(PredicateValidatorDefinition.class, PredicateValidatorReifier::new);
- }
-}