You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by va...@apache.org on 2020/10/17 08:01:56 UTC
[camel-kafka-connector] branch master updated (d5e333e -> 08ff410)
This is an automated email from the ASF dual-hosted git repository.
valdar pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git.
from d5e333e Updated CHANGELOG.md
new 0a09617 Catalog Order connectors in descriptor generation.
new db9ac6a Moved catalog descriptor generation to camel-kafka-connector-catalog module.
new 08ff410 chore: regen.
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
camel-kafka-connector-catalog/pom.xml | 22 ++++++++++++++
.../resources/descriptors/connectors.properties | 32 ++++++++++----------
connectors/pom.xml | 13 --------
.../descriptor/CollectConnectorDescriptorMojo.java | 35 ++++++++--------------
.../maven/CamelKafkaConnectorUpdateMojo.java | 3 ++
5 files changed, 53 insertions(+), 52 deletions(-)
[camel-kafka-connector] 02/03: Moved catalog descriptor generation
to camel-kafka-connector-catalog module.
Posted by va...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
valdar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git
commit db9ac6a8611b58231ebeab08662c7408a639d9de
Author: Andrea Tarocchi <an...@gmail.com>
AuthorDate: Sat Oct 17 08:26:31 2020 +0200
Moved catalog descriptor generation to camel-kafka-connector-catalog module.
---
camel-kafka-connector-catalog/pom.xml | 22 ++++++++++++++++++++++
connectors/pom.xml | 13 -------------
2 files changed, 22 insertions(+), 13 deletions(-)
diff --git a/camel-kafka-connector-catalog/pom.xml b/camel-kafka-connector-catalog/pom.xml
index 5742bdd..bc29100 100644
--- a/camel-kafka-connector-catalog/pom.xml
+++ b/camel-kafka-connector-catalog/pom.xml
@@ -50,6 +50,12 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.camel.kafkaconnector</groupId>
+ <artifactId>connectors</artifactId>
+ <version>${project.version}</version>
+ <type>pom</type>
+ </dependency>
+ <dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-core-catalog</artifactId>
<version>${camel.version}</version>
@@ -106,6 +112,22 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.camel.kafkaconnector</groupId>
+ <artifactId>camel-kafka-connector-catalog-descriptor-maven-plugin</artifactId>
+ <version>${project.version}</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>update-descriptor-files</goal>
+ </goals>
+ <phase>process-resources</phase>
+ <configuration>
+
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>
diff --git a/connectors/pom.xml b/connectors/pom.xml
index 56bc268..e6f5246 100644
--- a/connectors/pom.xml
+++ b/connectors/pom.xml
@@ -174,19 +174,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.camel.kafkaconnector</groupId>
- <artifactId>camel-kafka-connector-catalog-descriptor-maven-plugin</artifactId>
- <version>${project.version}</version>
- <executions>
- <execution>
- <goals>
- <goal>list-descriptor-files</goal>
- </goals>
- <phase>process-resources</phase>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
[camel-kafka-connector] 01/03: Catalog Order connectors in
descriptor generation.
Posted by va...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
valdar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git
commit 0a0961749b6a0445d22477e966882bad51a755dd
Author: Andrea Tarocchi <an...@gmail.com>
AuthorDate: Sat Oct 17 08:25:03 2020 +0200
Catalog Order connectors in descriptor generation.
---
.../descriptor/CollectConnectorDescriptorMojo.java | 35 ++++++++--------------
.../maven/CamelKafkaConnectorUpdateMojo.java | 3 ++
2 files changed, 15 insertions(+), 23 deletions(-)
diff --git a/tooling/camel-kafka-connector-catalog-descriptor-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/catalog/descriptor/CollectConnectorDescriptorMojo.java b/tooling/camel-kafka-connector-catalog-descriptor-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/catalog/descriptor/CollectConnectorDescriptorMojo.java
index 4049e41..ce4d87e 100644
--- a/tooling/camel-kafka-connector-catalog-descriptor-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/catalog/descriptor/CollectConnectorDescriptorMojo.java
+++ b/tooling/camel-kafka-connector-catalog-descriptor-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/catalog/descriptor/CollectConnectorDescriptorMojo.java
@@ -23,11 +23,11 @@ import java.io.FileInputStream;
import java.io.FileWriter;
import java.io.IOException;
import java.io.InputStreamReader;
+import java.util.Arrays;
+import java.util.stream.Stream;
import org.apache.commons.io.FileUtils;
import org.apache.maven.plugin.AbstractMojo;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProject;
@@ -35,7 +35,7 @@ import org.apache.maven.project.MavenProject;
/**
* Updates connector.properties file
*/
-@Mojo(name = "list-descriptor-files", threadSafe = true)
+@Mojo(name = "update-descriptor-files", threadSafe = true)
public class CollectConnectorDescriptorMojo extends AbstractMojo {
/**
@@ -53,41 +53,29 @@ public class CollectConnectorDescriptorMojo extends AbstractMojo {
/**
* The directory for catalog descriptors
*/
- @Parameter(defaultValue = "${project.directory}/../../camel-kafka-connector-catalog/src/generated/resources/descriptors")
+ @Parameter(defaultValue = "${project.directory}/../src/generated/resources/descriptors")
protected File catalogDescriptorDir;
/**
- * The connectors project name parameter.
- */
- @Parameter(property = "connectors-project-name", defaultValue = "connectors", readonly = true)
- protected String connectorsProjectName;
-
- /**
* Execute goal.
- *
- * @throws MojoExecutionException execution of the main class or one of the
- * threads it generated failed.
- * @throws MojoFailureException something bad happened...
*/
@Override
- public void execute() throws MojoExecutionException, MojoFailureException {
- if (!project.getArtifactId().equals(connectorsProjectName)) {
- getLog()
- .debug("Skipping project " + project.getArtifactId() + " since it is not " + connectorsProjectName + " can be configured with <connectors-project-name> option.");
- return;
- }
+ public void execute() {
try {
executeComponentsReadme();
} catch (IOException e) {
- e.printStackTrace();
+ getLog().error("An error occurred while running camel-kakfa-connector-descriptor-maven-plugin:update-descriptor-files", e);
}
}
- protected void executeComponentsReadme() throws MojoExecutionException, MojoFailureException, IOException {
-
+ protected void executeComponentsReadme() throws IOException {
+ getLog().info("About to scan all projects in" + connectorsDir + " in order to gather descriptors files");
if (connectorsDir != null && connectorsDir.isDirectory()) {
File[] files = connectorsDir.listFiles();
+ getLog().info("Found " + (files != null ? String.valueOf(files.length) : "0") + "directories:");
if (files != null) {
+ Arrays.sort(files);
+ Stream.of(files).filter(f -> f.isDirectory()).forEach(f -> getLog().info(f.getPath()));
StringBuilder sb = new StringBuilder();
for (int i = 0; i < files.length; i++) {
File file = files[i];
@@ -119,6 +107,7 @@ public class CollectConnectorDescriptorMojo extends AbstractMojo {
}
}
File file = FileUtils.getFile(catalogDescriptorDir, "connectors.properties");
+ getLog().info("About to write descriptor to: " + catalogDescriptorDir);
file.createNewFile();
try (BufferedWriter writer = new BufferedWriter(new FileWriter(file))) {
writer.write(sb.toString());
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 03ca7ee..e93b3d0 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
@@ -591,7 +591,10 @@ public class CamelKafkaConnectorUpdateMojo extends AbstractCamelKafkaConnectorMo
} else {
getLog().debug("No changes to website doc file: " + docFileWebsite);
}
+
+ // generate json descriptor src/generated/resources/<connector-name>.json
writeJson(listOptions, getMainDepArtifactId(), connectorDir, ct, packageName + "." + javaClassConnectorName, convertersList, transformsList, aggregationStrategiesList);
+ // generate descriptor src/generated/descriptors/connector-{sink,source}.properties
writeDescriptors(connectorDir, ct);
}
[camel-kafka-connector] 03/03: chore: regen.
Posted by va...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
valdar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git
commit 08ff4109a19dbe59a4d3bd0f5a069376ef2b69ed
Author: Andrea Tarocchi <an...@gmail.com>
AuthorDate: Sat Oct 17 08:26:50 2020 +0200
chore: regen.
---
.../resources/descriptors/connectors.properties | 32 +++++++++++-----------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/camel-kafka-connector-catalog/src/generated/resources/descriptors/connectors.properties b/camel-kafka-connector-catalog/src/generated/resources/descriptors/connectors.properties
index a77388e..0ed7b30 100644
--- a/camel-kafka-connector-catalog/src/generated/resources/descriptors/connectors.properties
+++ b/camel-kafka-connector-catalog/src/generated/resources/descriptors/connectors.properties
@@ -35,10 +35,17 @@ camel-avro-sink
camel-aws-cw-sink
camel-aws-ddb-sink
camel-aws-ddbstream-source
+camel-aws-ec2-sink
+camel-aws-ecs-sink
+camel-aws-eks-sink
+camel-aws-iam-sink
camel-aws-kinesis-firehose-sink
camel-aws-kinesis-source
camel-aws-kinesis-sink
+camel-aws-kms-sink
camel-aws-lambda-sink
+camel-aws-mq-sink
+camel-aws-msk-sink
camel-aws-s3-source
camel-aws-s3-sink
camel-aws-sdb-sink
@@ -53,10 +60,17 @@ camel-aws2-athena-sink
camel-aws2-cw-sink
camel-aws2-ddb-sink
camel-aws2-ddbstream-source
+camel-aws2-ec2-sink
+camel-aws2-ecs-sink
+camel-aws2-eks-sink
+camel-aws2-iam-sink
camel-aws2-kinesis-firehose-sink
camel-aws2-kinesis-source
camel-aws2-kinesis-sink
+camel-aws2-kms-sink
camel-aws2-lambda-sink
+camel-aws2-mq-sink
+camel-aws2-msk-sink
camel-aws2-s3-source
camel-aws2-s3-sink
camel-aws2-ses-sink
@@ -274,6 +288,8 @@ camel-json-validator-sink
camel-jsonata-sink
camel-jt400-source
camel-jt400-sink
+camel-kafka-source
+camel-kafka-sink
camel-kubernetes-config-maps-sink
camel-kubernetes-deployments-source
camel-kubernetes-deployments-sink
@@ -507,19 +523,3 @@ camel-zendesk-sink
camel-zookeeper-source
camel-zookeeper-sink
camel-zookeeper-master-source
-camel-aws-ec2-sink
-camel-aws-ecs-sink
-camel-aws-eks-sink
-camel-aws-iam-sink
-camel-aws-kms-sink
-camel-aws-mq-sink
-camel-aws-msk-sink
-camel-aws2-ec2-sink
-camel-aws2-ecs-sink
-camel-aws2-eks-sink
-camel-aws2-iam-sink
-camel-aws2-kms-sink
-camel-aws2-mq-sink
-camel-aws2-msk-sink
-camel-kafka-source
-camel-kafka-sink