Updated Branches: refs/heads/camel-2.10.x ff5cf8baf -> f0749e913 refs/heads/camel-2.11.x e118998f1 -> 5e8235a80 refs/heads/master e7563a761 -> 651709060
Upgrade to disruptor 3.1.1. Added note to camel-disruptor features how to install it Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9beccf1f Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9beccf1f Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9beccf1f Branch: refs/heads/master Commit: 9beccf1f3b7bb119fbf4b328b1833357b64b5a4b Parents: e7563a7 Author: Claus Ibsen <davscl...@apache.org> Authored: Tue Jul 23 08:05:19 2013 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Tue Jul 23 08:05:19 2013 +0200 ---------------------------------------------------------------------- parent/pom.xml | 2 +- platforms/karaf/features/src/main/resources/features.xml | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/9beccf1f/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index f5fd691..cf225a5 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -109,7 +109,7 @@ <cxf-xjc-utils-version>2.6.0</cxf-xjc-utils-version> <deltaspike-version>0.3-incubating</deltaspike-version> <derby-version>10.10.1.1</derby-version> - <disruptor-version>3.1.0</disruptor-version> + <disruptor-version>3.1.1</disruptor-version> <dnsjava-version>2.1.1</dnsjava-version> <dnsjava-bundle-version>2.1.1_1</dnsjava-bundle-version> <dom4j-bundle-version>1.6.1_5</dom4j-bundle-version> http://git-wip-us.apache.org/repos/asf/camel/blob/9beccf1f/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 d858050..9b46175 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -221,15 +221,14 @@ <bundle>mvn:org.apache.camel/camel-cxf-transport/${project.version}</bundle> <bundle>mvn:org.apache.camel/camel-cxf/${project.version}</bundle> </feature> -<!-- TODO: Does not work due: No export found to match sun.misc (imported by mvn:com.lmax/disruptor/3.0.1) <feature name='camel-disruptor' version='${project.version}' resolver='(obr)' start-level='50'> + <details>The camel-disruptor feature can only run on a SUN JVM. You need to add the package sun.misc to the java platform packages in the etc/jre.properties file.</details> <bundle dependency='true'>mvn:com.lmax/disruptor/${disruptor-version}</bundle> <feature version='${project.version}'>camel-core</feature> <bundle>mvn:org.apache.camel/camel-disruptor/${project.version}</bundle> </feature> ---> <feature name='camel-dns' version='${project.version}' resolver='(obr)' start-level='50'> - <details>The camel-dns feature can only run on a SUN JVM. You need to ddd the package sun.net.spi.nameservice to the java platform packages in the etc/jre.properties file.</details> + <details>The camel-dns feature can only run on a SUN JVM. You need to add the package sun.net.spi.nameservice to the java platform packages in the etc/jre.properties file.</details> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.dnsjava/${dnsjava-bundle-version}</bundle> <feature version='${project.version}'>camel-core</feature> <bundle>mvn:org.apache.camel/camel-dns/${project.version}</bundle>
