Remove camel-quarkus-support-common

Fixes #3243
apache · Nov 25, 2021 · f2be8e5 · f2be8e5
1 parent 85665e9
commit f2be8e5
Show file tree

Hide file tree

Showing 14 changed files with 5 additions and 237 deletions.
diff --git a/catalog/pom.xml b/catalog/pom.xml
@@ -3678,19 +3678,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>org.apache.camel.quarkus</groupId>
-            <artifactId>camel-quarkus-support-common</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.quarkus</groupId>
             <artifactId>camel-quarkus-support-commons-logging</artifactId>

diff --git a/extensions-core/core/deployment/pom.xml b/extensions-core/core/deployment/pom.xml
@@ -39,11 +39,6 @@
         </dependency>
 
         <!-- camel -->
-        <dependency>
-            <groupId>org.apache.camel.quarkus</groupId>
-            <artifactId>camel-quarkus-support-common-deployment</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>
             <artifactId>camel-quarkus-core</artifactId>

diff --git a/...ore/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelProcessor.java b/...ore/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelProcessor.java
@@ -46,6 +46,7 @@
 import io.quarkus.runtime.RuntimeValue;
 import org.apache.camel.Converter;
 import org.apache.camel.impl.converter.BaseTypeConverterRegistry;
+import org.apache.camel.quarkus.core.CamelCapabilities;
 import org.apache.camel.quarkus.core.CamelConfig;
 import org.apache.camel.quarkus.core.CamelConfigFlags;
 import org.apache.camel.quarkus.core.CamelProducers;
@@ -71,7 +72,6 @@
 import org.apache.camel.quarkus.core.deployment.spi.RoutesBuilderClassExcludeBuildItem;
 import org.apache.camel.quarkus.core.deployment.util.CamelSupport;
 import org.apache.camel.quarkus.core.deployment.util.PathFilter;
-import org.apache.camel.quarkus.support.common.CamelCapabilities;
 import org.apache.camel.spi.TypeConverterLoader;
 import org.apache.camel.spi.TypeConverterRegistry;
 import org.jboss.jandex.AnnotationTarget;

diff --git a/...e/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/ConsumeProcessor.java b/...e/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/ConsumeProcessor.java
@@ -51,9 +51,9 @@
 import io.quarkus.runtime.RuntimeValue;
 import org.apache.camel.Consume;
 import org.apache.camel.model.RoutesDefinition;
+import org.apache.camel.quarkus.core.CamelCapabilities;
 import org.apache.camel.quarkus.core.ConsumeRecorder;
 import org.apache.camel.quarkus.core.deployment.spi.CamelContextBuildItem;
-import org.apache.camel.quarkus.support.common.CamelCapabilities;
 import org.apache.camel.util.StringHelper;
 import org.jboss.jandex.AnnotationInstance;
 import org.jboss.jandex.AnnotationTarget;

diff --git a/...ment/src/main/java/org/apache/camel/quarkus/core/deployment/InjectionPointsProcessor.java b/...ment/src/main/java/org/apache/camel/quarkus/core/deployment/InjectionPointsProcessor.java
@@ -52,10 +52,10 @@
 import org.apache.camel.FluentProducerTemplate;
 import org.apache.camel.Produce;
 import org.apache.camel.ProducerTemplate;
+import org.apache.camel.quarkus.core.CamelCapabilities;
 import org.apache.camel.quarkus.core.CamelRecorder;
 import org.apache.camel.quarkus.core.InjectionPointsRecorder;
 import org.apache.camel.quarkus.core.deployment.spi.CamelRuntimeTaskBuildItem;
-import org.apache.camel.quarkus.support.common.CamelCapabilities;
 import org.jboss.jandex.AnnotationInstance;
 import org.jboss.jandex.AnnotationTarget;
 import org.jboss.jandex.AnnotationTarget.Kind;

diff --git a/extensions-core/core/runtime/pom.xml b/extensions-core/core/runtime/pom.xml
@@ -55,10 +55,6 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-arc</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.apache.camel.quarkus</groupId>
-            <artifactId>camel-quarkus-support-common</artifactId>
-        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-development-mode-spi</artifactId>

diff --git a/...kus/support/common/CamelCapabilities.java → ...camel/quarkus/core/CamelCapabilities.java b/...kus/support/common/CamelCapabilities.java → ...camel/quarkus/core/CamelCapabilities.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.quarkus.support.common;
+package org.apache.camel.quarkus.core;
 
 public final class CamelCapabilities {
     public static final String BEAN = "org.apache.camel.bean";

diff --git a/extensions-support/common/deployment/pom.xml b/extensions-support/common/deployment/pom.xml
diff --git a/extensions-support/common/pom.xml b/extensions-support/common/pom.xml
diff --git a/extensions-support/common/runtime/pom.xml b/extensions-support/common/runtime/pom.xml
diff --git a/extensions-support/common/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions-support/common/runtime/src/main/resources/META-INF/quarkus-extension.yaml
diff --git a/extensions-support/pom.xml b/extensions-support/pom.xml
@@ -39,7 +39,6 @@
         <module>aws2</module>
         <module>azure-core</module>
         <module>bouncycastle</module>
-        <module>common</module>
         <module>commons-logging</module>
         <module>consul-client</module>
         <module>debezium</module>

diff --git a/.../main/java/org/apache/camel/quarkus/component/csimple/deployment/CSimpleXmlProcessor.java b/.../main/java/org/apache/camel/quarkus/component/csimple/deployment/CSimpleXmlProcessor.java
@@ -29,11 +29,11 @@
 import io.quarkus.deployment.annotations.BuildStep;
 import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.camel.impl.engine.DefaultPackageScanResourceResolver;
+import org.apache.camel.quarkus.core.CamelCapabilities;
 import org.apache.camel.quarkus.core.CamelConfig;
 import org.apache.camel.quarkus.core.deployment.LanguageExpressionContentHandler;
 import org.apache.camel.quarkus.core.deployment.spi.CamelRoutesBuilderClassBuildItem;
 import org.apache.camel.quarkus.core.deployment.util.CamelSupport;
-import org.apache.camel.quarkus.support.common.CamelCapabilities;
 import org.apache.camel.spi.Resource;
 import org.apache.camel.util.AntPathMatcher;
 import org.jboss.logging.Logger;

diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
@@ -5127,16 +5127,6 @@
                 <artifactId>camel-quarkus-support-bouncycastle-deployment</artifactId>
                 <version>${camel-quarkus.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.apache.camel.quarkus</groupId>
-                <artifactId>camel-quarkus-support-common</artifactId>
-                <version>${camel-quarkus.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.camel.quarkus</groupId>
-                <artifactId>camel-quarkus-support-common-deployment</artifactId>
-                <version>${camel-quarkus.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.apache.camel.quarkus</groupId>
                 <artifactId>camel-quarkus-support-commons-logging</artifactId>