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/10/02 04:24:53 UTC
[camel-spring-boot-examples] branch master updated: CAMEL-15482:
refactor dependencies to use spring-boot starters (#12)
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-examples.git
The following commit(s) were added to refs/heads/master by this push:
new d7260bf CAMEL-15482: refactor dependencies to use spring-boot starters (#12)
d7260bf is described below
commit d7260bf89671952e47e466e35a76c2af19553e52
Author: Matej Melko <68...@users.noreply.github.com>
AuthorDate: Fri Oct 2 06:24:44 2020 +0200
CAMEL-15482: refactor dependencies to use spring-boot starters (#12)
---
camel-example-spring-boot-amqp/pom.xml | 7 ----
camel-example-spring-boot-fhir-auth-tx/pom.xml | 5 ---
camel-example-spring-boot-kafka-avro/pom.xml | 40 +++++++---------------
.../pom.xml | 27 ++++-----------
.../service2/pom.xml | 6 ++--
camel-example-spring-boot-widget-gadget/pom.xml | 15 +++-----
6 files changed, 27 insertions(+), 73 deletions(-)
diff --git a/camel-example-spring-boot-amqp/pom.xml b/camel-example-spring-boot-amqp/pom.xml
index c4bf95e..77e7e7f 100644
--- a/camel-example-spring-boot-amqp/pom.xml
+++ b/camel-example-spring-boot-amqp/pom.xml
@@ -91,13 +91,6 @@
<artifactId>camel-spring-boot-starter</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-amqp</artifactId>
- <version>${camel-version}</version>
- </dependency>
-
-
<!-- test -->
<dependency>
<groupId>org.springframework.boot</groupId>
diff --git a/camel-example-spring-boot-fhir-auth-tx/pom.xml b/camel-example-spring-boot-fhir-auth-tx/pom.xml
index 7ca6c22..db05285 100644
--- a/camel-example-spring-boot-fhir-auth-tx/pom.xml
+++ b/camel-example-spring-boot-fhir-auth-tx/pom.xml
@@ -100,11 +100,6 @@
<version>${camel-version}</version>
</dependency>
<dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-management</artifactId>
- <version>${camel-version}</version>
- </dependency>
- <dependency>
<groupId>ca.uhn.hapi</groupId>
<artifactId>hapi-structures-v24</artifactId>
</dependency>
diff --git a/camel-example-spring-boot-kafka-avro/pom.xml b/camel-example-spring-boot-kafka-avro/pom.xml
index 842e728..817f610 100644
--- a/camel-example-spring-boot-kafka-avro/pom.xml
+++ b/camel-example-spring-boot-kafka-avro/pom.xml
@@ -36,7 +36,7 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<spring.boot-version>${spring-boot-version}</spring.boot-version>
</properties>
-
+
<!--necessary to resolve confluent dependencies-->
<repositories>
<repository>
@@ -64,10 +64,10 @@
<scope>import</scope>
</dependency>
</dependencies>
- </dependencyManagement>
+ </dependencyManagement>
<dependencies>
-
+
<!-- Spring Boot -->
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -97,38 +97,24 @@
<groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-stream-starter</artifactId>
</dependency>
-
- <!-- camel -->
<dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-core</artifactId>
- <version>${camel-version}</version>
+ <groupId>org.apache.camel.springboot</groupId>
+ <artifactId>camel-avro-starter</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-kafka</artifactId>
- <version>${camel-version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-support</artifactId>
- <version>${camel-version}</version>
+ <groupId>org.apache.camel.springboot</groupId>
+ <artifactId>camel-kafka-starter</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-avro</artifactId>
- <version>${camel-version}</version>
- </dependency>
<dependency>
- <groupId>io.confluent</groupId>
- <artifactId>kafka-avro-serializer</artifactId>
- <version>${kafka-avro-serializer-version}</version>
- </dependency>
+ <groupId>io.confluent</groupId>
+ <artifactId>kafka-avro-serializer</artifactId>
+ <version>${kafka-avro-serializer-version}</version>
+ </dependency>
</dependencies>
<build>
<plugins>
- <!--Avro plugin to generated classes from schema-->
+ <!--Avro plugin to generated classes from schema-->
<!-- <plugin>
<groupId>org.apache.avro</groupId>
<artifactId>avro-maven-plugin</artifactId>
@@ -186,4 +172,4 @@
</plugin>
</plugins>
</build>
- </project>
+</project>
diff --git a/camel-example-spring-boot-kafka-offsetrepository/pom.xml b/camel-example-spring-boot-kafka-offsetrepository/pom.xml
index 6e067cf..4beaf65 100644
--- a/camel-example-spring-boot-kafka-offsetrepository/pom.xml
+++ b/camel-example-spring-boot-kafka-offsetrepository/pom.xml
@@ -17,7 +17,8 @@
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/maven-v4_0_0.xsd">
+<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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -39,7 +40,7 @@
</properties>
<dependencyManagement>
- <dependencies>
+ <dependencies>
<!-- Spring Boot BOM -->
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -57,10 +58,10 @@
<scope>import</scope>
</dependency>
</dependencies>
- </dependencyManagement>
+ </dependencyManagement>
<dependencies>
-
+
<!-- Spring Boot -->
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -90,24 +91,10 @@
<groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-stream-starter</artifactId>
</dependency>
-
- <!-- camel -->
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-core</artifactId>
- <version>${camel-version}</version>
- </dependency>
<dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-kafka</artifactId>
- <version>${camel-version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-support</artifactId>
- <version>${camel-version}</version>
+ <groupId>org.apache.camel.springboot</groupId>
+ <artifactId>camel-kafka-starter</artifactId>
</dependency>
-
</dependencies>
<build>
diff --git a/camel-example-spring-boot-opentracing/service2/pom.xml b/camel-example-spring-boot-opentracing/service2/pom.xml
index 0d70a34..8bb31c8 100644
--- a/camel-example-spring-boot-opentracing/service2/pom.xml
+++ b/camel-example-spring-boot-opentracing/service2/pom.xml
@@ -82,11 +82,9 @@
<artifactId>camel-http-starter</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-undertow</artifactId>
- <version>${camel-version}</version>
+ <groupId>org.apache.camel.springboot</groupId>
+ <artifactId>camel-undertow-starter</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.camel.springboot.example</groupId>
<artifactId>camel-example-spring-boot-opentracing-loggingtracer</artifactId>
diff --git a/camel-example-spring-boot-widget-gadget/pom.xml b/camel-example-spring-boot-widget-gadget/pom.xml
index 1147857..823479a 100644
--- a/camel-example-spring-boot-widget-gadget/pom.xml
+++ b/camel-example-spring-boot-widget-gadget/pom.xml
@@ -28,7 +28,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>camel-example-spring-boot-widget-gadget</artifactId>
- <name>Camel SB Examples :: </name>
+ <name>Camel SB Examples ::</name>
<description>The widget and gadget example from EIP book, running on Spring Boot</description>
<properties>
@@ -90,20 +90,15 @@
<groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-spring-boot-starter</artifactId>
</dependency>
-
<dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-amqp</artifactId>
- <version>${camel-version}</version>
+ <groupId>org.apache.camel.springboot</groupId>
+ <artifactId>camel-amqp-starter</artifactId>
</dependency>
-
<dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-jsonpath</artifactId>
- <version>${camel-version}</version>
+ <groupId>org.apache.camel.springboot</groupId>
+ <artifactId>camel-jsonpath-starter</artifactId>
</dependency>
-
<!-- test -->
<dependency>
<groupId>org.springframework.boot</groupId>