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:10 UTC
[camel-spring-boot] branch claus created (now 10e9c42)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch claus
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git.
at 10e9c42 Fixed camel-spring-cloud-* starters
This branch includes the following new commits:
new ede3a24 Remove not used maven profiles in camel-spring-boot from release argument
new 2d75360 Fix camel-jetty not adding camel-apt as dependency
new f9d9a07 Fix camel-jaxp-starter
new ed32c3b Fix camel-jaxp-starter to rename
new 788e344 Fix camel-jetty-starter
new e3e4b91 Fixed SB Generator after project moved to camel-spring-boot
new 3b0471a Fixed camel-spring-cloud-consul-starter
new 06e786d Fixed camel-spring-cloud-* starters
new 2015786 Fix camel-jaxp-starter to rename
new 10e9c42 Fixed camel-spring-cloud-* starters
The 10 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.
[camel-spring-boot] 02/10: Fix camel-jetty not adding camel-apt as
dependency
Posted by da...@apache.org.
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 2d753605ff6182f6d2f7fade22895d68ecd563f0
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sat Feb 22 08:08:52 2020 +0100
Fix camel-jetty not adding camel-apt as dependency
---
.../src/main/resources/spring-boot-fix-dependencies.properties | 3 ---
1 file changed, 3 deletions(-)
diff --git a/tooling/camel-spring-boot-generator-maven-plugin/src/main/resources/spring-boot-fix-dependencies.properties b/tooling/camel-spring-boot-generator-maven-plugin/src/main/resources/spring-boot-fix-dependencies.properties
index dc48206..2d22af9 100644
--- a/tooling/camel-spring-boot-generator-maven-plugin/src/main/resources/spring-boot-fix-dependencies.properties
+++ b/tooling/camel-spring-boot-generator-maven-plugin/src/main/resources/spring-boot-fix-dependencies.properties
@@ -32,9 +32,6 @@ camel-guava-eventbus=com.google.guava:guava:${google-guava-version}
# Defaulting to netty in the starter
camel-hl7=org.apache.camel:camel-netty:${camel-version}
-# Camel Core requires on APT for the usage of CollectionStringBuffer.
-# Remove this dependency if it was a mistake
-camel-jetty=org.apache.camel:apt:${camel-version}
camel-jbpm=org.apache.geronimo.specs:geronimo-jms_1.1_spec
camel-jcr=org.apache.lucene:lucene-core:${lucene3-version}
camel-jms=org.apache.geronimo.specs:geronimo-jms_1.1_spec
[camel-spring-boot] 07/10: Fixed camel-spring-cloud-consul-starter
Posted by da...@apache.org.
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 3b0471af10bd4ca415bd94a703ef9edc8d0bb17b
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sat Feb 22 08:57:24 2020 +0100
Fixed camel-spring-cloud-consul-starter
---
.../camel-spring-cloud-consul-starter/pom.xml | 16 ++--------------
1 file changed, 2 insertions(+), 14 deletions(-)
diff --git a/components-starter/camel-spring-cloud-consul-starter/pom.xml b/components-starter/camel-spring-cloud-consul-starter/pom.xml
index fa49bf0..767df04 100644
--- a/components-starter/camel-spring-cloud-consul-starter/pom.xml
+++ b/components-starter/camel-spring-cloud-consul-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-consul</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>
[camel-spring-boot] 05/10: Fix camel-jetty-starter
Posted by da...@apache.org.
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 788e34428c7ca929c492d51b967a11d5bdc576d0
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sat Feb 22 08:42:48 2020 +0100
Fix camel-jetty-starter
---
components-starter/camel-jetty-starter/pom.xml | 5 -----
1 file changed, 5 deletions(-)
diff --git a/components-starter/camel-jetty-starter/pom.xml b/components-starter/camel-jetty-starter/pom.xml
index ba349a0..6933baf 100644
--- a/components-starter/camel-jetty-starter/pom.xml
+++ b/components-starter/camel-jetty-starter/pom.xml
@@ -48,11 +48,6 @@
<groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-spring-boot-starter</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>apt</artifactId>
- <version>${camel-version}</version>
- </dependency>
<!--END OF GENERATED CODE-->
</dependencies>
</project>
[camel-spring-boot] 06/10: Fixed SB Generator after project moved
to camel-spring-boot
Posted by da...@apache.org.
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 e3e4b9146186d4f771c86562c38677b58e8935e3
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sat Feb 22 08:57:09 2020 +0100
Fixed SB Generator after project moved to camel-spring-boot
---
.../camel/springboot/maven/AbstractSpringBootGenerator.java | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
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 8b5524c..3dd5b0e 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
@@ -81,8 +81,13 @@ public abstract class AbstractSpringBootGenerator extends AbstractMojo {
}
protected String getMainDepGroupId() {
- return "camel-spring-boot-starter".equals(project.getArtifactId())
- ? "org.apache.camel.springboot" : "org.apache.camel";
+ if ("camel-spring-boot-starter".equals(project.getArtifactId())) {
+ return "org.apache.camel.springboot";
+ } else if (project.getArtifactId().startsWith("camel-spring-cloud")) {
+ return "org.apache.camel.springboot";
+ } else {
+ return "org.apache.camel";
+ }
}
protected Artifact getMainDep() {
[camel-spring-boot] 09/10: Fix camel-jaxp-starter to rename
Posted by da...@apache.org.
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 20157868e2afffaebb1b649e0d50eeea5cc13cca
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sat Feb 22 09:30:59 2020 +0100
Fix camel-jaxp-starter to rename
---
tooling/camel-spring-boot-dependencies/pom.xml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/tooling/camel-spring-boot-dependencies/pom.xml b/tooling/camel-spring-boot-dependencies/pom.xml
index f30de28..7a1a909 100644
--- a/tooling/camel-spring-boot-dependencies/pom.xml
+++ b/tooling/camel-spring-boot-dependencies/pom.xml
@@ -1008,11 +1008,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel.springboot</groupId>
- <artifactId>camel-jaxp-starter</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-jbpm-starter</artifactId>
<version>${project.version}</version>
</dependency>
@@ -1798,6 +1793,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel.springboot</groupId>
+ <artifactId>camel-xml-jaxp-starter</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-xmlsecurity-starter</artifactId>
<version>${project.version}</version>
</dependency>
[camel-spring-boot] 01/10: Remove not used maven profiles in
camel-spring-boot from release argument
Posted by da...@apache.org.
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 ede3a245c7fb88e9c6d7f09791c95f515e60dd58
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sat Feb 22 08:07:49 2020 +0100
Remove not used maven profiles in camel-spring-boot from release argument
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 00a41c2..6c2fd7a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -425,7 +425,7 @@
<preparationGoals>clean install</preparationGoals>
<goals>deploy</goals>
<!-- The profile we want to use when doing the release -->
- <arguments>-Prelease,apache-release,enable-schemagen,apt,sourcecheck,hibernate</arguments>
+ <arguments>-Prelease,apache-release,sourcecheck</arguments>
<autoVersionSubmodules>true</autoVersionSubmodules>
</configuration>
</plugin>
[camel-spring-boot] 04/10: Fix camel-jaxp-starter to rename
Posted by da...@apache.org.
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 ed32c3bd0aa859e6aacbe55b49c52568b159b378
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sat Feb 22 08:29:35 2020 +0100
Fix camel-jaxp-starter to rename
---
.../org/apache/camel/springboot/catalog/languages/xtokenize.json | 2 +-
.../{camel-jaxp-starter => camel-xml-jaxp-starter}/pom.xml | 4 ++--
.../src/main/docs/xml-jaxp-starter.adoc} | 7 ++++---
.../springboot/XMLTokenizeLanguageAutoConfiguration.java | 0
.../xtokenizer/springboot/XMLTokenizeLanguageConfiguration.java | 0
.../src/main/resources/META-INF/LICENSE.txt | 0
.../src/main/resources/META-INF/NOTICE.txt | 0
.../src/main/resources/META-INF/spring.factories | 0
.../src/main/resources/META-INF/spring.provides | 2 +-
components-starter/pom.xml | 2 +-
10 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/languages/xtokenize.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/languages/xtokenize.json
index 3f51f6b..23a967b 100644
--- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/languages/xtokenize.json
+++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/languages/xtokenize.json
@@ -12,7 +12,7 @@
"javaType": "org.apache.camel.language.xtokenizer.XMLTokenizeLanguage",
"modelJavaType": "org.apache.camel.model.language.XMLTokenizerExpression",
"groupId": "org.apache.camel.springboot",
- "artifactId": "camel-jaxp-starter",
+ "artifactId": "camel-xml-jaxp-starter",
"version": "3.1.0-SNAPSHOT"
},
"properties": {
diff --git a/components-starter/camel-jaxp-starter/pom.xml b/components-starter/camel-xml-jaxp-starter/pom.xml
similarity index 95%
rename from components-starter/camel-jaxp-starter/pom.xml
rename to components-starter/camel-xml-jaxp-starter/pom.xml
index 789052b..bcaeb35 100644
--- a/components-starter/camel-jaxp-starter/pom.xml
+++ b/components-starter/camel-xml-jaxp-starter/pom.xml
@@ -24,9 +24,9 @@
<artifactId>components-starter</artifactId>
<version>3.1.0-SNAPSHOT</version>
</parent>
- <artifactId>camel-jaxp-starter</artifactId>
+ <artifactId>camel-xml-jaxp-starter</artifactId>
<packaging>jar</packaging>
- <name>Camel SB Starters :: JAXP</name>
+ <name>Camel SB Starters :: XML JAXP</name>
<description>Spring-Boot Starter for Camel JAXP Support</description>
<dependencies>
<dependency>
diff --git a/components-starter/camel-jaxp-starter/src/main/docs/jaxp-starter.adoc b/components-starter/camel-xml-jaxp-starter/src/main/docs/xml-jaxp-starter.adoc
similarity index 83%
rename from components-starter/camel-jaxp-starter/src/main/docs/jaxp-starter.adoc
rename to components-starter/camel-xml-jaxp-starter/src/main/docs/xml-jaxp-starter.adoc
index 2a497e4..d7752d4 100644
--- a/components-starter/camel-jaxp-starter/src/main/docs/jaxp-starter.adoc
+++ b/components-starter/camel-xml-jaxp-starter/src/main/docs/xml-jaxp-starter.adoc
@@ -1,16 +1,16 @@
// spring-boot-auto-configure options: START
:page-partial:
-:doctitle: Camel Spring Boot Starter for jaxp
+:doctitle: Camel Spring Boot Starter for xml-jaxp
== Spring Boot Auto-Configuration
-When using jaxp with Spring Boot make sure to use the following Maven dependency to have support for auto configuration:
+When using xml-jaxp with Spring Boot make sure to use the following Maven dependency to have support for auto configuration:
[source,xml]
----
<dependency>
<groupId>org.apache.camel.springboot</groupId>
- <artifactId>camel-jaxp-starter</artifactId>
+ <artifactId>camel-xml-jaxp-starter</artifactId>
<version>x.x.x</version>
<!-- use the same version as your Camel core version -->
</dependency>
@@ -29,4 +29,5 @@ The component supports 3 options, which are listed below.
| *camel.language.xtokenize.trim* | Whether to trim the value to remove leading and trailing whitespaces and line breaks | true | Boolean
|===
+
// spring-boot-auto-configure options: END
diff --git a/components-starter/camel-jaxp-starter/src/main/java/org/apache/camel/language/xtokenizer/springboot/XMLTokenizeLanguageAutoConfiguration.java b/components-starter/camel-xml-jaxp-starter/src/main/java/org/apache/camel/language/xtokenizer/springboot/XMLTokenizeLanguageAutoConfiguration.java
similarity index 100%
rename from components-starter/camel-jaxp-starter/src/main/java/org/apache/camel/language/xtokenizer/springboot/XMLTokenizeLanguageAutoConfiguration.java
rename to components-starter/camel-xml-jaxp-starter/src/main/java/org/apache/camel/language/xtokenizer/springboot/XMLTokenizeLanguageAutoConfiguration.java
diff --git a/components-starter/camel-jaxp-starter/src/main/java/org/apache/camel/language/xtokenizer/springboot/XMLTokenizeLanguageConfiguration.java b/components-starter/camel-xml-jaxp-starter/src/main/java/org/apache/camel/language/xtokenizer/springboot/XMLTokenizeLanguageConfiguration.java
similarity index 100%
rename from components-starter/camel-jaxp-starter/src/main/java/org/apache/camel/language/xtokenizer/springboot/XMLTokenizeLanguageConfiguration.java
rename to components-starter/camel-xml-jaxp-starter/src/main/java/org/apache/camel/language/xtokenizer/springboot/XMLTokenizeLanguageConfiguration.java
diff --git a/components-starter/camel-jaxp-starter/src/main/resources/META-INF/LICENSE.txt b/components-starter/camel-xml-jaxp-starter/src/main/resources/META-INF/LICENSE.txt
similarity index 100%
rename from components-starter/camel-jaxp-starter/src/main/resources/META-INF/LICENSE.txt
rename to components-starter/camel-xml-jaxp-starter/src/main/resources/META-INF/LICENSE.txt
diff --git a/components-starter/camel-jaxp-starter/src/main/resources/META-INF/NOTICE.txt b/components-starter/camel-xml-jaxp-starter/src/main/resources/META-INF/NOTICE.txt
similarity index 100%
rename from components-starter/camel-jaxp-starter/src/main/resources/META-INF/NOTICE.txt
rename to components-starter/camel-xml-jaxp-starter/src/main/resources/META-INF/NOTICE.txt
diff --git a/components-starter/camel-jaxp-starter/src/main/resources/META-INF/spring.factories b/components-starter/camel-xml-jaxp-starter/src/main/resources/META-INF/spring.factories
similarity index 100%
rename from components-starter/camel-jaxp-starter/src/main/resources/META-INF/spring.factories
rename to components-starter/camel-xml-jaxp-starter/src/main/resources/META-INF/spring.factories
diff --git a/components-starter/camel-jaxp-starter/src/main/resources/META-INF/spring.provides b/components-starter/camel-xml-jaxp-starter/src/main/resources/META-INF/spring.provides
similarity index 97%
rename from components-starter/camel-jaxp-starter/src/main/resources/META-INF/spring.provides
rename to components-starter/camel-xml-jaxp-starter/src/main/resources/META-INF/spring.provides
index 91141f6..42ebe77 100644
--- a/components-starter/camel-jaxp-starter/src/main/resources/META-INF/spring.provides
+++ b/components-starter/camel-xml-jaxp-starter/src/main/resources/META-INF/spring.provides
@@ -14,4 +14,4 @@
## See the License for the specific language governing permissions and
## limitations under the License.
## ---------------------------------------------------------------------------
-provides: camel-jaxp
+provides: camel-xml-jaxp
diff --git a/components-starter/pom.xml b/components-starter/pom.xml
index 2417ad2..cd3654d 100644
--- a/components-starter/pom.xml
+++ b/components-starter/pom.xml
@@ -259,7 +259,6 @@
<module>camel-jacksonxml-starter</module>
<module>camel-jasypt-starter</module>
<module>camel-jaxb-starter</module>
- <module>camel-jaxp-starter</module>
<module>camel-jbpm-starter</module>
<module>camel-jcache-starter</module>
<module>camel-jclouds-starter</module>
@@ -416,6 +415,7 @@
<module>camel-workday-starter</module>
<module>camel-xchange-starter</module>
<module>camel-xj-starter</module>
+ <module>camel-xml-jaxp-starter</module>
<module>camel-xmlsecurity-starter</module>
<module>camel-xmpp-starter</module>
<module>camel-xpath-starter</module>
[camel-spring-boot] 10/10: Fixed camel-spring-cloud-* starters
Posted by da...@apache.org.
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 10e9c42fc3cea2c39ef1bf92a70a21f3b6ab9b5d
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sat Feb 22 09:42:34 2020 +0100
Fixed camel-spring-cloud-* starters
---
components-starter/camel-spring-cloud-starter/pom.xml | 16 ++--------------
.../springboot/maven/AbstractSpringBootGenerator.java | 4 ++--
2 files changed, 4 insertions(+), 16 deletions(-)
diff --git a/components-starter/camel-spring-cloud-starter/pom.xml b/components-starter/camel-spring-cloud-starter/pom.xml
index 01e27a4..bb1ecd3 100644
--- a/components-starter/camel-spring-cloud-starter/pom.xml
+++ b/components-starter/camel-spring-cloud-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</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/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 3297eb2..aee711e 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,8 +83,8 @@ 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-")) {
- // any of the -cloud-xxx are from camel-spring-boot
+ } else if (project.getArtifactId().startsWith("camel-spring-cloud")) {
+ // any of the camel-spring-cloud are from camel-spring-boot
return "org.apache.camel.springboot";
} else {
// others are from camel
[camel-spring-boot] 03/10: Fix camel-jaxp-starter
Posted by da...@apache.org.
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 f9d9a076cb3897e23cd38c34fb2277b52511a4f8
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sat Feb 22 08:18:29 2020 +0100
Fix camel-jaxp-starter
---
components-starter/camel-jaxp-starter/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components-starter/camel-jaxp-starter/pom.xml b/components-starter/camel-jaxp-starter/pom.xml
index 088d5dd..789052b 100644
--- a/components-starter/camel-jaxp-starter/pom.xml
+++ b/components-starter/camel-jaxp-starter/pom.xml
@@ -36,7 +36,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-jaxp</artifactId>
+ <artifactId>camel-xml-jaxp</artifactId>
<version>${camel-version}</version>
</dependency>
<!--START OF GENERATED CODE-->
[camel-spring-boot] 08/10: Fixed camel-spring-cloud-* starters
Posted by da...@apache.org.
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";
}
}