Fixed the RubyOSGiTest in camel-2.14.x branch
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f14fcfc0 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f14fcfc0 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f14fcfc0 Branch: refs/heads/camel-2.14.x Commit: f14fcfc0e956d4fa6f4e86c1dd088b298596be69 Parents: 1692381 Author: Willem Jiang <willem.ji...@gmail.com> Authored: Mon Feb 16 21:05:46 2015 +0800 Committer: Willem Jiang <willem.ji...@gmail.com> Committed: Mon Feb 16 21:05:46 2015 +0800 ---------------------------------------------------------------------- platforms/karaf/features/src/main/resources/features.xml | 10 ++++------ tests/camel-itest-osgi/pom.xml | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/f14fcfc0/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 4e24704..840f3e2 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -1018,7 +1018,7 @@ <feature name='camel-rabbitmq' version='${project.version}' resolver='(obr)' start-level='50'> <feature version='${project.version}'>camel-core</feature> <bundle dependency='true'>mvn:com.rabbitmq/amqp-client/${rabbitmq-amqp-client-version}</bundle> - <bundle dependency='true'>mvn:commons-pool/commons-pool/${commons-pool-version}</bundle> + <bundle dependency='true'>mvn:commons-pool/commons-pool/${commons-pool-version}</bundle> <bundle>mvn:org.apache.camel/camel-rabbitmq/${project.version}</bundle> </feature> <feature name='camel-restlet' version='${project.version}' resolver='(obr)' start-level='50'> @@ -1046,8 +1046,7 @@ </feature> <feature name='camel-ruby' version='${project.version}' start-level='50'> <feature version='${project.version}'>camel-script</feature> - <bundle dependency='true'>mvn:org.jruby/jruby-core/${jruby-version}</bundle> - <bundle dependency='true'>mvn:org.jruby/jruby-stdlib/${jruby-version}</bundle> + <bundle dependency='true'>mvn:org.jruby/jruby-complete/${jruby-version}</bundle> </feature> <feature name='camel-rx' version='${project.version}' start-level='50'> <feature version='${project.version}'>camel-core</feature> @@ -1096,8 +1095,7 @@ <feature name='camel-script-jruby' version='${project.version}' resolver='(obr)' start-level='50'> <bundle>mvn:http://scriptengines.googlecode.com/svn/m2-repo/!com.google.code.scriptengines/scriptengines-jruby/${scriptengines-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.scripting-api-1.0/${servicemix-specs-version}</bundle> - <bundle dependency='true'>mvn:org.jruby/jruby-core/${jruby-version}</bundle> - <bundle dependency='true'>mvn:org.jruby/jruby-stdlib/${jruby-version}</bundle> + <bundle dependency='true'>mvn:org.jruby/jruby-complete/${jruby-version}</bundle> </feature> <feature name='camel-script-javascript' version='${project.version}' resolver='(obr)' start-level='50'> <bundle>mvn:http://scriptengines.googlecode.com/svn/m2-repo/!com.google.code.scriptengines/scriptengines-javascript/${scriptengines-version}</bundle> @@ -1115,7 +1113,7 @@ <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr/${antlr-bundle-version}</bundle> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.rhino/${rhino-bundle-version}</bundle> <bundle>mvn:org.codehaus.groovy/groovy-all/${groovy-version}</bundle> - <bundle dependency='true'>mvn:org.jruby/jruby/${jruby-version}</bundle> + <bundle>mvn:org.jruby/jruby-complete/${jruby-version}</bundle> <bundle>mvn:org.apache.camel/camel-script/${project.version}</bundle> </feature> <feature name='camel-servlet' version='${project.version}' resolver='(obr)' start-level='50'> http://git-wip-us.apache.org/repos/asf/camel/blob/f14fcfc0/tests/camel-itest-osgi/pom.xml ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/pom.xml b/tests/camel-itest-osgi/pom.xml index 6693b10..96c277c 100644 --- a/tests/camel-itest-osgi/pom.xml +++ b/tests/camel-itest-osgi/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.camel</groupId> <artifactId>tests</artifactId> - <version>2.14.1-SNAPSHOT</version> + <version>2.14.2-SNAPSHOT</version> </parent> <artifactId>camel-itest-osgi</artifactId>
