This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch issue-515 in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git
commit 6d373484dd4409147785e592ea9c2b364c54ce7c Author: Andrea Cosentino <[email protected]> AuthorDate: Tue Oct 6 19:01:06 2020 +0200 Move model classes CamelKafkaConnectorModel and CamelKafkaConnectorOptionModel in their own module --- .../pom.xml | 9 +++-- .../maven/CamelKafkaConnectorUpdateMojo.java | 4 +-- .../maven/utils/JsonMapperKafkaConnector.java | 4 +-- tooling/camel-kafka-connector-model/pom.xml | 42 ++++++++++++++++++++++ .../model}/CamelKafkaConnectorModel.java | 2 +- .../model}/CamelKafkaConnectorOptionModel.java | 2 +- tooling/pom.xml | 1 + 7 files changed, 53 insertions(+), 11 deletions(-) diff --git a/tooling/camel-kafka-connector-generator-maven-plugin/pom.xml b/tooling/camel-kafka-connector-generator-maven-plugin/pom.xml index ab9581d..a831fbe 100644 --- a/tooling/camel-kafka-connector-generator-maven-plugin/pom.xml +++ b/tooling/camel-kafka-connector-generator-maven-plugin/pom.xml @@ -136,11 +136,10 @@ <version>${camel.version}</version> </dependency> <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-tooling-model</artifactId> - <version>${camel.version}</version> - </dependency> - + <groupId>org.apache.camel.kafkaconnector</groupId> + <artifactId>camel-kafka-connector-model</artifactId> + <version>${project.version}</version> + </dependency> <!-- jandex for annotation processing --> <dependency> diff --git a/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/CamelKafkaConnectorUpdateMojo.java b/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/CamelKafkaConnectorUpdateMojo.java index 520860e..a2533cc 100644 --- a/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/CamelKafkaConnectorUpdateMojo.java +++ b/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/CamelKafkaConnectorUpdateMojo.java @@ -50,10 +50,10 @@ import org.w3c.dom.Node; import org.xml.sax.SAXException; import freemarker.template.Template; -import org.apache.camel.kafkaconnector.maven.dto.CamelKafkaConnectorModel; -import org.apache.camel.kafkaconnector.maven.dto.CamelKafkaConnectorOptionModel; import org.apache.camel.kafkaconnector.maven.utils.JsonMapperKafkaConnector; import org.apache.camel.kafkaconnector.maven.utils.MavenUtils; +import org.apache.camel.kafkaconnector.model.CamelKafkaConnectorModel; +import org.apache.camel.kafkaconnector.model.CamelKafkaConnectorOptionModel; import org.apache.camel.maven.packaging.MvelHelper; import org.apache.camel.tooling.model.BaseOptionModel; import org.apache.camel.tooling.model.ComponentModel; diff --git a/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/utils/JsonMapperKafkaConnector.java b/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/utils/JsonMapperKafkaConnector.java index 669c601..afe2815 100644 --- a/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/utils/JsonMapperKafkaConnector.java +++ b/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/utils/JsonMapperKafkaConnector.java @@ -18,8 +18,8 @@ package org.apache.camel.kafkaconnector.maven.utils; import java.util.List; -import org.apache.camel.kafkaconnector.maven.dto.CamelKafkaConnectorModel; -import org.apache.camel.kafkaconnector.maven.dto.CamelKafkaConnectorOptionModel; +import org.apache.camel.kafkaconnector.model.CamelKafkaConnectorModel; +import org.apache.camel.kafkaconnector.model.CamelKafkaConnectorOptionModel; import org.apache.camel.util.json.JsonObject; public final class JsonMapperKafkaConnector { diff --git a/tooling/camel-kafka-connector-model/pom.xml b/tooling/camel-kafka-connector-model/pom.xml new file mode 100644 index 0000000..4ebb0e3 --- /dev/null +++ b/tooling/camel-kafka-connector-model/pom.xml @@ -0,0 +1,42 @@ +<?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/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.apache.camel.kafkaconnector</groupId> + <artifactId>parent</artifactId> + <version>0.6.0-SNAPSHOT</version> + <relativePath>../parent/pom.xml</relativePath> + </parent> + + <artifactId>camel-kafka-connector-model</artifactId> + <packaging>jar</packaging> + <name>Camel-Kafka-Connector :: Model</name> + + <dependencies> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-tooling-model</artifactId> + <version>${camel.version}</version> + </dependency> + </dependencies> + +</project> diff --git a/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/dto/CamelKafkaConnectorModel.java b/tooling/camel-kafka-connector-model/src/main/java/org/apache/camel/kafkaconnector/model/CamelKafkaConnectorModel.java similarity index 98% rename from tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/dto/CamelKafkaConnectorModel.java rename to tooling/camel-kafka-connector-model/src/main/java/org/apache/camel/kafkaconnector/model/CamelKafkaConnectorModel.java index d14a9b2..4e4ad97 100644 --- a/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/dto/CamelKafkaConnectorModel.java +++ b/tooling/camel-kafka-connector-model/src/main/java/org/apache/camel/kafkaconnector/model/CamelKafkaConnectorModel.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.kafkaconnector.maven.dto; +package org.apache.camel.kafkaconnector.model; import java.util.List; diff --git a/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/dto/CamelKafkaConnectorOptionModel.java b/tooling/camel-kafka-connector-model/src/main/java/org/apache/camel/kafkaconnector/model/CamelKafkaConnectorOptionModel.java similarity index 97% rename from tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/dto/CamelKafkaConnectorOptionModel.java rename to tooling/camel-kafka-connector-model/src/main/java/org/apache/camel/kafkaconnector/model/CamelKafkaConnectorOptionModel.java index 069ad66..96cf01b 100644 --- a/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/dto/CamelKafkaConnectorOptionModel.java +++ b/tooling/camel-kafka-connector-model/src/main/java/org/apache/camel/kafkaconnector/model/CamelKafkaConnectorOptionModel.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.kafkaconnector.maven.dto; +package org.apache.camel.kafkaconnector.model; import org.apache.camel.tooling.model.Strings; diff --git a/tooling/pom.xml b/tooling/pom.xml index 97dffd5..708dbd8 100644 --- a/tooling/pom.xml +++ b/tooling/pom.xml @@ -33,6 +33,7 @@ <name>Camel-Kafka-Connector :: Tooling Parent</name> <modules> + <module>camel-kafka-connector-model</module> <module>camel-kafka-connector-generator-maven-plugin</module> <module>camel-kafka-connector-docs-maven-plugin</module> </modules>
