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 2016/03/12 15:37:19 UTC
[01/16] camel git commit: Make camel-itest-karaf to run all the tests
as new version of surefire fails, so use older working version.
Repository: camel
Updated Branches:
refs/heads/master 7fe487c68 -> 7db9c8e5e
Make camel-itest-karaf to run all the tests as new version of surefire fails, so use older working version.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/332e31a6
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/332e31a6
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/332e31a6
Branch: refs/heads/master
Commit: 332e31a62f68e0f5120af9519a0523524f78f58d
Parents: 7fe487c
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Mar 12 11:20:51 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Mar 12 11:20:51 2016 +0100
----------------------------------------------------------------------
tests/camel-itest-karaf/pom.xml | 9 ++++++++-
.../org/apache/camel/itest/karaf/AbstractFeatureTest.java | 10 +++-------
2 files changed, 11 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/332e31a6/tests/camel-itest-karaf/pom.xml
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/pom.xml b/tests/camel-itest-karaf/pom.xml
index 0fbb7a1..4bd0442 100644
--- a/tests/camel-itest-karaf/pom.xml
+++ b/tests/camel-itest-karaf/pom.xml
@@ -184,9 +184,13 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
+ <!-- version 2.19.1 causes pax-exam to fail when testing the 2nd/3rd container when testing all -->
+ <!-- so we use an older version of surefire which works -->
+ <version>2.16</version>
<configuration>
<!-- do not re-run these tests -->
- <rerunFailingTestsCount>0</rerunFailingTestsCount>
+ <!-- not supported by older version of surefire -->
+ <!--<rerunFailingTestsCount>0</rerunFailingTestsCount>-->
<systemPropertyVariables>
<karafVersion>${karaf-version}</karafVersion>
</systemPropertyVariables>
@@ -209,6 +213,9 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
+ <!-- version 2.19.1 causes pax-exam to fail when testing the 2nd/3rd container when testing all -->
+ <!-- so we use an older version of surefire which works -->
+ <version>2.16</version>
<configuration>
<forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds>
<!--
http://git-wip-us.apache.org/repos/asf/camel/blob/332e31a6/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
index 63f1688..2589c0d 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
@@ -61,7 +61,6 @@ public abstract class AbstractFeatureTest {
@Before
public void setUp() throws Exception {
LOG.info("setUp() using BundleContext: {}", bundleContext);
- Thread.sleep(3000);
}
@After
@@ -75,7 +74,7 @@ public abstract class AbstractFeatureTest {
try {
assertNotNull("Cannot get component with name: " + component, createCamelContext().getComponent(component));
return;
- } catch (Exception t) {
+ } catch (Throwable t) {
if (System.currentTimeMillis() < max) {
Thread.sleep(1000);
} else {
@@ -97,7 +96,7 @@ public abstract class AbstractFeatureTest {
assertNotNull(dataFormatDefinition);
assertNotNull(dataFormatDefinition.getDataFormat(new DefaultRouteContext(createCamelContext())));
return;
- } catch (Exception t) {
+ } catch (Throwable t) {
if (System.currentTimeMillis() < max) {
Thread.sleep(1000);
} else {
@@ -117,7 +116,7 @@ public abstract class AbstractFeatureTest {
try {
assertNotNull(createCamelContext().resolveLanguage(lang));
return;
- } catch (Exception t) {
+ } catch (Throwable t) {
if (System.currentTimeMillis() < max) {
Thread.sleep(1000);
} else {
@@ -219,9 +218,6 @@ public abstract class AbstractFeatureTest {
// we need INFO logging otherwise we cannot see what happens
new LogLevelOption(LogLevelOption.LogLevel.INFO),
- // to allow rbac to connect to localhost
- org.ops4j.pax.exam.CoreOptions.systemProperty(Constants.RMI_HOST_PROPERTY).value("localhost"),
-
KarafDistributionOption.karafDistributionConfiguration()
.frameworkUrl(maven().groupId("org.apache.karaf").artifactId("apache-karaf").type("tar.gz").versionAsInProject())
.karafVersion(karafVersion)
[14/16] camel git commit: Make more camel-spring-xxx modules install
in karaf.
Posted by da...@apache.org.
Make more camel-spring-xxx modules install in karaf.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9d7499d2
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9d7499d2
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9d7499d2
Branch: refs/heads/master
Commit: 9d7499d27283bdf74b2261d4094a4eba1af5b79e
Parents: de1c208
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Mar 12 14:50:10 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Mar 12 14:50:10 2016 +0100
----------------------------------------------------------------------
components/camel-spring-security/pom.xml | 184 +++++++++----------
.../security/SpringSecurityAccessPolicy.java | 1 -
.../security/config/BeanDefinitionParser.java | 114 ++++++++++++
...SpringSecurityAuthorizationPolicyParser.java | 1 -
.../SpringSecurityAuthorizationPolicyTest.java | 3 +-
.../spring/security/commonSecurity.xml | 10 +-
parent/pom.xml | 3 +-
.../features/src/main/resources/features.xml | 8 +-
8 files changed, 209 insertions(+), 115 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/9d7499d2/components/camel-spring-security/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-spring-security/pom.xml b/components/camel-spring-security/pom.xml
index c21099c..3d39506 100644
--- a/components/camel-spring-security/pom.xml
+++ b/components/camel-spring-security/pom.xml
@@ -15,109 +15,95 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>components</artifactId>
- <groupId>org.apache.camel</groupId>
- <version>2.17-SNAPSHOT</version>
- </parent>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>components</artifactId>
+ <groupId>org.apache.camel</groupId>
+ <version>2.17-SNAPSHOT</version>
+ </parent>
- <artifactId>camel-spring-security</artifactId>
- <packaging>bundle</packaging>
- <name>Camel :: Spring Security </name>
- <description>Camel Spring Security support</description>
+ <artifactId>camel-spring-security</artifactId>
+ <packaging>bundle</packaging>
+ <name>Camel :: Spring Security</name>
+ <description>Camel Spring Security support</description>
- <properties>
- <camel.osgi.export.pkg>org.apache.camel.component.spring.security.*</camel.osgi.export.pkg>
- <camel.osgi.import.before.defaults>org.springframework.security.*;version="[3,4)"</camel.osgi.import.before.defaults>
- </properties>
+ <properties>
+ <camel.osgi.export.pkg>org.apache.camel.component.spring.security.*</camel.osgi.export.pkg>
+ <camel.osgi.import.before.defaults>org.springframework.security.*;version="[4,5)"</camel.osgi.import.before.defaults>
+ </properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-spring</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-core</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-expression</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-support</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-config</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
-
- <!-- test dependencies -->
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-core-xml</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- </dependency>
+ <dependencies>
- </dependencies>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core</artifactId>
+ </dependency>
- <build>
- <defaultGoal>install</defaultGoal>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-artifacts</id>
- <phase>package</phase>
- <goals>
- <goal>attach-artifact</goal>
- </goals>
- <configuration>
- <artifacts>
- <artifact>
- <file>./src/main/resources/schema/camel-spring-security.xsd</file>
- <type>xsd</type>
- </artifact>
- </artifacts>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-config</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
+
+ <!-- test dependencies -->
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-test-spring</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core-xml</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <defaultGoal>install</defaultGoal>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-artifacts</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attach-artifact</goal>
+ </goals>
+ <configuration>
+ <artifacts>
+ <artifact>
+ <file>./src/main/resources/schema/camel-spring-security.xsd</file>
+ <type>xsd</type>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/9d7499d2/components/camel-spring-security/src/main/java/org/apache/camel/component/spring/security/SpringSecurityAccessPolicy.java
----------------------------------------------------------------------
diff --git a/components/camel-spring-security/src/main/java/org/apache/camel/component/spring/security/SpringSecurityAccessPolicy.java b/components/camel-spring-security/src/main/java/org/apache/camel/component/spring/security/SpringSecurityAccessPolicy.java
index df35f4b..f601365 100644
--- a/components/camel-spring-security/src/main/java/org/apache/camel/component/spring/security/SpringSecurityAccessPolicy.java
+++ b/components/camel-spring-security/src/main/java/org/apache/camel/component/spring/security/SpringSecurityAccessPolicy.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.component.spring.security;
-
import java.util.List;
import org.springframework.security.access.ConfigAttribute;
http://git-wip-us.apache.org/repos/asf/camel/blob/9d7499d2/components/camel-spring-security/src/main/java/org/apache/camel/component/spring/security/config/BeanDefinitionParser.java
----------------------------------------------------------------------
diff --git a/components/camel-spring-security/src/main/java/org/apache/camel/component/spring/security/config/BeanDefinitionParser.java b/components/camel-spring-security/src/main/java/org/apache/camel/component/spring/security/config/BeanDefinitionParser.java
new file mode 100644
index 0000000..fcf4288
--- /dev/null
+++ b/components/camel-spring-security/src/main/java/org/apache/camel/component/spring/security/config/BeanDefinitionParser.java
@@ -0,0 +1,114 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.spring.security.config;
+
+import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
+import org.springframework.core.Conventions;
+import org.springframework.util.Assert;
+import org.springframework.util.StringUtils;
+import org.w3c.dom.Attr;
+import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
+
+/**
+ * A base class for a parser for a bean.
+ *
+ * @version
+ */
+public class BeanDefinitionParser extends AbstractSingleBeanDefinitionParser {
+ private final Class<?> type;
+ private final boolean assignId;
+
+ /**
+ * Bean definition parser
+ *
+ * @param type the type, can be null
+ * @param assignId whether to allow assigning id from the id attribute on the type
+ * (there must be getter/setter id on type class).
+ */
+ public BeanDefinitionParser(Class<?> type, boolean assignId) {
+ this.type = type;
+ this.assignId = assignId;
+ }
+
+ protected Class<?> getBeanClass(Element element) {
+ return type;
+ }
+
+ protected boolean isAssignId() {
+ return assignId;
+ }
+
+ protected boolean isEligibleAttribute(String attributeName) {
+ return attributeName != null && !ID_ATTRIBUTE.equals(attributeName)
+ && !attributeName.equals("xmlns") && !attributeName.startsWith("xmlns:");
+ }
+
+ protected void doParse(Element element, BeanDefinitionBuilder builder) {
+ NamedNodeMap attributes = element.getAttributes();
+ for (int x = 0; x < attributes.getLength(); x++) {
+ Attr attribute = (Attr) attributes.item(x);
+ String name = attribute.getLocalName();
+ String fullName = attribute.getName();
+ // assign id if we want them
+ if (fullName.equals("id") && isAssignId()) {
+ if (attribute.getValue() != null) {
+ builder.addPropertyValue("id", attribute.getValue());
+ }
+ // assign other attributes if eligible
+ } else if (!fullName.startsWith("xmlns:") && !fullName.equals("xmlns") && isEligibleAttribute(name)) {
+ String propertyName = extractPropertyName(name);
+ Assert.state(StringUtils.hasText(propertyName),
+ "Illegal property name returned from 'extractPropertyName(String)': cannot be null or empty.");
+ builder.addPropertyValue(propertyName, attribute.getValue());
+ }
+ }
+ postProcess(builder, element);
+ }
+
+
+ /**
+ * Extract a JavaBean property name from the supplied attribute name.
+ * <p>The default implementation uses the
+ * {@link Conventions#attributeNameToPropertyName(String)}
+ * method to perform the extraction.
+ * <p>The name returned must obey the standard JavaBean property name
+ * conventions. For example for a class with a setter method
+ * '<code>setBingoHallFavourite(String)</code>', the name returned had
+ * better be '<code>bingoHallFavourite</code>' (with that exact casing).
+ *
+ * @param attributeName the attribute name taken straight from the
+ * XML element being parsed (never <code>null</code>)
+ * @return the extracted JavaBean property name (must never be <code>null</code>)
+ */
+ protected String extractPropertyName(String attributeName) {
+ return Conventions.attributeNameToPropertyName(attributeName);
+ }
+
+ /**
+ * Hook method that derived classes can implement to inspect/change a
+ * bean definition after parsing is complete.
+ * <p>The default implementation does nothing.
+ *
+ * @param beanDefinition the parsed (and probably totally defined) bean definition being built
+ * @param element the XML element that was the source of the bean definition's metadata
+ */
+ protected void postProcess(BeanDefinitionBuilder beanDefinition, Element element) {
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/9d7499d2/components/camel-spring-security/src/main/java/org/apache/camel/component/spring/security/config/SpringSecurityAuthorizationPolicyParser.java
----------------------------------------------------------------------
diff --git a/components/camel-spring-security/src/main/java/org/apache/camel/component/spring/security/config/SpringSecurityAuthorizationPolicyParser.java b/components/camel-spring-security/src/main/java/org/apache/camel/component/spring/security/config/SpringSecurityAuthorizationPolicyParser.java
index dbd3a54..9bc1c3e 100644
--- a/components/camel-spring-security/src/main/java/org/apache/camel/component/spring/security/config/SpringSecurityAuthorizationPolicyParser.java
+++ b/components/camel-spring-security/src/main/java/org/apache/camel/component/spring/security/config/SpringSecurityAuthorizationPolicyParser.java
@@ -20,7 +20,6 @@ import org.w3c.dom.Element;
import org.apache.camel.component.spring.security.SpringSecurityAccessPolicy;
import org.apache.camel.component.spring.security.SpringSecurityAuthorizationPolicy;
-import org.apache.camel.spring.handler.BeanDefinitionParser;
import org.apache.camel.util.ObjectHelper;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
http://git-wip-us.apache.org/repos/asf/camel/blob/9d7499d2/components/camel-spring-security/src/test/java/org/apache/camel/component/spring/security/SpringSecurityAuthorizationPolicyTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring-security/src/test/java/org/apache/camel/component/spring/security/SpringSecurityAuthorizationPolicyTest.java b/components/camel-spring-security/src/test/java/org/apache/camel/component/spring/security/SpringSecurityAuthorizationPolicyTest.java
index 3e43b4a..b8229c1 100644
--- a/components/camel-spring-security/src/test/java/org/apache/camel/component/spring/security/SpringSecurityAuthorizationPolicyTest.java
+++ b/components/camel-spring-security/src/test/java/org/apache/camel/component/spring/security/SpringSecurityAuthorizationPolicyTest.java
@@ -112,8 +112,7 @@ public class SpringSecurityAuthorizationPolicyTest extends CamelSpringTestSuppor
@Override
protected AbstractXmlApplicationContext createApplicationContext() {
- return new ClassPathXmlApplicationContext(
- "/org/apache/camel/component/spring/security/SpringSecurityCamelContext.xml");
+ return new ClassPathXmlApplicationContext("/org/apache/camel/component/spring/security/SpringSecurityCamelContext.xml");
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/9d7499d2/components/camel-spring-security/src/test/resources/org/apache/camel/component/spring/security/commonSecurity.xml
----------------------------------------------------------------------
diff --git a/components/camel-spring-security/src/test/resources/org/apache/camel/component/spring/security/commonSecurity.xml b/components/camel-spring-security/src/test/resources/org/apache/camel/component/spring/security/commonSecurity.xml
index 75dafa6..849e312 100644
--- a/components/camel-spring-security/src/test/resources/org/apache/camel/component/spring/security/commonSecurity.xml
+++ b/components/camel-spring-security/src/test/resources/org/apache/camel/component/spring/security/commonSecurity.xml
@@ -25,12 +25,10 @@
http://www.springframework.org/schema/security/spring-security.xsd">
<bean id="accessDecisionManager" class="org.springframework.security.access.vote.AffirmativeBased">
- <property name="allowIfAllAbstainDecisions" value="true"/>
- <property name="decisionVoters">
- <list>
- <bean class="org.springframework.security.access.vote.RoleVoter"/>
- </list>
- </property>
+ <constructor-arg index="0">
+ <bean class="org.springframework.security.access.vote.RoleVoter"/>
+ </constructor-arg>
+ <property name="allowIfAllAbstainDecisions" value="true"/>
</bean>
<spring-security:authentication-manager alias="authenticationManager">
http://git-wip-us.apache.org/repos/asf/camel/blob/9d7499d2/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index ef07002..969c594 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -517,7 +517,8 @@
<spring42-version>4.2.5.RELEASE</spring42-version>
<spring4-version>4.2.5.RELEASE</spring4-version>
<spring-osgi-version>1.2.1</spring-osgi-version>
- <spring-security-version>3.2.8.RELEASE</spring-security-version>
+ <spring-security-version>4.0.4.RELEASE</spring-security-version>
+ <spring-security-bundle-version>4.0.3.RELEASE_1</spring-security-bundle-version>
<spring-ws-bundle-version>2.2.4.RELEASE_1</spring-ws-bundle-version>
<spring-ws-version>2.2.4.RELEASE</spring-ws-version>
<spymemcached-bundle-version>2.5_2</spymemcached-bundle-version> <!-- FIXME cmueller: not in sync! -->
http://git-wip-us.apache.org/repos/asf/camel/blob/9d7499d2/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 b27b53a..c974bb2 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1515,13 +1515,11 @@
<bundle>mvn:org.apache.camel/camel-spring-redis/${project.version}</bundle>
</feature>
<feature name='camel-spring-security' version='${project.version}' resolver='(obr)' start-level='50'>
- <details>spring-security doesn't support importing spring 4.x </details>
<feature>http</feature>
+ <feature version='${project.version}'>camel-core</feature>
<feature version='${spring-version-range}'>spring</feature>
- <feature version='${spring-version-range}'>spring-web</feature>
- <bundle dependency='true'>mvn:org.springframework.security/spring-security-core/${spring-security-version}</bundle>
- <bundle dependency='true'>mvn:org.springframework.security/spring-security-config/${spring-security-version}</bundle>
- <bundle dependency='true'>mvn:org.springframework.security/spring-security-web/${spring-security-version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-core/${spring-security-bundle-version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-config/${spring-security-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-spring-security/${project.version}</bundle>
</feature>
<feature name='camel-spring-ws' version='${project.version}' resolver='(obr)' start-level='50'>
[16/16] camel git commit: Remove camel-docker as jersey do not work
in osgi and its one pain in the ass to get working
Posted by da...@apache.org.
Remove camel-docker as jersey do not work in osgi and its one pain in the ass to get working
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7db9c8e5
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7db9c8e5
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7db9c8e5
Branch: refs/heads/master
Commit: 7db9c8e5e8f5822e8e36c0dc947b7e8dec242b7b
Parents: 8240465
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Mar 12 15:26:16 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Mar 12 15:27:36 2016 +0100
----------------------------------------------------------------------
.../features/src/main/resources/features.xml | 28 --------------------
.../camel/itest/karaf/CamelDockerTest.java | 2 ++
2 files changed, 2 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/7db9c8e5/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 c974bb2..b11cfff 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -345,34 +345,6 @@
<bundle dependency='true'>mvn:com.lmax/disruptor/${disruptor-version}</bundle>
<bundle>mvn:org.apache.camel/camel-disruptor/${project.version}</bundle>
</feature>
- <feature name='camel-docker' 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.docker-java/${docker-bundle-version}</bundle>
- <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle>
- <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version}</bundle>
- <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-version}</bundle>
- <bundle dependency='true'>mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/${jackson2-version}</bundle>
- <bundle dependency='true'>mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/${jackson2-version}</bundle>
- <bundle dependency='true'>mvn:com.google.guava/guava/${docker-guava-version}</bundle>
- <bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle>
- <bundle dependency='true'>mvn:org.apache.commons/commons-compress/${commons-compress-version}</bundle>
- <bundle dependency='true'>mvn:commons-io/commons-io/${commons-io-version}</bundle>
- <bundle dependency='true'>mvn:commons-lang/commons-lang/${commons-lang-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'>mvn:org.bouncycastle/bcprov-jdk15on/${bouncycastle-version}</bundle>
- <bundle dependency='true'>mvn:org.bouncycastle/bcmail-jdk15on/${bouncycastle-version}</bundle>
- <bundle dependency='true'>mvn:org.bouncycastle/bcpkix-jdk15on/${bouncycastle-version}</bundle>
- <bundle dependency='true'>mvn:org.glassfish.jersey.core/jersey-client/${jersey-version}</bundle>
- <bundle dependency='true'>mvn:org.glassfish.jersey.core/jersey-common/${jersey-version}</bundle>
- <bundle dependency='true'>mvn:org.glassfish.jersey.bundles.repackaged/jersey-guava/${jersey-version}</bundle>
- <bundle dependency='true'>mvn:org.glassfish.hk2/hk2-api/${hk2-version}</bundle>
- <bundle dependency='true'>mvn:org.glassfish.hk2/hk2-utils/${hk2-version}</bundle>
- <bundle dependency='true'>mvn:org.glassfish.hk2/osgi-resource-locator/${hk2-osgi-resource-version}</bundle>
- <bundle dependency="true">wrap:mvn:org.glassfish.jersey.connectors/jersey-apache-connector/${jersey-version}$Bundle-SymbolicName=org.glassfish.jersey.connectors&Bundle-Version=${jersey-version}</bundle>
- <bundle dependency='true'>wrap:mvn:de.gesellix/unix-socket-factory/${unix-socket-factory-version}$Bundle-SymbolicName=de.gesellix.unix-socket-factory&Bundle-Version=${unix-socket-factory-bundle-version}</bundle>
- <bundle>mvn:org.apache.camel/camel-docker/${project.version}</bundle>
- </feature>
<feature name='camel-dns' 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.dnsjava/${dnsjava-bundle-version}</bundle>
http://git-wip-us.apache.org/repos/asf/camel/blob/7db9c8e5/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDockerTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDockerTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDockerTest.java
index 31d1fd3..5e269d4 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDockerTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDockerTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.camel.itest.karaf;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Configuration;
@@ -23,6 +24,7 @@ import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
+@Ignore("camel-docker do not work in OSGi")
public class CamelDockerTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelDockerTest.class);
[12/16] camel git commit: Make more camel-spring-xxx modules install
in karaf.
Posted by da...@apache.org.
Make more camel-spring-xxx modules install in karaf.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d38e24ee
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d38e24ee
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d38e24ee
Branch: refs/heads/master
Commit: d38e24eeea63fb27a33b9d3a39708a262f2164b1
Parents: 7c77e18
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Mar 12 14:21:22 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Mar 12 14:21:22 2016 +0100
----------------------------------------------------------------------
parent/pom.xml | 2 ++
platforms/karaf/features/src/main/resources/features.xml | 10 +++++++---
2 files changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/d38e24ee/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 70ee31d..919b64b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -506,6 +506,8 @@
<spring-dm-version-range>[3.2,4)</spring-dm-version-range>
<!-- karaf 2.x/3.x/4.x supports spring 4.1 onwards -->
<spring-version-range>[4.1,5)</spring-version-range>
+ <!-- and special for only spring 4.0.x -->
+ <spring40-version-range>[4.0,4.1)</spring40-version-range>
<!-- and for spring 4.2.x onwards-->
<spring42-version-range>[4.2,5)</spring42-version-range>
<spring-version>${spring4-version}</spring-version>
http://git-wip-us.apache.org/repos/asf/camel/blob/d38e24ee/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 0173afc..63702fd 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1472,6 +1472,7 @@
<bundle>mvn:org.apache.camel/camel-splunk/${project.version}</bundle>
</feature>
<feature name='camel-spring-batch' version='${project.version}' resolver='(obr)' start-level='50'>
+ <feature version='${project.version}'>camel-core</feature>
<feature>transaction</feature>
<feature version='${spring-version-range}'>spring</feature>
<feature version='${spring-version-range}'>spring-tx</feature>
@@ -1487,9 +1488,12 @@
<bundle>mvn:org.apache.camel/camel-spring-javaconfig/${project.version}</bundle>
</feature>
<feature name='camel-spring-ldap' version='${project.version}' resolver='(obr)' start-level='50'>
- <feature version='${project.version}'>camel-spring</feature>
- <feature version='${spring-version-range}'>spring-tx</feature>
- <feature version='${spring-version-range}'>spring-jdbc</feature>
+ <details>camel-spring-ldap only works with Spring 4.0.x</details>
+ <feature version='${project.version}'>camel-core</feature>
+ <feature>transaction</feature>
+ <feature version='${spring40-version-range}'>spring</feature>
+ <feature version='${spring40-version-range}'>spring-jdbc</feature>
+ <feature version='${spring40-version-range}'>spring-tx</feature>
<bundle dependency='true'>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
<bundle dependency='true'>mvn:commons-pool/commons-pool/${commons-pool-version}</bundle>
<bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms-spec-version}</bundle>
[13/16] camel git commit: Make more camel-spring-xxx modules install
in karaf.
Posted by da...@apache.org.
Make more camel-spring-xxx modules install in karaf.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/de1c208c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/de1c208c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/de1c208c
Branch: refs/heads/master
Commit: de1c208cc701037dbc25a3132d926f8ed3ced0b2
Parents: d38e24e
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Mar 12 14:26:29 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Mar 12 14:26:29 2016 +0100
----------------------------------------------------------------------
parent/pom.xml | 2 +-
platforms/karaf/features/src/main/resources/features.xml | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/de1c208c/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 919b64b..ef07002 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -495,7 +495,7 @@
<spring-boot-version>1.3.3.RELEASE</spring-boot-version>
<spring-castor-bundle-version>1.2.0</spring-castor-bundle-version>
<spring-data-commons-version>1.6.5.RELEASE</spring-data-commons-version>
- <spring-data-redis-version>1.6.0.RELEASE</spring-data-redis-version>
+ <spring-data-redis-version>1.6.4.RELEASE</spring-data-redis-version>
<spring-integration-version>4.2.3.RELEASE</spring-integration-version>
<spring-javaconfig-version>1.0.0-20090215</spring-javaconfig-version>
<spring-ldap-version>2.0.4.RELEASE</spring-ldap-version>
http://git-wip-us.apache.org/repos/asf/camel/blob/de1c208c/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 63702fd..b27b53a 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1504,10 +1504,10 @@
<bundle>mvn:org.apache.camel/camel-spring-ldap/${project.version}</bundle>
</feature>
<feature name='camel-spring-redis' version='${project.version}' resolver='(obr)' start-level='50'>
- <details>spring-data-redis doesn't support importing spring version which is above 4.0.5 </details>
+ <details>camel-spring-redis only works with Spring 4.2.x</details>
<feature version='${project.version}'>camel-core</feature>
- <feature version='${spring-version-range}'>spring</feature>
- <feature version='${spring-version-range}'>spring-tx</feature>
+ <feature version='${spring42-version-range}'>spring</feature>
+ <feature version='${spring42-version-range}'>spring-tx</feature>
<bundle dependency='true'>mvn:commons-pool/commons-pool/${commons-pool-version}</bundle>
<bundle dependency='true'>mvn:org.springframework.data/spring-data-redis/${spring-data-redis-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jedis/${jedis-client-bundle-version}</bundle>
[07/16] camel git commit: Polish karaf features to be aligned
Posted by da...@apache.org.
Polish karaf features to be aligned
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c00d5672
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c00d5672
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c00d5672
Branch: refs/heads/master
Commit: c00d56728832b071b8a31fd7076e734bfb63b165
Parents: a5640b6
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Mar 12 12:35:05 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Mar 12 12:35:36 2016 +0100
----------------------------------------------------------------------
components/camel-servletlistener/pom.xml | 2 +-
.../features/src/main/resources/features.xml | 187 +++++++++----------
2 files changed, 92 insertions(+), 97 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/c00d5672/components/camel-servletlistener/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-servletlistener/pom.xml b/components/camel-servletlistener/pom.xml
index d59802b..67b6663 100644
--- a/components/camel-servletlistener/pom.xml
+++ b/components/camel-servletlistener/pom.xml
@@ -83,7 +83,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<forkCount>1</forkCount>
- <reuseForks>false</reuseForks>
+ <reuseForks>false</reuseForks>
</configuration>
</plugin>
</plugins>
http://git-wip-us.apache.org/repos/asf/camel/blob/c00d5672/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 5cb1174..6d8fe3f 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -73,18 +73,17 @@
<bundle>mvn:org.apache.camel/camel-ahc/${project.version}</bundle>
</feature>
<feature name='camel-ahc-ws' version='${project.version}' resolver='(obr)' start-level='50'>
- <feature version='${project.version}'>camel-core</feature>
<feature version='${project.version}'>camel-ahc</feature>
<bundle>mvn:org.apache.camel/camel-ahc-ws/${project.version}</bundle>
</feature>
<feature name='camel-amqp' version='${project.version}' resolver='(obr)' start-level='50'>
+ <feature version='${project.version}'>camel-jms</feature>
<bundle dependency='true'>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
<bundle dependency='true'>mvn:commons-collections/commons-collections/${commons-collections-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.mina/${mina-bundle-version}</bundle>
<bundle dependency='true'>wrap:mvn:org.apache.qpid/qpid-jms-client/${qpid-jms-client-version}</bundle>
<bundle dependency='true'>wrap:mvn:org.apache.qpid/proton-j/0.10</bundle>
<bundle dependency='true'>wrap:mvn:io.netty/netty-all/4.0.17.Final</bundle>
- <feature version='${project.version}'>camel-jms</feature>
<bundle>mvn:org.apache.camel/camel-amqp/${project.version}</bundle>
</feature>
<feature name='camel-apns' version='${project.version}' resolver='(obr)' start-level='50'>
@@ -95,7 +94,6 @@
<bundle>mvn:org.apache.camel/camel-apns/${project.version}</bundle>
</feature>
<feature name='camel-atmosphere-websocket' version='${project.version}' resolver='(obr)' start-level='50'>
- <feature version='${project.version}'>camel-core</feature>
<feature version='${project.version}'>camel-servlet</feature>
<bundle dependency='true'>mvn:org.atmosphere/atmosphere-runtime/${atmosphere-version}</bundle>
<bundle>mvn:org.apache.camel/camel-atmosphere-websocket/${project.version}</bundle>
@@ -104,7 +102,6 @@
<feature version='${project.version}'>camel-core</feature>
<bundle dependency='true'>mvn:com.sun.mail/javax.mail/${javax-mail-version}</bundle>
<bundle dependency='true'>mvn:org.apache.abdera/abdera-core/${abdera-version}</bundle>
- <!--bundle dependency='true'>mvn:org.apache.abdera/abdera-extensions-json/${abdera-version}</bundle-->
<bundle dependency='true'>mvn:org.apache.abdera/abdera-extensions-main/${abdera-version}</bundle>
<bundle dependency='true'>mvn:org.apache.abdera/abdera-i18n/${abdera-version}</bundle>
<bundle dependency='true'>mvn:org.apache.abdera/abdera-parser/${abdera-version}</bundle>
@@ -128,6 +125,7 @@
<bundle>mvn:org.apache.camel/camel-avro/${project.version}</bundle>
</feature>
<feature name='camel-aws' version='${project.version}' resolver='(obr)' start-level='50'>
+ <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:joda-time/joda-time/${jodatime2-bundle-version}</bundle>
@@ -138,14 +136,15 @@
<bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-version}</bundle>
<bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aws-java-sdk/${aws-java-sdk-bundle-version}</bundle>
- <feature version='${project.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-aws/${project.version}</bundle>
</feature>
<feature name='camel-bam' version='${project.version}' resolver='(obr)' start-level='50'>
+ <feature version='${project.version}'>camel-core</feature>
+ <feature version='${spring-version-range-karaf}'>spring-orm</feature>
+ <feature version='${spring-version-range-karaf}'>spring-jdbc</feature>
<feature version='${spring-version-range-karaf}'>spring-tx</feature>
<feature version='${spring-version-range-karaf}'>spring-web</feature>
<bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version}</bundle>
- <feature version='${spring-version-range-karaf}'>spring-jdbc</feature>
<bundle dependency='true'>mvn:commons-pool/commons-pool/${commons-pool-version}</bundle>
<bundle dependency='true'>mvn:commons-dbcp/commons-dbcp/${commons-dbcp-version}</bundle>
<bundle dependency='true'>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
@@ -154,8 +153,6 @@
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cglib-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oscache/${oscache-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ibatis-sqlmap/${ibatis-bundle-version}</bundle>
- <feature version='${spring-version-range-karaf}'>spring-orm</feature>
- <feature version='${project.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-bam/${project.version}</bundle>
</feature>
<feature name='camel-base64' version='${project.version}' resolver='(obr)' start-level='50'>
@@ -200,7 +197,7 @@
</feature>
<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>
+ <feature>jetty</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'>wrap:mvn:org.apache.httpcomponents/httpmime/${httpclient4-version}$Export-Package=org.apache.http.*;version=${httpclient4-version}</bundle>
@@ -222,7 +219,7 @@
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xalan/${xalan-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xerces/${xerces-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/${xmlresolver-bundle-version}</bundle>
- <feature>jetty</feature>
+ <bundle>mvn:org.apache.camel/camel-box/${project.version}</bundle>
</feature>
<feature name='camel-braintree' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
@@ -262,9 +259,9 @@
<bundle>mvn:org.apache.camel/camel-castor/${project.version}</bundle>
</feature>
<feature name='camel-cdi' version='${project.version}' resolver='(obr)' start-level='50'>
- <!-- you've got to install pax-cdi-weld or pax-cdi-openwebbeans in order to make it works -->
- <feature version='${pax-cdi-version}'>pax-cdi</feature>
+ <details>camel-cdi requires that either pax-cdi-weld or pax-cdi-openwebbeans has been installed</details>
<feature version='${project.version}'>camel-core</feature>
+ <feature version='${pax-cdi-version}'>pax-cdi</feature>
<feature>eventadmin</feature>
<bundle>mvn:org.apache.camel/camel-core-osgi/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-cdi/${project.version}</bundle>
@@ -284,12 +281,12 @@
<bundle>mvn:org.apache.camel/camel-cmis/${project.version}</bundle>
</feature>
<feature name='camel-coap' version='${project.version}' resolver='(obr)' start-level='50'>
- <feature version='${project.version}'>camel-core</feature>
- <bundle>mvn:org.eclipse.californium/californium-osgi/${californium-version}</bundle>
- <bundle>mvn:org.apache.camel/camel-coap/${project.version}</bundle>
+ <feature version='${project.version}'>camel-core</feature>
+ <bundle>mvn:org.eclipse.californium/californium-osgi/${californium-version}</bundle>
+ <bundle>mvn:org.apache.camel/camel-coap/${project.version}</bundle>
</feature>
<feature name='camel-cometd' version='${project.version}' resolver='(obr)' start-level='50'>
- <!-- camel-cometd currently requries jetty 8 -->
+ <details>camel-cometd currently requires jetty 8</details>
<feature version="[8,9)">jetty</feature>
<feature version='${project.version}'>camel-core</feature>
<bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax.servlet-api-version}</bundle>
@@ -319,8 +316,8 @@
<bundle>mvn:org.apache.camel/camel-crypto/${project.version}</bundle>
</feature>
<feature name='camel-csv' version='${project.version}' resolver='(obr)' start-level='50'>
- <bundle dependency='true'>mvn:org.apache.commons/commons-csv/${commons-csv-version}</bundle>
<feature version='${project.version}'>camel-core</feature>
+ <bundle dependency='true'>mvn:org.apache.commons/commons-csv/${commons-csv-version}</bundle>
<bundle>mvn:org.apache.camel/camel-csv/${project.version}</bundle>
</feature>
<feature name='camel-cxf' version='${project.version}' resolver='(obr)' start-level='50'>
@@ -336,11 +333,12 @@
</feature>
<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 dependency='true'>mvn:com.lmax/disruptor/${disruptor-version}</bundle>
<bundle>mvn:org.apache.camel/camel-disruptor/${project.version}</bundle>
</feature>
<feature name='camel-docker' 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.docker-java/${docker-bundle-version}</bundle>
<bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle>
<bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version}</bundle>
@@ -365,12 +363,11 @@
<bundle dependency='true'>mvn:org.glassfish.hk2/osgi-resource-locator/${hk2-osgi-resource-version}</bundle>
<bundle dependency="true">wrap:mvn:org.glassfish.jersey.connectors/jersey-apache-connector/${jersey-version}$Bundle-SymbolicName=org.glassfish.jersey.connectors&Bundle-Version=${jersey-version}</bundle>
<bundle dependency='true'>wrap:mvn:de.gesellix/unix-socket-factory/${unix-socket-factory-version}$Bundle-SymbolicName=de.gesellix.unix-socket-factory&Bundle-Version=${unix-socket-factory-bundle-version}</bundle>
- <feature version='${project.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-docker/${project.version}</bundle>
</feature>
<feature name='camel-dns' version='${project.version}' resolver='(obr)' start-level='50'>
- <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 dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.dnsjava/${dnsjava-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-dns/${project.version}</bundle>
</feature>
<feature name='camel-dozer' version='${project.version}' resolver='(obr)' start-level='50'>
@@ -435,8 +432,8 @@
<bundle>mvn:org.apache.camel/camel-etcd/${project.version}</bundle>
</feature>
<feature name='camel-eventadmin' version='${project.version}' resolver='(obr)' start-level='50'>
- <feature>eventadmin</feature>
<feature version='${project.version}'>camel-core</feature>
+ <feature>eventadmin</feature>
<bundle>mvn:org.apache.camel/camel-eventadmin/${project.version}</bundle>
</feature>
<feature name='camel-exec' version='${project.version}' resolver='(obr)' start-level='50'>
@@ -490,13 +487,12 @@
<bundle>mvn:org.apache.camel/camel-freemarker/${project.version}</bundle>
</feature>
<feature name='camel-ftp' version='${project.version}' resolver='(obr)' start-level='50'>
- <bundle dependency='true'>mvn:commons-net/commons-net/${commons-net-version}</bundle>
<feature version='${project.version}'>camel-core</feature>
+ <bundle dependency='true'>mvn:commons-net/commons-net/${commons-net-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jsch/${jsch-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-ftp/${project.version}</bundle>
</feature>
<feature name='camel-gae' version='${project.version}' resolver='(obr)' start-level='50'>
- <feature version='${project.version}'>camel-core</feature>
<feature version='${project.version}'>camel-servlet</feature>
<bundle dependency='true'>mvn:com.google.guava/guava/${google-guava-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.gdata/${google-gdata-bundle-version}</bundle>
@@ -530,7 +526,7 @@
</feature>
<feature name='camel-github' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
- <!--the lastest gson version of github core supports is 2.2.2 -->
+ <!--the latest gson version of github core supports is 2.2.2 -->
<bundle dependency='true'>mvn:com.google.code.gson/gson/2.2.2</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.egit.github.core/${egit-github-core-bundle-version}</bundle>
<bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle>
@@ -587,21 +583,21 @@
<bundle>mvn:org.apache.camel/camel-groovy/${project.version}</bundle>
</feature>
<feature name='camel-gson' version='${project.version}' resolver='(obr)' start-level='50'>
- <bundle dependency='true'>mvn:com.google.code.gson/gson/${gson-version}</bundle>
<feature version='${project.version}'>camel-core</feature>
+ <bundle dependency='true'>mvn:com.google.code.gson/gson/${gson-version}</bundle>
<bundle>mvn:org.apache.camel/camel-gson/${project.version}</bundle>
</feature>
<feature name='camel-guava-eventbus' version='${project.version}' resolver='(obr)' start-level='50'>
- <bundle dependency='true'>mvn:com.google.guava/guava/${google-guava-version}</bundle>
<feature version='${project.version}'>camel-core</feature>
+ <bundle dependency='true'>mvn:com.google.guava/guava/${google-guava-version}</bundle>
<bundle>mvn:org.apache.camel/camel-guava-eventbus/${project.version}</bundle>
</feature>
<feature name='camel-guice' version='${project.version}' resolver='(obr)' start-level='50'>
+ <feature version='${project.version}'>camel-core</feature>
<bundle dependency='true'>mvn:com.google.inject/guice/${guice-version}</bundle>
- <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javax-inject/${javax-inject-bundle-version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javax-inject/${javax-inject-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/${aopalliance-bundle-version}</bundle>
<bundle dependency='true'>mvn:com.google.guava/guava/${google-guava-version}</bundle>
- <feature version='${project.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-guice/${project.version}</bundle>
</feature>
<feature name='camel-hawtdb' version='${project.version}' resolver='(obr)' start-level='50'>
@@ -623,9 +619,9 @@
<!-- see https://issues.apache.org/jira/browse/HADOOP-7101 -->
<details>Hadoop does not currently work properly in OSGi environment.</details>
<feature version='${project.version}'>camel-core</feature>
+ <feature>war</feature>
<bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${geronimo-servlet-2.5-spec-version}</bundle>
<bundle dependency="true">wrap:mvn:javax.servlet.jsp/jsp-api/2.1</bundle>
- <feature>war</feature>
<bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version}</bundle>
<bundle dependency='true'>mvn:com.sun.mail/javax.mail/${javax-mail-version}</bundle>
<bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle>
@@ -690,12 +686,12 @@
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.hadoop-client/${hadoop2-bundle-version}</bundle>
</feature>
<feature name='camel-hipchat' version='${project.version}' resolver='(obr)' start-level='50'>
+ <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:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle>
<bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-version}</bundle>
<bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version}</bundle>
- <feature version='${project.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-hipchat/${project.version}</bundle>
</feature>
<feature name='camel-hessian' version='${project.version}' resolver='(obr)' start-level='50'>
@@ -704,7 +700,6 @@
<bundle>mvn:org.apache.camel/camel-hessian/${project.version}</bundle>
</feature>
<feature name='camel-hl7' version='${project.version}' resolver='(obr)' start-level='50'>
- <feature version='${project.version}'>camel-core</feature>
<feature version='${project.version}'>camel-netty4</feature>
<bundle dependency='true'>mvn:org.apache.mina/mina-core/${mina2-version}</bundle>
<bundle dependency='true'>mvn:ca.uhn.hapi/hapi-osgi-base/${hapi-version}</bundle>
@@ -752,15 +747,16 @@
<bundle>mvn:org.apache.camel/camel-ignite/${project.version}</bundle>
</feature>
<feature name='camel-ical' version='${project.version}' resolver='(obr)' start-level='50'>
+ <feature version='${project.version}'>camel-core</feature>
<bundle dependency='true'>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
<bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle>
<bundle dependency='true'>wrap:mvn:backport-util-concurrent/backport-util-concurrent/${backport-util-concurrent-version}$Bundle-SymbolicName=backport-util-concurrent.backport-util-concurrent&Bundle-Version=${backport-util-concurrent-version}</bundle>
<bundle dependency='true'>mvn:org.mnode.ical4j/ical4j/${ical4j-version}</bundle>
- <feature version='${project.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-ical/${project.version}</bundle>
</feature>
<feature name='camel-infinispan' version='${project.version}' resolver='(obr)' start-level='50'>
<details>The camel-infinispan feature requires Java 8</details>
+ <feature version='${project.version}'>camel-core</feature>
<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>
@@ -773,26 +769,26 @@
<bundle>mvn:org.apache.camel/camel-infinispan/${project.version}</bundle>
</feature>
<feature name='camel-irc' version='${project.version}' resolver='(obr)' start-level='50'>
- <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.irclib/${irclib-bundle-version}</bundle>
<feature version='${project.version}'>camel-core</feature>
+ <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.irclib/${irclib-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-irc/${project.version}</bundle>
</feature>
<feature name='camel-jackson' version='${project.version}' resolver='(obr)' start-level='50'>
+ <feature version='${project.version}'>camel-core</feature>
<bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle>
<bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-version}</bundle>
<bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version}</bundle>
<bundle dependency='true'>mvn:com.fasterxml.jackson.module/jackson-module-jaxb-annotations/${jackson2-version}</bundle>
- <feature version='${project.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-jackson/${project.version}</bundle>
</feature>
<feature name='camel-jacksonxml' version='${project.version}' resolver='(obr)' start-level='50'>
+ <feature version='${project.version}'>camel-core</feature>
<bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle>
<bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-version}</bundle>
<bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version}</bundle>
<bundle dependency='true'>mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-xml/${jackson2-version}</bundle>
<bundle dependency='true'>mvn:com.fasterxml.jackson.module/jackson-module-jaxb-annotations/${jackson2-version}</bundle>
<bundle dependency='true'>mvn:org.codehaus.woodstox/woodstox-core-asl/${woodstox-version}</bundle>
- <feature version='${project.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-jacksonxml/${project.version}</bundle>
</feature>
<feature name='camel-jasypt' version='${project.version}' resolver='(obr)' start-level='50'>
@@ -805,6 +801,7 @@
<bundle>mvn:org.apache.camel/camel-jaxb/${project.version}</bundle>
</feature>
<feature name='camel-jbpm' version='${project.version}' resolver='(obr)' start-level='50'>
+ <feature version='${project.version}'>camel-core</feature>
<bundle dependency='true'>mvn:org.openengsb.wrapped/com.google.protobuf/2.4.1.w1</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javax-inject/${javax-inject-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.codehaus.jackson/jackson-jaxrs/${jackson-version}</bundle>
@@ -828,23 +825,23 @@
<bundle>mvn:org.apache.camel/camel-jbpm/${project.version}</bundle>
</feature>
<feature name='camel-jcache' version='${project.version}' resolver='(obr)' start-level='50'>
- <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javax-cache-api/${jcache-bundle-version}</bundle>
<feature version='${project.version}'>camel-core</feature>
+ <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javax-cache-api/${jcache-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-jcache/${project.version}</bundle>
</feature>
<feature name='camel-jclouds' version='${project.version}' resolver='(obr)' start-level='50'>
+ <feature version='${project.version}'>camel-core</feature>
<feature version='${jclouds-version}'>jclouds</feature>
<feature version='${jclouds-version}'>jclouds-blobstore</feature>
<feature version='${jclouds-version}'>jclouds-compute</feature>
- <feature version='${project.version}'>camel-core</feature>
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr311-api-1.1.1/${servicemix-specs-version}</bundle>
<bundle>mvn:org.apache.camel/camel-jclouds/${project.version}</bundle>
</feature>
<feature name='camel-jcr' version='${project.version}' resolver='(obr)' start-level='50'>
+ <feature version='${project.version}'>camel-core</feature>
<bundle dependency='true'>mvn:javax.jcr/jcr/${jcr-version}</bundle>
<bundle dependency='true'>mvn:org.apache.jackrabbit/jackrabbit-jcr-commons/${jackrabbit-version}</bundle>
<bundle dependency='true'>mvn:com.google.guava/guava/${jackrabbit-guava-version}</bundle>
- <feature version='${project.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-jcr/${project.version}</bundle>
</feature>
<feature name='camel-jdbc' version='${project.version}' resolver='(obr)' start-level='50'>
@@ -877,7 +874,7 @@
<bundle dependency='true'>mvn:org.jgroups/jgroups/${jgroups-version}</bundle>
</feature>
<feature name='camel-jibx' version='${project.version}' resolver='(obr)' start-level='50'>
- <details> this feature doesn't work under JDK8 </details>
+ <details>camel-jibx does not work with Java 8</details>
<feature version='${project.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-jibx/${project.version}</bundle>
<bundle dependency='true'>mvn:org.jibx/jibx-run/${jibx-version}</bundle>
@@ -895,12 +892,12 @@
<bundle>mvn:org.apache.camel/camel-jing/${project.version}</bundle>
</feature>
<feature name='camel-jms' version='${project.version}' resolver='(obr)' start-level='50'>
+ <feature version='${project.version}'>camel-core</feature>
<feature version='${spring-version-range-karaf}'>spring</feature>
<bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version}</bundle>
<bundle dependency='true'>mvn:commons-pool/commons-pool/${commons-pool-version}</bundle>
<bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms-spec-version}</bundle>
<feature version='${spring-version-range-karaf}'>spring-jms</feature>
- <feature version='${project.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-jms/${project.version}</bundle>
</feature>
<feature name='camel-jmx' version='${project.version}' resolver='(obr)' start-level='50'>
@@ -908,25 +905,25 @@
<bundle>mvn:org.apache.camel/camel-jmx/${project.version}</bundle>
</feature>
<feature name='camel-jolt' version='${project.version}' resolver='(obr)' start-level='50'>
- <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.bazaarvoice-jolt/${jolt-bundle-version}</bundle>
<feature version='${project.version}'>camel-core</feature>
+ <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.bazaarvoice-jolt/${jolt-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-jolt/${project.version}</bundle>
</feature>
<feature name='camel-josql' version='${project.version}' resolver='(obr)' start-level='50'>
- <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.josql/${josql-bundle-version}</bundle>
<feature version='${project.version}'>camel-core</feature>
+ <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.josql/${josql-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-josql/${project.version}</bundle>
</feature>
<feature name='camel-jpa' version='${project.version}' resolver='(obr)' start-level='50'>
- <bundle dependency='true'>
- mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/${geronimo-annotation-1.0-spec-version}
- </bundle>
+ <feature version='${project.version}'>camel-core</feature>
+ <feature version='${spring-version-range-karaf}'>spring-jdbc</feature>
+ <feature version='${spring-version-range-karaf}'>spring-orm</feature>
+ <feature version='${spring-version-range-karaf}'>spring-tx</feature>
+ <bundle dependency='true'> mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/${geronimo-annotation-1.0-spec-version}</bundle>
<bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jpa_2.0_spec/${geronimo-jpa2-spec-version}</bundle>
<bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax.servlet-api-version}</bundle>
- <feature version='${spring-version-range-karaf}'>spring-tx</feature>
<bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-el_1.0_spec/${geronimo-el-spec-version}</bundle>
<bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version}</bundle>
- <feature version='${spring-version-range-karaf}'>spring-jdbc</feature>
<bundle dependency='true'>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
<bundle dependency='true'>mvn:commons-collections/commons-collections/${commons-collections-version}</bundle>
<bundle dependency='true'>mvn:commons-pool/commons-pool/${commons-pool-version}</bundle>
@@ -935,8 +932,6 @@
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.serp/${serp-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms-spec-version}</bundle>
<bundle dependency='true'>mvn:org.apache.xbean/xbean-asm4-shaded/${xbean-asm4-bundle-version}</bundle>
- <feature version='${spring-version-range-karaf}'>spring-orm</feature>
- <feature version='${project.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-jpa/${project.version}</bundle>
</feature>
<feature name='camel-jsch' version='${project.version}' resolver='(obr)' start-level='50'>
@@ -956,10 +951,10 @@
<bundle>mvn:org.apache.camel/camel-jsonpath/${project.version}</bundle>
</feature>
<feature name='camel-jt400' version='${project.version}' resolver='(obr)' start-level='50'>
+ <feature version='${project.version}'>camel-core</feature>
+ <feature>transaction</feature>
<bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax.servlet-api-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'>
@@ -969,32 +964,33 @@
<bundle>mvn:org.apache.camel/camel-juel/${project.version}</bundle>
</feature>
<feature name='camel-jxpath' version='${project.version}' resolver='(obr)' start-level='50'>
+ <feature version='${project.version}'>camel-core</feature>
<!-- All those bundles should be optional I think, but the commons-jxpath osgi metadata is not really good -->
<feature>war</feature>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-beanutils/${commons-beanutils-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version}</bundle>
<bundle dependency='true'>mvn:commons-jxpath/commons-jxpath/${commons-jxpath-version}</bundle>
- <feature version='${project.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-jxpath/${project.version}</bundle>
</feature>
<feature name='camel-kafka' version='${project.version}' resolver='(obr)' start-level='50'>
+ <feature version='${project.version}'>camel-core</feature>
<bundle dependency='true'>wrap:mvn:org.apache.kafka/kafka-clients/${kafka-version}</bundle>
<bundle dependency='true'>mvn:org.xerial.snappy/snappy-java/${snappy-version}</bundle>
<bundle dependency='true'>wrap:mvn:net.jpountz.lz4/lz4/1.2.0</bundle>
- <feature version='${project.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-kafka/${project.version}</bundle>
</feature>
<feature name='camel-kestrel' version='${project.version}' resolver='(obr)' start-level='50'>
- <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spymemcached/${spymemcached-bundle-version}</bundle>
<feature version='${project.version}'>camel-core</feature>
+ <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spymemcached/${spymemcached-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-kestrel/${project.version}</bundle>
</feature>
<feature name='camel-krati' version='${project.version}' resolver='(obr)' start-level='50'>
+ <feature version='${project.version}'>camel-core</feature>
<bundle dependency='true'>mvn:com.sna-projects.krati/krati/${krati-version}</bundle>
<bundle>mvn:org.apache.camel/camel-krati/${project.version}</bundle>
- <feature version='${project.version}'>camel-core</feature>
</feature>
<feature name='camel-kubernetes' version='${project.version}' resolver='(obr)' start-level='50'>
+ <feature version='${project.version}'>camel-core</feature>
<bundle dependency='true'>mvn:javax.validation/validation-api/${validation-api-version}</bundle>
<bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax.servlet-api-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr311-api-1.1.1/${servicemix-specs-version}</bundle>
@@ -1010,7 +1006,6 @@
<bundle dependency='true'>mvn:io.fabric8/kubernetes-client/${kubernetes-client-version}/jar/bundle</bundle>
<bundle dependency='true'>mvn:io.fabric8/openshift-client/${openshift-client-version}/jar/bundle</bundle>
<bundle>mvn:org.apache.camel/camel-kubernetes/${project.version}</bundle>
- <feature version='${project.version}'>camel-core</feature>
</feature>
<feature name='camel-ldap' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
@@ -1036,11 +1031,11 @@
<bundle dependency='true'>mvn:commons-collections/commons-collections/${commons-collections-version}</bundle>
<bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle>
<bundle dependency='true'>wrap:mvn:net.sourceforge.nekohtml/nekohtml/1.9.21</bundle>
- <bundle>mvn:org.apache.camel/camel-linkedin-api/${project.version}</bundle>
- <bundle>mvn:org.apache.camel/camel-linkedin/${project.version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xalan/${xalan-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xerces/${xerces-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/${xmlresolver-bundle-version}</bundle>
+ <bundle>mvn:org.apache.camel/camel-linkedin-api/${project.version}</bundle>
+ <bundle>mvn:org.apache.camel/camel-linkedin/${project.version}</bundle>
</feature>
<feature name='camel-leveldb' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
@@ -1059,22 +1054,22 @@
<bundle>mvn:org.apache.camel/camel-lucene/${project.version}</bundle>
</feature>
<feature name='camel-lzf' version='${project.version}' resolver='(obr)' start-level='50'>
- <bundle dependency='true'>mvn:com.ning/compress-lzf/${compress-lzf-version}</bundle>
<feature version='${project.version}'>camel-core</feature>
+ <bundle dependency='true'>mvn:com.ning/compress-lzf/${compress-lzf-version}</bundle>
<bundle>mvn:org.apache.camel/camel-lzf/${project.version}</bundle>
</feature>
<feature name='camel-mail' version='${project.version}' resolver='(obr)' start-level='50'>
- <bundle dependency='true'>mvn:com.sun.mail/javax.mail/${javax-mail-version}</bundle>
<feature version='${project.version}'>camel-core</feature>
+ <bundle dependency='true'>mvn:com.sun.mail/javax.mail/${javax-mail-version}</bundle>
<bundle>mvn:org.apache.camel/camel-mail/${project.version}</bundle>
</feature>
<feature name='camel-metrics' version='${project.version}' resolver='(obr)' start-level='50'>
+ <feature version='${project.version}'>camel-core</feature>
<bundle dependency='true'>mvn:io.dropwizard.metrics/metrics-core/${metrics-version}</bundle>
<bundle dependency='true'>mvn:io.dropwizard.metrics/metrics-json/${metrics-version}</bundle>
<bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle>
<bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-version}</bundle>
<bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version}</bundle>
- <feature version='${project.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-metrics/${project.version}</bundle>
</feature>
<feature name='camel-mina' version='${project.version}' resolver='(obr)' start-level='50'>
@@ -1088,46 +1083,47 @@
<bundle>mvn:org.apache.camel/camel-mina2/${project.version}</bundle>
</feature>
<feature name='camel-mllp' version='${project.version}' resolver='(obr)' start-level='50'>
+ <feature version='${project.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-mllp/${project.version}</bundle>
</feature>
<feature name='camel-mongodb' version='${project.version}' resolver='(obr)' start-level='50'>
- <bundle dependency='true'>mvn:org.mongodb/mongo-java-driver/${mongo-java-driver-version}</bundle>
- <bundle>mvn:org.apache.camel/camel-mongodb/${project.version}</bundle>
<feature version='${project.version}'>camel-core</feature>
<feature version='${project.version}'>camel-jackson</feature>
+ <bundle dependency='true'>mvn:org.mongodb/mongo-java-driver/${mongo-java-driver-version}</bundle>
+ <bundle>mvn:org.apache.camel/camel-mongodb/${project.version}</bundle>
</feature>
<feature name='camel-mongodb-gridfs' version='${project.version}' resolver='(obr)' start-level='50'>
- <bundle dependency='true'>mvn:org.mongodb/mongo-java-driver/${mongo-java-driver-version}</bundle>
- <bundle>mvn:org.apache.camel/camel-mongodb-gridfs/${project.version}</bundle>
- <feature version='${project.version}'>camel-core</feature>
- <feature version='${project.version}'>camel-jackson</feature>
+ <feature version='${project.version}'>camel-core</feature>
+ <feature version='${project.version}'>camel-jackson</feature>
+ <bundle dependency='true'>mvn:org.mongodb/mongo-java-driver/${mongo-java-driver-version}</bundle>
+ <bundle>mvn:org.apache.camel/camel-mongodb-gridfs/${project.version}</bundle>
</feature>
<feature name='camel-mqtt' version='${project.version}' resolver='(obr)' start-level='50'>
+ <feature version='${project.version}'>camel-core</feature>
<bundle dependency='true'>mvn:org.fusesource.mqtt-client/mqtt-client/${mqtt-client-version}</bundle>
<bundle dependency='true'>mvn:org.fusesource.hawtdispatch/hawtdispatch/${hawtdispatch-version}</bundle>
<bundle dependency='true'>mvn:org.fusesource.hawtdispatch/hawtdispatch-transport/${hawtdispatch-version}</bundle>
<bundle dependency='true'>mvn:org.fusesource.hawtbuf/hawtbuf/${hawtbuf-version}</bundle>
<bundle>mvn:org.apache.camel/camel-mqtt/${project.version}</bundle>
- <feature version='${project.version}'>camel-core</feature>
</feature>
<feature name='camel-msv' 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.xmlresolver/${xmlresolver-bundle-version}</bundle>
<!-- xerces is an optional dependency from isorelax -->
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xerces/${xerces-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/${ant-bundle-version}</bundle>
<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>
<feature name='camel-mustache' 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.mustache-compiler/${mustache-bundle-version}</bundle>
<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>
<feature name='camel-mvel' version='${project.version}' resolver='(obr)' start-level='50'>
- <bundle dependency='true'>mvn:org.mvel/mvel2/${mvel-version}</bundle>
<feature version='${project.version}'>camel-core</feature>
+ <bundle dependency='true'>mvn:org.mvel/mvel2/${mvel-version}</bundle>
<bundle>mvn:org.apache.camel/camel-mvel/${project.version}</bundle>
</feature>
<feature name='camel-mybatis' version='${project.version}' resolver='(obr)' start-level='50'>
@@ -1394,16 +1390,14 @@
<bundle>mvn:org.apache.camel/camel-script/${project.version}</bundle>
</feature>
<feature name='camel-servlet' version='${project.version}' resolver='(obr)' start-level='50'>
- <details> camel-servlet need to access the http OSGi services </details>
<feature version='${project.version}'>camel-core</feature>
<feature>http</feature>
<bundle>mvn:org.apache.camel/camel-http-common/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-servlet/${project.version}</bundle>
</feature>
<feature name='camel-servletlistener' version='${project.version}' resolver='(obr)' start-level='50'>
- <details> camel-servletlistener need to access the http OSGi services </details>
+ <feature version='${project.version}'>camel-core</feature>
<feature>http</feature>
- <feature version='${project.version}'>camel-http</feature>
<bundle>mvn:org.apache.camel/camel-servletlistener/${project.version}</bundle>
</feature>
<feature name='camel-shiro' version='${project.version}' resolver='(obr)' start-level='50'>
@@ -1419,19 +1413,19 @@
<bundle>mvn:org.apache.camel/camel-sip/${project.version}</bundle>
</feature>
<feature name='camel-sjms' version='${project.version}' resolver='(obr)' start-level='50'>
+ <feature version='${project.version}'>camel-core</feature>
<!-- JTA is not currently supported by SJMS but is a required dependency of the Geronimo JMS Bundle -->
<bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version}</bundle>
<bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms-spec-version}</bundle>
<bundle dependency='true'>mvn:commons-pool/commons-pool/${commons-pool-version}</bundle>
- <feature version='${project.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-sjms/${project.version}</bundle>
</feature>
<feature name='camel-slack' version='${project.version}' resolver='(obr)' start-level='50'>
+ <feature version='${project.version}'>camel-core</feature>
<bundle dependency='true'>mvn:com.googlecode.json-simple/json-simple/${json-simple-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'>mvn:javax.servlet/javax.servlet-api/${javax.servlet-api-version}</bundle>
- <feature version='${project.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-slack/${project.version}</bundle>
</feature>
<feature name='camel-smpp' version='${project.version}' resolver='(obr)' start-level='50'>
@@ -1469,7 +1463,7 @@
<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>
+ <details>camel-spark-rest 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>
@@ -1482,16 +1476,16 @@
<bundle>mvn:org.apache.camel/camel-splunk/${project.version}</bundle>
</feature>
<feature name='camel-spring-batch' version='${project.version}' resolver='(obr)' start-level='50'>
+ <feature version='${project.version}'>camel-spring</feature>
<bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms-spec-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-batch-core/${spring-batch-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-batch-infrastructure/${spring-batch-bundle-version}</bundle>
- <feature version='${project.version}'>camel-spring</feature>
<bundle>mvn:org.apache.camel/camel-spring-batch/${project.version}</bundle>
</feature>
<feature name='camel-spring-javaconfig' version='${project.version}' resolver='(obr)' start-level='50'>
- <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cglib-bundle-version}</bundle>
<feature version='${project.version}'>camel-spring</feature>
<feature version='${spring-version-range-karaf}'>spring-test</feature>
+ <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cglib-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-spring-javaconfig/${project.version}</bundle>
</feature>
<feature name='camel-spring-ldap' version='${project.version}' resolver='(obr)' start-level='50'>
@@ -1547,10 +1541,10 @@
<bundle>mvn:org.apache.camel/camel-spring-ws/${project.version}</bundle>
</feature>
<feature name='camel-sql' version='${project.version}' resolver='(obr)' start-level='50'>
+ <feature version='${project.version}'>camel-core</feature>
<feature version='${spring-version-range-karaf}'>spring-tx</feature>
- <bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version}</bundle>
<feature version='${spring-version-range-karaf}'>spring-jdbc</feature>
- <feature version='${project.version}'>camel-core</feature>
+ <bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version}</bundle>
<bundle>mvn:org.apache.camel/camel-sql/${project.version}</bundle>
</feature>
<feature name='camel-ssh' version='${project.version}' resolver='(obr)' start-level='50'>
@@ -1662,8 +1656,8 @@
<bundle>mvn:org.apache.camel/camel-test-spring/${project.version}</bundle>
</feature>
<feature name='camel-twitter' version='${project.version}' resolver='(obr)' start-level='50'>
- <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.twitter4j/${twitter4j-bundle-version}</bundle>
<feature version='${project.version}'>camel-core</feature>
+ <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.twitter4j/${twitter4j-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-twitter/${project.version}</bundle>
</feature>
<feature name='camel-undertow' version='${project.version}' resolver='(obr)' start-level='50'>
@@ -1673,20 +1667,21 @@
<bundle>mvn:org.apache.camel/camel-undertow/${project.version}</bundle>
</feature>
<feature name='camel-univocity-parsers' version='${project.version}' resolver='(obr)' start-level='50'>
- <bundle dependency='true'>mvn:com.univocity/univocity-parsers/${univocity-parsers-version}</bundle>
<feature version='${project.version}'>camel-core</feature>
+ <bundle dependency='true'>mvn:com.univocity/univocity-parsers/${univocity-parsers-version}</bundle>
<bundle>mvn:org.apache.camel/camel-univocity-parsers/${project.version}</bundle>
</feature>
<feature name='camel-urlrewrite' version='${project.version}' resolver='(obr)' start-level='50'>
+ <feature version='${project.version}'>camel-core</feature>
<feature version='${project.version}'>camel-http</feature>
<feature version='${project.version}'>camel-http4</feature>
<feature version='${project.version}'>camel-jetty</feature>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.urlrewritefilter/${urlrewritefilter-bundle-version}</bundle>
- <feature version='${project.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-urlrewrite/${project.version}</bundle>
</feature>
<feature name='camel-vertx' version='${project.version}' resolver='(obr)' start-level='50'>
- <details>The camel-vertx feature requires Java 8</details>
+ <feature version='${project.version}'>camel-core</feature>
+ <details>camel-vertx feature requires Java 8</details>
<bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle>
<bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-version}</bundle>
<bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version}</bundle>
@@ -1699,10 +1694,10 @@
<bundle dependency='true'>mvn:com.hazelcast/hazelcast/${hazelcast-version}</bundle>
<bundle dependency='true'>mvn:com.eclipsesource.minimal-json/minimal-json/${minimal-json-version}</bundle>
<bundle dependency='true'>wrap:mvn:io.vertx/vertx-core/${vertx-version}</bundle>
- <feature version='${project.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-vertx/${project.version}</bundle>
</feature>
<feature name='camel-velocity' version='${project.version}' resolver='(obr)' start-level='50'>
+ <feature version='${project.version}'>camel-core</feature>
<bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax.servlet-api-version}</bundle>
<bundle dependency='true'>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
<bundle dependency='true'>mvn:commons-collections/commons-collections/${commons-collections-version}</bundle>
@@ -1711,68 +1706,68 @@
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr/${antlr-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oro/${oro-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.velocity/${velocity-bundle-version}</bundle>
- <feature version='${project.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-velocity/${project.version}</bundle>
</feature>
<feature name='camel-weather' version='${project.version}' resolver='(obr)' start-level='50'>
+ <feature version='${project.version}'>camel-core</feature>
<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>
- <feature version='${project.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-weather/${project.version}</bundle>
</feature>
<feature name='camel-websocket' version='${project.version}' resolver='(obr)' start-level='50'>
- <feature>jetty</feature>
+ <details>camel-websocket currently requires jetty 8</details>
+ <feature version="[8,9)">jetty</feature>
<feature version='${project.version}'>camel-core</feature>
<bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax.servlet-api-version}</bundle>
<bundle>mvn:org.apache.camel/camel-websocket/${project.version}</bundle>
</feature>
<feature name='camel-xmlbeans' 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.ant/${ant-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlbeans/${xmlbeans-bundle-version}</bundle>
- <feature version='${project.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-xmlbeans/${project.version}</bundle>
</feature>
<feature name='camel-xmljson' version='${project.version}' resolver='(obr)' start-level='50'>
<!-- NOTICE: XOM cannot be included by default due to an incompatible license; please review its license model and install the dependency manually if you agree. -->
<details>Before using this feature make sure to install this bundle first manually: mvn:xom/xom/${xom-version}</details>
+ <feature version='${project.version}'>camel-core</feature>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-beanutils/${commons-beanutils-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oro/${oro-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ezmorph/${ezmorph-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.json-lib/${jsonlib-bundle-version}</bundle>
<bundle dependency='true'>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
<bundle dependency='true'>mvn:commons-collections/commons-collections/${commons-collections-version}</bundle>
- <feature version='${project.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-xmljson/${project.version}</bundle>
</feature>
<feature name='camel-xmlrpc' version='${project.version}' resolver='(obr)' start-level='50'>
+ <feature version='${project.version}'>camel-core</feature>
<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>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlrpc-client/${xmlrpc-client-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ws-commons-util/${ws-commons-util-bundle-version}</bundle>
- <feature version='${project.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-xmlrpc/${project.version}</bundle>
</feature>
<feature name='camel-xmlsecurity' version='${project.version}' resolver='(obr)' start-level='50'>
+ <feature version='${project.version}'>camel-core</feature>
<bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xalan/${xalan-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.apache.santuario/xmlsec/${xmlsec-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xerces/${xerces-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/${xmlresolver-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.bcel/${bcel-bundle-version}</bundle>
- <feature version='${project.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-xmlsecurity/${project.version}</bundle>
</feature>
<feature name='camel-xmpp' 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.xpp3/${xpp3-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>
<feature name='camel-xstream' version='${project.version}' resolver='(obr)' start-level='50'>
- <bundle dependency='true'>mvn:org.codehaus.jettison/jettison/${jettison-version}</bundle>
<feature version='${project.version}'>camel-core</feature>
+ <bundle dependency='true'>mvn:org.codehaus.jettison/jettison/${jettison-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xpp3/${xpp3-bundle-version}</bundle>
<bundle dependency='true'>mvn:joda-time/joda-time/${jodatime-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version}</bundle>
@@ -1782,11 +1777,11 @@
<bundle>mvn:org.apache.camel/camel-xstream/${project.version}</bundle>
</feature>
<feature name='camel-yammer' version='${project.version}' resolver='(obr)' start-level='50'>
+ <feature version='${project.version}'>camel-core</feature>
<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>
<feature name='camel-zipfile' version='${project.version}' resolver='(obr)' start-level='50'>
[02/16] camel git commit: Fixed wrong test
Posted by da...@apache.org.
Fixed wrong test
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/821c771a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/821c771a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/821c771a
Branch: refs/heads/master
Commit: 821c771a5e7bbd34061f4589edf81d72dcf9cc94
Parents: 332e31a
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Mar 12 11:26:01 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Mar 12 11:26:01 2016 +0100
----------------------------------------------------------------------
.../src/test/java/org/apache/camel/itest/karaf/CamelCmisTest.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/821c771a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCmisTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCmisTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCmisTest.java
index 22ab9b9..8db85e2 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCmisTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCmisTest.java
@@ -22,10 +22,9 @@ import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
-
@RunWith(PaxExam.class)
public class CamelCmisTest extends AbstractFeatureTest {
- public static final String COMPONENT = extractName(CamelCxfTest.class);
+ public static final String COMPONENT = extractName(CamelCmisTest.class);
@Test
public void test() throws Exception {
[06/16] camel git commit: Make camel-cometd install in karaf 4
Posted by da...@apache.org.
Make camel-cometd install in karaf 4
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a5640b63
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a5640b63
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a5640b63
Branch: refs/heads/master
Commit: a5640b63b9156ed79be2cc55f720876581dba2f0
Parents: 891ab44
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Mar 12 12:11:49 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Mar 12 12:11:49 2016 +0100
----------------------------------------------------------------------
platforms/karaf/features/src/main/resources/features.xml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/a5640b63/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 d660c40..5cb1174 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -289,7 +289,8 @@
<bundle>mvn:org.apache.camel/camel-coap/${project.version}</bundle>
</feature>
<feature name='camel-cometd' version='${project.version}' resolver='(obr)' start-level='50'>
- <feature>jetty</feature>
+ <!-- camel-cometd currently requries jetty 8 -->
+ <feature version="[8,9)">jetty</feature>
<feature version='${project.version}'>camel-core</feature>
<bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax.servlet-api-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cometd-java-server/${cometd-java-server-bundle-version}</bundle>
[05/16] camel git commit: Fix camel install on karaf with servlet
range. Make camel-jetty into 2 features for 8 and 9. And make camel-jetty use
9 as default now.
Posted by da...@apache.org.
Fix camel install on karaf with servlet range. Make camel-jetty into 2 features for 8 and 9. And make camel-jetty use 9 as default now.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/891ab44f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/891ab44f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/891ab44f
Branch: refs/heads/master
Commit: 891ab44f21f6102abf8bcfcf6caf7ef35bd7cd0a
Parents: 9ec5776
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Mar 12 12:07:15 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Mar 12 12:07:15 2016 +0100
----------------------------------------------------------------------
components/camel-atmosphere-websocket/pom.xml | 8 ++--
components/camel-http/pom.xml | 8 ----
components/camel-jetty8/pom.xml | 2 +-
.../features/src/main/resources/features.xml | 8 +++-
.../camel/itest/karaf/CamelJetty8Test.java | 41 ++++++++++++++++++++
.../camel/itest/karaf/CamelJetty9Test.java | 40 +++++++++++++++++++
6 files changed, 92 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/891ab44f/components/camel-atmosphere-websocket/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-atmosphere-websocket/pom.xml b/components/camel-atmosphere-websocket/pom.xml
index efe297a..c0a27a9 100644
--- a/components/camel-atmosphere-websocket/pom.xml
+++ b/components/camel-atmosphere-websocket/pom.xml
@@ -36,13 +36,13 @@
</camel.osgi.export.pkg>
<camel.osgi.import.pkg>
!org.apache.camel.component.atmosphere.websocket.*,
- javax.servlet*;version="3.1.0",
+ javax.servlet.*;version="${servlet-version-range}",
org.atmosphere.*;version="${atmosphere-version-range}",
org.apache.catalina;resolution:=optional,
org.apache.catalina.comet;resolution:=optional,
- org.eclipse.jetty.continuation;version="[7.6,8.2)";resolution:=optional,
- org.eclipse.jetty.server;version="[7.6,8.2)";resolution:=optional,
- org.eclipse.jetty.util.ssl;version="[7.6,8.2)";resolution:=optional,
+ org.eclipse.jetty.continuation;version="[8,10)";resolution:=optional,
+ org.eclipse.jetty.server;version="[8,10)";resolution:=optional,
+ org.eclipse.jetty.util.ssl;version="[8,10)";resolution:=optional,
${camel.osgi.import.defaults},
*
</camel.osgi.import.pkg>
http://git-wip-us.apache.org/repos/asf/camel/blob/891ab44f/components/camel-http/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-http/pom.xml b/components/camel-http/pom.xml
index 91df298..3a0e30c 100644
--- a/components/camel-http/pom.xml
+++ b/components/camel-http/pom.xml
@@ -30,9 +30,6 @@
<description>Camel HTTP support</description>
<properties>
- <camel.osgi.import.before.defaults>
- javax.servlet.*;version="${servlet-version-range}"
- </camel.osgi.import.before.defaults>
<camel.osgi.export.pkg>org.apache.camel.component.http.*</camel.osgi.export.pkg>
<camel.osgi.export.service>
org.apache.camel.spi.ComponentResolver;component=http,
@@ -50,11 +47,6 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-http-common</artifactId>
</dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>${javax.servlet-api-version}</version>
- </dependency>
<dependency>
<groupId>commons-httpclient</groupId>
http://git-wip-us.apache.org/repos/asf/camel/blob/891ab44f/components/camel-jetty8/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-jetty8/pom.xml b/components/camel-jetty8/pom.xml
index 737c628..cf27adf 100644
--- a/components/camel-jetty8/pom.xml
+++ b/components/camel-jetty8/pom.xml
@@ -31,7 +31,7 @@
<properties>
<camel.osgi.import.before.defaults>
- javax.servlet.*;version="${servlet-version-range}"
+ org.eclipse.jetty.*;version="[8,9)"
</camel.osgi.import.before.defaults>
<camel.osgi.export.pkg>org.apache.camel.component.jetty8</camel.osgi.export.pkg>
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=jetty</camel.osgi.export.service>
http://git-wip-us.apache.org/repos/asf/camel/blob/891ab44f/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 59faaa5..d660c40 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -850,8 +850,8 @@
<feature version='${project.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-jdbc/${project.version}</bundle>
</feature>
- <feature name='camel-jetty' version='${project.version}' resolver='(obr)' start-level='50'>
- <details>camel-jetty intend to work with jetty8, so this feature only works in the karaf container which support jetty8, e.g. karaf 2.x/3.x</details>
+ <feature name='camel-jetty8' version='${project.version}' resolver='(obr)' start-level='50'>
+ <details>camel-jetty8 intend to work with jetty8, so this feature only works in the karaf container which support jetty8, e.g. karaf 2.x/3.x</details>
<feature>jetty</feature>
<feature version='${project.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-http-common/${project.version}</bundle>
@@ -866,6 +866,10 @@
<bundle>mvn:org.apache.camel/camel-jetty-common/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-jetty9/${project.version}</bundle>
</feature>
+ <feature name='camel-jetty' version='${project.version}' resolver='(obr)' start-level='50'>
+ <details>camel-jetty intend to work with jetty9, so this feature only works in the karaf container which support jetty9, e.g. karaf 4.x</details>
+ <feature>camel-jetty9</feature>
+ </feature>
<feature name='camel-jgroups' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-jgroups/${project.version}</bundle>
http://git-wip-us.apache.org/repos/asf/camel/blob/891ab44f/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJetty8Test.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJetty8Test.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJetty8Test.java
new file mode 100644
index 0000000..0a81006
--- /dev/null
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJetty8Test.java
@@ -0,0 +1,41 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.itest.karaf;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.junit.PaxExam;
+
+@RunWith(PaxExam.class)
+@Deprecated
+public class CamelJetty8Test extends AbstractFeatureTest {
+
+ public static final String COMPONENT = extractName(CamelJetty8Test.class);
+
+ @Test
+ public void test() throws Exception {
+ testComponent("jetty");
+ }
+
+ @Configuration
+ public static Option[] configure() {
+ return configure(COMPONENT);
+ }
+
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/891ab44f/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJetty9Test.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJetty9Test.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJetty9Test.java
new file mode 100644
index 0000000..07b2681
--- /dev/null
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJetty9Test.java
@@ -0,0 +1,40 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.itest.karaf;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.junit.PaxExam;
+
+@RunWith(PaxExam.class)
+public class CamelJetty9Test extends AbstractFeatureTest {
+
+ public static final String COMPONENT = extractName(CamelJetty9Test.class);
+
+ @Test
+ public void test() throws Exception {
+ testComponent("jetty");
+ }
+
+ @Configuration
+ public static Option[] configure() {
+ return configure(COMPONENT);
+ }
+
+}
\ No newline at end of file
[15/16] camel git commit: Make more camel-spring-xxx modules install
in karaf.
Posted by da...@apache.org.
Make more camel-spring-xxx modules install in karaf.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/82404655
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/82404655
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/82404655
Branch: refs/heads/master
Commit: 824046553381839bfe6c42dee9c2f538cb2aa0be
Parents: 9d7499d
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Mar 12 14:52:28 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Mar 12 14:52:28 2016 +0100
----------------------------------------------------------------------
components/camel-spring-security/pom.xml | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/82404655/components/camel-spring-security/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-spring-security/pom.xml b/components/camel-spring-security/pom.xml
index 3d39506..6fa7fb0 100644
--- a/components/camel-spring-security/pom.xml
+++ b/components/camel-spring-security/pom.xml
@@ -41,6 +41,29 @@
<artifactId>camel-core</artifactId>
</dependency>
+ <!-- spring-core -->
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-aop</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-expression</artifactId>
+ </dependency>
+
+ <!-- spring-security -->
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-core</artifactId>
[04/16] camel git commit: camel-cometd is currently jetty 8 only.
Posted by da...@apache.org.
camel-cometd is currently jetty 8 only.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9ec57764
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9ec57764
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9ec57764
Branch: refs/heads/master
Commit: 9ec577642d724550153a3de7d5d8299df665e4f2
Parents: fb9b3fc
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Mar 12 11:41:59 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Mar 12 11:41:59 2016 +0100
----------------------------------------------------------------------
components/camel-cometd/pom.xml | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/9ec57764/components/camel-cometd/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-cometd/pom.xml b/components/camel-cometd/pom.xml
index e3c075b..4628b45 100644
--- a/components/camel-cometd/pom.xml
+++ b/components/camel-cometd/pom.xml
@@ -33,7 +33,7 @@
<camel.osgi.export.pkg>org.apache.camel.component.cometd.*</camel.osgi.export.pkg>
<camel.osgi.import.pkg>
!org.apache.camel.component.cometd.*,
- org.eclipse.jetty.util.ssl;version="[7.6,8.2)";resolution:=optional,
+ org.eclipse.jetty.util.ssl;version="[8,9)";resolution:=optional,
javax.servlet.*;version="${servlet-version-range}",
${camel.osgi.import.defaults},
*
@@ -52,27 +52,27 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
- <version>${jetty-version}</version>
+ <version>${jetty8-version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
- <version>${jetty-version}</version>
+ <version>${jetty8-version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlets</artifactId>
- <version>${jetty-version}</version>
+ <version>${jetty8-version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
- <version>${jetty-version}</version>
+ <version>${jetty8-version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-jmx</artifactId>
- <version>${jetty-version}</version>
+ <version>${jetty8-version}</version>
</dependency>
<dependency>
<groupId>org.cometd.java</groupId>
[09/16] camel git commit: camel-spring-ws can now install in karaf 4
Posted by da...@apache.org.
camel-spring-ws can now install in karaf 4
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3fb521ec
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3fb521ec
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3fb521ec
Branch: refs/heads/master
Commit: 3fb521ec54bdc60f069512cbb409b811de2728af
Parents: 20baad8
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Mar 12 13:18:54 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Mar 12 13:18:54 2016 +0100
----------------------------------------------------------------------
components/camel-spring-ws/pom.xml | 269 +++++++++----------
parent/pom.xml | 7 +-
.../features/src/main/resources/features.xml | 27 +-
3 files changed, 148 insertions(+), 155 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/3fb521ec/components/camel-spring-ws/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-spring-ws/pom.xml b/components/camel-spring-ws/pom.xml
index e748952..a19ebd3 100644
--- a/components/camel-spring-ws/pom.xml
+++ b/components/camel-spring-ws/pom.xml
@@ -15,152 +15,145 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.camel</groupId>
- <artifactId>components</artifactId>
- <version>2.17-SNAPSHOT</version>
- </parent>
+ <parent>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>components</artifactId>
+ <version>2.17-SNAPSHOT</version>
+ </parent>
- <artifactId>camel-spring-ws</artifactId>
- <packaging>bundle</packaging>
- <name>Camel :: Spring Web Services</name>
- <description>Camel support for Spring Web Services</description>
+ <artifactId>camel-spring-ws</artifactId>
+ <packaging>bundle</packaging>
+ <name>Camel :: Spring Web Services</name>
+ <description>Camel support for Spring Web Services</description>
- <properties>
- <camel.osgi.export.pkg>org.apache.camel.component.spring.ws.*</camel.osgi.export.pkg>
- <camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=spring-ws</camel.osgi.export.service>
- </properties>
+ <properties>
+ <camel.osgi.import.before.defaults>
+ org.springframework.beans.*;version="${spring4-version-range-karaf}",
+ org.springframework.util.*;version="${spring4-version-range-karaf}"
+ </camel.osgi.import.before.defaults>
+ <camel.osgi.export.pkg>org.apache.camel.component.spring.ws.*</camel.osgi.export.pkg>
+ <camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=spring-ws</camel.osgi.export.service>
+ </properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-spring</artifactId>
- </dependency>
+ <dependencies>
-<!-- spring-oxm is needed when upgrading to Spring WS 2.1 that uses Spring 3.1 onwards
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-oxm</artifactId>
- <version>${spring-version}</version>
- </dependency>
--->
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-webmvc</artifactId>
- <version>${spring-version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.springframework.ws</groupId>
- <artifactId>spring-ws-core</artifactId>
- <version>${spring-ws-version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.ws</groupId>
- <artifactId>spring-ws-support</artifactId>
- <version>${spring-ws-version}</version>
- </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-spring</artifactId>
+ </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <scope>provided</scope>
- </dependency>
+ <!-- spring -->
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-webmvc</artifactId>
+ <version>${spring-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.ws</groupId>
+ <artifactId>spring-ws-core</artifactId>
+ <version>${spring-ws-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.ws</groupId>
+ <artifactId>spring-ws-support</artifactId>
+ <version>${spring-ws-version}</version>
+ </dependency>
- <!-- test dependencies -->
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-server</artifactId>
- <version>${jetty-version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-security</artifactId>
- <version>${jetty-version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-servlet</artifactId>
- <version>${jetty-version}</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-test</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework.ws</groupId>
- <artifactId>spring-ws-test</artifactId>
- <version>${spring-ws-version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-jaxb</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>net.javacrumbs</groupId>
- <artifactId>smock-springws</artifactId>
- <version>0.5</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.easytesting</groupId>
- <artifactId>fest-assert</artifactId>
- <version>1.4</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>net.javacrumbs</groupId>
- <artifactId>spring-ws-test</artifactId>
- <version>${javacrumbs-version}</version>
- <exclusions>
- <exclusion>
- <groupId>xmlunit</groupId>
- <artifactId>xmlunit</artifactId>
- </exclusion>
- </exclusions>
- <scope>test</scope>
- </dependency>
+ <!-- test dependencies -->
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ <version>${jetty-version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-security</artifactId>
+ <version>${jetty-version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-servlet</artifactId>
+ <version>${jetty-version}</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.ws</groupId>
+ <artifactId>spring-ws-test</artifactId>
+ <version>${spring-ws-version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-test-spring</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-jaxb</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>net.javacrumbs</groupId>
+ <artifactId>smock-springws</artifactId>
+ <version>0.5</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.easytesting</groupId>
+ <artifactId>fest-assert</artifactId>
+ <version>1.4</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>net.javacrumbs</groupId>
+ <artifactId>spring-ws-test</artifactId>
+ <version>${javacrumbs-version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>xmlunit</groupId>
+ <artifactId>xmlunit</artifactId>
+ </exclusion>
+ </exclusions>
+ <scope>test</scope>
+ </dependency>
- </dependencies>
+ </dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/3fb521ec/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 0f9b608..c1c8c38 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -506,7 +506,10 @@
<spring-version-range>[3.2,5)</spring-version-range>
<!-- However, spring-dm does not support spring 4.x so import-range must be 3.x for the -->
<!-- Karaf features file. -->
+ <!-- TODO: rename to spring-dm-version-range-karaf -->
<spring-version-range-karaf>[3.2,4)</spring-version-range-karaf>
+ <!-- for spring 4.x in karaf -->
+ <spring4-version-range-karaf>[4,5)</spring4-version-range-karaf>
<spring-version>${spring4-version}</spring-version>
<spring32-version>3.2.15.RELEASE</spring32-version>
<spring40-version>4.0.9.RELEASE</spring40-version>
@@ -515,8 +518,8 @@
<spring4-version>4.2.5.RELEASE</spring4-version>
<spring-osgi-version>1.2.1</spring-osgi-version>
<spring-security-version>3.2.8.RELEASE</spring-security-version>
- <spring-ws-bundle-version>2.2.2.RELEASE_1</spring-ws-bundle-version>
- <spring-ws-version>2.2.2.RELEASE</spring-ws-version>
+ <spring-ws-bundle-version>2.2.4.RELEASE_1</spring-ws-bundle-version>
+ <spring-ws-version>2.2.4.RELEASE</spring-ws-version>
<spymemcached-bundle-version>2.5_2</spymemcached-bundle-version> <!-- FIXME cmueller: not in sync! -->
<spymemcached-version>2.12.0</spymemcached-version>
<squareup-okhttp-version>2.7.5</squareup-okhttp-version>
http://git-wip-us.apache.org/repos/asf/camel/blob/3fb521ec/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 d8b0e29..f23dbd4 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1515,29 +1515,26 @@
<feature name='camel-spring-security' version='${project.version}' resolver='(obr)' start-level='50'>
<details>spring-security doesn't support importing spring 4.x </details>
<feature>http</feature>
- <feature version='${project.version}'>camel-spring</feature>
- <feature version='${spring-version-range-karaf}'>spring-web</feature>
+ <feature>spring</feature>
+ <feature>spring-web</feature>
<bundle dependency='true'>mvn:org.springframework.security/spring-security-core/${spring-security-version}</bundle>
<bundle dependency='true'>mvn:org.springframework.security/spring-security-config/${spring-security-version}</bundle>
<bundle dependency='true'>mvn:org.springframework.security/spring-security-web/${spring-security-version}</bundle>
<bundle>mvn:org.apache.camel/camel-spring-security/${project.version}</bundle>
</feature>
<feature name='camel-spring-ws' version='${project.version}' resolver='(obr)' start-level='50'>
- <details>spring-ws doesn't support importing spring 4.x </details>
+ <details>camel-spring-ws requires spring 4.x</details>
<feature>http</feature>
- <feature version='${project.version}'>camel-spring</feature>
- <bundle dependency='true'>mvn:com.sun.mail/javax.mail/${javax-mail-version}</bundle>
+ <feature>spring</feature>
+ <feature>spring-jms</feature>
+ <feature>spring-oxm</feature>
+ <feature>spring-web</feature>
<bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms-spec-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='${spring-version-range-karaf}'>spring-jms</feature>
- <feature version='${spring-version-range-karaf}'>spring-web</feature>
- <feature version='${spring-version-range-karaf}'>spring-oxm</feature>
- <bundle dependency='true'>mvn:org.springframework.ws/spring-xml/${spring-ws-bundle-version}</bundle>
- <bundle dependency='true'>mvn:org.springframework.ws/spring-ws-core/${spring-ws-bundle-version}</bundle>
- <bundle dependency='true'>mvn:org.springframework.ws/spring-ws-support/${spring-ws-bundle-version}</bundle>
- <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xpp3/${xpp3-bundle-version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.wsdl4j/${wsdl4j-bundle-version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-ws-core/${spring-ws-bundle-version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-ws-support/${spring-ws-bundle-version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-ws-security/${spring-ws-bundle-version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-xml/${spring-ws-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-spring-ws/${project.version}</bundle>
</feature>
<feature name='camel-sql' version='${project.version}' resolver='(obr)' start-level='50'>
[08/16] camel git commit: camel-velocity do not use servlet api
Posted by da...@apache.org.
camel-velocity do not use servlet api
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/20baad87
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/20baad87
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/20baad87
Branch: refs/heads/master
Commit: 20baad874cfb957805526779de39c6d4df0b1b7e
Parents: c00d567
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Mar 12 12:37:47 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Mar 12 12:37:47 2016 +0100
----------------------------------------------------------------------
platforms/karaf/features/src/main/resources/features.xml | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/20baad87/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 6d8fe3f..d8b0e29 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1698,7 +1698,6 @@
</feature>
<feature name='camel-velocity' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
- <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax.servlet-api-version}</bundle>
<bundle dependency='true'>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
<bundle dependency='true'>mvn:commons-collections/commons-collections/${commons-collections-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version}</bundle>
[03/16] camel git commit: Servlet range in osgi should be 3.x and we
need to ensure to fix this in all those bundles. Fixed it camel-cxf
Posted by da...@apache.org.
Servlet range in osgi should be 3.x and we need to ensure to fix this in all those bundles. Fixed it camel-cxf
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/fb9b3fcb
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/fb9b3fcb
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/fb9b3fcb
Branch: refs/heads/master
Commit: fb9b3fcb0ef1794b9a5646f3912cc8eeb4b120f1
Parents: 821c771
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Mar 12 11:39:02 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Mar 12 11:39:02 2016 +0100
----------------------------------------------------------------------
components/camel-cxf-transport/pom.xml | 4 +---
parent/pom.xml | 2 +-
.../src/test/java/org/apache/camel/itest/karaf/CamelCxfTest.java | 2 +-
3 files changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/fb9b3fcb/components/camel-cxf-transport/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-cxf-transport/pom.xml b/components/camel-cxf-transport/pom.xml
index 2e99e573..4a537f6 100644
--- a/components/camel-cxf-transport/pom.xml
+++ b/components/camel-cxf-transport/pom.xml
@@ -30,15 +30,13 @@
<description>Camel Transport for CXF </description>
<properties>
- <camel.osgi.import.before.defaults>
- javax.servlet.*;version="${servlet-version-range}"
- </camel.osgi.import.before.defaults>
<camel.osgi.import>
!org.apache.camel.component.cxf.*,
!META-INF.cxf.camel,
javax.activation*;version="[0.0,2)",
javax.annotation*;version="[0.0,2)",
javax.jws*;version="[0.0,3)",
+ javax.servlet.*;version="${servlet-version-range}",
javax.ws.rs*;version="[0.0,2)",
javax.xml.stream*;version="[0.0,2)",
javax.xml.ws*;version="[0.0,3.0)",
http://git-wip-us.apache.org/repos/asf/camel/blob/fb9b3fcb/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 6046dcc..0f9b608 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -473,7 +473,7 @@
<serp-bundle-version>1.14.1_1</serp-bundle-version>
<servicemix-specs-version>2.6.0</servicemix-specs-version>
<servlet-api-3.0-version>1.0</servlet-api-3.0-version>
- <servlet-version-range>[2.5,4)</servlet-version-range>
+ <servlet-version-range>[3,4)</servlet-version-range>
<shiro-version>1.2.4</shiro-version>
<shrinkwrap-descriptors-version>2.0.0-alpha-8</shrinkwrap-descriptors-version>
<sip-api-version>1.1</sip-api-version>
http://git-wip-us.apache.org/repos/asf/camel/blob/fb9b3fcb/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCxfTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCxfTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCxfTest.java
index 36aaaa7..6c55b9f 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCxfTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCxfTest.java
@@ -36,7 +36,7 @@ public class CamelCxfTest extends AbstractFeatureTest {
@Configuration
public static Option[] configure() {
- return configure(COMPONENT);
+ return configure(COMPONENT, "cxf-jaxb");
}
}
\ No newline at end of file
[10/16] camel git commit: Use spring 4.1 or better as default spring
version in karaf.
Posted by da...@apache.org.
Use spring 4.1 or better as default spring version in karaf.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/82d9b763
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/82d9b763
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/82d9b763
Branch: refs/heads/master
Commit: 82d9b7636ddfae37b1c2fb5bc27a5eae64196f87
Parents: 3fb521e
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Mar 12 13:43:03 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Mar 12 13:43:03 2016 +0100
----------------------------------------------------------------------
parent/pom.xml | 14 ++++++--------
.../features/src/main/resources/features.xml | 19 +++++++++----------
2 files changed, 15 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/82d9b763/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index c1c8c38..613551a 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -502,14 +502,12 @@
<spring-ldap-bundle-version>2.0.3.RELEASE_1</spring-ldap-bundle-version>
<!-- spring 1.1.0 is not OSGi bundle any more -->
<spring-retry-version>1.0.3.RELEASE</spring-retry-version>
- <!-- Spring 4 can be used in OSGi, but not with spring-dm. Allow Spring 4 for the bundle imports. -->
- <spring-version-range>[3.2,5)</spring-version-range>
- <!-- However, spring-dm does not support spring 4.x so import-range must be 3.x for the -->
- <!-- Karaf features file. -->
- <!-- TODO: rename to spring-dm-version-range-karaf -->
- <spring-version-range-karaf>[3.2,4)</spring-version-range-karaf>
- <!-- for spring 4.x in karaf -->
- <spring4-version-range-karaf>[4,5)</spring4-version-range-karaf>
+ <!-- spring-dm only supports spring 3.x -->
+ <spring-dm-version-range-karaf>[3.2,4)</spring-dm-version-range-karaf>
+ <!-- karaf 2.x supports spring 4.1 onwards -->
+ <spring-version-range-karaf>[4.1,5)</spring-version-range-karaf>
+ <!-- and for spring 4.2.x onwards-->
+ <spring42-version-range-karaf>[4.2,5)</spring42-version-range-karaf>
<spring-version>${spring4-version}</spring-version>
<spring32-version>3.2.15.RELEASE</spring32-version>
<spring40-version>4.0.9.RELEASE</spring40-version>
http://git-wip-us.apache.org/repos/asf/camel/blob/82d9b763/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 f23dbd4..884882f 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -30,7 +30,6 @@
</feature>
<feature name='camel' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
- <feature version='${project.version}'>camel-spring</feature>
<feature version='${project.version}'>camel-blueprint</feature>
</feature>
<feature name='camel-core' version='${project.version}' resolver='(obr)' start-level='50'>
@@ -53,9 +52,9 @@
</feature>
<feature name='camel-spring' version='${project.version}' resolver='(obr)' start-level='50'>
<bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version}</bundle>
- <feature version='${spring-version-range-karaf}'>spring</feature>
+ <feature version='${spring-dm-version-range-karaf}'>spring</feature>
<feature version='[1.2,2)'>spring-dm</feature>
- <feature version='${spring-version-range-karaf}'>spring-tx</feature>
+ <feature version='${spring-dm-version-range-karaf}'>spring-tx</feature>
<feature version='${project.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-spring/${project.version}</bundle>
</feature>
@@ -894,10 +893,10 @@
<feature name='camel-jms' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
<feature version='${spring-version-range-karaf}'>spring</feature>
+ <feature version='${spring-version-range-karaf}'>spring-jms</feature>
<bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version}</bundle>
<bundle dependency='true'>mvn:commons-pool/commons-pool/${commons-pool-version}</bundle>
<bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms-spec-version}</bundle>
- <feature version='${spring-version-range-karaf}'>spring-jms</feature>
<bundle>mvn:org.apache.camel/camel-jms/${project.version}</bundle>
</feature>
<feature name='camel-jmx' version='${project.version}' resolver='(obr)' start-level='50'>
@@ -1515,8 +1514,8 @@
<feature name='camel-spring-security' version='${project.version}' resolver='(obr)' start-level='50'>
<details>spring-security doesn't support importing spring 4.x </details>
<feature>http</feature>
- <feature>spring</feature>
- <feature>spring-web</feature>
+ <feature version='${spring-version-range-karaf}'>spring</feature>
+ <feature version='${spring-version-range-karaf}'>spring-web</feature>
<bundle dependency='true'>mvn:org.springframework.security/spring-security-core/${spring-security-version}</bundle>
<bundle dependency='true'>mvn:org.springframework.security/spring-security-config/${spring-security-version}</bundle>
<bundle dependency='true'>mvn:org.springframework.security/spring-security-web/${spring-security-version}</bundle>
@@ -1525,10 +1524,10 @@
<feature name='camel-spring-ws' version='${project.version}' resolver='(obr)' start-level='50'>
<details>camel-spring-ws requires spring 4.x</details>
<feature>http</feature>
- <feature>spring</feature>
- <feature>spring-jms</feature>
- <feature>spring-oxm</feature>
- <feature>spring-web</feature>
+ <feature version='${spring4-version-range-karaf}'>spring</feature>
+ <feature version='${spring4-version-range-karaf}'>spring-jms</feature>
+ <feature version='${spring4-version-range-karaf}'>spring-oxm</feature>
+ <feature version='${spring4-version-range-karaf}'>spring-web</feature>
<bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms-spec-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.wsdl4j/${wsdl4j-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-ws-core/${spring-ws-bundle-version}</bundle>
[11/16] camel git commit: Make more camel-spring-xxx modules install
in karaf.
Posted by da...@apache.org.
Make more camel-spring-xxx modules install in karaf.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7c77e185
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7c77e185
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7c77e185
Branch: refs/heads/master
Commit: 7c77e18566cd96f796501f3056488a0c9d13355d
Parents: 82d9b76
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Mar 12 14:15:44 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Mar 12 14:15:44 2016 +0100
----------------------------------------------------------------------
components/camel-spring-ws/pom.xml | 4 +-
parent/pom.xml | 12 +--
.../features/src/main/resources/features.xml | 82 ++++++++++----------
3 files changed, 48 insertions(+), 50 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/7c77e185/components/camel-spring-ws/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-spring-ws/pom.xml b/components/camel-spring-ws/pom.xml
index a19ebd3..35b8fc2 100644
--- a/components/camel-spring-ws/pom.xml
+++ b/components/camel-spring-ws/pom.xml
@@ -33,8 +33,8 @@
<properties>
<camel.osgi.import.before.defaults>
- org.springframework.beans.*;version="${spring4-version-range-karaf}",
- org.springframework.util.*;version="${spring4-version-range-karaf}"
+ org.springframework.beans.*;version="${spring-version-range}",
+ org.springframework.util.*;version="${spring-version-range}"
</camel.osgi.import.before.defaults>
<camel.osgi.export.pkg>org.apache.camel.component.spring.ws.*</camel.osgi.export.pkg>
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=spring-ws</camel.osgi.export.service>
http://git-wip-us.apache.org/repos/asf/camel/blob/7c77e185/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 613551a..70ee31d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -490,8 +490,8 @@
<spark-rest-version>2.3</spark-rest-version>
<spark-rest-bundle-version>2.3_1</spark-rest-bundle-version>
<splunk-version>1.5.0.0_1</splunk-version>
- <spring-batch-version>3.0.4.RELEASE</spring-batch-version>
- <spring-batch-bundle-version>3.0.4.RELEASE_1</spring-batch-bundle-version>
+ <spring-batch-version>3.0.6.RELEASE</spring-batch-version>
+ <spring-batch-bundle-version>3.0.6.RELEASE_1</spring-batch-bundle-version>
<spring-boot-version>1.3.3.RELEASE</spring-boot-version>
<spring-castor-bundle-version>1.2.0</spring-castor-bundle-version>
<spring-data-commons-version>1.6.5.RELEASE</spring-data-commons-version>
@@ -503,11 +503,11 @@
<!-- spring 1.1.0 is not OSGi bundle any more -->
<spring-retry-version>1.0.3.RELEASE</spring-retry-version>
<!-- spring-dm only supports spring 3.x -->
- <spring-dm-version-range-karaf>[3.2,4)</spring-dm-version-range-karaf>
- <!-- karaf 2.x supports spring 4.1 onwards -->
- <spring-version-range-karaf>[4.1,5)</spring-version-range-karaf>
+ <spring-dm-version-range>[3.2,4)</spring-dm-version-range>
+ <!-- karaf 2.x/3.x/4.x supports spring 4.1 onwards -->
+ <spring-version-range>[4.1,5)</spring-version-range>
<!-- and for spring 4.2.x onwards-->
- <spring42-version-range-karaf>[4.2,5)</spring42-version-range-karaf>
+ <spring42-version-range>[4.2,5)</spring42-version-range>
<spring-version>${spring4-version}</spring-version>
<spring32-version>3.2.15.RELEASE</spring32-version>
<spring40-version>4.0.9.RELEASE</spring40-version>
http://git-wip-us.apache.org/repos/asf/camel/blob/7c77e185/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 884882f..0173afc 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -28,9 +28,11 @@
<bundle>mvn:org.codehaus.woodstox/woodstox-core-asl/${woodstox-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-impl/${jaxb-bundle-version}</bundle>
</feature>
+
<feature name='camel' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
<feature version='${project.version}'>camel-blueprint</feature>
+ <!-- we no longer install camel-spring by default as spring-dm is deprecated -->
</feature>
<feature name='camel-core' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${servicemix-specs-version}'>xml-specs-api</feature>
@@ -50,17 +52,24 @@
<feature version='${project.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel.karaf/camel-karaf-commands-catalog/${project.version}</bundle>
</feature>
+ <feature name='camel-blueprint' version='${project.version}' resolver='(obr)' start-level='50'>
+ <feature version='${project.version}'>camel-core</feature>
+ <bundle>mvn:org.apache.camel/camel-blueprint/${project.version}</bundle>
+ </feature>
<feature name='camel-spring' version='${project.version}' resolver='(obr)' start-level='50'>
<bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version}</bundle>
- <feature version='${spring-dm-version-range-karaf}'>spring</feature>
+ <feature version='${spring-dm-version-range}'>spring</feature>
<feature version='[1.2,2)'>spring-dm</feature>
- <feature version='${spring-dm-version-range-karaf}'>spring-tx</feature>
+ <feature version='${spring-dm-version-range}'>spring-tx</feature>
<feature version='${project.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-spring/${project.version}</bundle>
</feature>
- <feature name='camel-blueprint' version='${project.version}' resolver='(obr)' start-level='50'>
- <feature version='${project.version}'>camel-core</feature>
- <bundle>mvn:org.apache.camel/camel-blueprint/${project.version}</bundle>
+ <feature name='camel-scr' version='${project.version}' resolver='(obr)' start-level='50'>
+ <feature version='${project.version}'>camel-core</feature>
+ <feature>scr</feature>
+ <feature>eventadmin</feature>
+ <bundle dependency='true'>mvn:org.apache.camel/camel-core-osgi/${project.version}</bundle>
+ <bundle>mvn:org.apache.camel/camel-scr/${project.version}</bundle>
</feature>
<!-- the following features are sorted A..Z -->
@@ -139,10 +148,10 @@
</feature>
<feature name='camel-bam' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
- <feature version='${spring-version-range-karaf}'>spring-orm</feature>
- <feature version='${spring-version-range-karaf}'>spring-jdbc</feature>
- <feature version='${spring-version-range-karaf}'>spring-tx</feature>
- <feature version='${spring-version-range-karaf}'>spring-web</feature>
+ <feature version='${spring-version-range}'>spring-orm</feature>
+ <feature version='${spring-version-range}'>spring-jdbc</feature>
+ <feature version='${spring-version-range}'>spring-tx</feature>
+ <feature version='${spring-version-range}'>spring-web</feature>
<bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version}</bundle>
<bundle dependency='true'>mvn:commons-pool/commons-pool/${commons-pool-version}</bundle>
<bundle dependency='true'>mvn:commons-dbcp/commons-dbcp/${commons-dbcp-version}</bundle>
@@ -892,8 +901,8 @@
</feature>
<feature name='camel-jms' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
- <feature version='${spring-version-range-karaf}'>spring</feature>
- <feature version='${spring-version-range-karaf}'>spring-jms</feature>
+ <feature version='${spring-version-range}'>spring</feature>
+ <feature version='${spring-version-range}'>spring-jms</feature>
<bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version}</bundle>
<bundle dependency='true'>mvn:commons-pool/commons-pool/${commons-pool-version}</bundle>
<bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms-spec-version}</bundle>
@@ -915,9 +924,9 @@
</feature>
<feature name='camel-jpa' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
- <feature version='${spring-version-range-karaf}'>spring-jdbc</feature>
- <feature version='${spring-version-range-karaf}'>spring-orm</feature>
- <feature version='${spring-version-range-karaf}'>spring-tx</feature>
+ <feature version='${spring-version-range}'>spring-jdbc</feature>
+ <feature version='${spring-version-range}'>spring-orm</feature>
+ <feature version='${spring-version-range}'>spring-tx</feature>
<bundle dependency='true'> mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/${geronimo-annotation-1.0-spec-version}</bundle>
<bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jpa_2.0_spec/${geronimo-jpa2-spec-version}</bundle>
<bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax.servlet-api-version}</bundle>
@@ -1127,11 +1136,6 @@
</feature>
<feature name='camel-mybatis' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
- <feature version='${project.version}'>camel-spring</feature>
- <bundle dependency='true'>mvn:commons-pool/commons-pool/${commons-pool-version}</bundle>
- <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax.servlet-api-version}</bundle>
- <bundle dependency='true'>mvn:commons-dbcp/commons-dbcp/${commons-dbcp-version}</bundle>
- <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cglib-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.mybatis/mybatis/${mybatis-version}</bundle>
<bundle>mvn:org.apache.camel/camel-mybatis/${project.version}</bundle>
</feature>
@@ -1356,13 +1360,6 @@
<bundle dependency='true'>mvn:commons-io/commons-io/${commons-io-version}</bundle>
<bundle>mvn:org.apache.camel/camel-schematron/${project.version}</bundle>
</feature>
- <feature name='camel-scr' version='${project.version}' resolver='(obr)' start-level='50'>
- <feature version='${project.version}'>camel-core</feature>
- <feature>scr</feature>
- <feature>eventadmin</feature>
- <bundle dependency='true'>mvn:org.apache.camel/camel-core-osgi/${project.version}</bundle>
- <bundle>mvn:org.apache.camel/camel-scr/${project.version}</bundle>
- </feature>
<feature name='camel-script-jruby' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-script</feature>
<bundle>mvn:com.google.code.scriptengines/scriptengines-jruby/${scriptengines-version}</bundle>
@@ -1475,7 +1472,9 @@
<bundle>mvn:org.apache.camel/camel-splunk/${project.version}</bundle>
</feature>
<feature name='camel-spring-batch' version='${project.version}' resolver='(obr)' start-level='50'>
- <feature version='${project.version}'>camel-spring</feature>
+ <feature>transaction</feature>
+ <feature version='${spring-version-range}'>spring</feature>
+ <feature version='${spring-version-range}'>spring-tx</feature>
<bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms-spec-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-batch-core/${spring-batch-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-batch-infrastructure/${spring-batch-bundle-version}</bundle>
@@ -1483,14 +1482,14 @@
</feature>
<feature name='camel-spring-javaconfig' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-spring</feature>
- <feature version='${spring-version-range-karaf}'>spring-test</feature>
+ <feature version='${spring-version-range}'>spring-test</feature>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cglib-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-spring-javaconfig/${project.version}</bundle>
</feature>
<feature name='camel-spring-ldap' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-spring</feature>
- <feature version='${spring-version-range-karaf}'>spring-tx</feature>
- <feature version='${spring-version-range-karaf}'>spring-jdbc</feature>
+ <feature version='${spring-version-range}'>spring-tx</feature>
+ <feature version='${spring-version-range}'>spring-jdbc</feature>
<bundle dependency='true'>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
<bundle dependency='true'>mvn:commons-pool/commons-pool/${commons-pool-version}</bundle>
<bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms-spec-version}</bundle>
@@ -1503,8 +1502,8 @@
<feature name='camel-spring-redis' version='${project.version}' resolver='(obr)' start-level='50'>
<details>spring-data-redis doesn't support importing spring version which is above 4.0.5 </details>
<feature version='${project.version}'>camel-core</feature>
- <feature version='${spring-version-range-karaf}'>spring</feature>
- <feature version='${spring-version-range-karaf}'>spring-tx</feature>
+ <feature version='${spring-version-range}'>spring</feature>
+ <feature version='${spring-version-range}'>spring-tx</feature>
<bundle dependency='true'>mvn:commons-pool/commons-pool/${commons-pool-version}</bundle>
<bundle dependency='true'>mvn:org.springframework.data/spring-data-redis/${spring-data-redis-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jedis/${jedis-client-bundle-version}</bundle>
@@ -1514,20 +1513,19 @@
<feature name='camel-spring-security' version='${project.version}' resolver='(obr)' start-level='50'>
<details>spring-security doesn't support importing spring 4.x </details>
<feature>http</feature>
- <feature version='${spring-version-range-karaf}'>spring</feature>
- <feature version='${spring-version-range-karaf}'>spring-web</feature>
+ <feature version='${spring-version-range}'>spring</feature>
+ <feature version='${spring-version-range}'>spring-web</feature>
<bundle dependency='true'>mvn:org.springframework.security/spring-security-core/${spring-security-version}</bundle>
<bundle dependency='true'>mvn:org.springframework.security/spring-security-config/${spring-security-version}</bundle>
<bundle dependency='true'>mvn:org.springframework.security/spring-security-web/${spring-security-version}</bundle>
<bundle>mvn:org.apache.camel/camel-spring-security/${project.version}</bundle>
</feature>
<feature name='camel-spring-ws' version='${project.version}' resolver='(obr)' start-level='50'>
- <details>camel-spring-ws requires spring 4.x</details>
<feature>http</feature>
- <feature version='${spring4-version-range-karaf}'>spring</feature>
- <feature version='${spring4-version-range-karaf}'>spring-jms</feature>
- <feature version='${spring4-version-range-karaf}'>spring-oxm</feature>
- <feature version='${spring4-version-range-karaf}'>spring-web</feature>
+ <feature version='${spring-version-range}'>spring</feature>
+ <feature version='${spring-version-range}'>spring-jms</feature>
+ <feature version='${spring-version-range}'>spring-oxm</feature>
+ <feature version='${spring-version-range}'>spring-web</feature>
<bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms-spec-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.wsdl4j/${wsdl4j-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-ws-core/${spring-ws-bundle-version}</bundle>
@@ -1538,8 +1536,8 @@
</feature>
<feature name='camel-sql' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
- <feature version='${spring-version-range-karaf}'>spring-tx</feature>
- <feature version='${spring-version-range-karaf}'>spring-jdbc</feature>
+ <feature version='${spring-version-range}'>spring-tx</feature>
+ <feature version='${spring-version-range}'>spring-jdbc</feature>
<bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version}</bundle>
<bundle>mvn:org.apache.camel/camel-sql/${project.version}</bundle>
</feature>
@@ -1646,7 +1644,7 @@
</feature>
<feature name='camel-test-spring' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-spring</feature>
- <feature version='${spring-version-range-karaf}'>spring-test</feature>
+ <feature version='${spring-version-range}'>spring-test</feature>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.junit/${junit-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-test/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-test-spring/${project.version}</bundle>