camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject svn commit: r956801 - in /camel/trunk: 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
Date Tue, 22 Jun 2010 07:51:12 GMT
Author: ningjiang
Date: Tue Jun 22 07:51:12 2010
New Revision: 956801

URL: http://svn.apache.org/viewvc?rev=956801&view=rev
Log:
CAMEL-2831, CAMEL-2832 Upgrade to quartz-1.8.1 and clean up the camel-dozer feature

Modified:
    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/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=956801&r1=956800&r2=956801&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Tue Jun 22 07:51:12 2010
@@ -100,7 +100,7 @@
     <pax-exam-version>1.2.0</pax-exam-version>
     <pax-tiny-bundle-version>1.2.0</pax-tiny-bundle-version>
     <qpid-version>0.5.0</qpid-version>
-    <quartz-version>1.8.1</quartz-version>
+    <quartz-version>1.8.2</quartz-version>
     <restlet-version>1.1.9</restlet-version>
     <saxon-version>9.1.0.8</saxon-version>
     <scala-version>2.7.7</scala-version>

Modified: camel/trunk/platforms/karaf/features/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/pom.xml?rev=956801&r1=956800&r2=956801&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/pom.xml (original)
+++ camel/trunk/platforms/karaf/features/pom.xml Tue Jun 22 07:51:12 2010
@@ -103,7 +103,7 @@
       <osgi.compendium.version>4.2.0</osgi.compendium.version>
       <protobuf-java-bundle-version>2.2.0_1</protobuf-java-bundle-version>
       <pax.web.version>0.7.2</pax.web.version>
-      <quartz-bundle-version>1.8.1_1-SNAPSHOT</quartz-bundle-version>
+      <quartz-bundle-version>1.8.2_1-SNAPSHOT</quartz-bundle-version>
       <qpid-bundle-version>0.5.0_2</qpid-bundle-version>
       <saxon-bundle-version>9.1.0.1_3</saxon-bundle-version>
       <servicemix-specs-version>1.5.0</servicemix-specs-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=956801&r1=956800&r2=956801&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 Tue Jun 22
07:51:12 2010
@@ -228,13 +228,14 @@
   </feature>
   <feature name='camel-dozer' 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:net.sf.dozer/dozer-osgi/${dozer-bundle-version}</bundle>
-	<bundle>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
-	<bundle>mvn:commons-collections/commons-collections/${commons-collections-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.xmlbeans/${xmlbeans-bundle-version}</bundle>
-	<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-beanutils/${commons-beanutils-bundle-version}</bundle>
-    <bundle>mvn:http://repository.springsource.com/maven/bundles/external!javax.el/com.springsource.javax.el/${javax.el-bundle-version}</bundle>
-	<bundle>mvn:org.apache.camel/camel-dozer/${pom.version}</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-beanutils/${commons-beanutils-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>

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=956801&r1=956800&r2=956801&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml (original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Tue Jun 22 07:51:12
2010
@@ -120,13 +120,14 @@
   </feature>
   <feature name='camel-dozer' 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:net.sf.dozer/dozer-osgi/${dozer-bundle-version}</bundle>
-	<bundle>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
-	<bundle>mvn:commons-collections/commons-collections/${commons-collections-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.xmlbeans/${xmlbeans-bundle-version}</bundle>
-	<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-beanutils/${commons-beanutils-bundle-version}</bundle>
-    <bundle>mvn:http://repository.springsource.com/maven/bundles/external!javax.el/com.springsource.javax.el/${javax.el-bundle-version}</bundle>
-	<bundle>mvn:org.apache.camel/camel-dozer/${pom.version}</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-beanutils/${commons-beanutils-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>



Mime
View raw message