You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2021/05/17 08:42:34 UTC
[camel-quarkus] 23/28: Adjust capability configuration for Quarkus
2.x (#2576)
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 410d9b9e555b5b9376e3a59b6af396fb86c6210a
Author: Alexey Loubyansky <ol...@redhat.com>
AuthorDate: Tue May 11 22:35:58 2021 +0200
Adjust capability configuration for Quarkus 2.x (#2576)
---
.../camel/quarkus/core/deployment/CamelFeature.java | 7 -------
.../camel/quarkus/core/deployment/CamelProcessor.java | 2 +-
.../quarkus/core/deployment/main/CamelMainProcessor.java | 7 -------
extensions-core/core/runtime/pom.xml | 9 +++++++++
.../camel/quarkus/core/CamelQuarkusClassResolver.java | 16 ++++++++++++++++
.../quarkus/dsl/xml/io/deployment/XmlIoDslProcessor.java | 8 --------
extensions-core/xml-io-dsl/runtime/pom.xml | 5 +++++
.../component/xml/jaxb/deployment/XmlJaxbProcessor.java | 12 ------------
extensions-core/xml-jaxb/runtime/pom.xml | 5 +++++
.../component/xml/jaxp/deployment/XmlJaxpProcessor.java | 7 -------
extensions-core/xml-jaxp/runtime/pom.xml | 5 +++++
.../src/main/resources/META-INF/quarkus-extension.yaml | 1 +
.../camel/quarkus/support/common/CamelCapabilities.java | 2 ++
.../component/atlasmap/graalvm/Substitutions.java | 16 ++++++++++++++++
poms/bom/pom.xml | 10 +++++-----
15 files changed, 65 insertions(+), 47 deletions(-)
diff --git a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelFeature.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelFeature.java
index 276dbe9..dda8327 100644
--- a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelFeature.java
+++ b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelFeature.java
@@ -17,9 +17,7 @@
package org.apache.camel.quarkus.core.deployment;
import io.quarkus.deployment.annotations.BuildStep;
-import io.quarkus.deployment.builditem.CapabilityBuildItem;
import io.quarkus.deployment.builditem.FeatureBuildItem;
-import org.apache.camel.quarkus.support.common.CamelCapabilities;
class CamelFeature {
private static final String FEATURE = "camel-core";
@@ -28,9 +26,4 @@ class CamelFeature {
FeatureBuildItem feature() {
return new FeatureBuildItem(FEATURE);
}
-
- @BuildStep
- CapabilityBuildItem capability() {
- return new CapabilityBuildItem(CamelCapabilities.CORE);
- }
}
diff --git a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelProcessor.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelProcessor.java
index d819be8..839e9c6 100644
--- a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelProcessor.java
+++ b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelProcessor.java
@@ -303,7 +303,7 @@ class CamelProcessor {
@BuildStep
@Record(ExecutionTime.STATIC_INIT)
void disableXmlReifiers(CamelRecorder recorder, Capabilities capabilities) {
- if (!capabilities.isCapabilityPresent(CamelCapabilities.XML)) {
+ if (!capabilities.isCapabilityWithPrefixPresent(CamelCapabilities.XML)) {
LOGGER.debug("Camel XML capability not detected, disable XML reifiers");
recorder.disableXmlReifiers();
}
diff --git a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/main/CamelMainProcessor.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/main/CamelMainProcessor.java
index 928b87a..cc329c8 100644
--- a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/main/CamelMainProcessor.java
+++ b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/main/CamelMainProcessor.java
@@ -29,7 +29,6 @@ import io.quarkus.deployment.annotations.ExecutionTime;
import io.quarkus.deployment.annotations.Overridable;
import io.quarkus.deployment.annotations.Record;
import io.quarkus.deployment.builditem.AdditionalIndexedClassesBuildItem;
-import io.quarkus.deployment.builditem.CapabilityBuildItem;
import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
import io.quarkus.runtime.RuntimeValue;
import io.quarkus.runtime.annotations.QuarkusMain;
@@ -55,7 +54,6 @@ import org.apache.camel.quarkus.main.CamelMainApplication;
import org.apache.camel.quarkus.main.CamelMainConfig;
import org.apache.camel.quarkus.main.CamelMainProducers;
import org.apache.camel.quarkus.main.CamelMainRecorder;
-import org.apache.camel.quarkus.support.common.CamelCapabilities;
import org.jboss.jandex.DotName;
import org.jboss.jandex.IndexView;
@@ -67,11 +65,6 @@ public class CamelMainProcessor {
}
@BuildStep(onlyIf = CamelMainEnabled.class)
- CapabilityBuildItem capability() {
- return new CapabilityBuildItem(CamelCapabilities.MAIN);
- }
-
- @BuildStep(onlyIf = CamelMainEnabled.class)
@Record(value = ExecutionTime.STATIC_INIT, optional = true)
public CamelRoutesLoaderBuildItems.Registry routesLoader(CamelConfig config, CamelRecorder recorder) {
return config.routesDiscovery.enabled
diff --git a/extensions-core/core/runtime/pom.xml b/extensions-core/core/runtime/pom.xml
index 1ec06a2..c64d8a1 100644
--- a/extensions-core/core/runtime/pom.xml
+++ b/extensions-core/core/runtime/pom.xml
@@ -113,6 +113,15 @@
<plugin>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+ <configuration>
+ <capabilities>
+ <provides>org.apache.camel</provides>
+ <providesIf>
+ <positive>org.apache.camel.quarkus.core.deployment.main.spi.CamelMainEnabled</positive>
+ <name>org.apache.camel.main</name>
+ </providesIf>
+ </capabilities>
+ </configuration>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
diff --git a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelQuarkusClassResolver.java b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelQuarkusClassResolver.java
index 361763c..f6c1d00 100644
--- a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelQuarkusClassResolver.java
+++ b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelQuarkusClassResolver.java
@@ -1,3 +1,19 @@
+/*
+ * 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.quarkus.core;
import java.io.InputStream;
diff --git a/extensions-core/xml-io-dsl/deployment/src/main/java/org/apache/camel/quarkus/dsl/xml/io/deployment/XmlIoDslProcessor.java b/extensions-core/xml-io-dsl/deployment/src/main/java/org/apache/camel/quarkus/dsl/xml/io/deployment/XmlIoDslProcessor.java
index cbe00a6..1ef7a72 100644
--- a/extensions-core/xml-io-dsl/deployment/src/main/java/org/apache/camel/quarkus/dsl/xml/io/deployment/XmlIoDslProcessor.java
+++ b/extensions-core/xml-io-dsl/deployment/src/main/java/org/apache/camel/quarkus/dsl/xml/io/deployment/XmlIoDslProcessor.java
@@ -18,9 +18,7 @@
package org.apache.camel.quarkus.dsl.xml.io.deployment;
import io.quarkus.deployment.annotations.BuildStep;
-import io.quarkus.deployment.builditem.CapabilityBuildItem;
import io.quarkus.deployment.builditem.FeatureBuildItem;
-import org.apache.camel.quarkus.support.common.CamelCapabilities;
public class XmlIoDslProcessor {
private static final String FEATURE = "camel-xml-io-dsl";
@@ -29,10 +27,4 @@ public class XmlIoDslProcessor {
FeatureBuildItem feature() {
return new FeatureBuildItem(FEATURE);
}
-
- @BuildStep
- CapabilityBuildItem capability() {
- return new CapabilityBuildItem(CamelCapabilities.XML);
- }
-
}
diff --git a/extensions-core/xml-io-dsl/runtime/pom.xml b/extensions-core/xml-io-dsl/runtime/pom.xml
index 1359efd..14a92e2 100644
--- a/extensions-core/xml-io-dsl/runtime/pom.xml
+++ b/extensions-core/xml-io-dsl/runtime/pom.xml
@@ -67,6 +67,11 @@
<plugin>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+ <configuration>
+ <capabilities>
+ <provides>org.apache.camel.xml.io.dsl</provides>
+ </capabilities>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/extensions-core/xml-jaxb/deployment/src/main/java/org/apache/camel/quarkus/component/xml/jaxb/deployment/XmlJaxbProcessor.java b/extensions-core/xml-jaxb/deployment/src/main/java/org/apache/camel/quarkus/component/xml/jaxb/deployment/XmlJaxbProcessor.java
index 01e3d45..fe4cce2 100644
--- a/extensions-core/xml-jaxb/deployment/src/main/java/org/apache/camel/quarkus/component/xml/jaxb/deployment/XmlJaxbProcessor.java
+++ b/extensions-core/xml-jaxb/deployment/src/main/java/org/apache/camel/quarkus/component/xml/jaxb/deployment/XmlJaxbProcessor.java
@@ -16,20 +16,15 @@
*/
package org.apache.camel.quarkus.component.xml.jaxb.deployment;
-import java.util.Arrays;
-import java.util.List;
-
import io.quarkus.deployment.annotations.BuildStep;
import io.quarkus.deployment.annotations.ExecutionTime;
import io.quarkus.deployment.annotations.Record;
-import io.quarkus.deployment.builditem.CapabilityBuildItem;
import io.quarkus.deployment.builditem.FeatureBuildItem;
import io.quarkus.jaxb.deployment.JaxbFileRootBuildItem;
import org.apache.camel.quarkus.component.xml.jaxb.XmlJaxbRecorder;
import org.apache.camel.quarkus.core.deployment.spi.CamelModelJAXBContextFactoryBuildItem;
import org.apache.camel.quarkus.core.deployment.spi.CamelModelToXMLDumperBuildItem;
import org.apache.camel.quarkus.core.deployment.util.CamelSupport;
-import org.apache.camel.quarkus.support.common.CamelCapabilities;
class XmlJaxbProcessor {
@@ -46,13 +41,6 @@ class XmlJaxbProcessor {
}
@BuildStep
- List<CapabilityBuildItem> capabilities() {
- return Arrays.asList(
- new CapabilityBuildItem(CamelCapabilities.XML),
- new CapabilityBuildItem(CamelCapabilities.XML_JAXB));
- }
-
- @BuildStep
@Record(value = ExecutionTime.STATIC_INIT, optional = true)
CamelModelJAXBContextFactoryBuildItem contextFactory(XmlJaxbRecorder recorder) {
return new CamelModelJAXBContextFactoryBuildItem(recorder.newContextFactory());
diff --git a/extensions-core/xml-jaxb/runtime/pom.xml b/extensions-core/xml-jaxb/runtime/pom.xml
index 536fdce..6d12527 100644
--- a/extensions-core/xml-jaxb/runtime/pom.xml
+++ b/extensions-core/xml-jaxb/runtime/pom.xml
@@ -89,6 +89,11 @@
<plugin>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+ <configuration>
+ <capabilities>
+ <provides>org.apache.camel.xml.jaxb</provides>
+ </capabilities>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/extensions-core/xml-jaxp/deployment/src/main/java/org/apache/camel/quarkus/component/xml/jaxp/deployment/XmlJaxpProcessor.java b/extensions-core/xml-jaxp/deployment/src/main/java/org/apache/camel/quarkus/component/xml/jaxp/deployment/XmlJaxpProcessor.java
index 18f49cd..5decedd 100644
--- a/extensions-core/xml-jaxp/deployment/src/main/java/org/apache/camel/quarkus/component/xml/jaxp/deployment/XmlJaxpProcessor.java
+++ b/extensions-core/xml-jaxp/deployment/src/main/java/org/apache/camel/quarkus/component/xml/jaxp/deployment/XmlJaxpProcessor.java
@@ -18,10 +18,8 @@ package org.apache.camel.quarkus.component.xml.jaxp.deployment;
import io.quarkus.deployment.annotations.BuildProducer;
import io.quarkus.deployment.annotations.BuildStep;
-import io.quarkus.deployment.builditem.CapabilityBuildItem;
import io.quarkus.deployment.builditem.FeatureBuildItem;
import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
-import org.apache.camel.quarkus.support.common.CamelCapabilities;
class XmlJaxpProcessor {
@@ -33,11 +31,6 @@ class XmlJaxpProcessor {
}
@BuildStep
- CapabilityBuildItem capability() {
- return new CapabilityBuildItem(CamelCapabilities.XML);
- }
-
- @BuildStep
void reflective(BuildProducer<ReflectiveClassBuildItem> reflectiveClass) {
reflectiveClass.produce(
new ReflectiveClassBuildItem(
diff --git a/extensions-core/xml-jaxp/runtime/pom.xml b/extensions-core/xml-jaxp/runtime/pom.xml
index 717ca30..f2ff21e 100644
--- a/extensions-core/xml-jaxp/runtime/pom.xml
+++ b/extensions-core/xml-jaxp/runtime/pom.xml
@@ -66,6 +66,11 @@
<plugin>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+ <configuration>
+ <capabilities>
+ <provides>org.apache.camel.xml.jaxp</provides>
+ </capabilities>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/extensions-jvm/apns/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions-jvm/apns/runtime/src/main/resources/META-INF/quarkus-extension.yaml
index 76188a0..7d21ccd 100644
--- a/extensions-jvm/apns/runtime/src/main/resources/META-INF/quarkus-extension.yaml
+++ b/extensions-jvm/apns/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -30,3 +30,4 @@ metadata:
- "integration"
status:
- "preview"
+ - "deprecated"
\ No newline at end of file
diff --git a/extensions-support/common/runtime/src/main/java/org/apache/camel/quarkus/support/common/CamelCapabilities.java b/extensions-support/common/runtime/src/main/java/org/apache/camel/quarkus/support/common/CamelCapabilities.java
index 31a042f..a70224b 100644
--- a/extensions-support/common/runtime/src/main/java/org/apache/camel/quarkus/support/common/CamelCapabilities.java
+++ b/extensions-support/common/runtime/src/main/java/org/apache/camel/quarkus/support/common/CamelCapabilities.java
@@ -21,7 +21,9 @@ public final class CamelCapabilities {
public static final String CORE = "org.apache.camel";
public static final String MAIN = "org.apache.camel.main";
public static final String XML = "org.apache.camel.xml";
+ public static final String XML_IO_DSL = "org.apache.camel.xml.io.dsl";
public static final String XML_JAXB = "org.apache.camel.xml.jaxb";
+ public static final String XML_JAXP = "org.apache.camel.xml.jaxp";
private CamelCapabilities() {
}
diff --git a/extensions/atlasmap/runtime/src/main/java/org/apache/camel/quarkus/component/atlasmap/graalvm/Substitutions.java b/extensions/atlasmap/runtime/src/main/java/org/apache/camel/quarkus/component/atlasmap/graalvm/Substitutions.java
index 53779cf..571c7cc 100644
--- a/extensions/atlasmap/runtime/src/main/java/org/apache/camel/quarkus/component/atlasmap/graalvm/Substitutions.java
+++ b/extensions/atlasmap/runtime/src/main/java/org/apache/camel/quarkus/component/atlasmap/graalvm/Substitutions.java
@@ -1,3 +1,19 @@
+/*
+ * 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.quarkus.component.atlasmap.graalvm;
import java.util.Set;
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index 3e00573..13bee01 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -5864,6 +5864,11 @@
<version>${eddsa.version}</version>
</dependency>
<dependency>
+ <groupId>net.minidev</groupId>
+ <artifactId>json-smart</artifactId>
+ <version>${json-smart.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.antlr</groupId>
<artifactId>antlr</artifactId>
<version>${antlr3.version}</version>
@@ -6130,11 +6135,6 @@
<version>${snakeyaml.version}</version>
</dependency>
<dependency>
- <groupId>net.minidev</groupId>
- <artifactId>json-smart</artifactId>
- <version>${json-smart.version}</version>
- </dependency>
- <dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
<version>${xalan.version}</version>