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/06/20 10:25:38 UTC
svn commit: r956327 - in /camel/trunk: components/camel-dozer/pom.xml
parent/pom.xml platforms/karaf/features/pom.xml
platforms/karaf/features/src/main/resources/features-spring3.xml
platforms/karaf/features/src/main/resources/features.xml
Author: davsclaus
Date: Sun Jun 20 08:25:38 2010
New Revision: 956327
URL: http://svn.apache.org/viewvc?rev=956327&view=rev
Log:
CAMEL-2832: Upgraded to dozer 5.2.2 which now has a osgi bundle out of the box.
Modified:
camel/trunk/components/camel-dozer/pom.xml
camel/trunk/parent/pom.xml
camel/trunk/platforms/karaf/features/pom.xml
camel/trunk/platforms/karaf/features/src/main/resources/features-spring3.xml
camel/trunk/platforms/karaf/features/src/main/resources/features.xml
Modified: camel/trunk/components/camel-dozer/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-dozer/pom.xml?rev=956327&r1=956326&r2=956327&view=diff
==============================================================================
--- camel/trunk/components/camel-dozer/pom.xml (original)
+++ camel/trunk/components/camel-dozer/pom.xml Sun Jun 20 08:25:38 2010
@@ -15,52 +15,68 @@
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">
- <parent>
- <artifactId>components</artifactId>
- <groupId>org.apache.camel</groupId>
- <version>2.4-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>camel-dozer</artifactId>
- <packaging>bundle</packaging>
-
- <name>Camel :: Dozer</name>
- <description>Camel Support for the Dozer type conversion framework</description>
-
- <properties>
- <camel.osgi.export.pkg>org.apache.camel.converter.dozer.*</camel.osgi.export.pkg>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-core</artifactId>
- </dependency>
- <dependency>
- <groupId>net.sf.dozer</groupId>
- <artifactId>dozer</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-spring</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
+<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>
+
+ <parent>
+ <artifactId>components</artifactId>
+ <groupId>org.apache.camel</groupId>
+ <version>2.4-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>camel-dozer</artifactId>
+ <packaging>bundle</packaging>
+ <name>Camel :: Dozer</name>
+ <description>Camel Support for the Dozer type conversion framework</description>
+
+ <properties>
+ <camel.osgi.export.pkg>org.apache.camel.converter.dozer.*</camel.osgi.export.pkg>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.dozer</groupId>
+ <artifactId>dozer</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.dozer</groupId>
+ <artifactId>dozer-osgi</artifactId>
+ <version>5.2.2</version>
+ </dependency>
+
+ <!-- xmlbeans is marked as optional in dozer by we need it for testing -->
+ <dependency>
+ <groupId>org.apache.xmlbeans</groupId>
+ <artifactId>xmlbeans</artifactId>
+ <version>2.4.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-spring</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
</project>
Modified: camel/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=956327&r1=956326&r2=956327&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Sun Jun 20 08:25:38 2010
@@ -50,7 +50,7 @@
<commons-dbcp-version>1.3</commons-dbcp-version>
<cxf-version>2.2.9</cxf-version>
<derby-version>10.4.2.0</derby-version>
- <dozer-version>5.2.0</dozer-version>
+ <dozer-version>5.2.2</dozer-version>
<easymock-version>2.5.2</easymock-version>
<flatpack-version>3.1.1</flatpack-version>
<ftpserver-version>1.0.3</ftpserver-version>
Modified: camel/trunk/platforms/karaf/features/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/pom.xml?rev=956327&r1=956326&r2=956327&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/pom.xml (original)
+++ camel/trunk/platforms/karaf/features/pom.xml Sun Jun 20 08:25:38 2010
@@ -42,7 +42,7 @@
<asm-bundle-version>2.2.3_3</asm-bundle-version>
<bcel-bundle-version>5.2_2</bcel-bundle-version>
<dom4j-bundle-version>1.6.1_2</dom4j-bundle-version>
- <dozer-bundle-version>5.2.0_1</dozer-bundle-version>
+ <dozer-bundle-version>5.2.2</dozer-bundle-version>
<cglib-version>2.1_3_4</cglib-version>
<commons-beanutils-bundle-version>1.7.0_3</commons-beanutils-bundle-version>
<commons-csv-version>1.0-r706899_3</commons-csv-version>
Modified: camel/trunk/platforms/karaf/features/src/main/resources/features-spring3.xml
URL: http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/features-spring3.xml?rev=956327&r1=956326&r2=956327&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features-spring3.xml (original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features-spring3.xml Sun Jun 20 08:25:38 2010
@@ -118,14 +118,6 @@
<bundle>mvn:commons-codec/commons-codec/${commons-codec}</bundle>
<bundle>mvn:org.apache.camel/camel-crypto/${pom.version}</bundle>
</feature>
- <feature name='camel-dozer' version='${pom.version}'>
- <feature version='${pom.version}'>camel-core</feature>
- <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.commons-beanutils/${commons-beanutils-bundle-version}</bundle>
- <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.dozer/${dozer-bundle-version}</bundle>
- <bundle>mvn:org.apache.camel/camel-dozer/${pom.version}</bundle>
- </feature>
<feature name='camel-http' 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>
@@ -234,6 +226,11 @@
<feature version='${pom.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-csv/${pom.version}</bundle>
</feature>
+ <feature name='camel-dozer' version='${pom.version}'>
+ <feature version='${pom.version}'>camel-core</feature>
+ <bundle>mvn:net.sf.dozer/dozer-osgi/${dozer-bundle-version}</bundle>
+ <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>
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=956327&r1=956326&r2=956327&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml (original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Sun Jun 20 08:25:38 2010
@@ -120,10 +120,7 @@
</feature>
<feature name='camel-dozer' version='${pom.version}'>
<feature version='${pom.version}'>camel-core</feature>
- <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.commons-beanutils/${commons-beanutils-bundle-version}</bundle>
- <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.dozer/${dozer-bundle-version}</bundle>
+ <bundle>mvn:net.sf.dozer/dozer-osgi/${dozer-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-dozer/${pom.version}</bundle>
</feature>
<feature name='camel-http' version='${pom.version}'>
@@ -211,6 +208,12 @@
<feature version='${pom.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-bam/${pom.version}</bundle>
</feature>
+ <feature name='camel-bean-validator' version='${pom.version}'>
+ <feature version='${pom.version}'>camel-core</feature>
+ <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr303-api-1.0.0/${servicemix-specs-version}</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.hibernate-validator/${hibernate-validator-bundle-version}</bundle>
+ <bundle>mvn:org.apache.camel/camel-bean-validator/${pom.version}</bundle>
+ </feature>
<feature name='camel-bindy' version='${pom.version}'>
<feature version='${pom.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-bindy/${pom.version}</bundle>
@@ -267,6 +270,11 @@
<bundle>mvn:org.codehaus.groovy/groovy-all/${groovy-version}</bundle>
<bundle>mvn:org.apache.camel/camel-groovy/${pom.version}</bundle>
</feature>
+ <feature name='camel-hawtdb' version='${pom.version}'>
+ <feature version='${pom.version}'>camel-core</feature>
+ <bundle>mvn:${hawtdb-maven-repo-url}!org.fusesource.hawtdb/hawtdb/${hawtdb-version}</bundle>
+ <bundle>mvn:org.apache.camel/camel-hawtdb/${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>
@@ -280,11 +288,6 @@
<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-hawtdb' version='${pom.version}'>
- <feature version='${pom.version}'>camel-core</feature>
- <bundle>mvn:${hawtdb-maven-repo-url}!org.fusesource.hawtdb/hawtdb/${hawtdb-version}</bundle>
- <bundle>mvn:org.apache.camel/camel-hawtdb/${pom.version}</bundle>
- </feature>
<feature name='camel-ibatis' version='${pom.version}'>
<feature version='${pom.version}'>camel-spring</feature>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/${commons-pool-bundle-version}</bundle>
@@ -300,22 +303,26 @@
<feature version='${pom.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-irc/${pom.version}</bundle>
</feature>
+ <feature name='camel-jaxb' version='${pom.version}'>
+ <feature version='${pom.version}'>camel-core</feature>
+ <bundle>mvn:org.apache.camel/camel-jaxb/${pom.version}</bundle>
+ </feature>
<feature name='camel-jackson' version='${pom.version}'>
<bundle>mvn:org.codehaus.jackson/jackson-core-asl/${jackson-version}</bundle>
<bundle>mvn:org.codehaus.jackson/jackson-mapper-asl/${jackson-version}</bundle>
<feature version='${pom.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-jackson/${pom.version}</bundle>
</feature>
- <feature name='camel-jaxb' version='${pom.version}'>
- <feature version='${pom.version}'>camel-core</feature>
- <bundle>mvn:org.apache.camel/camel-jaxb/${pom.version}</bundle>
- </feature>
<feature name='camel-jcr' version='${pom.version}'>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jcr-api/${jcr-bundle-version}</bundle>
<bundle>mvn:org.apache.jackrabbit/jackrabbit-jcr-commons/${jackrabbit-version}</bundle>
<feature version='${pom.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-jcr/${pom.version}</bundle>
</feature>
+ <feature name='camel-jdbc' version='${pom.version}'>
+ <feature version='${pom.version}'>camel-core</feature>
+ <bundle>mvn:org.apache.camel/camel-jdbc/${pom.version}</bundle>
+ </feature>
<feature name='camel-jing' version='${pom.version}'>
<feature version='${pom.version}'>camel-spring</feature>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/${ant-bundle-version}</bundle>
@@ -323,10 +330,6 @@
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jing/${jing-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-jing/${pom.version}</bundle>
</feature>
- <feature name='camel-jdbc' version='${pom.version}'>
- <feature version='${pom.version}'>camel-core</feature>
- <bundle>mvn:org.apache.camel/camel-jdbc/${pom.version}</bundle>
- </feature>
<feature name='camel-josql' version='${pom.version}'>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.josql/${josql-bundle-version}</bundle>
<feature version='${pom.version}'>camel-core</feature>
@@ -350,6 +353,13 @@
<feature version='${pom.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-jpa/${pom.version}</bundle>
</feature>
+ <feature name='camel-juel' version='${pom.version}'>
+ <feature version='${pom.version}'>camel-core</feature>
+ <feature version='${pom.version}'>http</feature>
+ <bundle>mvn:org.ops4j.pax.web/pax-web-jsp/${pax.web.version}</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.juel/${juel-bundle-version}</bundle>
+ <bundle>mvn:org.apache.camel/camel-juel/${pom.version}</bundle>
+ </feature>
<feature name='camel-jxpath' version='${pom.version}'>
<!-- All those bundles should be optional I think, but the commons-jxpath osgi metadata is not really good -->
<bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${servlet-api-2.5-version}</bundle>
@@ -361,13 +371,6 @@
<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>
- <feature version='${pom.version}'>http</feature>
- <bundle>mvn:org.ops4j.pax.web/pax-web-jsp/${pax.web.version}</bundle>
- <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.juel/${juel-bundle-version}</bundle>
- <bundle>mvn:org.apache.camel/camel-juel/${pom.version}</bundle>
- </feature>
<feature name='camel-ldap' version='${pom.version}'>
<feature version='${pom.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-ldap/${pom.version}</bundle>
@@ -560,10 +563,4 @@
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xstream/${xstream-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-xstream/${pom.version}</bundle>
</feature>
- <feature name='camel-bean-validator' version='${pom.version}'>
- <feature version='${pom.version}'>camel-core</feature>
- <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr303-api-1.0.0/${servicemix-specs-version}</bundle>
- <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.hibernate-validator/${hibernate-validator-bundle-version}</bundle>
- <bundle>mvn:org.apache.camel/camel-bean-validator/${pom.version}</bundle>
- </feature>
</features>