Skip to content

CAMEL-15482: refactor dependencies to use spring-boot starters #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 2, 2020
Merged

CAMEL-15482: refactor dependencies to use spring-boot starters #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions camel-example-spring-boot-amqp/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
5 changes: 0 additions & 5 deletions camel-example-spring-boot-fhir-auth-tx/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,11 +99,6 @@
<artifactId>camel-csv-starter</artifactId>
<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>
Expand Down
40 changes: 13 additions & 27 deletions camel-example-spring-boot-kafka-avro/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -64,10 +64,10 @@
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
</dependencyManagement>

<dependencies>

<!-- Spring Boot -->
<dependency>
<groupId>org.springframework.boot</groupId>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -186,4 +172,4 @@
</plugin>
</plugins>
</build>
</project>
</project>
27 changes: 7 additions & 20 deletions camel-example-spring-boot-kafka-offsetrepository/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand All @@ -39,7 +40,7 @@
</properties>

<dependencyManagement>
<dependencies>
<dependencies>
<!-- Spring Boot BOM -->
<dependency>
<groupId>org.springframework.boot</groupId>
Expand All @@ -57,10 +58,10 @@
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
</dependencyManagement>

<dependencies>

<!-- Spring Boot -->
<dependency>
<groupId>org.springframework.boot</groupId>
Expand Down Expand Up @@ -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>
Expand Down
6 changes: 2 additions & 4 deletions camel-example-spring-boot-opentracing/service2/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
15 changes: 5 additions & 10 deletions camel-example-spring-boot-widget-gadget/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down