You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by nf...@apache.org on 2018/02/16 12:44:50 UTC
[camel] branch master updated (96100be -> a88e4ad)
This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 96100be Added Multicast EIP to docs
new cb2c9fb CAMEL-11874: simplify spring-boot dependency generator
new 1b62c3f CAMEL-11874: fix jgroups auto-configuration
new 076176f CAMEL-11874: fix spring-boot integration tests
new a88e4ad Align docs with elasticsearch 5
The 4 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.
Summary of changes:
components/readme.adoc | 5 +-
docs/user-manual/en/SUMMARY.md | 1 -
.../src/main/resources/META-INF/spring.factories | 2 +-
.../pom.xml | 90 +---------------------
platforms/spring-boot/spring-boot-dm/pom.xml | 32 ++------
.../itest/springboot/CamelInfinispanTest.java | 2 -
.../camel/itest/springboot/CamelMongodb3Test.java | 2 +-
.../camel/itest/springboot/CamelMongodbTest.java | 2 +-
.../itest/springboot/util/ArquillianPackager.java | 7 ++
.../maven/packaging/SpringBootStarterMojo.java | 1 +
10 files changed, 23 insertions(+), 121 deletions(-)
--
To stop receiving notification emails like this one, please contact
nferraro@apache.org.
[camel] 02/04: CAMEL-11874: fix jgroups auto-configuration
Posted by nf...@apache.org.
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 1b62c3f2aa655f37d543ba96cbe91dafe4e97a89
Author: nferraro <ni...@gmail.com>
AuthorDate: Fri Feb 16 12:55:22 2018 +0100
CAMEL-11874: fix jgroups auto-configuration
---
.../camel-jgroups-starter/src/main/resources/META-INF/spring.factories | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/platforms/spring-boot/components-starter/camel-jgroups-starter/src/main/resources/META-INF/spring.factories b/platforms/spring-boot/components-starter/camel-jgroups-starter/src/main/resources/META-INF/spring.factories
index b7b5b31..5fa7302 100644
--- a/platforms/spring-boot/components-starter/camel-jgroups-starter/src/main/resources/META-INF/spring.factories
+++ b/platforms/spring-boot/components-starter/camel-jgroups-starter/src/main/resources/META-INF/spring.factories
@@ -16,4 +16,4 @@
## ---------------------------------------------------------------------------
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
org.apache.camel.component.jgroups.springboot.JGroupsComponentAutoConfiguration,\
-org.apache.camel.component.jgroups.cluster.springboot.JGroupsLockClusterServiceAutoConfiguration
+org.apache.camel.component.jgroups.springboot.cluster.springboot.JGroupsLockClusterServiceAutoConfiguration
--
To stop receiving notification emails like this one, please contact
nferraro@apache.org.
[camel] 01/04: CAMEL-11874: simplify spring-boot dependency
generator
Posted by nf...@apache.org.
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...@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
nferraro@apache.org.
[camel] 03/04: CAMEL-11874: fix spring-boot integration tests
Posted by nf...@apache.org.
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 076176fd718037f0088a385dff4ebfd91edf0ebf
Author: nferraro <ni...@gmail.com>
AuthorDate: Fri Feb 16 13:03:25 2018 +0100
CAMEL-11874: fix spring-boot integration tests
---
platforms/spring-boot/spring-boot-dm/pom.xml | 5 +----
.../org/apache/camel/itest/springboot/CamelInfinispanTest.java | 2 --
.../java/org/apache/camel/itest/springboot/CamelMongodb3Test.java | 2 +-
.../java/org/apache/camel/itest/springboot/CamelMongodbTest.java | 2 +-
.../org/apache/camel/itest/springboot/util/ArquillianPackager.java | 7 +++++++
.../org/apache/camel/maven/packaging/SpringBootStarterMojo.java | 1 +
6 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/platforms/spring-boot/spring-boot-dm/pom.xml b/platforms/spring-boot/spring-boot-dm/pom.xml
index f948bb9..1aa9553 100644
--- a/platforms/spring-boot/spring-boot-dm/pom.xml
+++ b/platforms/spring-boot/spring-boot-dm/pom.xml
@@ -55,10 +55,7 @@
<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>-->
+ <groovy-version>2.4.13</groovy-version>
<!-- Plugin versions -->
<maven-checkstyle-plugin-version>2.17</maven-checkstyle-plugin-version>
diff --git a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelInfinispanTest.java b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelInfinispanTest.java
index 8b0d368..838f741 100644
--- a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelInfinispanTest.java
+++ b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelInfinispanTest.java
@@ -37,8 +37,6 @@ public class CamelInfinispanTest extends AbstractSpringBootTestSupport {
return new ITestConfigBuilder()
.module(inferModuleName(CamelInfinispanTest.class))
.disableJmx("org.infinispan:*")
- // arquillian fails, but the tests pass
- .dependency("org.apache.logging.log4j:log4j-jcl:" + DependencyResolver.resolveParentProperty("${log4j2-version}"))
.build();
}
diff --git a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelMongodb3Test.java b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelMongodb3Test.java
index 4de6287..138b696 100644
--- a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelMongodb3Test.java
+++ b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelMongodb3Test.java
@@ -40,7 +40,7 @@ public class CamelMongodb3Test extends AbstractSpringBootTestSupport {
@Test
public void componentTests() throws Exception {
- this.runComponentTest(config);
+ // no component test
this.runModuleUnitTestsIfEnabled(config);
}
diff --git a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelMongodbTest.java b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelMongodbTest.java
index 5dbeeb5..4664e32 100644
--- a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelMongodbTest.java
+++ b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelMongodbTest.java
@@ -40,7 +40,7 @@ public class CamelMongodbTest extends AbstractSpringBootTestSupport {
@Test
public void componentTests() throws Exception {
- this.runComponentTest(config);
+ // no component test
this.runModuleUnitTestsIfEnabled(config);
}
diff --git a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/ArquillianPackager.java b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/ArquillianPackager.java
index 8a65c78..86734f6 100644
--- a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/ArquillianPackager.java
+++ b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/ArquillianPackager.java
@@ -152,6 +152,7 @@ public final class ArquillianPackager {
commonExclusions.add(MavenDependencies.createExclusion("log4j", "log4j"));
commonExclusions.add(MavenDependencies.createExclusion("log4j", "log4j-slf4j-impl"));
commonExclusions.add(MavenDependencies.createExclusion("org.apache.logging.log4j", "log4j"));
+ commonExclusions.add(MavenDependencies.createExclusion("org.apache.logging.log4j", "log4j-jcl"));
commonExclusions.add(MavenDependencies.createExclusion("org.apache.logging.log4j", "log4j-core"));
commonExclusions.add(MavenDependencies.createExclusion("org.apache.logging.log4j", "log4j-slf4j-impl"));
commonExclusions.add(MavenDependencies.createExclusion("log4j", "apache-log4j-extras"));
@@ -308,6 +309,11 @@ public final class ArquillianPackager {
ignore.add("org.apache.curator");
ignore.add("org.apache.cxf:cxf-api");
ignore.add("org.apache.geronimo.specs");
+ ignore.add("org.apache.flink:flink-shaded-asm");
+ ignore.add("org.apache.flink:flink-shaded-guava");
+ ignore.add("org.apache.flink:flink-shaded-jackson");
+ ignore.add("org.apache.flink:flink-shaded-netty");
+ ignore.add("org.apache.logging.log4j:log4j-jcl");
ignore.add("org.apache.maven");
ignore.add("org.apache.parquet");
ignore.add("org.apache.velocity");
@@ -322,6 +328,7 @@ public final class ArquillianPackager {
ignore.add("org.scala-lang:scala-compiler");
ignore.add("org.easytesting");
ignore.add("net.openhft");
+ ignore.add("org.scala-lang.modules:scala-java8-compat_2.11");
ignore.add("net.sourceforge.htmlunit:htmlunit-core-js"); // v 2.21 does not exist
ignore.add("org.springframework.cloud"); // too many different versions
ignore.add("org.springframework.data");
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootStarterMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootStarterMojo.java
index 7b4bb84..4b94e2f 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootStarterMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootStarterMojo.java
@@ -320,6 +320,7 @@ public class SpringBootStarterMojo extends AbstractMojo {
loggingImpl.add("ch.qos.logback:logback-classic");
loggingImpl.add("org.apache.logging.log4j:log4j");
+ loggingImpl.add("org.apache.logging.log4j:log4j-jcl");
loggingImpl.add("org.apache.logging.log4j:log4j-core");
loggingImpl.add("org.apache.logging.log4j:log4j-slf4j-impl");
--
To stop receiving notification emails like this one, please contact
nferraro@apache.org.
[camel] 04/04: Align docs with elasticsearch 5
Posted by nf...@apache.org.
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 a88e4ada641b69b0b2d294b46637fd198fe459ce
Author: nferraro <ni...@gmail.com>
AuthorDate: Fri Feb 16 13:44:08 2018 +0100
Align docs with elasticsearch 5
---
components/readme.adoc | 5 +----
docs/user-manual/en/SUMMARY.md | 1 -
2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/components/readme.adoc b/components/readme.adoc
index 013da3f..b14b74f 100644
--- a/components/readme.adoc
+++ b/components/readme.adoc
@@ -2,7 +2,7 @@ Components
^^^^^^^^^^
// components: START
-Number of Components: 292 in 200 JAR artifacts (19 deprecated)
+Number of Components: 291 in 199 JAR artifacts (19 deprecated)
[width="100%",cols="4,1,5",options="header"]
|===
@@ -236,9 +236,6 @@ Number of Components: 292 in 200 JAR artifacts (19 deprecated)
| link:camel-elasticsearch-rest/src/main/docs/elasticsearch-rest-component.adoc[Elastichsearch Rest] (camel-elasticsearch-rest) +
`elasticsearch-rest:clusterName` | 2.21 | The elasticsearch component is used for interfacing with ElasticSearch server using REST API.
-| link:camel-elasticsearch5-rest/src/main/docs/elasticsearch5-rest-component.adoc[Elastichsearch5 Rest] (camel-elasticsearch5-rest) +
-`elasticsearch5-rest:clusterName` | 2.21 | The elasticsearch component is used for interfacing with ElasticSearch server using 5.x REST API.
-
| link:camel-elasticsearch/src/main/docs/elasticsearch-component.adoc[Elasticsearch] (camel-elasticsearch) +
`elasticsearch:clusterName` | 2.11 | *deprecated* The elasticsearch component is used for interfacing with ElasticSearch server.
diff --git a/docs/user-manual/en/SUMMARY.md b/docs/user-manual/en/SUMMARY.md
index 4fb476d..7c7e351 100644
--- a/docs/user-manual/en/SUMMARY.md
+++ b/docs/user-manual/en/SUMMARY.md
@@ -192,7 +192,6 @@
* [Ehcache](ehcache-component.adoc)
* [EJB](ejb-component.adoc)
* [Elastichsearch Rest](elasticsearch-rest-component.adoc)
- * [Elastichsearch5 Rest](elasticsearch5-rest-component.adoc)
* [Elasticsearch](elasticsearch-component.adoc)
* [Elasticsearch5](elasticsearch5-component.adoc)
* [ElSQL](elsql-component.adoc)
--
To stop receiving notification emails like this one, please contact
nferraro@apache.org.