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/04/28 21:42:27 UTC

[camel-kafka-connector] branch master updated (2c3e418 -> c319e83)

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 2c3e418  Merge pull request #160 from apache/docs-up
     new 94246b4  Resolved a maven warning and added SHA512 checksum generation.
     new 6291090  camel-kafka-connector-generator-maven-plugin: Implemented the possibility to specify a scope in addeditional depencendices fix #158
     new 4ecc255  chore: connectors regen after fix 3158
     new 905a6df  Enabled unused import sourcecheck fix #156
     new c319e83  chore: fixed unused imports.

The 5 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:
 .../src/main/resources/camel-checkstyle.xml        |  4 +--
 ...mel-kafka-connector-fix-dependencies.properties |  2 +-
 connectors/camel-sjms2-kafka-connector/pom.xml     |  1 +
 .../camel/kafkaconnector/utils/TaskHelperTest.java |  1 -
 parent/pom.xml                                     |  7 ++---
 pom.xml                                            | 31 ++++++++++++++++++++++
 .../maven/CamelKafkaConnectorUpdateMojo.java       |  4 +--
 .../kafkaconnector/maven/utils/MavenUtils.java     |  9 ++++++-
 8 files changed, 49 insertions(+), 10 deletions(-)


[camel-kafka-connector] 01/05: Resolved a maven warning and added SHA512 checksum 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 94246b414e755925086141e3743170b37123b7f3
Author: Andrea Tarocchi <an...@gmail.com>
AuthorDate: Tue Apr 28 22:31:54 2020 +0200

    Resolved a maven warning and added SHA512 checksum generation.
---
 parent/pom.xml |  7 ++++---
 pom.xml        | 31 +++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index f5e1e29..c930377 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -2,9 +2,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache</groupId>
-        <artifactId>apache</artifactId>
-        <version>21</version>
+        <groupId>org.apache.camel.kafkaconnector</groupId>
+        <artifactId>camel-kafka-connector-aggregator</artifactId>
+        <version>0.2.0-SNAPSHOT</version>
+        <relativePath>..</relativePath>
     </parent>
 
     <groupId>org.apache.camel.kafkaconnector</groupId>
diff --git a/pom.xml b/pom.xml
index 6376b52..37402be 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,6 +42,7 @@
         <maven-surefire-plugin.version>3.0.0-M4</maven-surefire-plugin.version>
         <maven-javadoc-plugin.version>3.1.1</maven-javadoc-plugin.version>
         <maven-source-plugin.version>3.1.0</maven-source-plugin.version>
+        <maven-checksum-maven-plugin.version>1.7</maven-checksum-maven-plugin.version>
     </properties>
 
     <modules>
@@ -303,6 +304,36 @@
                             </execution>
                         </executions>
                     </plugin>
+                    <plugin>
+                        <groupId>net.nicoulaj.maven.plugins</groupId>
+                        <artifactId>checksum-maven-plugin</artifactId>
+                        <version>${maven-checksum-maven-plugin.version}</version>
+                        <executions>
+                            <execution>
+                                <id>source-release-checksum</id>
+                                <goals>
+                                    <goal>files</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <algorithms>
+                                <algorithm>SHA-512</algorithm>
+                            </algorithms>
+                            <csvSummary>false</csvSummary>
+                            <fileSets>
+                                <fileSet>
+                                    <directory>${project.build.directory}</directory>
+                                    <includes>
+                                        <include>${project.artifactId}-${project.version}.jar</include>
+                                        <include>${project.artifactId}-${project.version}-package.zip</include>
+                                        <include>${project.artifactId}-${project.version}-package.tar*</include>
+                                    </includes>
+                                </fileSet>
+                            </fileSets>
+                            <failIfNoFiles>false</failIfNoFiles><!-- usually, no file to do checksum: don't consider error -->
+                        </configuration>
+                    </plugin>
                 </plugins>
             </build>
         </profile>


[camel-kafka-connector] 03/05: chore: connectors regen after fix 3158

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 4ecc2558eba76ebe7f38dcff88355d166a1e73d5
Author: Andrea Tarocchi <an...@gmail.com>
AuthorDate: Tue Apr 28 23:01:48 2020 +0200

    chore: connectors regen after fix 3158
---
 connectors/camel-sjms2-kafka-connector/pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/connectors/camel-sjms2-kafka-connector/pom.xml b/connectors/camel-sjms2-kafka-connector/pom.xml
index 57c7199..a62bb63 100644
--- a/connectors/camel-sjms2-kafka-connector/pom.xml
+++ b/connectors/camel-sjms2-kafka-connector/pom.xml
@@ -48,6 +48,7 @@
     <dependency>
       <groupId>org.apache.activemq</groupId>
       <artifactId>activemq-client</artifactId>
+      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.camel.kafkaconnector</groupId>


[camel-kafka-connector] 04/05: Enabled unused import sourcecheck fix #156

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 905a6dff3df6ca5337e11fc702fdcaa892965e6e
Author: Andrea Tarocchi <an...@gmail.com>
AuthorDate: Tue Apr 28 23:04:36 2020 +0200

    Enabled unused import sourcecheck fix #156
---
 buildingtools/src/main/resources/camel-checkstyle.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/buildingtools/src/main/resources/camel-checkstyle.xml b/buildingtools/src/main/resources/camel-checkstyle.xml
