Repository: camel Updated Branches: refs/heads/master 8519bb3ea -> 0229cbcfb
Removing netty from managed dependencies and fix spring-boot tests Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0229cbcf Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0229cbcf Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0229cbcf Branch: refs/heads/master Commit: 0229cbcfbe54bd84a45becc0c408346264f768ad Parents: 371a4ea Author: Nicola Ferraro <ni.ferr...@gmail.com> Authored: Fri Sep 22 14:45:21 2017 +0200 Committer: Nicola Ferraro <ni.ferr...@gmail.com> Committed: Fri Sep 22 17:15:19 2017 +0200 ---------------------------------------------------------------------- components/camel-netty4/pom.xml | 1 + parent/pom.xml | 6 ------ .../spring-boot/components-starter/camel-ahc-starter/pom.xml | 5 ----- .../components-starter/camel-ahc-ws-starter/pom.xml | 5 ----- platforms/spring-boot/spring-boot-dm/pom.xml | 1 - .../apache/camel/itest/springboot/util/ArquillianPackager.java | 2 ++ .../org/apache/camel/itest/springboot/util/JarExporter.java | 3 +-- .../src/main/resources/spring-boot-fix-dependencies.properties | 3 --- 8 files changed, 4 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/0229cbcf/components/camel-netty4/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-netty4/pom.xml b/components/camel-netty4/pom.xml index 60fcd9b..d4aa394 100644 --- a/components/camel-netty4/pom.xml +++ b/components/camel-netty4/pom.xml @@ -46,6 +46,7 @@ <dependency> <groupId>io.netty</groupId> <artifactId>netty-all</artifactId> + <version>${netty-version}</version> </dependency> <dependency> <groupId>commons-pool</groupId> http://git-wip-us.apache.org/repos/asf/camel/blob/0229cbcf/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 1ba4c4e..0034bf9 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -3627,12 +3627,6 @@ <version>${fastjson-version}</version> </dependency> - <dependency> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - <version>${netty-version}</version> - </dependency> - <!-- abdera dependencies--> <dependency> <groupId>org.apache.abdera</groupId> http://git-wip-us.apache.org/repos/asf/camel/blob/0229cbcf/platforms/spring-boot/components-starter/camel-ahc-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-ahc-starter/pom.xml b/platforms/spring-boot/components-starter/camel-ahc-starter/pom.xml index db544a7..353747c 100644 --- a/platforms/spring-boot/components-starter/camel-ahc-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-ahc-starter/pom.xml @@ -41,11 +41,6 @@ </dependency> <!--START OF GENERATED CODE--> <dependency> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - <version>${ahc-netty-version}</version> - </dependency> - <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-core-starter</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/0229cbcf/platforms/spring-boot/components-starter/camel-ahc-ws-starter/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-ahc-ws-starter/pom.xml b/platforms/spring-boot/components-starter/camel-ahc-ws-starter/pom.xml index 8fdb350..99cf0be 100644 --- a/platforms/spring-boot/components-starter/camel-ahc-ws-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-ahc-ws-starter/pom.xml @@ -41,11 +41,6 @@ </dependency> <!--START OF GENERATED CODE--> <dependency> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - <version>${ahc-netty-version}</version> - </dependency> - <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-core-starter</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/0229cbcf/platforms/spring-boot/spring-boot-dm/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/spring-boot-dm/pom.xml b/platforms/spring-boot/spring-boot-dm/pom.xml index 9fb7c6c..6b0dff6 100644 --- a/platforms/spring-boot/spring-boot-dm/pom.xml +++ b/platforms/spring-boot/spring-boot-dm/pom.xml @@ -63,7 +63,6 @@ <hadoop2-version>2.7.2</hadoop2-version> <!-- Custom dependency required by some modules --> - <ahc-netty-version>4.0.46.Final</ahc-netty-version> <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.12</groovy-version> http://git-wip-us.apache.org/repos/asf/camel/blob/0229cbcf/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/ArquillianPackager.java ---------------------------------------------------------------------- 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 0ef066c..d3a577d 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 @@ -302,6 +302,7 @@ public final class ArquillianPackager { ignore.add("commons-beanutils:commons-beanutils"); ignore.add("io.fabric8:kubernetes-"); ignore.add("io.netty:netty:jar"); // an old version + ignore.add("io.netty:netty-tcnative-boringssl-static"); ignore.add("io.swagger:swagger-parser"); ignore.add("org.apache.commons"); ignore.add("org.apache.curator"); @@ -322,6 +323,7 @@ public final class ArquillianPackager { ignore.add("org.easytesting"); ignore.add("net.openhft"); 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"); ignore.add("org.springframework.security:spring-security-jwt"); ignore.add("org.springframework.security:spring-security-rsa"); http://git-wip-us.apache.org/repos/asf/camel/blob/0229cbcf/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/JarExporter.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/JarExporter.java b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/JarExporter.java index 4f0de2e..84dde29 100644 --- a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/JarExporter.java +++ b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/JarExporter.java @@ -32,8 +32,7 @@ public class JarExporter { public void exportJar() throws Exception { Archive<?> archive = ArquillianPackager.springBootPackage(new ITestConfigBuilder() - .module("camel-cache") - .resource("components/cache-ehcache.xml", "ehcache.xml") + .module("camel-ahc") .build()); new ZipExporterImpl(archive).exportTo(new File("target/export.zip"), true); http://git-wip-us.apache.org/repos/asf/camel/blob/0229cbcf/tooling/maven/camel-package-maven-plugin/src/main/resources/spring-boot-fix-dependencies.properties ---------------------------------------------------------------------- diff --git a/tooling/maven/camel-package-maven-plugin/src/main/resources/spring-boot-fix-dependencies.properties b/tooling/maven/camel-package-maven-plugin/src/main/resources/spring-boot-fix-dependencies.properties index fa1dc10..b1ad02f 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/resources/spring-boot-fix-dependencies.properties +++ b/tooling/maven/camel-package-maven-plugin/src/main/resources/spring-boot-fix-dependencies.properties @@ -21,9 +21,6 @@ # Global dependencies included in all modules (except the ones in the list) global=org.apache.camel:camel-core-starter,org.apache.camel:camel-spring-boot-starter -camel-ahc=io.netty:netty-all:${ahc-netty-version} -camel-ahc-ws=io.netty:netty-all:${ahc-netty-version} - camel-bam=org.hibernate:hibernate-entitymanager,org.apache.geronimo.specs:geronimo-jta_1.1_spec # we need spring-boot in camel-core-starter
