You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gz...@apache.org on 2021/06/14 06:57:24 UTC
[camel-spring-boot] branch CAMEL-16055-fix-parent created (now
2d88e0a)
This is an automated email from the ASF dual-hosted git repository.
gzurowski pushed a change to branch CAMEL-16055-fix-parent
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git.
at 2d88e0a CAMEL-16055: Add spring-boot-parent pom.xml
This branch includes the following new commits:
new 2d88e0a CAMEL-16055: Add spring-boot-parent pom.xml
The 1 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] 01/01: CAMEL-16055: Add spring-boot-parent
pom.xml
Posted by gz...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gzurowski pushed a commit to branch CAMEL-16055-fix-parent
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 2d88e0ac9127ea6a7a570693c9728f899b83336b
Author: Gregor Zurowski <gr...@zurowski.net>
AuthorDate: Mon Jun 14 08:47:56 2021 +0200
CAMEL-16055: Add spring-boot-parent pom.xml
Add spring-boot-parent pom.xml so we can separate spring-boot-bom from unwanted extra dependencies via
camel-parent
---
catalog/pom.xml | 4 +-
core/pom.xml | 4 +-
parent/pom.xml | 68 ++++++++++++++++++++++
pom.xml | 33 +----------
tests/pom.xml | 4 +-
.../target-template-pom.xml | 7 +++
tooling/camel-spring-boot-bom/pom.xml | 6 ++
tooling/pom.xml | 3 +-
8 files changed, 90 insertions(+), 39 deletions(-)
diff --git a/catalog/pom.xml b/catalog/pom.xml
index 811e0e2..c748470 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.4.6-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 dd99844..808c593 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -23,9 +23,9 @@
<parent>
<groupId>org.apache.camel.springboot</groupId>
- <artifactId>spring-boot</artifactId>
+ <artifactId>spring-boot-parent</artifactId>
<version>3.4.6-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..42efb65
--- /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.4.6-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.camel.springboot</groupId>
+ <artifactId>spring-boot-parent</artifactId>
+ <version>3.4.6-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>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 5488e1f..9ecce5f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -72,6 +72,7 @@
</prerequisites>
<modules>
+ <module>parent</module>
<module>tooling</module>
<module>core</module>
<module>components-starter</module>
@@ -167,38 +168,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 8c540cf..1aa7603 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.4.6-SNAPSHOT</version>
- <relativePath>..</relativePath>
+ <relativePath>../parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.camel.springboot</groupId>
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 d3361ab..e064c1e 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.4.6-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
<groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-spring-boot-bom</artifactId>
<version>3.4.6-SNAPSHOT</version>
diff --git a/tooling/pom.xml b/tooling/pom.xml
index cf66133..b6d7c7e 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.4.6-SNAPSHOT</version>
+ <relativePath>../parent/pom.xml</relativePath>
</parent>
<artifactId>tooling</artifactId>