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 <davscl...@apache.org> Authored: Sat Mar 12 13:18:54 2016 +0100 Committer: Claus Ibsen <davscl...@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'>
