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 2019/11/20 09:07:31 UTC
[camel] branch master updated: CAMEL-13643: Fixed spring-boot
itests after SB groupId change.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 7f860c9 CAMEL-13643: Fixed spring-boot itests after SB groupId change.
7f860c9 is described below
commit 7f860c9df33fe3e9cadf790a8ee8a8d6921dc9c0
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Nov 20 10:06:46 2019 +0100
CAMEL-13643: Fixed spring-boot itests after SB groupId change.
---
.../src/test/resources/application-pom-sb1.xml | 6 +++---
.../src/test/resources/application-pom-sb2.xml | 6 +++---
.../org/apache/camel/maven/bom/generator/BomGeneratorMojo.java | 9 +++++++--
3 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/tests/camel-itest-spring-boot/src/test/resources/application-pom-sb1.xml b/tests/camel-itest-spring-boot/src/test/resources/application-pom-sb1.xml
index 67eed1f..2e34f8b 100644
--- a/tests/camel-itest-spring-boot/src/test/resources/application-pom-sb1.xml
+++ b/tests/camel-itest-spring-boot/src/test/resources/application-pom-sb1.xml
@@ -41,7 +41,7 @@
<scope>import</scope>
</dependency>
<dependency>
- <groupId>org.apache.camel</groupId>
+ <groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-spring-boot-dependencies</artifactId>
<version>${project.version}</version>
<type>pom</type>
@@ -54,12 +54,12 @@
<dependencies>
<dependency>
- <groupId>org.apache.camel</groupId>
+ <groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-spring-boot-starter</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.camel</groupId>
+ <groupId>org.apache.camel.springboot</groupId>
<artifactId>#{module}-starter</artifactId>
</dependency>
diff --git a/tests/camel-itest-spring-boot/src/test/resources/application-pom-sb2.xml b/tests/camel-itest-spring-boot/src/test/resources/application-pom-sb2.xml
index c749a34..2d88840 100644
--- a/tests/camel-itest-spring-boot/src/test/resources/application-pom-sb2.xml
+++ b/tests/camel-itest-spring-boot/src/test/resources/application-pom-sb2.xml
@@ -41,7 +41,7 @@
<scope>import</scope>
</dependency>
<dependency>
- <groupId>org.apache.camel</groupId>
+ <groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-spring-boot-dependencies</artifactId>
<version>${project.version}</version>
<type>pom</type>
@@ -54,12 +54,12 @@
<dependencies>
<dependency>
- <groupId>org.apache.camel</groupId>
+ <groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-spring-boot-starter</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.camel</groupId>
+ <groupId>org.apache.camel.springboot</groupId>
<artifactId>#{module}-starter</artifactId>
</dependency>
diff --git a/tooling/maven/bom-generator-maven-plugin/src/main/java/org/apache/camel/maven/bom/generator/BomGeneratorMojo.java b/tooling/maven/bom-generator-maven-plugin/src/main/java/org/apache/camel/maven/bom/generator/BomGeneratorMojo.java
index 797d812..d1735f4 100644
--- a/tooling/maven/bom-generator-maven-plugin/src/main/java/org/apache/camel/maven/bom/generator/BomGeneratorMojo.java
+++ b/tooling/maven/bom-generator-maven-plugin/src/main/java/org/apache/camel/maven/bom/generator/BomGeneratorMojo.java
@@ -177,6 +177,11 @@ public class BomGeneratorMojo extends AbstractMojo {
if (accept) {
outDependencies.add(dep);
+ } else {
+ // lets log a WARN if some Camel JARs was excluded
+ if (dep.getGroupId().startsWith("org.apache.camel")) {
+ getLog().warn(dep + " excluded from BOM");
+ }
}
}
@@ -250,10 +255,10 @@ public class BomGeneratorMojo extends AbstractMojo {
try (FileReader fr = new FileReader(file)) {
String oldContent = IOUtils.toString(fr);
if (!content.equals(oldContent)) {
- getLog().debug("Writing new file " + file.getAbsolutePath());
+ getLog().info("File: " + file.getAbsolutePath() + " is updated");
fr.close();
} else {
- getLog().debug("File " + file.getAbsolutePath() + " left unchanged");
+ getLog().info("File " + file.getAbsolutePath() + " is not changed");
write = false;
}
}