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 <andrea.taroc...@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)); }