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 2021/01/21 14:15:16 UTC
[camel-spring-boot] branch CAMEL-16055 created (now 8b94c38)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch CAMEL-16055
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git.
at 8b94c38 CAMEL-16055: Add spring-boot-parent pom.xml so we can separate spring-boot-bom from unwanted extra dependencies via camel-parent
This branch includes the following new commits:
new c967a1b CAMEL-16055: Add spring-boot-parent pom.xml so we can separate spring-boot-bom from unwanted extra dependencies via camel-parent
new a1cc49b Regen
new 8b94c38 CAMEL-16055: Add spring-boot-parent pom.xml so we can separate spring-boot-bom from unwanted extra dependencies via camel-parent
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.
[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 CAMEL-16055
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit a1cc49bfcc5408cc732e23a8c1d3ea3847c947b8
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Jan 21 15:06:44 2021 +0100
Regen
---
docs/modules/ROOT/pages/spring-boot.adoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/modules/ROOT/pages/spring-boot.adoc b/docs/modules/ROOT/pages/spring-boot.adoc
index 60878db..d90c23be 100644
--- a/docs/modules/ROOT/pages/spring-boot.adoc
+++ b/docs/modules/ROOT/pages/spring-boot.adoc
@@ -202,7 +202,7 @@ The component supports 165 options, which are listed below.
| *camel.springboot.shutdown-timeout* | Timeout in seconds to graceful shutdown Camel. | 300 | Integer
| *camel.springboot.startup-recorder* | To use startup recorder for capturing execution time during starting Camel. The recorder can be one of: false, logging, java-flight-recorder The default is false. | false | String
| *camel.springboot.startup-recorder-dir* | Directory to store the recording. By default the user home directory will be used. Use false to turn off saving recording to disk. | | String
-| *camel.springboot.startup-recorder-duration* | How long time to run the startup recorder. Use 0 (default) to stop the recorder after Camel has been started. Use -1 to keep the recorder running until the JVM is being stopped. A positive value is to run the recorder for N seconds. When the recorder is stopped then the recording is auto saved to disk (note: save to disk can be disabled by setting startupRecorderDir to false) | 0 | Long
+| *camel.springboot.startup-recorder-duration* | How long time to run the startup recorder. Use 0 (default) to keep the recorder running until the JVM is exited. Use -1 to stop the recorder right after Camel has been started (to only focus on potential Camel startup performance bottlenecks) Use a positive value to keep recording for N seconds. When the recorder is stopped then the recording is auto saved to disk (note: save to disk can be disabled by setting startupRecorderDir to false) [...]
| *camel.springboot.startup-recorder-max-depth* | To filter our sub steps at a maximum depth. Use -1 for no maximum. Use 0 for no sub steps. Use 1 for max 1 sub step, and so forth. The default is -1. | -1 | Integer
| *camel.springboot.startup-recorder-profile* | To use a specific Java Flight Recorder profile configuration, such as default or profile. The default is default. | default | String
| *camel.springboot.startup-recorder-recording* | To enable Java Flight Recorder to start a recording and automatic dump the recording to disk after startup is complete. This requires that camel-jfr is on the classpath. The default is true. | true | Boolean
[camel-spring-boot] 01/03: CAMEL-16055: Add spring-boot-parent
pom.xml so we can separate spring-boot-bom from unwanted extra dependencies
via camel-parent
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch CAMEL-16055
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit c967a1b66b4e226195423eb3543849c255071704
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Jan 21 15:06:32 2021 +0100
CAMEL-16055: Add spring-boot-parent pom.xml so we can separate spring-boot-bom from unwanted extra dependencies via camel-parent
---
archetypes/pom.xml | 4 ++--
catalog/pom.xml | 4 ++--
core/pom.xml | 4 ++--
docs/pom.xml | 4 ++--
parent/pom.xml | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
pom.xml | 37 +----------------------------
tests/pom.xml | 4 ++--
tooling/pom.xml | 3 ++-
8 files changed, 81 insertions(+), 47 deletions(-)
diff --git a/archetypes/pom.xml b/archetypes/pom.xml
index e4883fe..d84e35f 100644
--- a/archetypes/pom.xml
+++ b/archetypes/pom.xml
@@ -23,9 +23,9 @@
<parent>
<groupId>org.apache.camel.springboot</groupId>
- <artifactId>spring-boot</artifactId>
+ <artifactId>spring-boot-parent</artifactId>
<version>3.8.0-SNAPSHOT</version>
- <relativePath>..</relativePath>
+ <relativePath>../parent/pom.xml</relativePath>
</parent>
<artifactId>archetypes</artifactId>
diff --git a/catalog/pom.xml b/catalog/pom.xml
index c35cd4f..a4e12bd 100644
--- a/catalog/pom.xml
+++ b/catalog/pom.xml
@@ -23,9 +23,9 @@
<parent>
<groupId>org.apache.camel.springboot</groupId>
- <artifactId>spring-boot</artifactId>
+ <artifactId>spring-boot-parent</artifactId>
<version>3.8.0-SNAPSHOT</version>
- <relativePath>..</relativePath>
+ <relativePath>../parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.camel.springboot</groupId>
diff --git a/core/pom.xml b/core/pom.xml
index 3c13f65..6172fec 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -24,9 +24,9 @@
<parent>
<groupId>org.apache.camel.springboot</groupId>
- <artifactId>spring-boot</artifactId>
+ <artifactId>spring-boot-parent</artifactId>
<version>3.8.0-SNAPSHOT</version>
- <relativePath>..</relativePath>
+ <relativePath>../parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.camel.springboot</groupId>
diff --git a/docs/pom.xml b/docs/pom.xml
index 725543c..99d5232 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -23,9 +23,9 @@
<parent>
<groupId>org.apache.camel.springboot</groupId>
- <artifactId>spring-boot</artifactId>
+ <artifactId>spring-boot-parent</artifactId>
<version>3.8.0-SNAPSHOT</version>
- <relativePath>..</relativePath>
+ <relativePath>../parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.camel.springboot</groupId>
diff --git a/parent/pom.xml b/parent/pom.xml
new file mode 100644
index 0000000..13d9340
--- /dev/null
+++ b/parent/pom.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.camel.springboot</groupId>
+ <artifactId>spring-boot</artifactId>
+ <version>3.8.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.camel.springboot</groupId>
+ <artifactId>spring-boot-parent</artifactId>
+ <version>3.8.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <name>Camel SB :: Parent</name>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.camel.springboot</groupId>
+ <artifactId>camel-core-starter</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.springboot</groupId>
+ <artifactId>camel-spring-boot-starter</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.springboot</groupId>
+ <artifactId>camel-spring-boot</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-parent</artifactId>
+ <version>${camel-version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>${google-guava-version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+</project>
diff --git a/pom.xml b/pom.xml
index 2908798..1758e5f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,11 +67,8 @@
</mailingList>
</mailingLists>
- <prerequisites>
- <maven>3.5.0</maven>
- </prerequisites>
-
<modules>
+ <module>parent</module>
<module>tooling</module>
<module>core</module>
<module>components-starter</module>
@@ -168,38 +165,6 @@
</pluginRepository>
</pluginRepositories>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.camel.springboot</groupId>
- <artifactId>camel-core-starter</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.springboot</groupId>
- <artifactId>camel-spring-boot-starter</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.springboot</groupId>
- <artifactId>camel-spring-boot</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-parent</artifactId>
- <version>${camel-version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>${google-guava-version}</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
<build>
<defaultGoal>install</defaultGoal>
diff --git a/tests/pom.xml b/tests/pom.xml
index 0b4a372..a6dc03d 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -23,9 +23,9 @@
<parent>
<groupId>org.apache.camel.springboot</groupId>
- <artifactId>spring-boot</artifactId>
+ <artifactId>spring-boot-parent</artifactId>
<version>3.8.0-SNAPSHOT</version>
- <relativePath>..</relativePath>
+ <relativePath>../parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.camel.springboot</groupId>
diff --git a/tooling/pom.xml b/tooling/pom.xml
index 768a738..d0af614 100644
--- a/tooling/pom.xml
+++ b/tooling/pom.xml
@@ -23,8 +23,9 @@
<parent>
<groupId>org.apache.camel.springboot</groupId>
- <artifactId>spring-boot</artifactId>
+ <artifactId>spring-boot-parent</artifactId>
<version>3.8.0-SNAPSHOT</version>
+ <relativePath>../parent/pom.xml</relativePath>
</parent>
<artifactId>tooling</artifactId>
[camel-spring-boot] 03/03: CAMEL-16055: Add spring-boot-parent
pom.xml so we can separate spring-boot-bom from unwanted extra dependencies
via camel-parent
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch CAMEL-16055
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 8b94c382c9fe18cebdc6b62665a96e640a35682a
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Jan 21 15:14:56 2021 +0100
CAMEL-16055: Add spring-boot-parent pom.xml so we can separate spring-boot-bom from unwanted extra dependencies via camel-parent
---
tooling/camel-spring-boot-bom-generator/target-template-pom.xml | 7 +++++++
tooling/camel-spring-boot-bom/pom.xml | 6 ++++++
2 files changed, 13 insertions(+)
diff --git a/tooling/camel-spring-boot-bom-generator/target-template-pom.xml b/tooling/camel-spring-boot-bom-generator/target-template-pom.xml
index de20081..edfb79e 100644
--- a/tooling/camel-spring-boot-bom-generator/target-template-pom.xml
+++ b/tooling/camel-spring-boot-bom-generator/target-template-pom.xml
@@ -23,6 +23,13 @@
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.camel.springboot</groupId>
+ <artifactId>spring-boot</artifactId>
+ <version>${project.version}</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+
<groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-spring-boot-bom</artifactId>
<version>${project.version}</version>
diff --git a/tooling/camel-spring-boot-bom/pom.xml b/tooling/camel-spring-boot-bom/pom.xml
index 510831f..6611941 100644
--- a/tooling/camel-spring-boot-bom/pom.xml
+++ b/tooling/camel-spring-boot-bom/pom.xml
@@ -19,6 +19,12 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.camel.springboot</groupId>
+ <artifactId>spring-boot</artifactId>
+ <version>3.8.0-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
<groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-spring-boot-bom</artifactId>
<version>3.8.0-SNAPSHOT</version>