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/08/24 13:50:13 UTC
[camel-spring-boot] branch master updated (cc9a219 -> db871b6)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git.
from cc9a219 CAMEL-15428: camel-spring-boot BOM with just the starter JARs
new 8c462be spring boot BOM generator should only include active starters
new 7fee106 Regen
new db871b6 CAMEL-15428: camel-spring-boot BOM with just the starter JARs
The 3 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:
tooling/camel-spring-boot-bom/pom.xml | 25 ++++++
tooling/camel-spring-boot-dependencies/pom.xml | 88 +++++++++++-----------
.../maven/BomDependenciesGeneratorMojo.java | 5 ++
.../camel/springboot/maven/BomGeneratorMojo.java | 32 ++++++++
4 files changed, 106 insertions(+), 44 deletions(-)
[camel-spring-boot] 01/03: spring boot BOM generator should only
include active starters
Posted by da...@apache.org.
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-spring-boot.git
commit 8c462bee3101fc5dc21879ae08c724b0ce944fbf
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Aug 24 15:43:30 2020 +0200
spring boot BOM generator should only include active starters
---
.../apache/camel/springboot/maven/BomDependenciesGeneratorMojo.java | 5 +++++
.../java/org/apache/camel/springboot/maven/BomGeneratorMojo.java | 5 +++++
2 files changed, 10 insertions(+)
diff --git a/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/BomDependenciesGeneratorMojo.java b/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/BomDependenciesGeneratorMojo.java
index dbe40bd..7102bf9 100644
--- a/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/BomDependenciesGeneratorMojo.java
+++ b/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/BomDependenciesGeneratorMojo.java
@@ -199,6 +199,11 @@ public class BomDependenciesGeneratorMojo extends AbstractMojo {
Files.list(startersDir.toPath())
.filter(Files::isDirectory)
+ // must have a pom.xml to be active
+ .filter(d -> {
+ File pom = new File(d.toFile(), "pom.xml");
+ return pom.isFile() && pom.exists();
+ })
.map(dir -> {
Dependency dep = new Dependency();
dep.setGroupId("org.apache.camel.springboot");
diff --git a/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/BomGeneratorMojo.java b/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/BomGeneratorMojo.java
index 28edd4b..20d131b 100644
--- a/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/BomGeneratorMojo.java
+++ b/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/BomGeneratorMojo.java
@@ -98,6 +98,11 @@ public class BomGeneratorMojo extends AbstractMojo {
Files.list(startersDir.toPath())
.filter(Files::isDirectory)
+ // must have a pom.xml to be active
+ .filter(d -> {
+ File pom = new File(d.toFile(), "pom.xml");
+ return pom.isFile() && pom.exists();
+ })
.map(dir -> {
Dependency dep = new Dependency();
dep.setGroupId("org.apache.camel.springboot");
[camel-spring-boot] 03/03: CAMEL-15428: camel-spring-boot BOM with
just the starter JARs
Posted by da...@apache.org.
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-spring-boot.git
commit db871b67b9c7828c31ea9907ee723bdc5bddacc9
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Aug 24 15:49:57 2020 +0200
CAMEL-15428: camel-spring-boot BOM with just the starter JARs
---
tooling/camel-spring-boot-bom/pom.xml | 25 ++++++++++++++++++++
.../camel/springboot/maven/BomGeneratorMojo.java | 27 ++++++++++++++++++++++
2 files changed, 52 insertions(+)
diff --git a/tooling/camel-spring-boot-bom/pom.xml b/tooling/camel-spring-boot-bom/pom.xml
index 0a6956f..617e624 100644
--- a/tooling/camel-spring-boot-bom/pom.xml
+++ b/tooling/camel-spring-boot-bom/pom.xml
@@ -1710,6 +1710,31 @@
<artifactId>camel-zookeeper-starter</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-management</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-test-spring</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-test-spring-junit5</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-testcontainers-spring</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-testcontainers-spring-junit5</artifactId>
+ <version>${project.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
</project>
diff --git a/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/BomGeneratorMojo.java b/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/BomGeneratorMojo.java
index 20d131b..a33311e 100644
--- a/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/BomGeneratorMojo.java
+++ b/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/BomGeneratorMojo.java
@@ -114,6 +114,33 @@ public class BomGeneratorMojo extends AbstractMojo {
outDependencies.sort(Comparator.comparing(d -> (d.getGroupId() + ":" + d.getArtifactId())));
+ // include some dependencies for testing and management
+ Dependency dep = new Dependency();
+ dep.setGroupId("org.apache.camel");
+ dep.setArtifactId("camel-management");
+ dep.setVersion("${project.version}");
+ outDependencies.add(dep);
+ dep = new Dependency();
+ dep.setGroupId("org.apache.camel");
+ dep.setArtifactId("camel-test-spring");
+ dep.setVersion("${project.version}");
+ outDependencies.add(dep);
+ dep = new Dependency();
+ dep.setGroupId("org.apache.camel");
+ dep.setArtifactId("camel-test-spring-junit5");
+ dep.setVersion("${project.version}");
+ outDependencies.add(dep);
+ dep = new Dependency();
+ dep.setGroupId("org.apache.camel");
+ dep.setArtifactId("camel-testcontainers-spring");
+ dep.setVersion("${project.version}");
+ outDependencies.add(dep);
+ dep = new Dependency();
+ dep.setGroupId("org.apache.camel");
+ dep.setArtifactId("camel-testcontainers-spring-junit5");
+ dep.setVersion("${project.version}");
+ outDependencies.add(dep);
+
return outDependencies;
}
[camel-spring-boot] 02/03: Regen
Posted by da...@apache.org.
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-spring-boot.git
commit 7fee106a5fd926b35bba6c47d6523eea2a625d85
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Aug 24 15:43:35 2020 +0200
Regen
---
tooling/camel-spring-boot-dependencies/pom.xml | 88 +++++++++++++-------------
1 file changed, 44 insertions(+), 44 deletions(-)
diff --git a/tooling/camel-spring-boot-dependencies/pom.xml b/tooling/camel-spring-boot-dependencies/pom.xml
index 42271e6..54db8c0 100644
--- a/tooling/camel-spring-boot-dependencies/pom.xml
+++ b/tooling/camel-spring-boot-dependencies/pom.xml
@@ -73,7 +73,7 @@
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
- <version>1.2.72</version>
+ <version>1.2.73</version>
</dependency>
<dependency>
<groupId>com.cloudbees.thirdparty</groupId>
@@ -4251,229 +4251,229 @@
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-benchmark</artifactId>
- <version>7.41.0.Final</version>
+ <version>7.42.0.Final</version>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-benchmark</artifactId>
- <version>7.41.0.Final</version>
+ <version>7.42.0.Final</version>
<classifier>javadoc</classifier>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-core</artifactId>
- <version>7.41.0.Final</version>
+ <version>7.42.0.Final</version>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-core</artifactId>
- <version>7.41.0.Final</version>
+ <version>7.42.0.Final</version>
<classifier>javadoc</classifier>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-distribution</artifactId>
- <version>7.41.0.Final</version>
+ <version>7.42.0.Final</version>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-docs</artifactId>
- <version>7.41.0.Final</version>
+ <version>7.42.0.Final</version>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-examples</artifactId>
- <version>7.41.0.Final</version>
+ <version>7.42.0.Final</version>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-persistence-common</artifactId>
- <version>7.41.0.Final</version>
+ <version>7.42.0.Final</version>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-persistence-common</artifactId>
- <version>7.41.0.Final</version>
+ <version>7.42.0.Final</version>
<classifier>javadoc</classifier>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-persistence-jackson</artifactId>
- <version>7.41.0.Final</version>
+ <version>7.42.0.Final</version>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-persistence-jackson</artifactId>
- <version>7.41.0.Final</version>
+ <version>7.42.0.Final</version>
<classifier>javadoc</classifier>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-persistence-jaxb</artifactId>
- <version>7.41.0.Final</version>
+ <version>7.42.0.Final</version>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-persistence-jaxb</artifactId>
- <version>7.41.0.Final</version>
+ <version>7.42.0.Final</version>
<classifier>javadoc</classifier>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-persistence-jpa</artifactId>
- <version>7.41.0.Final</version>
+ <version>7.42.0.Final</version>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-persistence-jpa</artifactId>
- <version>7.41.0.Final</version>
+ <version>7.42.0.Final</version>
<classifier>javadoc</classifier>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-persistence-jsonb</artifactId>
- <version>7.41.0.Final</version>
+ <version>7.42.0.Final</version>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-persistence-jsonb</artifactId>
- <version>7.41.0.Final</version>
+ <version>7.42.0.Final</version>
<classifier>javadoc</classifier>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-persistence-xstream</artifactId>
- <version>7.41.0.Final</version>
+ <version>7.42.0.Final</version>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-persistence-xstream</artifactId>
- <version>7.41.0.Final</version>
+ <version>7.42.0.Final</version>
<classifier>javadoc</classifier>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-quarkus</artifactId>
- <version>7.41.0.Final</version>
+ <version>7.42.0.Final</version>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-quarkus-deployment</artifactId>
- <version>7.41.0.Final</version>
+ <version>7.42.0.Final</version>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-quarkus-jackson</artifactId>
- <version>7.41.0.Final</version>
+ <version>7.42.0.Final</version>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-quarkus-jackson-deployment</artifactId>
- <version>7.41.0.Final</version>
+ <version>7.42.0.Final</version>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-quarkus-jackson-integration-test</artifactId>
- <version>7.41.0.Final</version>
+ <version>7.42.0.Final</version>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-quarkus-jsonb</artifactId>
- <version>7.41.0.Final</version>
+ <version>7.42.0.Final</version>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-quarkus-jsonb-deployment</artifactId>
- <version>7.41.0.Final</version>
+ <version>7.42.0.Final</version>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-quarkus-jsonb-integration-test</artifactId>
- <version>7.41.0.Final</version>
+ <version>7.42.0.Final</version>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-spring-boot-autoconfigure</artifactId>
- <version>7.41.0.Final</version>
+ <version>7.42.0.Final</version>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-spring-boot-starter</artifactId>
- <version>7.41.0.Final</version>
+ <version>7.42.0.Final</version>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-test</artifactId>
- <version>7.41.0.Final</version>
+ <version>7.42.0.Final</version>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-test</artifactId>
- <version>7.41.0.Final</version>
+ <version>7.42.0.Final</version>
<classifier>javadoc</classifier>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-wb-domain-editor-api</artifactId>
- <version>7.41.0.Final</version>
+ <version>7.42.0.Final</version>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-wb-domain-editor-backend</artifactId>
- <version>7.41.0.Final</version>
+ <version>7.42.0.Final</version>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-wb-domain-editor-client</artifactId>
- <version>7.41.0.Final</version>
+ <version>7.42.0.Final</version>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-wb-guided-rule-editor-api</artifactId>
- <version>7.41.0.Final</version>
+ <version>7.42.0.Final</version>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-wb-guided-rule-editor-backend</artifactId>
- <version>7.41.0.Final</version>
+ <version>7.42.0.Final</version>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-wb-guided-rule-editor-client</artifactId>
- <version>7.41.0.Final</version>
+ <version>7.42.0.Final</version>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-wb-solver-editor-api</artifactId>
- <version>7.41.0.Final</version>
+ <version>7.42.0.Final</version>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-wb-solver-editor-backend</artifactId>
- <version>7.41.0.Final</version>
+ <version>7.42.0.Final</version>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-wb-solver-editor-client</artifactId>
- <version>7.41.0.Final</version>
+ <version>7.42.0.Final</version>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-wb-ui</artifactId>
- <version>7.41.0.Final</version>
+ <version>7.42.0.Final</version>
<type>war</type>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-workbench-models-core</artifactId>
- <version>7.41.0.Final</version>
+ <version>7.42.0.Final</version>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-workbench-models-datamodel-api</artifactId>
- <version>7.41.0.Final</version>
+ <version>7.42.0.Final</version>
</dependency>
<dependency>
<groupId>org.python</groupId>