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 2015/03/01 11:47:58 UTC
[1/6] camel git commit: CAMEL-8331: OSGi bundle upgrades
Repository: camel
Updated Branches:
refs/heads/master e086d29fa -> df4a9413e
CAMEL-8331: OSGi bundle upgrades
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ead9be3d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ead9be3d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ead9be3d
Branch: refs/heads/master
Commit: ead9be3d186f5655b66d35b60582551abf73bc5d
Parents: e086d29
Author: Claus Ibsen <da...@apache.org>
Authored: Sun Mar 1 09:40:53 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Mar 1 09:40:53 2015 +0100
----------------------------------------------------------------------
parent/pom.xml | 1 +
platforms/karaf/features/src/main/resources/features.xml | 7 +++++++
2 files changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/ead9be3d/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 05459fb..0c5f2d9 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -419,6 +419,7 @@
<solr-version>4.9.0</solr-version>
<solr-version-range>[4.9,5)</solr-version-range>
<spark-rest-version>2.0.0</spark-rest-version>
+ <spark-rest-bundle-version>2.0.0_1</spark-rest-bundle-version>
<splunk-version>1.3.0_1</splunk-version>
<spring-batch-version>3.0.3.RELEASE</spring-batch-version>
<spring-batch-bundle-version>3.0.3.RELEASE_1</spring-batch-bundle-version>
http://git-wip-us.apache.org/repos/asf/camel/blob/ead9be3d/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 27d60d6..8c4e9e4 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1290,6 +1290,13 @@
<bundle dependency='true'>mvn:commons-io/commons-io/${commons-io-version}</bundle>
<bundle>mvn:org.apache.camel/camel-solr/${project.version}</bundle>
</feature>
+ <feature name='camel-spark-rest' version='${project.version}' resolver='(obr)' start-level='50'>
+ <details>The camel-spark-rest feature requires Java 8 and Jetty9</details>
+ <feature version='${project.version}'>camel-core</feature>
+ <feature version='${project.version}'>camel-jetty9</feature>
+ <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.sparkjava-core/${spark-rest-bundle-version}</bundle>
+ <bundle>mvn:org.apache.camel/camel-spark-rest/${project.version}</bundle>
+ </feature>
<feature name='camel-splunk' 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.splunk/${splunk-version}</bundle>
[4/6] camel git commit: CAMEL-8331: OSGi bundle upgrades
Posted by da...@apache.org.
CAMEL-8331: OSGi bundle upgrades
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/13dd3684
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/13dd3684
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/13dd3684
Branch: refs/heads/master
Commit: 13dd3684314ec50327c7e1e329829915366fcfd7
Parents: 995ac55
Author: Claus Ibsen <da...@apache.org>
Authored: Sun Mar 1 09:58:05 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Mar 1 09:58:05 2015 +0100
----------------------------------------------------------------------
parent/pom.xml | 6 +++---
platforms/karaf/features/src/main/resources/features.xml | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/13dd3684/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 243a8511..055c598 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -250,7 +250,7 @@
<jcr-version>2.0</jcr-version>
<jdom-bundle-version>1.1_4</jdom-bundle-version>
<jdom-version>1.1.3</jdom-version>
- <jedis-client-bundle-version>2.1.0_1</jedis-client-bundle-version>
+ <jedis-client-bundle-version>2.6.2_1</jedis-client-bundle-version>
<jetty6-bundle-version>6.1.26_4</jetty6-bundle-version>
<jetty6-version>6.1.26</jetty6-version>
<jetty8-version>8.1.16.v20140903</jetty8-version>
@@ -359,7 +359,6 @@
<oncrpc-version>1.1.2</oncrpc-version>
<openejb-version>4.6.0.2</openejb-version>
<openjpa-version>2.3.0</openjpa-version>
- <opensaml-version>2.5.1_2</opensaml-version>
<openshift-java-client-version>2.5.0.Final</openshift-java-client-version>
<optaplanner-version>6.1.0.Final</optaplanner-version>
<oro-bundle-version>2.0.8_6</oro-bundle-version>
@@ -400,7 +399,8 @@
<scala-maven-plugin-version>3.2.0</scala-maven-plugin-version>
<scalatest-version>2.2.0</scalatest-version>
<scalaxml-version>1.0.3</scalaxml-version>
- <scribe-version>1.3.5</scribe-version>
+ <scribe-version>1.3.7</scribe-version>
+ <scribe-bundle-version>1.3.7_1</scribe-bundle-version>
<scriptengines-version>1.1.1</scriptengines-version>
<serp-bundle-version>1.14.1_1</serp-bundle-version>
<servicemix-specs-version>2.2.0</servicemix-specs-version>
http://git-wip-us.apache.org/repos/asf/camel/blob/13dd3684/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 8c4e9e4..59fba34 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1571,7 +1571,7 @@
<feature name='camel-yammer' version='${project.version}' resolver='(obr)' start-level='50'>
<bundle dependency='true'>mvn:org.codehaus.jackson/jackson-core-asl/${jackson-version}</bundle>
<bundle dependency='true'>mvn:org.codehaus.jackson/jackson-mapper-asl/${jackson-version}</bundle>
- <bundle dependency='true'>wrap:mvn:org.scribe/scribe/${scribe-version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.scribe/${scribe-bundle-version}</bundle>
<feature version='${project.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-yammer/${project.version}</bundle>
</feature>
[6/6] camel git commit: Get stuff work with OSGi
Posted by da...@apache.org.
Get stuff work with OSGi
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/df4a9413
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/df4a9413
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/df4a9413
Branch: refs/heads/master
Commit: df4a9413ec5a18ac58a1d91ea3ec701d75e04091
Parents: ed62696
Author: Claus Ibsen <da...@apache.org>
Authored: Sun Mar 1 11:49:00 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Mar 1 11:49:00 2015 +0100
----------------------------------------------------------------------
parent/pom.xml | 1 -
platforms/karaf/features/src/main/resources/features.xml | 7 ++++---
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/df4a9413/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index ffaa2e9..c3eb356 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -527,7 +527,6 @@
org.eclipse.jetty.*;version="[8.0,10)",
com.thoughtworks.xstream.*;version="[1.3,2)",
org.antlr.stringtemplate.*;version="[3.0,4)",
- org.jivesoftware.smack.*;version="[3.0,4)",
org.ccil.cowan.tagsoup.*;version="[1.2,2)",
org.mortbay.cometd.*;version="[6.1,7)",
org.slf4j.*;version="[1.6,2)",
http://git-wip-us.apache.org/repos/asf/camel/blob/df4a9413/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 f089606..7bf0838 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1548,9 +1548,9 @@
</feature>
<feature name='camel-xmpp' version='${project.version}' resolver='(obr)' start-level='50'>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xpp3/${xpp3-bundle-version}</bundle>
- <bundle dependency='true'>mvn:org.igniterealtime.smack/smack-core/${smack-bundle-version}</bundle>
- <bundle dependency='true'>mvn:org.igniterealtime.smack/smack-tcp/${smack-bundle-version}</bundle>
- <bundle dependency='true'>mvn:org.igniterealtime.smack/smack-extensions/${smack-bundle-version}</bundle>
+ <bundle dependency='true'>mvn:org.igniterealtime.smack/smack-core/${smack-version}</bundle>
+ <bundle dependency='true'>mvn:org.igniterealtime.smack/smack-tcp/${smack-version}</bundle>
+ <bundle dependency='true'>mvn:org.igniterealtime.smack/smack-extensions/${smack-version}</bundle>
<feature version='${project.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-xmpp/${project.version}</bundle>
</feature>
@@ -1569,6 +1569,7 @@
<bundle dependency='true'>mvn:org.codehaus.jackson/jackson-core-asl/${jackson-version}</bundle>
<bundle dependency='true'>mvn:org.codehaus.jackson/jackson-mapper-asl/${jackson-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.scribe/${scribe-bundle-version}</bundle>
+ <bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle>
<feature version='${project.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-yammer/${project.version}</bundle>
</feature>
[5/6] camel git commit: CAMEL-8331: OSGi bundle upgrades
Posted by da...@apache.org.
CAMEL-8331: OSGi bundle upgrades
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ed62696d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ed62696d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ed62696d
Branch: refs/heads/master
Commit: ed62696dddabf62126486b382a9673c5215334fb
Parents: 13dd368
Author: Claus Ibsen <da...@apache.org>
Authored: Sun Mar 1 10:54:35 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Mar 1 10:54:35 2015 +0100
----------------------------------------------------------------------
parent/pom.xml | 5 +++--
platforms/karaf/features/src/main/resources/features.xml | 7 ++-----
2 files changed, 5 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/ed62696d/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 055c598..ffaa2e9 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -290,7 +290,7 @@
<jt400-bundle-version>6.7_1</jt400-bundle-version>
<juel-bundle-version>2.1.3_1</juel-bundle-version>
<juel-version>2.1.3</juel-version>
- <junit-bundle-version>4.12_1</junit-bundle-version>
+ <junit-bundle-version>4.11_2</junit-bundle-version>
<junit-version>4.12</junit-version>
<jython-version>2.5.3</jython-version>
<jzlib-version>1.1.3</jzlib-version>
@@ -344,7 +344,8 @@
<mqtt-client-version>1.10</mqtt-client-version>
<msv-version>2013.6.1</msv-version>
<mustache-java-version>0.9.0</mustache-java-version>
- <mustache-bundle-version>0.9.0_1</mustache-bundle-version>
+ <mustache-guava-version>16.0</mustache-guava-version>
+ <mustache-bundle-version>0.8.16_1</mustache-bundle-version>
<mvel-version>2.2.1.Final</mvel-version>
<mybatis-version>3.2.8</mybatis-version>
<neethi-bundle-version>3.0.1</neethi-bundle-version>
http://git-wip-us.apache.org/repos/asf/camel/blob/ed62696d/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 59fba34..f089606 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -972,13 +972,10 @@
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.isorelax/${isorelax-bundle-version}</bundle>
<feature version='${project.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-msv/${project.version}</bundle>
- </feature>
- <!-- TODO: The mustache bundle is flawed and requires ruby and scala and guava 13.0, see SMX4-1477 -->
+ </feature>
<feature name='camel-mustache' version='${project.version}' resolver='(obr)' start-level='50'>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.mustache-compiler/${mustache-bundle-version}</bundle>
- <bundle dependency='true'>mvn:com.google.guava/guava/13.0.1</bundle>
- <feature version='${project.version}'>camel-ruby</feature>
- <feature version='${project.version}'>camel-scala</feature>
+ <bundle dependency='true'>mvn:com.google.guava/guava/${mustache-guava-version}</bundle>
<feature version='${project.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-mustache/${project.version}</bundle>
</feature>
[2/6] camel git commit: CAMEL-8331: OSGi bundle upgrades
Posted by da...@apache.org.
CAMEL-8331: OSGi bundle upgrades
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ef827229
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ef827229
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ef827229
Branch: refs/heads/master
Commit: ef8272295f66626d3bdaf5b3ef71b02f75613453
Parents: ead9be3
Author: Claus Ibsen <da...@apache.org>
Authored: Sun Mar 1 09:45:36 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Mar 1 09:45:36 2015 +0100
----------------------------------------------------------------------
parent/pom.xml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/ef827229/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 0c5f2d9..6b45ad8 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -139,7 +139,7 @@
<eclipse-equinox-common-version>3.3.0-v20070426</eclipse-equinox-common-version>
<ehcache-version>2.9.0</ehcache-version>
<egit-github-core-version>2.1.5</egit-github-core-version>
- <elasticsearch-bundle-version>1.4.1_1</elasticsearch-bundle-version>
+ <elasticsearch-bundle-version>1.4.2_1</elasticsearch-bundle-version>
<elasticsearch-version>1.4.2</elasticsearch-version>
<el-api-1.0-version>1.0.1</el-api-1.0-version>
<embedmongo-version>1.46.4</embedmongo-version>
@@ -305,8 +305,8 @@
<!-- virtual dependency only used by Eclipse m2e -->
<lifecycle-mapping-version>1.0.0</lifecycle-mapping-version>
<log4j-version>1.2.17</log4j-version>
- <lucene-bundle-version>4.10.2_1</lucene-bundle-version>
- <lucene-version>4.10.2</lucene-version>
+ <lucene-bundle-version>4.10.3_1</lucene-bundle-version>
+ <lucene-version>4.10.3</lucene-version>
<lucene-version-range>[4.5,5)</lucene-version-range>
<lightcouch-version>0.1.3</lightcouch-version>
<lightcouch-bundle-version>0.1.3_1</lightcouch-bundle-version>
@@ -414,7 +414,7 @@
<smack-version>4.0.6</smack-version>
<snakeyaml-version>1.14</snakeyaml-version>
<snappy-version>1.1.0.1</snappy-version>
- <snmp4j-version>2.3.0_1</snmp4j-version>
+ <snmp4j-version>2.3.3_1</snmp4j-version>
<solr-bundle-version>4.9.0_1</solr-bundle-version>
<solr-version>4.9.0</solr-version>
<solr-version-range>[4.9,5)</solr-version-range>
@@ -451,7 +451,7 @@
<stompjms-version>1.19</stompjms-version>
<swagger-version>1.3.12</swagger-version>
<swagger-guava-version>15.0</swagger-guava-version>
- <swagger-bundle-version>1.3.11_1</swagger-bundle-version>
+ <swagger-bundle-version>1.3.12_1</swagger-bundle-version>
<stax-api-version>1.0.1</stax-api-version>
<stax2-api-bundle-version>3.1.4</stax2-api-bundle-version>
<stringtemplate-bundle-version>4.0.2_2</stringtemplate-bundle-version>
[3/6] camel git commit: CAMEL-8331: OSGi bundle upgrades
Posted by da...@apache.org.
CAMEL-8331: OSGi bundle upgrades
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/995ac557
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/995ac557
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/995ac557
Branch: refs/heads/master
Commit: 995ac557810dbd87f6c34e2707aa6eb8df883380
Parents: ef82722
Author: Claus Ibsen <da...@apache.org>
Authored: Sun Mar 1 09:51:14 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Mar 1 09:51:14 2015 +0100
----------------------------------------------------------------------
parent/pom.xml | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/995ac557/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 6b45ad8..243a8511 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -137,7 +137,7 @@
<easymock-version>3.2</easymock-version>
<eclipse-compiler-version>4.2.2</eclipse-compiler-version>
<eclipse-equinox-common-version>3.3.0-v20070426</eclipse-equinox-common-version>
- <ehcache-version>2.9.0</ehcache-version>
+ <ehcache-version>2.9.1</ehcache-version>
<egit-github-core-version>2.1.5</egit-github-core-version>
<elasticsearch-bundle-version>1.4.2_1</elasticsearch-bundle-version>
<elasticsearch-version>1.4.2</elasticsearch-version>
@@ -290,8 +290,8 @@
<jt400-bundle-version>6.7_1</jt400-bundle-version>
<juel-bundle-version>2.1.3_1</juel-bundle-version>
<juel-version>2.1.3</juel-version>
- <junit-bundle-version>4.11_2</junit-bundle-version>
- <junit-version>4.11</junit-version>
+ <junit-bundle-version>4.12_1</junit-bundle-version>
+ <junit-version>4.12</junit-version>
<jython-version>2.5.3</jython-version>
<jzlib-version>1.1.3</jzlib-version>
<kafka-version>0.8.1.1</kafka-version>
@@ -343,8 +343,8 @@
<mongo-java-driver-version>2.12.4</mongo-java-driver-version>
<mqtt-client-version>1.10</mqtt-client-version>
<msv-version>2013.6.1</msv-version>
- <mustache-java-version>0.8.17</mustache-java-version>
- <mustache-bundle-version>0.8.16_1</mustache-bundle-version>
+ <mustache-java-version>0.9.0</mustache-java-version>
+ <mustache-bundle-version>0.9.0_1</mustache-bundle-version>
<mvel-version>2.2.1.Final</mvel-version>
<mybatis-version>3.2.8</mybatis-version>
<neethi-bundle-version>3.0.1</neethi-bundle-version>
@@ -420,7 +420,7 @@
<solr-version-range>[4.9,5)</solr-version-range>
<spark-rest-version>2.0.0</spark-rest-version>
<spark-rest-bundle-version>2.0.0_1</spark-rest-bundle-version>
- <splunk-version>1.3.0_1</splunk-version>
+ <splunk-version>1.3.2.0_1</splunk-version>
<spring-batch-version>3.0.3.RELEASE</spring-batch-version>
<spring-batch-bundle-version>3.0.3.RELEASE_1</spring-batch-bundle-version>
<spring-boot-version>1.2.1.RELEASE</spring-boot-version>