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 2015/09/17 17:57:30 UTC
[1/2] camel git commit: Add Jcommander to Camel-barcode feature
Repository: camel
Updated Branches:
refs/heads/master d8c357d61 -> 2f6fc20aa
Add Jcommander to Camel-barcode feature
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2f6fc20a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2f6fc20a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2f6fc20a
Branch: refs/heads/master
Commit: 2f6fc20aace99f8ad3c1e968a81ffceb54f37b1c
Parents: f8dda27
Author: Andrea Cosentino <an...@gmail.com>
Authored: Thu Sep 17 17:55:48 2015 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Thu Sep 17 17:56:25 2015 +0200
----------------------------------------------------------------------
parent/pom.xml | 1 +
platforms/karaf/features/src/main/resources/features.xml | 1 +
2 files changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/2f6fc20a/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index a9ce308..6a4973d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -261,6 +261,7 @@
<!-- jclouds must use this guava version -->
<jclouds-google-guava-version>16.0.1</jclouds-google-guava-version>
<jclouds-google-guava-version-range>[16.0,17.0)</jclouds-google-guava-version-range>
+ <jcommander-version>1.48</jcommander-version>
<jcr-version>2.0</jcr-version>
<jdom-bundle-version>1.1_4</jdom-bundle-version>
<jdom-version>1.1.3</jdom-version>
http://git-wip-us.apache.org/repos/asf/camel/blob/2f6fc20a/platforms/karaf/features/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index 8083e67..060f2a7 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -184,6 +184,7 @@
<feature name='camel-barcode' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.zxing/${zxing-bundle-version}</bundle>
+ <bundle dependency='true'>wrap:mvn:com.beust/jcommander/${jcommander-version}</bundle>
<bundle>mvn:org.apache.camel/camel-barcode/${project.version}</bundle>
</feature>
<feature name='camel-bindy' version='${project.version}' resolver='(obr)' start-level='50'>
[2/2] camel git commit: Upgrade Zxing to version 3.2.1
Posted by ac...@apache.org.
Upgrade Zxing to version 3.2.1
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f8dda274
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f8dda274
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f8dda274
Branch: refs/heads/master
Commit: f8dda274f0a7b9349637c4ed711927165e7eafb9
Parents: d8c357d
Author: Andrea Cosentino <an...@gmail.com>
Authored: Thu Sep 17 16:50:50 2015 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Thu Sep 17 17:56:25 2015 +0200
----------------------------------------------------------------------
parent/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/f8dda274/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 680107f..a9ce308 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -538,8 +538,8 @@
<yammer-metrics-version>2.2.0</yammer-metrics-version>
<zkclient-version>0.5</zkclient-version>
<zookeeper-version>3.4.6</zookeeper-version>
- <zxing-version>3.2.0</zxing-version>
- <zxing-bundle-version>3.2.0_1</zxing-bundle-version>
+ <zxing-version>3.2.1</zxing-version>
+ <zxing-bundle-version>3.2.1_1</zxing-bundle-version>
<!-- OSGi bundles properties -->
<camel.osgi.import.camel.version>version="[$(version;==;${camel.osgi.version.clean}),$(version;=+;${camel.osgi.version.clean}))"</camel.osgi.import.camel.version>