You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by sr...@apache.org on 2018/01/05 14:47:06 UTC

[incubator-plc4x] branch master updated: PLC4X-22: temporary disable camel BOM due to long build-time on site:site

This is an automated email from the ASF dual-hosted git repository.

sruehl pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git


The following commit(s) were added to refs/heads/master by this push:
     new 0a22610  PLC4X-22: temporary disable camel BOM due to long build-time on site:site
0a22610 is described below

commit 0a2261036340ceadc1ee02b6d60ee10a9beeb778
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Fri Jan 5 15:45:56 2018 +0100

    PLC4X-22: temporary disable camel BOM due to long build-time on site:site
---
 integrations/apache-camel/pom.xml | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/integrations/apache-camel/pom.xml b/integrations/apache-camel/pom.xml
index 83affa6..71099c9 100644
--- a/integrations/apache-camel/pom.xml
+++ b/integrations/apache-camel/pom.xml
@@ -48,12 +48,16 @@
     <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-core</artifactId>
+      <!-- TODO: version temporary defined due to PLC4X-22-->
+      <version>2.20.1</version>
     </dependency>
 
     <!-- Support camel documentation-->
     <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>apt</artifactId>
+      <!-- TODO: version temporary defined due to PLC4X-22-->
+      <version>2.20.1</version>
       <scope>provided</scope>
     </dependency>
 
@@ -69,28 +73,42 @@
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-api</artifactId>
+      <version>2.9.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-core</artifactId>
+      <!-- TODO: version temporary defined due to PLC4X-22-->
+      <version>2.9.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-slf4j-impl</artifactId>
+      <!-- TODO: version temporary defined due to PLC4X-22-->
+      <version>2.9.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
+      <!-- TODO: version temporary defined due to PLC4X-22-->
       <version>2.12.0</version>
+      <!-- TODO: version temporary defined due to PLC4X-22-->
+      <exclusions>
+        <exclusion>
+          <artifactId>hamcrest-core</artifactId>
+          <groupId>org.hamcrest</groupId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
     <!-- Testing -->
     <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-test</artifactId>
+      <!-- TODO: version temporary defined due to PLC4X-22-->
       <version>2.20.1</version>
     </dependency>
   </dependencies>
@@ -98,13 +116,14 @@
   <dependencyManagement>
     <dependencies>
       <!-- Camel BOM -->
-      <dependency>
+      <!-- TODO: version temporary disabled due to PLC4X-22-->
+      <!--dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-parent</artifactId>
         <version>2.20.1</version>
         <scope>import</scope>
         <type>pom</type>
-      </dependency>
+      </dependency-->
     </dependencies>
   </dependencyManagement>
 

-- 
To stop receiving notification emails like this one, please contact
['"commits@plc4x.apache.org" <co...@plc4x.apache.org>'].