You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2011/10/11 15:56:06 UTC
svn commit: r1181781 - in /camel/trunk: parent/pom.xml
platforms/karaf/features/pom.xml
platforms/karaf/features/src/main/resources/config.properties
platforms/karaf/features/src/main/resources/features.xml
Author: ningjiang
Date: Tue Oct 11 13:56:05 2011
New Revision: 1181781
URL: http://svn.apache.org/viewvc?rev=1181781&view=rev
Log:
CAMEL-4535 Upgrade jclouds version to 1.1.1, also updated the camel karaf feature to make the validate profile work
Modified:
camel/trunk/parent/pom.xml
camel/trunk/platforms/karaf/features/pom.xml
camel/trunk/platforms/karaf/features/src/main/resources/config.properties
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=1181781&r1=1181780&r2=1181781&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Tue Oct 11 13:56:05 2011
@@ -101,7 +101,8 @@
<javassist-bundle-version>3.9.0.GA_1</javassist-bundle-version>
<javax-mail-version>1.4.4</javax-mail-version>
<jaxen-version>1.1.1</jaxen-version>
- <jclouds-version>1.0.0</jclouds-version>
+ <jclouds-version>1.1.1</jclouds-version>
+ <jclouds-feature-version>1.1.1-SNAPSHOT</jclouds-feature-version>
<jdom-version>1.1</jdom-version>
<jetty-version>7.4.5.v20110725</jetty-version>
<jettison-version>1.3</jettison-version>
Modified: camel/trunk/platforms/karaf/features/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/pom.xml?rev=1181781&r1=1181780&r2=1181781&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/pom.xml (original)
+++ camel/trunk/platforms/karaf/features/pom.xml Tue Oct 11 13:56:05 2011
@@ -136,7 +136,7 @@
<xmlsec-bundle-version>1.4.5_1</xmlsec-bundle-version>
<xmlresolver-bundle-version>1.2_3</xmlresolver-bundle-version>
<xpp3-bundle-version>1.1.4c_3</xpp3-bundle-version>
- <xstream-bundle-version>1.4.1_1-SNAPSHOT</xstream-bundle-version>
+ <xstream-bundle-version>1.4.1_1</xstream-bundle-version>
<werken-xpath-bundle-version>0.9.4_3</werken-xpath-bundle-version>
<woodstox-core-bundle-version>${woodstox-version}</woodstox-core-bundle-version>
<stax2-api-bundle-version>3.1.1</stax2-api-bundle-version>
@@ -259,6 +259,20 @@
</profile>
<profile>
<id>validate</id>
+ <!-- Added the repository for the google script -->
+ <repositories>
+ <repository>
+ <id>google.script.repo</id>
+ <name>Google Script Engine Deploy Repository </name>
+ <url>http://scriptengines.googlecode.com/svn/m2-repo/</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
<build>
<plugins>
<plugin>
@@ -279,13 +293,6 @@
</goals>
</execution>
</executions>
- <dependencies>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- <version>${slf4j-version}</version>
- </dependency>
- </dependencies>
</plugin>
</plugins>
</build>
Modified: camel/trunk/platforms/karaf/features/src/main/resources/config.properties
URL: http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/config.properties?rev=1181781&r1=1181780&r2=1181781&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/config.properties (original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/config.properties Tue Oct 11 13:56:05 2011
@@ -111,7 +111,7 @@ jre-1.5=, \
javax.swing.text.rtf, \
javax.swing.tree, \
javax.swing.undo, \
- javax.transaction; javax.transaction.xa; partial=true; mandatory:=partial, \
+ javax.transaction, javax.transaction.xa, \
javax.xml, \
javax.xml.datatype, \
javax.xml.namespace, \
@@ -180,8 +180,8 @@ jre-1.6=, \
javax.accessibility, \
javax.activation, \
javax.activity, \
-# javax.annotation, \
-# javax.annotation.processing, \
+ javax.annotation, \
+ javax.annotation.processing, \
javax.crypto, \
javax.crypto.interfaces, \
javax.crypto.spec, \
@@ -256,7 +256,7 @@ jre-1.6=, \
javax.swing.tree, \
javax.swing.undo, \
javax.tools, \
- javax.transaction; javax.transaction.xa; partial=true; mandatory:=partial, \
+ javax.transaction, javax.transaction.xa, \
javax.xml, \
javax.xml.bind, \
javax.xml.bind.annotation, \
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=1181781&r1=1181780&r2=1181781&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml (original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Tue Oct 11 13:56:05 2011
@@ -18,7 +18,7 @@
-->
<features name='camel-${pom.version}'>
<repository>mvn:org.apache.cxf.karaf/apache-cxf/${cxf-version}/xml/features</repository>
- <repository>mvn:org.jclouds.karaf/feature/${jclouds-version}/xml/features</repository>
+ <repository>mvn:org.jclouds.karaf/jclouds-karaf/${jclouds-feature-version}/xml/features</repository>
<feature name='camel' version='${pom.version}' resolver='(obr)' start-level='50'>
<feature version='${pom.version}'>camel-core</feature>
<feature version='${pom.version}'>camel-spring</feature>
@@ -54,6 +54,8 @@
<feature version='${pom.version}'>camel-spring</feature>
<feature>jetty</feature>
<feature version='[2.4,2.6)'>cxf</feature>
+ <!-- Added cxf-specs feature to workaround the karaf feature validate issue -->
+ <feature version='[2.4,2.6)'>cxf-specs</feature>
<bundle>mvn:org.apache.camel/camel-cxf-transport/${pom.version}</bundle>
<bundle>mvn:org.apache.camel/camel-cxf/${pom.version}</bundle>
</feature>
@@ -130,14 +132,15 @@
<feature version='${pom.version}'>camel-jms</feature>
<bundle>mvn:org.apache.camel/camel-amqp/${pom.version}</bundle>
</feature>
-<!-- TODO: apns bundle does not work - SMX4-857
+ <!-- TODO: apns bundle does not work - SMX4-857
+ apn has the depenency of mina 2.0, we need to provide that bundle in servicemix
<feature name='camel-apns' version='${pom.version}' resolver='(obr)' start-level='50'>
<feature version='${pom.version}'>camel-core</feature>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.mina/${mina-bundle-version}</bundle>
<bundle dependency="true">mvn:org.codehaus.jackson/jackson-core-asl/${jackson-version}</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.java-apns/${java-apns-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-apns/${pom.version}</bundle>
- </feature> -->
+ </feature-->
<feature name='camel-atom' version='${pom.version}' resolver='(obr)' start-level='50'>
<feature version='${pom.version}'>camel-core</feature>
<bundle dependency="true">mvn:javax.mail/mail/${javax-mail-version}</bundle>
@@ -340,7 +343,9 @@
<bundle>mvn:org.apache.camel/camel-jaxb/${pom.version}</bundle>
</feature>
<feature name='camel-jclouds' version='${pom.version}' resolver='(obr)' start-level='50'>
- <feature version="${jclouds-version}">jclouds</feature>
+ <!-- Added jclouds feature to workaround the karaf feature validate issue -->
+ <feature version="${jclouds-feature-version}">jclouds</feature>
+ <feature version="${jclouds-feature-version}">jclouds-compute</feature>
<feature version='${pom.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-jclouds/${pom.version}</bundle>
</feature>
@@ -377,6 +382,7 @@
<bundle>mvn:org.apache.camel/camel-josql/${pom.version}</bundle>
</feature>
<feature name='camel-jpa' version='${pom.version}' resolver='(obr)' start-level='50'>
+ <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/${gernimo-annotation-spec-version}</bundle>
<bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jpa_2.0_spec/${geronimo-jpa2-spec-version}</bundle>
<feature version="[3,4)">spring-tx</feature>
<bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-el_1.0_spec/${geronimo-el-version}</bundle>
@@ -537,6 +543,9 @@
<bundle>mvn:com.google.code.scriptengines/scriptengines-groovy/${scriptengines.version}</bundle>
<bundle>mvn:com.google.code.scriptengines/scriptengines-javascript/${scriptengines.version}</bundle>
<bundle>mvn:com.google.code.scriptengines/scriptengines-jruby/${scriptengines.version}</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.rhino/${rhino.bundle.version}</bundle>
+ <bundle>mvn:org.codehaus.groovy/groovy-all/${groovy-version}</bundle>
+ <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jruby/${jruby-bundle-version}</bundle>
</feature>
<feature name='camel-script' version='${pom.version}' resolver='(obr)' start-level='50'>
<feature version='${pom.version}'>camel-core</feature>