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 2010/09/01 08:59:51 UTC
svn commit: r991449 - in /camel/trunk: components/camel-flatpack/pom.xml
parent/pom.xml platforms/karaf/features/pom.xml
platforms/karaf/features/src/main/resources/features-spring2.xml
platforms/karaf/features/src/main/resources/features.xml
Author: davsclaus
Date: Wed Sep 1 06:59:50 2010
New Revision: 991449
URL: http://svn.apache.org/viewvc?rev=991449&view=rev
Log:
CAMEL-2966: Upgrade to flatpack 3.2.0
Modified:
camel/trunk/components/camel-flatpack/pom.xml
camel/trunk/parent/pom.xml
camel/trunk/platforms/karaf/features/pom.xml
camel/trunk/platforms/karaf/features/src/main/resources/features-spring2.xml
camel/trunk/platforms/karaf/features/src/main/resources/features.xml
Modified: camel/trunk/components/camel-flatpack/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-flatpack/pom.xml?rev=991449&r1=991448&r2=991449&view=diff
==============================================================================
--- camel/trunk/components/camel-flatpack/pom.xml (original)
+++ camel/trunk/components/camel-flatpack/pom.xml Wed Sep 1 06:59:50 2010
@@ -34,6 +34,14 @@
<camel.osgi.export.pkg>org.apache.camel.component.flatpack.*</camel.osgi.export.pkg>
</properties>
+ <repositories>
+ <repository>
+ <id>fusesource.m2</id>
+ <name>Fusesource Dependency Repository</name>
+ <url>http://repo.fusesource.com/maven2-all</url>
+ </repository>
+ </repositories>
+
<dependencies>
<dependency>
@@ -50,37 +58,35 @@
<artifactId>org.apache.servicemix.bundles.flatpack</artifactId>
<version>${flatpack-version}</version>
</dependency>
- <dependency>
- <groupId>jdom</groupId>
- <artifactId>jdom</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>jexcelapi</groupId>
- <artifactId>jxl</artifactId>
- <version>2.4.2</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
+ <dependency>
+ <groupId>org.jdom</groupId>
+ <artifactId>jdom</artifactId>
+ <version>${jdom-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>jexcelapi</groupId>
+ <artifactId>jxl</artifactId>
+ <version>${jexcelapi-version}</version>
</dependency>
+ <!-- logging -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>test</scope>
+ </dependency>
+
<!-- testing -->
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
Modified: camel/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=991449&r1=991448&r2=991449&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Wed Sep 1 06:59:50 2010
@@ -86,8 +86,10 @@
<jaxb-version>2.1.13</jaxb-version>
<jaxb-api-version>2.1</jaxb-api-version>
<jaxen-version>1.1.1</jaxen-version>
+ <jdom-version>1.1</jdom-version>
<jetty-version>7.1.6.v20100715</jetty-version>
<jettison-version>1.2</jettison-version>
+ <jexcelapi-version>2.4.2</jexcelapi-version>
<jruby-version>1.5.2</jruby-version>
<jsch-version>0.1.43</jsch-version>
<juel-version>2.1.2</juel-version>
Modified: camel/trunk/platforms/karaf/features/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/pom.xml?rev=991449&r1=991448&r2=991449&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/pom.xml (original)
+++ camel/trunk/platforms/karaf/features/pom.xml Wed Sep 1 06:59:50 2010
@@ -70,7 +70,7 @@
<hibernate-validator-bundle-version>4.0.2.GA_1</hibernate-validator-bundle-version>
<ibatis-bundle-version>2.3.4.726_2</ibatis-bundle-version>
<jackrabbit-version>1.5.3</jackrabbit-version>
- <jaxb-bundle-version>2.1.13_1-SNAPSHOT</jaxb-bundle-version>
+ <jaxb-bundle-version>2.1.13_1</jaxb-bundle-version>
<jetty6-bundle-version>6.1.22_1</jetty6-bundle-version>
<jexcelapi-bundle-version>2.4.2_2</jexcelapi-bundle-version>
<hapi-bundle-version>0.5.1_3</hapi-bundle-version>
@@ -85,7 +85,7 @@
<jing-bundle-version>20030619_1</jing-bundle-version>
<jodatime-bundle-version>1.5.2_2</jodatime-bundle-version>
<josql-bundle-version>1.5_3</josql-bundle-version>
- <jsch-bundle-version>0.1.43_1-SNAPSHOT</jsch-bundle-version>
+ <jsch-bundle-version>0.1.43_1</jsch-bundle-version>
<jsendnsca-bundle-version>1.3.1_1</jsendnsca-bundle-version>
<jsp-api-2.1-version>1.0.1</jsp-api-2.1-version>
<juel-bundle-version>2.1.2_1</juel-bundle-version>
@@ -100,11 +100,11 @@
<opensaml-version>1.1_3</opensaml-version>
<oscache-bundle-version>2.4_3</oscache-bundle-version>
<osgi.compendium.version>4.2.0</osgi.compendium.version>
- <protobuf-java-bundle-version>2.3.0_1-SNAPSHOT</protobuf-java-bundle-version>
+ <protobuf-java-bundle-version>2.3.0_1</protobuf-java-bundle-version>
<pax.web.version>0.7.2</pax.web.version>
<quartz-bundle-version>1.8.3_1</quartz-bundle-version>
<qpid-bundle-version>0.5.0_2</qpid-bundle-version>
- <rome-bundle-version>1.0_1-SNAPSHOT</rome-bundle-version>
+ <rome-bundle-version>1.0_1</rome-bundle-version>
<saxon-bundle-version>9.1.0.1_3</saxon-bundle-version>
<scala-bundle-version>2.8.0.RC7_1</scala-bundle-version>
<servicemix-specs-version>1.5.0</servicemix-specs-version>
@@ -118,10 +118,10 @@
<spring-castor-bundle-version>1.2.0</spring-castor-bundle-version>
<stringtemplate-bundle-version>3.2_3</stringtemplate-bundle-version>
<tagsoup-bundle-version>1.2_3</tagsoup-bundle-version>
- <velocity-bundle-version>1.6.4_1-SNAPSHOT</velocity-bundle-version>
+ <velocity-bundle-version>1.6.4_1</velocity-bundle-version>
<xalan-bundle-version>2.7.1_2</xalan-bundle-version>
<xerces-bundle-version>2.9.1_3</xerces-bundle-version>
- <xmlbeans-bundle-version>2.5.0_1-SNAPSHOT</xmlbeans-bundle-version>
+ <xmlbeans-bundle-version>2.5.0_1</xmlbeans-bundle-version>
<xmlschema-version>1.4.5</xmlschema-version>
<xmlsec-bundle-version>1.4.3_2</xmlsec-bundle-version>
<xmlresolver-bundle-version>1.2_2</xmlresolver-bundle-version>
Modified: camel/trunk/platforms/karaf/features/src/main/resources/features-spring2.xml
URL: http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/features-spring2.xml?rev=991449&r1=991448&r2=991449&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features-spring2.xml (original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features-spring2.xml Wed Sep 1 06:59:50 2010
@@ -244,8 +244,9 @@
<bundle>mvn:org.apache.camel/camel-csv/${pom.version}</bundle>
</feature>
<feature name='camel-flatpack' version='${pom.version}'>
- <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version}</bundle>
<feature version='${pom.version}'>camel-spring</feature>
+ <bundle>wrap:mvn:org.slf4j/slf4j-api/${slf4j-version}</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jexcelapi/${jexcelapi-bundle-version}</bundle>
<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>
Modified: camel/trunk/platforms/karaf/features/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/features.xml?rev=991449&r1=991448&r2=991449&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml (original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Wed Sep 1 06:59:50 2010
@@ -241,8 +241,9 @@
<bundle>mvn:org.apache.camel/camel-dozer/${pom.version}</bundle>
</feature>
<feature name='camel-flatpack' version='${pom.version}'>
- <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version}</bundle>
<feature version='${pom.version}'>camel-spring</feature>
+ <bundle>wrap:mvn:org.slf4j/slf4j-api/${slf4j-version}</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jexcelapi/${jexcelapi-bundle-version}</bundle>
<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>