You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2021/02/19 07:32:49 UTC
[camel-kafka-connector] 01/04: Generate just one connector package:
.zip or .tar.gz
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch only-zip-for-me
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git
commit 8a4e15d745fa687861d2c2402912b8717e70cf2f
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Feb 19 08:01:15 2021 +0100
Generate just one connector package: .zip or .tar.gz
---
.../resources/archetype-resources/src/main/assembly/package.xml | 1 -
.../resources/archetype-resources/src/main/assembly/package.xml | 1 -
.../resources/archetype-resources/src/main/assembly/package.xml | 1 -
connectors/template-connector-package.xml | 1 -
pom.xml | 1 -
.../src/main/resources/connectors.mvel | 4 ++--
.../kafkaconnector/maven/docs/UpdateDocComponentsListMojo.java | 4 +---
.../maven/docs/dto/CamelKafkaConnectorTableOptionModel.java | 9 ---------
.../src/main/resources/connectors.mvel | 4 ++--
.../resources/camel-kafka-connector-template-package.template | 1 -
.../src/test/resources/template-connector-package.xml | 1 -
11 files changed, 5 insertions(+), 23 deletions(-)
diff --git a/archetypes/camel-kafka-connector-extensible-apicurio-archetype/src/main/resources/archetype-resources/src/main/assembly/package.xml b/archetypes/camel-kafka-connector-extensible-apicurio-archetype/src/main/resources/archetype-resources/src/main/assembly/package.xml
index 4fd2529..bfd73d0 100644
--- a/archetypes/camel-kafka-connector-extensible-apicurio-archetype/src/main/resources/archetype-resources/src/main/assembly/package.xml
+++ b/archetypes/camel-kafka-connector-extensible-apicurio-archetype/src/main/resources/archetype-resources/src/main/assembly/package.xml
@@ -22,7 +22,6 @@
<id>package</id>
<formats>
<format>zip</format>
- <format>tar.gz</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
diff --git a/archetypes/camel-kafka-connector-extensible-archetype/src/main/resources/archetype-resources/src/main/assembly/package.xml b/archetypes/camel-kafka-connector-extensible-archetype/src/main/resources/archetype-resources/src/main/assembly/package.xml
index 4fd2529..bfd73d0 100644
--- a/archetypes/camel-kafka-connector-extensible-archetype/src/main/resources/archetype-resources/src/main/assembly/package.xml
+++ b/archetypes/camel-kafka-connector-extensible-archetype/src/main/resources/archetype-resources/src/main/assembly/package.xml
@@ -22,7 +22,6 @@
<id>package</id>
<formats>
<format>zip</format>
- <format>tar.gz</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
diff --git a/archetypes/camel-kafka-connector-extensible-dataformat-archetype/src/main/resources/archetype-resources/src/main/assembly/package.xml b/archetypes/camel-kafka-connector-extensible-dataformat-archetype/src/main/resources/archetype-resources/src/main/assembly/package.xml
index 4fd2529..bfd73d0 100644
--- a/archetypes/camel-kafka-connector-extensible-dataformat-archetype/src/main/resources/archetype-resources/src/main/assembly/package.xml
+++ b/archetypes/camel-kafka-connector-extensible-dataformat-archetype/src/main/resources/archetype-resources/src/main/assembly/package.xml
@@ -22,7 +22,6 @@
<id>package</id>
<formats>
<format>zip</format>
- <format>tar.gz</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
diff --git a/connectors/template-connector-package.xml b/connectors/template-connector-package.xml
index 558fa6c..4bdcaad 100644
--- a/connectors/template-connector-package.xml
+++ b/connectors/template-connector-package.xml
@@ -23,7 +23,6 @@
<id>package</id>
<formats>
<format>zip</format>
- <format>tar.gz</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
diff --git a/pom.xml b/pom.xml
index 42bcfde..9784432 100644
--- a/pom.xml
+++ b/pom.xml
@@ -338,7 +338,6 @@
<includes>
<include>${project.artifactId}-${project.version}-sources.jar</include>
<include>${project.artifactId}-${project.version}-package.zip</include>
- <include>${project.artifactId}-${project.version}-package.tar.gz</include>
<!--XXX: keep this in sync with distribution/pom.xml <finalName> tag-->
<include>camel-kafka-connector-${project.version}-src.zip</include>
</includes>
diff --git a/tooling/camel-kafka-connector-catalog-descriptor-maven-plugin/src/main/resources/connectors.mvel b/tooling/camel-kafka-connector-catalog-descriptor-maven-plugin/src/main/resources/connectors.mvel
index 2bb4eb9..78c53c0 100644
--- a/tooling/camel-kafka-connector-catalog-descriptor-maven-plugin/src/main/resources/connectors.mvel
+++ b/tooling/camel-kafka-connector-catalog-descriptor-maven-plugin/src/main/resources/connectors.mvel
@@ -4,8 +4,8 @@ Number of Camel Kafka connectors: @{options.size}
[width="100%",cols="4,1,1,1,1,1,1",options="header"]
|===
-| Name | Sink Support | Source Suppport | Sink Docs | Source Docs | Download Zip | Download Tar.gz
-@foreach{row : options}| *@{row.getName()}* | @{row.isSink()} | @{row.isSource()} | @{row.getDocsSink()} | @{row.getDocsSource()} | @{row.getDownloadLinkZip()} | @{row.getDownloadLinkTar()}
+| Name | Sink Support | Source Suppport | Sink Docs | Source Docs | Download
+@foreach{row : options}| *@{row.getName()}* | @{row.isSink()} | @{row.isSource()} | @{row.getDocsSink()} | @{row.getDocsSource()} | @{row.getDownloadLinkZip()}
@end{}|===
@end{}
\ No newline at end of file
diff --git a/tooling/camel-kafka-connector-docs-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/docs/UpdateDocComponentsListMojo.java b/tooling/camel-kafka-connector-docs-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/docs/UpdateDocComponentsListMojo.java
index a9163bd..438b036 100644
--- a/tooling/camel-kafka-connector-docs-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/docs/UpdateDocComponentsListMojo.java
+++ b/tooling/camel-kafka-connector-docs-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/docs/UpdateDocComponentsListMojo.java
@@ -152,10 +152,8 @@ public class UpdateDocComponentsListMojo extends AbstractMojo {
singleConnector.setDocsSource(XREF_CONNECTOR_LINK_PREFIX + connectorFinal + SOURCE_CONNECTOR_LINK_SUFFIX_ADOC);
}
}
- String downloadLinkZip = repositoryPath + singleConnector.getName() + "/" + lastReleasedVersion + "/" + singleConnector.getName() + "-" + lastReleasedVersion + "-package.zip[Download Zip]";
- String downloadLinkTar = repositoryPath + singleConnector.getName() + "/" + lastReleasedVersion + "/" + singleConnector.getName() + "-" + lastReleasedVersion + "-package.tar.gz[Download Tar.gz]";
+ String downloadLinkZip = repositoryPath + singleConnector.getName() + "/" + lastReleasedVersion + "/" + singleConnector.getName() + "-" + lastReleasedVersion + "-package.zip[Download]";
singleConnector.setDownloadLinkZip(downloadLinkZip);
- singleConnector.setDownloadLinkTar(downloadLinkTar);
options.add(singleConnector);
}
}
diff --git a/tooling/camel-kafka-connector-docs-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/docs/dto/CamelKafkaConnectorTableOptionModel.java b/tooling/camel-kafka-connector-docs-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/docs/dto/CamelKafkaConnectorTableOptionModel.java
index 065d57c..cb5222b 100644
--- a/tooling/camel-kafka-connector-docs-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/docs/dto/CamelKafkaConnectorTableOptionModel.java
+++ b/tooling/camel-kafka-connector-docs-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/docs/dto/CamelKafkaConnectorTableOptionModel.java
@@ -24,7 +24,6 @@ public class CamelKafkaConnectorTableOptionModel {
private String docsSink = "";
private String docsSource = "";
private String downloadLinkZip = "";
- private String downloadLinkTar = "";
public String getName() {
return name;
@@ -74,14 +73,6 @@ public class CamelKafkaConnectorTableOptionModel {
this.downloadLinkZip = downloadLinkZip;
}
- public String getDownloadLinkTar() {
- return downloadLinkTar;
- }
-
- public void setDownloadLinkTar(String downloadLinkTar) {
- this.downloadLinkTar = downloadLinkTar;
- }
-
@Override
public String toString() {
return "CamelKafkaConnectorTableOptionModel [name=" + name + ", sink=" + sink + ", source=" + source + ", docsSink=" + docsSink + ", docsSource=" + docsSource + "]";
diff --git a/tooling/camel-kafka-connector-docs-maven-plugin/src/main/resources/connectors.mvel b/tooling/camel-kafka-connector-docs-maven-plugin/src/main/resources/connectors.mvel
index 2bb4eb9..fe1796d 100644
--- a/tooling/camel-kafka-connector-docs-maven-plugin/src/main/resources/connectors.mvel
+++ b/tooling/camel-kafka-connector-docs-maven-plugin/src/main/resources/connectors.mvel
@@ -4,8 +4,8 @@ Number of Camel Kafka connectors: @{options.size}
[width="100%",cols="4,1,1,1,1,1,1",options="header"]
|===
-| Name | Sink Support | Source Suppport | Sink Docs | Source Docs | Download Zip | Download Tar.gz
-@foreach{row : options}| *@{row.getName()}* | @{row.isSink()} | @{row.isSource()} | @{row.getDocsSink()} | @{row.getDocsSource()} | @{row.getDownloadLinkZip()} | @{row.getDownloadLinkTar()}
+| Name | Sink Support | Source Suppport | Sink Docs | Source Docs | Download
+@foreach{row : options}| *@{row.getName()}* | @{row.isSink()} | @{row.isSource()} | @{row.getDocsSink()} | @{row.getDocsSource()} | @{row.getDownloadLinkZip()}
@end{}|===
@end{}
\ No newline at end of file
diff --git a/tooling/camel-kafka-connector-generator-maven-plugin/src/main/resources/camel-kafka-connector-template-package.template b/tooling/camel-kafka-connector-generator-maven-plugin/src/main/resources/camel-kafka-connector-template-package.template
index 5548ee7..bb7f6ae 100644
--- a/tooling/camel-kafka-connector-generator-maven-plugin/src/main/resources/camel-kafka-connector-template-package.template
+++ b/tooling/camel-kafka-connector-generator-maven-plugin/src/main/resources/camel-kafka-connector-template-package.template
@@ -25,7 +25,6 @@
<id>package</id>
<formats>
<format>zip</format>
- <format>tar.gz</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
diff --git a/tooling/camel-kafka-connector-generator-maven-plugin/src/test/resources/template-connector-package.xml b/tooling/camel-kafka-connector-generator-maven-plugin/src/test/resources/template-connector-package.xml
index 558fa6c..4bdcaad 100644
--- a/tooling/camel-kafka-connector-generator-maven-plugin/src/test/resources/template-connector-package.xml
+++ b/tooling/camel-kafka-connector-generator-maven-plugin/src/test/resources/template-connector-package.xml
@@ -23,7 +23,6 @@
<id>package</id>
<formats>
<format>zip</format>
- <format>tar.gz</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>