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/08/30 08:52:36 UTC
[1/3] git commit: Fix for CAMEL-7764. Added a profile for JKD8 with
updated jaxb version
Repository: camel
Updated Branches:
refs/heads/master 9430e4d55 -> bfa4b0afe
Fix for CAMEL-7764. Added a profile for JKD8 with updated jaxb version
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a1290c39
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a1290c39
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a1290c39
Branch: refs/heads/master
Commit: a1290c39b3d1b93238b975c963ce515cd6e18970
Parents: 9430e4d
Author: Kevin Earls <ke...@kevinearls.com>
Authored: Fri Aug 29 17:07:55 2014 +0200
Committer: Kevin Earls <ke...@kevinearls.com>
Committed: Fri Aug 29 17:07:55 2014 +0200
----------------------------------------------------------------------
parent/pom.xml | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/a1290c39/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index a2eec91..e264451 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -2916,6 +2916,24 @@
</dependency>
</dependencies>
</profile>
+
+ <profile>
+ <id>jdk1.8</id>
+ <activation>
+ <jdk>1.8</jdk>
+ </activation>
+
+ <properties>
+ <jaxb-version>2.2.10-b140310.1920</jaxb-version>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
[3/3] git commit: Merge branch 'CAMEL-7764' of
https://github.com/kevinearls/camel
Posted by da...@apache.org.
Merge branch 'CAMEL-7764' of https://github.com/kevinearls/camel
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/bfa4b0af
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bfa4b0af
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bfa4b0af
Branch: refs/heads/master
Commit: bfa4b0afe8cae929b2f2d662a4fc40eccbec9fac
Parents: 392cc84 a1290c3
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Aug 30 08:52:02 2014 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Aug 30 08:52:02 2014 +0200
----------------------------------------------------------------------
parent/pom.xml | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/bfa4b0af/parent/pom.xml
----------------------------------------------------------------------
[2/3] git commit: [CAMEL-7755] Fix all karaf feature definitions
Posted by da...@apache.org.
[CAMEL-7755] Fix all karaf feature definitions
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/392cc843
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/392cc843
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/392cc843
Branch: refs/heads/master
Commit: 392cc8438c875ce6821324a00e829b16bc4d6e63
Parents: 9430e4d
Author: Guillaume Nodet <gn...@gmail.com>
Authored: Wed Aug 27 15:21:18 2014 +0200
Committer: Guillaume Nodet <gn...@gmail.com>
Committed: Fri Aug 29 17:35:08 2014 +0200
----------------------------------------------------------------------
parent/pom.xml | 6 +++--
.../features/src/main/resources/features.xml | 23 ++++++++++++--------
2 files changed, 18 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/392cc843/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index a2eec91..980d1f0 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -106,7 +106,8 @@
<commons-lang-version-xmljson>2.5</commons-lang-version-xmljson>
<commons-lang3-version>3.1</commons-lang3-version>
<commons-logging-version>1.1.3</commons-logging-version>
- <commons-math-version>3.2</commons-math-version>
+ <commons-math-version>2.2</commons-math-version>
+ <commons-math3-version>3.3</commons-math3-version>
<commons-net-version>3.3</commons-net-version>
<commons-pool-version>1.6</commons-pool-version>
<commons-vfs2-version>2.0</commons-vfs2-version>
@@ -382,7 +383,7 @@
<smack-version>3.2.1</smack-version>
<snappy-version>1.1.0.1</snappy-version>
<snmp4j-version>2.3.0_1</snmp4j-version>
- <solr-bundle-version>4.8.9_1</solr-bundle-version>
+ <solr-bundle-version>4.8.1_1</solr-bundle-version>
<solr-version>4.8.0</solr-version>
<solr-version-range>[4.8,5)</solr-version-range>
<spark-rest-version>2.0.0</spark-rest-version>
@@ -463,6 +464,7 @@
<xom-version>1.2.5</xom-version>
<yammer-metrics-version>2.2.0</yammer-metrics-version>
<zxing-version>3.0.0</zxing-version>
+ <zxing-bundle-version>3.0.1_1</zxing-bundle-version>
<zookeeper-version>3.4.6</zookeeper-version>
<!-- OSGi bundles properties -->
http://git-wip-us.apache.org/repos/asf/camel/blob/392cc843/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 acc6ad3..3eb8274 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -164,8 +164,7 @@
</feature>
<feature name='camel-barcode' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
- <bundle dependency='true'>mvn:com.google.zxing/core/${zxing-version}</bundle>
- <bundle dependency='true'>mvn:com.google.zxing/javase/${zxing-version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.zxing/${zxing-bundle-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'>
@@ -175,10 +174,10 @@
<feature name='camel-box' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-box/${project.version}</bundle>
- <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'>wrap:mvn:org.apache.httpcomponents/httpmime-osgi/${httpclient4-version}</bundle>
- <bundle dependency='true'>wrap:mvn:org.apache.httpcomponents/httpclient-cache-osgi/${httpclient4-version}</bundle>
+ <bundle dependency='true'>wrap:mvn:org.apache.httpcomponents/httpcore/${httpcore4-version}$Export-Package=org.apache.http.*;version=${httpcore4-version}</bundle>
+ <bundle dependency='true'>wrap:mvn:org.apache.httpcomponents/httpclient/${httpclient4-version}$Export-Package=org.apache.http.*;version=${httpclient4-version}</bundle>
+ <bundle dependency='true'>wrap:mvn:org.apache.httpcomponents/httpclient-cache/${httpclient4-version}$Export-Package=org.apache.http.*;version=${httpclient4-version}</bundle>
+ <bundle dependency='true'>wrap:mvn:org.apache.httpcomponents/httpmime/${httpclient4-version}$Export-Package=org.apache.http.*;version=${httpclient4-version}</bundle>
<bundle dependency='true'>mvn:org.apache.commons/commons-lang3/${commons-lang3-version}</bundle>
<bundle dependency='true'>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
<bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle>
@@ -187,7 +186,6 @@
<bundle dependency='true'>mvn:commons-io/commons-io/${commons-io-version}</bundle>
<bundle dependency='true'>wrap:mvn:net.box/boxjavalibv2/${boxjavalibv2.version}</bundle>
<bundle dependency='true'>wrap:mvn:net.sourceforge.htmlunit/htmlunit/${htmlunit.version}</bundle>
- <bundle dependency='true'>wrap:mvn:net.sourceforge.htmlunit/htmlunit-core/${htmlunit.version}</bundle>
<bundle dependency='true'>wrap:mvn:net.sourceforge.htmlunit/htmlunit-core-js/${htmlunit.version}</bundle>
<bundle dependency='true'>wrap:mvn:net.sourceforge.cssparser/cssparser/0.9.14</bundle>
<bundle dependency='true'>wrap:mvn:org.w3c.css/sac/1.3</bundle>
@@ -205,6 +203,7 @@
</feature>
<feature name='camel-cache' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
+ <feature>transaction</feature>
<bundle dependency='true'>mvn:net.sf.ehcache/ehcache/${ehcache-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-cache/${project.version}</bundle>
@@ -430,6 +429,7 @@
</feature>
<feature name='camel-hazelcast' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
+ <feature>transaction</feature>
<bundle dependency='true'>mvn:com.hazelcast/hazelcast/${hazelcast-version}</bundle>
<bundle>mvn:org.apache.camel/camel-hazelcast/${project.version}</bundle>
</feature>
@@ -540,7 +540,7 @@
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.paranamer/${paranamer-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.avro/1.7.3_1</bundle>
<bundle dependency='true'>mvn:org.apache.commons/commons-compress/${commons-compress-version}</bundle>
- <bundle dependency='true'>mvn:org.apache.commons/commons-math3/3.1.1</bundle>
+ <bundle dependency='true'>mvn:org.apache.commons/commons-math3/${commons-math3-version}</bundle>
<bundle dependency='true'>mvn:commons-cli/commons-cli/1.2</bundle>
<bundle dependency='true'>mvn:commons-configuration/commons-configuration/${commons-configuration-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons-httpclient-bundle-version}</bundle>
@@ -581,6 +581,7 @@
</feature>
<feature name='camel-ibatis' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
+ <feature>transaction</feature>
<bundle dependency='true'>mvn:commons-pool/commons-pool/${commons-pool-version}</bundle>
<bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-servlet_3.0_spec/${geronimo-servlet-spec-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-dbcp/${commons-dbcp-bundle-version}</bundle>
@@ -598,6 +599,7 @@
<bundle>mvn:org.apache.camel/camel-ical/${project.version}</bundle>
</feature>
<feature name='camel-infinispan' version='${project.version}' resolver='(obr)' start-level='50'>
+ <feature>transaction</feature>
<bundle dependency='true'>mvn:org.infinispan/infinispan-core/${infinispan-version}</bundle>
<bundle dependency='true'>mvn:org.infinispan/infinispan-commons/${infinispan-version}</bundle>
<bundle dependency='true'>mvn:org.infinispan/infinispan-client-hotrod/${infinispan-version}</bundle>
@@ -730,6 +732,7 @@
<bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-servlet_3.0_spec/${geronimo-servlet-spec-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jt400/${jt400-bundle-version}</bundle>
<feature version='${project.version}'>camel-core</feature>
+ <feature>transaction</feature>
<bundle>mvn:org.apache.camel/camel-jt400/${project.version}</bundle>
</feature>
<feature name='camel-juel' version='${project.version}' resolver='(obr)' start-level='50'>
@@ -886,15 +889,17 @@
<feature name='camel-optaplanner' version='${project.version}' resolver='(obr)' start-level='50'>
<details>The camel-optaplanner feature can only run on a SUN JVM. You need to add the package com.sun.tools.xjc to the java platform packages in the etc/jre.properties file.</details>
<feature version='${project.version}'>camel-core</feature>
+ <bundle dependency='true'>mvn:com.google.guava/guava/${google-guava-version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.commons/commons-math3/${commons-math3-version}</bundle>
<bundle dependency='true'>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
<bundle dependency='true'>mvn:commons-io/commons-io/${commons-io-version}</bundle>
<bundle dependency='true'>mvn:commons-collections/commons-collections/${commons-collections-version}</bundle>
- <bundle dependency='true'>mvn:org.apache.commons/commons-math3/${commons-math-version}</bundle>
<bundle dependency='true'>mvn:org.optaplanner/optaplanner-core/${optaplanner-version}</bundle>
<bundle dependency='true'>mvn:org.kie/kie-api/${kie-version}</bundle>
<bundle dependency='true'>mvn:org.kie/kie-internal/${kie-version}</bundle>
<bundle dependency='true'>mvn:org.drools/drools-core/${drools-version}</bundle>
<bundle dependency='true'>mvn:org.drools/drools-compiler/${drools-version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-xjc/${jaxb-bundle-version}</bundle>
<!-- the ecj bundle on the central is malformed as both 'META-INF' and 'META-INF/MANIFEST.MF' entries are NOT the first 2 entries inside the jar when -->
<!-- one verifies this through 'jar -tf ecj-${eclipse-compiler-version}.jar'. one possible workaround for this is to make use of the wrap protocol. -->
<bundle dependency='true'>wrap:mvn:org.eclipse.jdt.core.compiler/ecj/${eclipse-compiler-version}</bundle>