CAMEL-10222: First working version (no unit tests)

Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b1244560
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b1244560
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b1244560

Branch: refs/heads/master
Commit: b12445607a8a1a8797e07bb35cb989cd1d160a35
Parents: 03a7e99
Author: Nicola Ferraro <ni.ferr...@gmail.com>
Authored: Wed Sep 7 16:37:23 2016 +0200
Committer: Nicola Ferraro <ni.ferr...@gmail.com>
Committed: Tue Sep 20 00:39:33 2016 +0200

----------------------------------------------------------------------
 .../camel-spring-boot-dependencies/pom.xml      | 31 ++++++++++---
 .../camel-spring-boot-generator-bom/pom.xml     | 48 ++++++++++++++++++++
 spring-boot-dm/pom.xml                          | 21 +++++----
 .../itest/springboot/ITestApplication.java      | 27 ++++++++++-
 .../springboot/util/ArquillianPackager.java     |  1 +
 5 files changed, 109 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/b1244560/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
----------------------------------------------------------------------
diff --git a/spring-boot-dm/camel-spring-boot-dependencies/pom.xml 
b/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
index cc554cd..57e2957 100644
--- a/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
+++ b/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
@@ -631,7 +631,12 @@
       <dependency>
         <groupId>net.sourceforge.htmlunit</groupId>
         <artifactId>htmlunit</artifactId>
-        <version>2.21</version>
+        <version>2.22</version>
+      </dependency>
+      <dependency>
+        <groupId>net.sourceforge.htmlunit</groupId>
+        <artifactId>htmlunit-core-js</artifactId>
+        <version>2.22</version>
       </dependency>
       <dependency>
         <groupId>net.sourceforge.jtds</groupId>
@@ -886,6 +891,23 @@
         <groupId>org.apache.avro</groupId>
         <artifactId>avro-ipc</artifactId>
         <version>1.8.1</version>
+        <classifier>tests</classifier>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.avro</groupId>
+        <artifactId>avro-ipc</artifactId>
+        <version>1.8.1</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.avro</groupId>
+        <artifactId>avro-mapred</artifactId>
+        <version>1.8.1</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.avro</groupId>
+        <artifactId>avro-mapred</artifactId>
+        <version>1.8.1</version>
+        <classifier>hadoop2</classifier>
       </dependency>
       <dependency>
         <groupId>org.apache.camel.karaf</groupId>
@@ -4580,14 +4602,9 @@
         <version>2.3.6</version>
       </dependency>
       <dependency>
-        <groupId>org.scala-lang</groupId>
-        <artifactId>scala-library</artifactId>
-        <version>2.11.7</version>
-      </dependency>
-      <dependency>
         <groupId>org.seleniumhq.selenium</groupId>
         <artifactId>htmlunit-driver</artifactId>
-        <version>2.21</version>
+        <version>2.22</version>
       </dependency>
       <dependency>
         <groupId>org.seleniumhq.selenium</groupId>

http://git-wip-us.apache.org/repos/asf/camel/blob/b1244560/spring-boot-dm/camel-spring-boot-generator-bom/pom.xml
----------------------------------------------------------------------
diff --git a/spring-boot-dm/camel-spring-boot-generator-bom/pom.xml 
b/spring-boot-dm/camel-spring-boot-generator-bom/pom.xml
index 4a9f91f..8da39f3 100644
--- a/spring-boot-dm/camel-spring-boot-generator-bom/pom.xml
+++ b/spring-boot-dm/camel-spring-boot-generator-bom/pom.xml
@@ -43,6 +43,30 @@
                 Dependencies are flattened and a BOM file is generated using a 
plugin.
              -->
 
