You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2014/06/26 20:17:14 UTC
[1/2] git commit: CAMEL-7458: Add noggit bundle to camel-solr feature.
Repository: camel
Updated Branches:
refs/heads/camel-2.13.x 4450a6c11 -> 768fcbb6f
refs/heads/master 559197e60 -> cd3515ab5
CAMEL-7458: Add noggit bundle to camel-solr feature.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/cd3515ab
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/cd3515ab
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/cd3515ab
Branch: refs/heads/master
Commit: cd3515ab5ca841b5e194e201267cef24619f70e7
Parents: 559197e
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Jun 26 20:16:06 2014 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Jun 26 20:16:06 2014 +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/cd3515ab/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 0aa72e4..fa56668 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -310,6 +310,7 @@
<neethi-bundle-version>3.0.1</neethi-bundle-version>
<netty3-version>3.9.2.Final</netty3-version>
<netty-version>4.0.20.Final</netty-version>
+ <noggit-bundle-version>0.5_1</noggit-bundle-version>
<ode-version>1.3.4</ode-version>
<!-- should be in-sync with deltaspike -->
<openwebbeans-version>1.1.5</openwebbeans-version>
http://git-wip-us.apache.org/repos/asf/camel/blob/cd3515ab/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 3c1be6b..a4ec9f6 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1039,6 +1039,7 @@
<feature version='${project.version}'>camel-core</feature>
<bundle dependency='true'>mvn:org.apache.httpcomponents/httpcore-osgi/${httpcore4-version}</bundle>
<bundle dependency='true'>mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient4-version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.noggit/${noggit-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.solr-solrj/${solr-bundle-version}</bundle>
<bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons-httpclient-bundle-version}</bundle>
[2/2] git commit: CAMEL-7458: Add noggit bundle to camel-solr feature.
Posted by da...@apache.org.
CAMEL-7458: Add noggit bundle to camel-solr feature.
Conflicts:
parent/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/768fcbb6
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/768fcbb6
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/768fcbb6
Branch: refs/heads/camel-2.13.x
Commit: 768fcbb6f75f666832b7153dc714ea68f00130a7
Parents: 4450a6c
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Jun 26 20:16:06 2014 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Jun 26 20:16:53 2014 +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/768fcbb6/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 9a8df52..d57c38e 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -315,6 +315,7 @@
<neethi-bundle-version>3.0.1</neethi-bundle-version>
<netty3-version>3.9.1.Final</netty3-version>
<netty-version>4.0.19.Final</netty-version>
+ <noggit-bundle-version>0.5_1</noggit-bundle-version>
<ode-version>1.3.4</ode-version>
<!-- should be in-sync with deltaspike -->
<openwebbeans-version>1.1.5</openwebbeans-version>
http://git-wip-us.apache.org/repos/asf/camel/blob/768fcbb6/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 e2d1569..a140257 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1011,6 +1011,7 @@
<feature version='${project.version}'>camel-core</feature>
<bundle dependency='true'>mvn:org.apache.httpcomponents/httpcore-osgi/${httpcore4-version}</bundle>
<bundle dependency='true'>mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient4-version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.noggit/${noggit-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.solr-solrj/${solr-bundle-version}</bundle>
<bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons-httpclient-bundle-version}</bundle>