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 15:59:49 UTC
[camel-kafka-connector] 01/05: 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 camel-master
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git
commit 8abfa8aa991b81dc4ca6d7c4c741f6e84da403c5
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Feb 19 14:19:04 2021 +0100
Generate just one connector package: .zip or .tar.gz
---
pom.xml | 1 -
.../kafkaconnector/maven/docs/UpdateDocComponentsListMojo.java | 4 +---
.../maven/docs/dto/CamelKafkaConnectorTableOptionModel.java | 9 ---------
.../resources/camel-kafka-connector-template-package.template | 1 -
.../resources/template-connector-package.xml} | 7 ++-----
5 files changed, 3 insertions(+), 19 deletions(-)
diff --git a/pom.xml b/pom.xml
index 51ad5db..1a8ceac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -337,7 +337,6 @@
<directory>${project.build.directory}</directory>
<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>
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..4b22b49 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,9 +152,7 @@ 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]";
- singleConnector.setDownloadLinkZip(downloadLinkZip);
+ String downloadLinkTar = repositoryPath + singleConnector.getName() + "/" + lastReleasedVersion + "/" + singleConnector.getName() + "-" + lastReleasedVersion + "-package.tar.gz[Download]";
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..159f032 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
@@ -23,7 +23,6 @@ public class CamelKafkaConnectorTableOptionModel {
private boolean source;
private String docsSink = "";
private String docsSource = "";
- private String downloadLinkZip = "";
private String downloadLinkTar = "";
public String getName() {
@@ -66,14 +65,6 @@ public class CamelKafkaConnectorTableOptionModel {
this.docsSource = docsSource;
}
- public String getDownloadLinkZip() {
- return downloadLinkZip;
- }
-
- public void setDownloadLinkZip(String downloadLinkZip) {
- this.downloadLinkZip = downloadLinkZip;
- }
-
public String getDownloadLinkTar() {
return downloadLinkTar;
}
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..105c893 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
@@ -24,7 +24,6 @@
<!-- Assembles a packaged version targeting OS installation. -->
<id>package</id>
<formats>
- <format>zip</format>
<format>tar.gz</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
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/test/resources/template-connector-package.xml
similarity index 86%
copy from tooling/camel-kafka-connector-generator-maven-plugin/src/main/resources/camel-kafka-connector-template-package.template
copy to tooling/camel-kafka-connector-generator-maven-plugin/src/test/resources/template-connector-package.xml
index 5548ee7..2a0d738 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/test/resources/template-connector-package.xml
@@ -1,3 +1,4 @@
+<#ftl output_format="XML" strip_whitespace=false>
<?xml version="1.0" encoding="UTF-8"?>
<!--
@@ -17,14 +18,10 @@
limitations under the License.
-->
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2
- http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+<assembly>
<!-- Assembles a packaged version targeting OS installation. -->
<id>package</id>
<formats>
- <format>zip</format>
<format>tar.gz</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>