You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2020/02/22 08:57:18 UTC
[camel-spring-boot] 08/10: Fixed camel-spring-cloud-* starters
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch claus
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 06e786d6ffe3300559c4b2e3382e9038112ecf6b
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sat Feb 22 09:13:23 2020 +0100
Fixed camel-spring-cloud-* starters
---
.../camel-spring-cloud-netflix-starter/pom.xml | 16 ++--------------
.../camel-spring-cloud-zookeeper-starter/pom.xml | 4 ++--
.../springboot/maven/AbstractSpringBootGenerator.java | 4 +++-
3 files changed, 7 insertions(+), 17 deletions(-)
diff --git a/components-starter/camel-spring-cloud-netflix-starter/pom.xml b/components-starter/camel-spring-cloud-netflix-starter/pom.xml
index 83a7370..9c1e82d 100644
--- a/components-starter/camel-spring-cloud-netflix-starter/pom.xml
+++ b/components-starter/camel-spring-cloud-netflix-starter/pom.xml
@@ -35,21 +35,9 @@
<version>${spring-boot-version}</version>
</dependency>
<dependency>
- <groupId>org.apache.camel</groupId>
+ <groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-spring-cloud-netflix</artifactId>
- <version>${camel-version}</version>
- <!--START OF GENERATED CODE-->
- <exclusions>
- <exclusion>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- </exclusion>
- <exclusion>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-core</artifactId>
- </exclusion>
- </exclusions>
- <!--END OF GENERATED CODE-->
+ <version>${project.version}</version>
</dependency>
<!--START OF GENERATED CODE-->
<dependency>
diff --git a/components-starter/camel-spring-cloud-zookeeper-starter/pom.xml b/components-starter/camel-spring-cloud-zookeeper-starter/pom.xml
index 1bc5d9a..140df86 100644
--- a/components-starter/camel-spring-cloud-zookeeper-starter/pom.xml
+++ b/components-starter/camel-spring-cloud-zookeeper-starter/pom.xml
@@ -35,9 +35,9 @@
<version>${spring-boot-version}</version>
</dependency>
<dependency>
- <groupId>org.apache.camel</groupId>
+ <groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-spring-cloud-zookeeper</artifactId>
- <version>${camel-version}</version>
+ <version>${project.version}</version>
<!--START OF GENERATED CODE-->
<exclusions>
<exclusion>
diff --git a/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/AbstractSpringBootGenerator.java b/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/AbstractSpringBootGenerator.java
index 3dd5b0e..3297eb2 100644
--- a/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/AbstractSpringBootGenerator.java
+++ b/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/AbstractSpringBootGenerator.java
@@ -83,9 +83,11 @@ public abstract class AbstractSpringBootGenerator extends AbstractMojo {
protected String getMainDepGroupId() {
if ("camel-spring-boot-starter".equals(project.getArtifactId())) {
return "org.apache.camel.springboot";
- } else if (project.getArtifactId().startsWith("camel-spring-cloud")) {
+ } else if (project.getArtifactId().startsWith("camel-spring-cloud-")) {
+ // any of the -cloud-xxx are from camel-spring-boot
return "org.apache.camel.springboot";
} else {
+ // others are from camel
return "org.apache.camel";
}
}