You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2018/08/21 08:01:47 UTC

[camel] branch master updated (e4a0e32 -> 495c1ad)

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

acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.


    from e4a0e32  Upgrade Proton-j to version 0.29.0
     new 8c2fd46  Fixed camel-web3j Karaf feature after Quorum dependency has been added
     new 495c1ad  Use the Web3j Quorum version declared in Parent POM for Karaf feature

The 2 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:
 platforms/karaf/features/src/main/resources/features.xml | 1 +
 1 file changed, 1 insertion(+)


[camel] 02/02: Use the Web3j Quorum version declared in Parent POM for Karaf feature

Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 495c1ad0e3d9b6707e4643cef0206d895c513192
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Aug 21 10:01:07 2018 +0200

    Use the Web3j Quorum version declared in Parent POM for Karaf feature
---
 platforms/karaf/features/src/main/resources/features.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index c56be5e..6fcc0d1 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -2372,7 +2372,7 @@
     <bundle dependency='true'>wrap:mvn:org.web3j/core/${web3j-version}</bundle>
     <bundle dependency='true'>wrap:mvn:org.web3j/geth/${web3j-version}</bundle>
     <bundle dependency='true'>wrap:mvn:org.web3j/parity/${web3j-version}</bundle>
-    <bundle dependency='true'>wrap:mvn:org.web3j/quorum/0.9.0</bundle>
+    <bundle dependency='true'>wrap:mvn:org.web3j/quorum/${web3j-quorum-version}</bundle>
     <bundle dependency='true'>mvn:io.reactivex/rxjava/${rxjava-version}</bundle>
     <bundle>mvn:org.apache.camel/camel-web3j/${project.version}</bundle>
   </feature>


[camel] 01/02: Fixed camel-web3j Karaf feature after Quorum dependency has been added

Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 8c2fd468c13118bc70bf5fceac66eb5e35d0dd56
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Aug 21 09:56:12 2018 +0200

    Fixed camel-web3j Karaf feature after Quorum dependency has been added
---
 platforms/karaf/features/src/main/resources/features.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index 413a8d6..c56be5e 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -2372,6 +2372,7 @@
     <bundle dependency='true'>wrap:mvn:org.web3j/core/${web3j-version}</bundle>
     <bundle dependency='true'>wrap:mvn:org.web3j/geth/${web3j-version}</bundle>
     <bundle dependency='true'>wrap:mvn:org.web3j/parity/${web3j-version}</bundle>
+    <bundle dependency='true'>wrap:mvn:org.web3j/quorum/0.9.0</bundle>
     <bundle dependency='true'>mvn:io.reactivex/rxjava/${rxjava-version}</bundle>
     <bundle>mvn:org.apache.camel/camel-web3j/${project.version}</bundle>
   </feature>