+            <!-- Additional libraries related to Avro -->
+            <dependency>
+                <groupId>org.apache.avro</groupId>
+                <artifactId>avro</artifactId>
+                <version>${avro-version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.avro</groupId>
+                <artifactId>avro-mapred</artifactId>
+                <version>${avro-version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.avro</groupId>
+                <artifactId>avro-ipc</artifactId>
+                <classifier>tests</classifier>
+                <version>${avro-version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.avro</groupId>
+                <artifactId>avro-mapred</artifactId>
+                <classifier>hadoop2</classifier>
+                <version>${avro-version}</version>
+            </dependency>
+
             <!-- Use the camel version of caffeine -->
             <dependency>
                 <groupId>com.github.ben-manes.caffeine</groupId>
@@ -98,6 +122,28 @@
                 <version>${jna-version}</version>
             </dependency>
 
+            <!-- Overwrite with the version provided in camel -->
+            <dependency>
+                <groupId>net.sourceforge.htmlunit</groupId>
+                <artifactId>htmlunit-core-js</artifactId>
+                <version>${htmlunit-version}</version>
+            </dependency>
+            <dependency>
+                <groupId>net.sourceforge.htmlunit</groupId>
+                <artifactId>htmlunit</artifactId>
+                <version>${htmlunit-version}</version>
+            </dependency>
+            <dependency>
+                <groupId>net.sourceforge.htmlunit</groupId>
+                <artifactId>htmlunit</artifactId>
+                <version>${htmlunit-version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.seleniumhq.selenium</groupId>
+                <artifactId>htmlunit-driver</artifactId>
+                <version>${htmlunit-version}</version>
+            </dependency>
+
             <!-- Added to match the version of related libraries provided by 
spring-boot -->
             <dependency>
                 <groupId>org.eclipse.jetty</groupId>
@@ -456,6 +502,8 @@
                             <exclude>com.google.guava:*</exclude>
                             <exclude>com.google.code.gson:*</exclude>
 
+                            <exclude>org.scala-lang:*</exclude>
+
                             <exclude>org.apache.servicemix.bundles:*</exclude>
                             <exclude>org.ops4j.pax*:*</exclude>
                             <exclude>org.codehaus.mojo:*</exclude>

http://git-wip-us.apache.org/repos/asf/camel/blob/b1244560/spring-boot-dm/pom.xml
----------------------------------------------------------------------
diff --git a/spring-boot-dm/pom.xml b/spring-boot-dm/pom.xml
index 1514dd9..e7739fc 100644
--- a/spring-boot-dm/pom.xml
+++ b/spring-boot-dm/pom.xml
@@ -42,22 +42,23 @@
         <spring-boot-version>1.4.0.RELEASE</spring-boot-version>
 
         <!-- The following dependencies should be aligned with the ones in 
standard camel parent -->
-        <activemq-version>5.14.0</activemq-version>
-        <arquillian-version>1.1.11.Final</arquillian-version>
+        <avro-version>1.8.1</avro-version>
         <caffeine-version>2.3.3</caffeine-version>
+        <jackson-version>1.9.12</jackson-version>
+        <activemq-version>5.14.0</activemq-version>
+        <htmlunit-version>2.22</htmlunit-version>
+
+        <ahc-netty-version>4.0.40.Final</ahc-netty-version>
         <egit-github-core-version>2.1.5</egit-github-core-version>
+        <google-guava-version>19.0</google-guava-version>
         <geronimo-jms-spec-version>1.1.1</geronimo-jms-spec-version>
         <geronimo-jpa2-spec-version>1.1</geronimo-jpa2-spec-version>
-        <google-guava-version>19.0</google-guava-version>
-        <hadoop2-version>2.7.2</hadoop2-version>
-        <jackson-version>1.9.12</jackson-version>
-        <junit-version>4.12</junit-version>
-        <log4j2-version>2.6.2</log4j2-version>
+
         <maven-checkstyle-plugin-version>2.17</maven-checkstyle-plugin-version>
         <maven-checkstyle-version>6.17</maven-checkstyle-version>
-        <netty-version>4.1.5.Final</netty-version>
-        <ahc-netty-version>4.0.40.Final</ahc-netty-version>
-        <spring-version>4.3.2.RELEASE</spring-version>
+
+        <arquillian-version>1.1.11.Final</arquillian-version>
+        <hadoop2-version>2.7.2</hadoop2-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) -->
         <commons-beanutils-version>1.9.2</commons-beanutils-version>

http://git-wip-us.apache.org/repos/asf/camel/blob/b1244560/tests/camel-itest-spring-boot/src/main/java/org/apache/camel/itest/springboot/ITestApplication.java
----------------------------------------------------------------------
diff --git 
a/tests/camel-itest-spring-boot/src/main/java/org/apache/camel/itest/springboot/ITestApplication.java
 
b/tests/camel-itest-spring-boot/src/main/java/org/apache/camel/itest/springboot/ITestApplication.java
index f85bdb6..943899e 100644
--- 
a/tests/camel-itest-spring-boot/src/main/java/org/apache/camel/itest/springboot/ITestApplication.java
+++ 
b/tests/camel-itest-spring-boot/src/main/java/org/apache/camel/itest/springboot/ITestApplication.java
@@ -39,10 +39,33 @@ import 
org.springframework.scheduling.annotation.EnableAsync;
 @Import(ITestXmlConfiguration.class)
 public class ITestApplication {
 
+    private static final long TEST_TIMEOUT = 1000L * 60 * 7;
+
     public static void main(String[] args) throws Exception {
-        overrideLoggingConfig();
 
-        SpringApplication.run(ITestApplication.class, args);
+        try {
+            overrideLoggingConfig();
+            startKillerThread();
+
+            SpringApplication.run(ITestApplication.class, args);
+        } catch (Throwable t) {
+            LoggerFactory.getLogger(ITestApplication.class).error("Error while 
executing test", t);
+            throw t;
+        }
+    }
+
+    private static void startKillerThread() {
+        Thread thread = new Thread(() -> {
+            try {
+                Thread.sleep(TEST_TIMEOUT);
+            } catch (Exception e) {
+            }
+
+            LoggerFactory.getLogger(ITestApplication.class).warn("Timeout. 
Killing the test.");
+            System.exit(1);
+        });
+        thread.setDaemon(true);
+        thread.start();
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/camel/blob/b1244560/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 8127999..b97faf3 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
@@ -308,6 +308,7 @@ public final class ArquillianPackager {
         ignore.add("org.apache.parquet");
         ignore.add("org.springframework.data");
         ignore.add("org.apache.velocity");
+        ignore.add("org.apache.cxf:cxf-api");
 
         Map<String, Map<String, String>> status = new TreeMap<>();
         Set<String> mismatches = new TreeSet<>();

Reply via email to