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 2022/08/18 08:11:30 UTC

[camel-k-runtime] 08/10: chore: remove unused modules and dependencies

This is an automated email from the ASF dual-hosted git repository.

lburgazzoli pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git

commit 4c02ee6c8eb29e1a4c8cf30ffcd82791ce3911f1
Author: Luca Burgazzoli <lb...@gmail.com>
AuthorDate: Wed Aug 17 19:31:51 2022 +0200

    chore: remove unused modules and dependencies
---
 .../camel-knative/camel-knative-test/pom.xml       |  39 --------
 .../knative/test/KnativeEnvironmentSupport.java    | 100 ---------------------
 components/camel-knative/pom.xml                   |  36 --------
 components/pom.xml                                 |  34 -------
 pom.xml                                            |  51 -----------
 support/camel-k-maven-plugin/pom.xml               |   8 --
 support/camel-k-test/pom.xml                       |  16 ----
 7 files changed, 284 deletions(-)

diff --git a/components/camel-knative/camel-knative-test/pom.xml b/components/camel-knative/camel-knative-test/pom.xml
deleted file mode 100644
index ed2e1c06..00000000
--- a/components/camel-knative/camel-knative-test/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-knative-parent</artifactId>
-        <version>1.14.0-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>camel-knative-test</artifactId>
-
-    <dependencies>
-
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-knative-api</artifactId>
-        </dependency>
-
-    </dependencies>
-
-</project>
diff --git a/components/camel-knative/camel-knative-test/src/main/java/org/apache/camel/component/knative/test/KnativeEnvironmentSupport.java b/components/camel-knative/camel-knative-test/src/main/java/org/apache/camel/component/knative/test/KnativeEnvironmentSupport.java
deleted file mode 100644
index 0f6e72d3..00000000
--- a/components/camel-knative/camel-knative-test/src/main/java/org/apache/camel/component/knative/test/KnativeEnvironmentSupport.java
+++ /dev/null
@@ -1,100 +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.component.knative.test;
-
-import java.util.Map;
-
-import org.apache.camel.component.knative.spi.Knative;
-import org.apache.camel.component.knative.spi.KnativeEnvironment;
-import org.apache.camel.component.knative.spi.KnativeResource;
-
-public final class KnativeEnvironmentSupport {
-    private KnativeEnvironmentSupport() {
-    }
-
-    public static KnativeResource endpoint(Knative.EndpointKind endpointKind, String name, String url) {
-        return KnativeEnvironment.serviceBuilder(Knative.Type.endpoint, name)
-            .withUrl(url)
-            .withEndpointKind(endpointKind)
-            .build();
-    }
-
-    public static KnativeResource endpoint(Knative.EndpointKind endpointKind, String name, String url, Map<String, String> metadata) {
-        return KnativeEnvironment.serviceBuilder(Knative.Type.endpoint, name)
-            .withUrl(url)
-            .withMeta(metadata)
-            .withEndpointKind(endpointKind)
-            .build();
-    }
-
-    public static KnativeResource sourceEndpoint(String name, Map<String, String> metadata) {
-        return KnativeEnvironment.serviceBuilder(Knative.Type.endpoint, name)
-            .withMeta(metadata)
-            .withEndpointKind(Knative.EndpointKind.source)
-            .build();
-    }
-
-    public static KnativeResource channel(Knative.EndpointKind endpointKind, String name, String url) {
-        return KnativeEnvironment.serviceBuilder(Knative.Type.channel, name)
-            .withUrl(url)
-            .withEndpointKind(endpointKind)
-            .build();
-    }
-
-    public static KnativeResource channel(Knative.EndpointKind endpointKind, String name, String url, Map<String, String> metadata) {
-        return KnativeEnvironment.serviceBuilder(Knative.Type.channel, name)
-            .withUrl(url)
-            .withMeta(metadata)
-            .withEndpointKind(endpointKind)
-            .build();
-    }
-
-    public static KnativeResource sourceChannel(String name, Map<String, String> metadata) {
-        return KnativeEnvironment.serviceBuilder(Knative.Type.channel, name)
-            .withMeta(metadata)
-            .withEndpointKind(Knative.EndpointKind.source)
-            .build();
-    }
-
-    public static KnativeResource event(Knative.EndpointKind endpointKind, String name, String url) {
-        return KnativeEnvironment.serviceBuilder(Knative.Type.event, name)
-            .withUrl(url)
-            .withEndpointKind(endpointKind)
-            .build();
-    }
-
-    public static KnativeResource sourceEvent(String name) {
-        return KnativeEnvironment.serviceBuilder(Knative.Type.event, name)
-            .withEndpointKind(Knative.EndpointKind.source)
-            .build();
-    }
-
-    public static KnativeResource sourceEvent(String name, Map<String, String> metadata) {
-        return KnativeEnvironment.serviceBuilder(Knative.Type.event, name)
-            .withMeta(metadata)
-            .withEndpointKind(Knative.EndpointKind.source)
-            .build();
-    }
-
-    public static KnativeResource event(Knative.EndpointKind endpointKind, String name, String url, Map<String, String> metadata) {
-        return KnativeEnvironment.serviceBuilder(Knative.Type.event, name)
-            .withUrl(url)
-            .withMeta(metadata)
-            .withEndpointKind(endpointKind)
-            .build();
-    }
-}
diff --git a/components/camel-knative/pom.xml b/components/camel-knative/pom.xml
deleted file mode 100644
index 8ee6e0da..00000000
--- a/components/camel-knative/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-components</artifactId>
-        <version>1.14.0-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <packaging>pom</packaging>
-
-    <artifactId>camel-knative-parent</artifactId>
-
-
-    <modules>
-        <module>camel-knative-test</module>
-    </modules>
-
-</project>
diff --git a/components/pom.xml b/components/pom.xml
deleted file mode 100644
index dfea4e05..00000000
--- a/components/pom.xml
+++ /dev/null
@@ -1,34 +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.14.0-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <packaging>pom</packaging>
-
-    <artifactId>camel-k-components</artifactId>
-
-    <modules>
-        <module>camel-knative</module>
-    </modules>
-</project>
diff --git a/pom.xml b/pom.xml
index 1eb085aa..53e00e87 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,12 +48,9 @@
 
         <!-- camel-k -->
         <groovy-version>3.0.12</groovy-version>