index f699143..6e17b7d 100644
--- a/buildingtools/src/main/resources/camel-checkstyle.xml
+++ b/buildingtools/src/main/resources/camel-checkstyle.xml
@@ -143,9 +143,9 @@ lengths, if/try depths, etc...
          -->
         <module name="IllegalImport"/> <!-- defaults to sun.* packages -->
         <module name="RedundantImport"/>
-        <!-- When you javadoc {@link } an import is added that checkstyle thinks is unused import.
+
         <module name="UnusedImports"/>
-        -->
+
         <module name="ImportOrder">
             <property name="groups" value="java,javax,org.w3c,org.xml,junit"/>
             <property name="ordered" value="true"/>


[camel-kafka-connector] 05/05: chore: fixed unused imports.

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 c319e83c407f783cf4a36dfcb489263f5a01624a
Author: Andrea Tarocchi <an...@gmail.com>
AuthorDate: Tue Apr 28 23:17:42 2020 +0200

    chore: fixed unused imports.
---
 .../test/java/org/apache/camel/kafkaconnector/utils/TaskHelperTest.java  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/core/src/test/java/org/apache/camel/kafkaconnector/utils/TaskHelperTest.java b/core/src/test/java/org/apache/camel/kafkaconnector/utils/TaskHelperTest.java
index 3688d76..2f32329 100644
--- a/core/src/test/java/org/apache/camel/kafkaconnector/utils/TaskHelperTest.java
+++ b/core/src/test/java/org/apache/camel/kafkaconnector/utils/TaskHelperTest.java
@@ -18,7 +18,6 @@ package org.apache.camel.kafkaconnector.utils;
 
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Map;
 
 import org.junit.jupiter.api.Test;


[camel-kafka-connector] 02/05: camel-kafka-connector-generator-maven-plugin: Implemented the possibility to specify a scope in addeditional depencendices fix #158

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 62910905fdee9ab44fc53ff0dde38e875b1b66ba
Author: Andrea Tarocchi <an...@gmail.com>
AuthorDate: Tue Apr 28 23:01:04 2020 +0200

    camel-kafka-connector-generator-maven-plugin: Implemented the possibility to specify a scope in addeditional depencendices fix #158
---
 connectors/camel-kafka-connector-fix-dependencies.properties     | 2 +-
 .../kafkaconnector/maven/CamelKafkaConnectorUpdateMojo.java      | 4 ++--
 .../org/apache/camel/kafkaconnector/maven/utils/MavenUtils.java  | 9 ++++++++-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/connectors/camel-kafka-connector-fix-dependencies.properties b/connectors/camel-kafka-connector-fix-dependencies.properties
index a0c5d07..d5666ee 100644
--- a/connectors/camel-kafka-connector-fix-dependencies.properties
+++ b/connectors/camel-kafka-connector-fix-dependencies.properties
@@ -22,6 +22,6 @@
 global=org.apache.camel.kafkaconnector:camel-kafka-connector
 
 # we add a default connection factory maven dependency (variables can be used as ${varname})
-camel-sjms2=org.apache.activemq:activemq-client
+camel-sjms2=org.apache.activemq:activemq-client::compile
 exclude_camel-sjms2=
 additional_properties_camel-sjms2=camel.component.sjms2.connection-factory=#class:org.apache.activemq.ActiveMQConnectionFactory,camel.component.sjms2.connection-factory.brokerURL=tcp://localhost:61616
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 ab15031..a5e7907 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
@@ -250,8 +250,8 @@ public class CamelKafkaConnectorUpdateMojo extends AbstractCamelKafkaConnectorMo
         boolean inGlobal = false;
         for (String gp : globalProps) {
             String camelGav = getMainDepGroupId() + ":" + getMainDepArtifactId();
-            String camelSpringBootGav = project.getGroupId() + ":" + project.getArtifactId();
-            if (gp.equals(camelGav) || gp.equals(camelSpringBootGav)) {
+            String camelKafkaConnectorGav = project.getGroupId() + ":" + project.getArtifactId();
+            if (gp.equals(camelGav) || gp.equals(camelKafkaConnectorGav)) {
                 inGlobal = true;
                 break;
             }
diff --git a/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/utils/MavenUtils.java b/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/utils/MavenUtils.java
index 7b999c2..c3aed14 100644
--- a/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/utils/MavenUtils.java
+++ b/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/utils/MavenUtils.java
@@ -190,7 +190,8 @@ public final class MavenUtils {
                 String[] comps = dep.split("\\:");
                 String groupIdStr = comps[0];
                 String artifactIdStr = comps[1];
-                String versionStr = comps.length > 2 ? comps[2] : null;
+                String versionStr = comps.length > 2 && !comps[2].isEmpty() ? comps[2] : null;
+                String scopeStr = comps.length > 3 ? comps[3] : null;
 
                 Element groupId = pom.createElement("groupId");
                 groupId.setTextContent(groupIdStr);
@@ -206,6 +207,12 @@ public final class MavenUtils {
                     dependency.appendChild(version);
                 }
 
+                if (scopeStr != null) {
+                    Element scope = pom.createElement("scope");
+                    scope.setTextContent(scopeStr);
+                    dependency.appendChild(scope);
+                }
+
             }
             dependencies.appendChild(pom.createComment(generatedSectionStopMarker));
         }