Author: janstey
Date: Wed Nov 11 18:28:12 2009
New Revision: 835004
URL: http://svn.apache.org/viewvc?rev=835004&view=rev
Log:
fix some more issues with the 1.x bundle refs
Modified:
camel/branches/camel-1.x/platforms/karaf/features/pom.xml
camel/branches/camel-1.x/platforms/karaf/features/src/main/resources/features.xml
Modified: camel/branches/camel-1.x/platforms/karaf/features/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-1.x/platforms/karaf/features/pom.xml?rev=835004&r1=835003&r2=835004&view=diff
==============================================================================
--- camel/branches/camel-1.x/platforms/karaf/features/pom.xml (original)
+++ camel/branches/camel-1.x/platforms/karaf/features/pom.xml Wed Nov 11
18:28:12 2009
@@ -38,23 +38,25 @@
<antlr-bundle-version>3.0.1_1</antlr-bundle-version>
<aopalliance-bundle-version>1.0_1</aopalliance-bundle-version>
<asm-bundle-version>2.2.3_1</asm-bundle-version>
+ <bcel-bundle-version>5.2_2</bcel-bundle-version>
<dom4j-bundle-version>1.6_1</dom4j-bundle-version>
<cglib-version>2.1_3_2</cglib-version>
<commons-beanutils-bundle-version>1.7.0_1</commons-beanutils-bundle-version>
<commons-dbcp-bundle-version>1.2.2_3</commons-dbcp-bundle-version>
<commons-csv-version>1.0-r706899_1</commons-csv-version>
- <commons-codec-bundle-version>1.2_1</commons-codec-bundle-version>
+ <commons-codec-bundle-version>1.3_2</commons-codec-bundle-version>
<commons-httpclient-bundle-version>3.1_1</commons-httpclient-bundle-version>
<commons-io-bundle-version>1.3.2_1</commons-io-bundle-version>
<commons-jxpath-version>1.3</commons-jxpath-version>
<commons-lang-version>2.4</commons-lang-version>
<commons-net-version>2.0</commons-net-version>
<flatpack-bundle-version>3.1.1_1</flatpack-bundle-version>
- <freemarker-bundle-version>2.3.15_2</freemarker-bundle-version>
+ <freemarker-bundle-version>2.3.15_1</freemarker-bundle-version>
<flatpack-bundle-version>3.1.1_3</flatpack-bundle-version>
<geronimo-el-version>1.0.1</geronimo-el-version>
<geronimo-jaxws-spec-version>1.0</geronimo-jaxws-spec-version>
<geronimo-jsp-version>1.0.1</geronimo-jsp-version>
+ <geronimo-jpa-spec-version>1.1.1</geronimo-jpa-spec-version>
<geronimo-javamail-1.4-version>1.6_1</geronimo-javamail-1.4-version>
<geronimo-ws-metadata-spec-version>1.1.2</geronimo-ws-metadata-spec-version>
<gernimo-annotation-spec-version>1.1.1</gernimo-annotation-spec-version>
@@ -62,6 +64,7 @@
<hapi-bundle-version>0.5.1_1</hapi-bundle-version>
<ibatis-bundle-version>2.3.4.726_1</ibatis-bundle-version>
<jackrabbit-version>1.5.3</jackrabbit-version>
+ <javax-mail-version>1.4.1_2</javax-mail-version>
<jaxb-bundle-version>2.1.6_1</jaxb-bundle-version>
<jexcelapi-bundle-version>2.4.2_1</jexcelapi-bundle-version>
<jsr311-api-1.0-spec-version>1.3.0</jsr311-api-1.0-spec-version>
@@ -76,23 +79,23 @@
<jetty-cometd-bundle-version>6.1.11_1</jetty-cometd-bundle-version>
<jing-bundle-version>20030619_1</jing-bundle-version>
<jodatime-bundle-version>1.5.2_1</jodatime-bundle-version>
- <josql-bundle-version>1.5_1</josql-bundle-version>
+ <josql-bundle-version>1.5_3</josql-bundle-version>
<jsch-bundle-version>0.1.31_1</jsch-bundle-version>
<juel-bundle-version>2.1.0_1</juel-bundle-version>
<junit-bundle-version>4.4_1</junit-bundle-version>
<mvel-bundle-version>2.0.9_1</mvel-bundle-version>
- <mina-bundle-version>1.1.7_2</mina-bundle-version>
+ <mina-bundle-version>1.1.7_1</mina-bundle-version>
<neethi-bundle-version>2.0.4_1</neethi-bundle-version>
<ognl-bundle-version>2.7.3_1</ognl-bundle-version>
<oro-bundle-version>2.0.8_1</oro-bundle-version>
- <openjpa-bundle-version>1.2.1_1</openjpa-bundle-version>
+ <openjpa-bundle-version>1.2.1_2</openjpa-bundle-version>
<oscache-bundle-version>2.4_1</oscache-bundle-version>
<quartz-bundle-version>1.6.1_1</quartz-bundle-version>
<qpid-bundle-version>1.0-incubating-M2.1_1</qpid-bundle-version>
<saxon-bundle-version>9.1.0.1_1</saxon-bundle-version>
<servicemix-specs-version>1.3.0</servicemix-specs-version>
<servlet-api-2.5-version>1.1.2</servlet-api-2.5-version>
- <serp-bundle-version>1.13.1_1</serp-bundle-version>
+ <serp-bundle-version>1.13.1_2</serp-bundle-version>
<snmp4j-bundle-version>1.8.1_2</snmp4j-bundle-version>
<smack-bundle-version>3.0.4_1</smack-bundle-version>
<spring-commons-collections-version>3.2.1</spring-commons-collections-version>
@@ -109,8 +112,8 @@
<xmlschema-version>1.4.5</xmlschema-version>
<xmlsec-bundle-version>1.3.0_1</xmlsec-bundle-version>
<xmlresolver-bundle-version>1.2_1</xmlresolver-bundle-version>
- <xpp3-bundle-version>1.1.4c_1</xpp3-bundle-version>
- <xstream-bundle-version>1.3_1</xstream-bundle-version>
+ <xpp3-bundle-version>1.1.4c_3</xpp3-bundle-version>
+ <xstream-bundle-version>1.3_3</xstream-bundle-version>
<werken-xpath-bundle-version>0.9.4_1</werken-xpath-bundle-version>
<woodstox-bundle-version>3.2.7_1</woodstox-bundle-version>
<wsdl4j-bundle-version>1.6.1_1</wsdl4j-bundle-version>
@@ -159,6 +162,7 @@
</execution>
</executions>
</plugin>
+
</plugins>
</build>
Modified:
camel/branches/camel-1.x/platforms/karaf/features/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-1.x/platforms/karaf/features/src/main/resources/features.xml?rev=835004&r1=835003&r2=835004&view=diff
==============================================================================
---
camel/branches/camel-1.x/platforms/karaf/features/src/main/resources/features.xml
(original)
+++
camel/branches/camel-1.x/platforms/karaf/features/src/main/resources/features.xml
Wed Nov 11 18:28:12 2009
@@ -5,6 +5,7 @@
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-2.1/${servicemix-specs-version}</bundle>
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${servicemix-specs-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-impl/${jaxb-bundle-version}</bundle>
+ <bundle>mvn:org.springframework/spring-context/${spring-version}</bundle>
<bundle>mvn:org.apache.camel/camel-core/${pom.version}</bundle>
</feature>
<feature name='camel-spring' version='${pom.version}'>
@@ -74,6 +75,11 @@
</feature>
<feature name='camel-mina' version='${pom.version}'>
<feature version='${pom.version}'>camel-core</feature>
+ <bundle>mvn:org.springframework/spring-core/${spring-version}</bundle>
+ <bundle>mvn:org.springframework/spring-beans/${spring-version}</bundle>
+ <bundle>mvn:org.springframework/spring-aop/${spring-version}</bundle>
+ <bundle>mvn:org.springframework/spring-context/${spring-version}</bundle>
+
<bundle>mvn:org.springframework/spring-context-support/${spring-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.mina/${mina-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-mina/${pom.version}</bundle>
</feature>
@@ -94,17 +100,21 @@
<feature version='${pom.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-jms/${pom.version}</bundle>
</feature>
+
<feature name='camel-amqp' version='${pom.version}'>
<bundle>mvn:commons-collections/commons-collections/${commons-collections-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.qpid/${qpid-bundle-version}</bundle>
<feature version='${pom.version}'>camel-jms</feature>
<bundle>mvn:org.apache.camel/camel-amqp/${pom.version}</bundle>
</feature>
+
<feature name='camel-atom' version='${pom.version}'>
<feature version='${pom.version}'>camel-core</feature>
+
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-codec/${commons-codec-bundle-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.abdera/${abdera-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-atom/${pom.version}</bundle>
</feature>
+
<feature name='camel-bam' version='${pom.version}'>
<bundle>mvn:org.springframework/spring-tx/${spring-version}</bundle>
<bundle>mvn:org.springframework/spring-web/${spring-version}</bundle>
@@ -119,8 +129,9 @@
<feature version='${pom.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-bam/${pom.version}</bundle>
</feature>
+
<feature name='camel-csv' version='${pom.version}'>
- <bundle>mvn:org.apache.commons/commons-csv/${commons-csv-version}</bundle>
+
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-csv/${commons-csv-version}</bundle>
<feature version='${pom.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-csv/${pom.version}</bundle>
</feature>
@@ -131,11 +142,13 @@
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.flatpack/${flatpack-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-flatpack/${pom.version}</bundle>
</feature>
+
<feature name='camel-freemarker' version='${pom.version}'>
<feature version='${pom.version}'>camel-spring</feature>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.freemarker/${freemarker-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-freemarker/${pom.version}</bundle>
</feature>
+
<feature name='camel-ftp' version='${pom.version}'>
<bundle>mvn:commons-net/commons-net/${commons-net-version}</bundle>
<feature version='${pom.version}'>camel-core</feature>
@@ -155,6 +168,7 @@
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.junit/${junit-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-hamcrest/${pom.version}</bundle>
</feature>
+
<feature name='camel-hl7' version='${pom.version}'>
<feature version='${pom.version}'>camel-core</feature>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/${xmlresolver-bundle-version}</bundle>
@@ -167,6 +181,8 @@
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.mina/${mina-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-hl7/${pom.version}</bundle>
</feature>
+
+
<feature name='camel-ibatis' version='${pom.version}'>
<feature version='${pom.version}'>camel-spring</feature>
<bundle>mvn:commons-pool/commons-pool/${commons-pool-version}</bundle>
@@ -175,6 +191,7 @@
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ibatis-sqlmap/${ibatis-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-ibatis/${pom.version}</bundle>
</feature>
+
<feature name='camel-irc' version='${pom.version}'>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.irclib/${irclib-bundle-version}</bundle>
<feature version='${pom.version}'>camel-core</feature>
@@ -212,7 +229,7 @@
<bundle>mvn:org.apache.camel/camel-josql/${pom.version}</bundle>
</feature>
<feature name='camel-jpa' version='${pom.version}'>
-
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.java-persistence-api-1.1.1/${servicemix-specs-version}</bundle>
+
<bundle>mvn:org.apache.geronimo.specs/geronimo-jpa_3.0_spec/${geronimo-jpa-spec-version}</bundle>
<bundle>mvn:org.springframework/spring-tx/${spring-version}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-el_1.0_spec/${geronimo-el-version}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version}</bundle>
@@ -224,16 +241,17 @@
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/${ant-bundle-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.serp/${serp-bundle-version}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms-spec-version}</bundle>
-
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.openjpa/${openjpa-bundle-version}</bundle>
<bundle>mvn:org.springframework/spring-orm/${spring-version}</bundle>
<feature version='${pom.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-jpa/${pom.version}</bundle>
</feature>
+
<feature name='camel-jxpath' version='${pom.version}'>
<bundle>mvn:commons-jxpath/commons-jxpath/${commons-jxpath-version}</bundle>
<feature version='${pom.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-jxpath/${pom.version}</bundle>
</feature>
+
<feature name='camel-juel' version='${pom.version}'>
<feature version='${pom.version}'>camel-core</feature>
<bundle>mvn:org.apache.geronimo.specs/geronimo-el_1.0_spec/${geronimo-el-version}</bundle>
@@ -261,7 +279,7 @@
</feature>
<feature name='camel-ognl' version='${pom.version}'>
<feature version='${pom.version}'>camel-core</feature>
-
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ognl/${ognl-version}</bundle>
+
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ognl/${ognl-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-ognl/${pom.version}</bundle>
</feature>
<feature name='camel-quartz' version='${pom.version}'>
@@ -273,12 +291,14 @@
<feature version='${pom.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-quartz/${pom.version}</bundle>
</feature>
+
<feature name='camel-restlet' version='${pom.version}'>
<bundle>mvn:org.apache.camel/camel-restlet/${pom.version}</bundle>
<bundle>mvn:http://maven.restlet.org!org.restlet/org.restlet/${restlet-version}</bundle>
<bundle>mvn:http://maven.restlet.org!com.noelios.restlet/com.noelios.restlet/${restlet-version}</bundle>
<feature version='${pom.version}'>camel-http</feature>
</feature>
+
<feature name='camel-rmi' version='${pom.version}'>
<feature version='${pom.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-rmi/${pom.version}</bundle>
@@ -293,11 +313,13 @@
<feature version='${pom.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-scala/${pom.version}</bundle>
</feature>
+
<feature name='camel-script' version='${pom.version}'>
<feature version='${pom.version}'>camel-core</feature>
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.scripting-api-1.0/${servicemix-specs-version}</bundle>
<bundle>mvn:org.apache.camel/camel-script/${pom.version}</bundle>
</feature>
+
<feature name='camel-spring-integration' version='${pom.version}'>
<bundle>mvn:http://repository.springsource.com/maven/bundles/release!org.springframework.integration/org.springframework.integration/1.0.1.RELEASE</bundle>
<feature version='${pom.version}'>camel-spring</feature>
@@ -314,18 +336,21 @@
<feature version='${pom.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-stream/${pom.version}</bundle>
</feature>
+
<feature name='camel-stringtemplate' version='${pom.version}'>
<feature version='${pom.version}'>camel-spring</feature>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr/${antlr-bundle-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.stringtemplate/${stringtemplate-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-stringtemplate/${pom.version}</bundle>
</feature>
+
<feature name='camel-tagsoup' version='${pom.version}'>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.tagsoup/${tagsoup-bundle-version}</bundle>
<feature version='${pom.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-tagsoup/${pom.version}</bundle>
</feature>
<feature name='camel-velocity' version='${pom.version}'>
+
<bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${servlet-api-2.5-version}</bundle>
<bundle>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
<bundle>mvn:commons-collections/commons-collections/${commons-collections-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version}</bundle>