-        <spock-version>2.1-groovy-3.0</spock-version>
         <immutables-version>2.9.0</immutables-version>
-        <semver4j-version>3.1.0</semver4j-version>
 
         <!-- overridden camel dependencies versions -->
-        <javapoet-version>1.13.0</javapoet-version>
         <json-schema-validator-version>2.2.14</json-schema-validator-version>
         <jandex-version>2.4.3.Final</jandex-version>
 
@@ -376,7 +373,6 @@
 
     <modules>
         <module>support</module>
-        <module>components</module>
 
         <module>camel-k-core</module>
 
@@ -458,16 +454,6 @@
                 <artifactId>camel-knative-test</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.apache.camel.k</groupId>
-                <artifactId>camel-kamelet</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.camel.k</groupId>
-                <artifactId>camel-kamelet-reify</artifactId>
-                <version>${project.version}</version>
-            </dependency>
 
             <!-- runtime -->
             <dependency>
@@ -580,16 +566,6 @@
                 <artifactId>camel-k-webhook-deployment</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.apache.camel.k</groupId>
-                <artifactId>camel-k-kamelet-reify</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.camel.k</groupId>
-                <artifactId>camel-k-kamelet-reify-deployment</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.apache.camel.k</groupId>
                 <artifactId>camel-k-runtime</artifactId>
@@ -601,23 +577,6 @@
                 <version>${project.version}</version>
             </dependency>
 
-            <!-- loaders -->
-            <dependency>
-                <groupId>org.apache.camel.k</groupId>
-                <artifactId>camel-k-loader-yaml</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.camel.k</groupId>
-                <artifactId>camel-k-loader-yaml-deployment</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.camel.k</groupId>
-                <artifactId>camel-k-loader-yaml-impl</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-
             <!-- itests -->
             <dependency>
                 <groupId>org.apache.camel.k</groupId>
@@ -695,11 +654,6 @@
                 <artifactId>snakeyaml</artifactId>
                 <version>${snakeyaml-version}</version>
             </dependency>
-            <dependency>
-                <groupId>com.vdurmont</groupId>
-                <artifactId>semver4j</artifactId>
-                <version>${semver4j-version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.immutables</groupId>
                 <artifactId>value</artifactId>
@@ -710,11 +664,6 @@
                 <artifactId>jandex</artifactId>
                 <version>${jandex-version}</version>
             </dependency>
-            <dependency>
-                <groupId>com.squareup</groupId>
-                <artifactId>javapoet</artifactId>
-                <version>${javapoet-version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.junit.jupiter</groupId>
                 <artifactId>junit-jupiter</artifactId>
diff --git a/support/camel-k-maven-plugin/pom.xml b/support/camel-k-maven-plugin/pom.xml
index df529ca2..d7a27e89 100644
--- a/support/camel-k-maven-plugin/pom.xml
+++ b/support/camel-k-maven-plugin/pom.xml
@@ -120,18 +120,10 @@
             <artifactId>jackson-dataformat-yaml</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.vdurmont</groupId>
-            <artifactId>semver4j</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.jboss</groupId>
             <artifactId>jandex</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.squareup</groupId>
-            <artifactId>javapoet</artifactId>
-        </dependency>
 
         <dependency>
             <groupId>org.junit.jupiter</groupId>
diff --git a/support/camel-k-test/pom.xml b/support/camel-k-test/pom.xml
index e8ad1ea3..baebf5ee 100644
--- a/support/camel-k-test/pom.xml
+++ b/support/camel-k-test/pom.xml
@@ -55,22 +55,6 @@
             </exclusions>
         </dependency>
 
-        <dependency>
-            <groupId>org.spockframework</groupId>
-            <artifactId>spock-core</artifactId>
-            <version>${spock-version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.codehaus.groovy</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>junit</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
         <dependency>
             <groupId>org.codehaus.groovy</groupId>
             <artifactId>groovy</artifactId>