This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit cb2c9fb0128bdd9cc11aabfab4da9228bd14d13b
Author: nferraro <ni.ferr...@gmail.com>
AuthorDate: Fri Feb 16 11:25:53 2018 +0100
CAMEL-11874: simplify spring-boot dependency generator
---
.../pom.xml | 90 +---------------------
platforms/spring-boot/spring-boot-dm/pom.xml | 35 +++------
2 files changed, 14 insertions(+), 111 deletions(-)
diff --git
a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies-generator/pom.xml
b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies-generator/pom.xml
index 115c6ed..aa35d61 100644
---
a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies-generator/pom.xml
+++
b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies-generator/pom.xml
@@ -73,57 +73,6 @@
<version>${jackson-version}</version>
</dependency>
- <!-- Added to match the version of related libraries provided by
spring-boot -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-ext</artifactId>
- <version>${slf4j-version}</version>
- </dependency>
-
- <!-- Added to match the version of related libraries provided by
spring-boot -->
- <dependency>
- <groupId>net.java.dev.jna</groupId>
- <artifactId>jna-platform</artifactId>
- <version>${jna-version}</version>
- </dependency>
-
- <!-- Added to match the version of related libraries provided by
spring-boot -->
- <!-- Seems that htmlunit 2.21 is not present in Maven central -->
- <!--<dependency>-->
- <!--<groupId>net.sourceforge.htmlunit</groupId>-->
- <!--<artifactId>htmlunit-core-js</artifactId>-->
- <!--<version>${htmlunit-version}</version>-->
- <!--</dependency>-->
-
- <!-- Added to match the version of related libraries provided by
spring-boot -->
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-util-ajax</artifactId>
- <version>${jetty-version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-rewrite</artifactId>
- <version>${jetty-version}</version>
- </dependency>
-
- <!-- Added to match the version of related libraries provided by
spring-boot -->
- <dependency>
- <groupId>org.eclipse.jetty.websocket</groupId>
- <artifactId>websocket-api</artifactId>
- <version>${jetty-version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty.websocket</groupId>
- <artifactId>websocket-common</artifactId>
- <version>${jetty-version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty.websocket</groupId>
- <artifactId>websocket-servlet</artifactId>
- <version>${jetty-version}</version>
- </dependency>
-
<!-- Dependencies from Camel parent at the end -->
<dependency>
<groupId>org.apache.camel</groupId>
@@ -157,27 +106,7 @@
<artifactId>spring-boot-dependencies</artifactId>
<version>${spring-boot-version}</version>
</bom>
- <!-- Other BOMs imported by SB should be listed explicitly -->
- <bom>
- <groupId>org.springframework</groupId>
- <artifactId>spring-framework-bom</artifactId>
- <version>${spring-version}</version>
- </bom>
- <bom>
- <groupId>org.springframework.data</groupId>
- <artifactId>spring-data-releasetrain</artifactId>
- <version>${spring-data-releasetrain-version}</version>
- </bom>
- <bom>
- <groupId>org.springframework.integration</groupId>
- <artifactId>spring-integration-bom</artifactId>
- <version>${spring-integration-version}</version>
- </bom>
- <bom>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-bom</artifactId>
- <version>${spring-security-version}</version>
- </bom>
+ <!-- Other BOMs used by SB are transitively imported now -->
</boms>
</checkConflicts>
<dependencies>
@@ -206,12 +135,7 @@
<exclude>org.hsqldb:*</exclude>
<exclude>org.mockito:*</exclude>
- <exclude>org.slf4j:jul-to-slf4j</exclude>
- <exclude>org.slf4j:log4j-over-slf4j</exclude>
- <exclude>org.slf4j:slf4j-api</exclude>
- <exclude>org.slf4j:slf4j-log4j12</exclude>
- <exclude>org.slf4j:slf4j-simple</exclude>
- <exclude>org.slf4j:slf4j-ext</exclude>
+ <exclude>org.slf4j:*</exclude>
<exclude>org.springframework*:*</exclude>
@@ -239,14 +163,8 @@
<exclude>io.netty*:*</exclude>
<exclude>org.scala-lang:*</exclude>
<exclude>org.apache.lucene:*</exclude>
- <exclude>net.java.dev.jna:*</exclude>
-
- <!-- Jetty -->
- <exclude>org.eclipse.jetty:jetty-rewrite</exclude>
- <exclude>org.eclipse.jetty:jetty-util-ajax</exclude>
- <exclude>org.eclipse.jetty.websocket:websocket-api</exclude>
- <exclude>org.eclipse.jetty.websocket:websocket-common</exclude>
- <exclude>org.eclipse.jetty.websocket:websocket-servlet</exclude>
+
+
<!-- Unrelated -->
<exclude>org.apache.servicemix.bundles:*</exclude>
diff --git a/platforms/spring-boot/spring-boot-dm/pom.xml
b/platforms/spring-boot/spring-boot-dm/pom.xml
index fbe053c..f948bb9 100644
--- a/platforms/spring-boot/spring-boot-dm/pom.xml
+++ b/platforms/spring-boot/spring-boot-dm/pom.xml
@@ -44,41 +44,26 @@
<spring-boot-version>1.5.10.RELEASE</spring-boot-version>
<!-- The following dependencies should be aligned with the ones in
standard camel parent -->
+ <!-- Needed by BOM generator-->
<avro-version>1.8.2</avro-version>
- <cassandra-driver-guava-version>18.0</cassandra-driver-guava-version>
<jackson-version>1.9.12</jackson-version>
+ <!-- Needed by starters -->
<egit-github-core-version>2.1.5</egit-github-core-version>
<google-guava-version>19.0</google-guava-version>
<lucene3-version>3.6.0</lucene3-version>
- <scala-version>2.11.7</scala-version>
- <scalaxml-version>1.0.6</scalaxml-version>
+ <hadoop2-version>2.7.4</hadoop2-version>
+
<infinispan-spring-boot-version>1.0.0.Final</infinispan-spring-boot-version>
+ <cassandra-driver-guava-version>18.0</cassandra-driver-guava-version>
+ <!--<scala-version>2.11.7</scala-version>-->
+ <!--<scalaxml-version>1.0.6</scalaxml-version>-->
+
<!--<cassandra-netty-version-testing>4.0.44.Final</cassandra-netty-version-testing>-->
+ <!--<groovy-version>2.4.13</groovy-version>-->
+ <!-- Plugin versions -->
<maven-checkstyle-plugin-version>2.17</maven-checkstyle-plugin-version>
<maven-checkstyle-version>7.6.1</maven-checkstyle-version>
- <hadoop2-version>2.7.2</hadoop2-version>
-
- <!-- Custom dependency required by some modules -->
-
<cassandra-netty-version-testing>4.0.44.Final</cassandra-netty-version-testing>
-
<infinispan-spring-boot-version>1.0.0.Final</infinispan-spring-boot-version>
- <groovy-version>2.4.13</groovy-version>
-
- <!-- The following versions should be aligned with the ones in
spring-boot-repo/spring-boot-dependencies/pom.xml (for the targeted version of
spring-boot) -->
- <!-- for example:
https://github.com/spring-projects/spring-boot/blob/v1.5.10.RELEASE/spring-boot-dependencies/pom.xml
-->
- <jackson2-version>2.8.10</jackson2-version>
- <!-- jetty 9.4.7 is buggy -->
- <jetty9-version>9.4.6.v20170531</jetty9-version>
- <jetty-version>${jetty9-version}</jetty-version>
- <jna-version>4.2.2</jna-version>
- <hazelcast-version>3.7.8</hazelcast-version>
- <htmlunit-version>2.21</htmlunit-version>
- <log4j2-version>2.7</log4j2-version>
- <slf4j-version>1.7.25</slf4j-version>
- <spring-version>4.3.14.RELEASE</spring-version>
-
<spring-data-releasetrain-version>Ingalls-SR10</spring-data-releasetrain-version>
- <spring-integration-version>4.3.14.RELEASE</spring-integration-version>
- <spring-security-version>4.2.4.RELEASE</spring-security-version>
</properties>
<build>
--
To stop receiving notification emails like this one, please contact
nferr...@apache.org.
