svn commit: r1068934 - in /camel/trunk/platforms/karaf: features/pom.xml features/src/main/resources/features.xml pom.xml

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r1068934 - in /camel/trunk/platforms/karaf: features/pom.xml features/src/main/resources/features.xml pom.xml

gertv-2
Author: gertv
Date: Wed Feb  9 15:21:19 2011
New Revision: 1068934

URL: http://svn.apache.org/viewvc?rev=1068934&view=rev
Log:
CAMEL-3268: Fix features-maven-plugin validate goal, remove tabs and fix a few minor issues in the features.xml

Modified:
    camel/trunk/platforms/karaf/features/pom.xml
    camel/trunk/platforms/karaf/features/src/main/resources/features.xml
    camel/trunk/platforms/karaf/pom.xml

Modified: camel/trunk/platforms/karaf/features/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/pom.xml?rev=1068934&r1=1068933&r2=1068934&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/pom.xml (original)
+++ camel/trunk/platforms/karaf/features/pom.xml Wed Feb  9 15:21:19 2011
@@ -140,12 +140,12 @@
     
     <!-- The validate plugin will export these provided dependencies bundles' export packages first -->  
     <dependencies>
-     <dependency>
-        <groupId>org.osgi</groupId>
-        <artifactId>org.osgi.core</artifactId>
-        <version>4.2.0</version>
-        <scope>provided</scope>
-     </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.core</artifactId>
+            <version>4.2.0</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.ops4j.pax.logging</groupId>
             <artifactId>pax-logging-api</artifactId>
@@ -218,4 +218,39 @@
       </plugins>
     </build>
 
+    <profiles>
+       <profile>
+          <id>validate</id>
+          <build>
+             <plugins>
+                <plugin>
+                   <groupId>org.apache.karaf.tooling</groupId>
+                   <artifactId>features-maven-plugin</artifactId>
+                   <version>${karaf-version}</version>
+                   <configuration>
+                       <file>${project.build.directory}/classes/${features.file}</file>
+                       <karafConfig>${project.build.directory}/classes/config.properties</karafConfig>
+                   </configuration>
+                   <executions>
+                     <execution>
+                       <id>validate</id>
+                       <phase>process-resources</phase>
+                       <goals>
+                         <goal>validate</goal>
+                       </goals>
+                     </execution>
+                   </executions>
+                   <dependencies>
+                    <dependency>
+                     <groupId>org.slf4j</groupId>
+                     <artifactId>slf4j-simple</artifactId>
+                     <version>1.4.3</version>
+                </dependency>
+                 </dependencies>
+               </plugin>
+              </plugins>
+           </build>
+        </profile>
+     </profiles>
+
 </project>

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=1068934&r1=1068933&r2=1068934&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml (original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Wed Feb  9 15:21:19 2011
@@ -107,7 +107,7 @@
     <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.oro/${oro-bundle-version}</bundle>
     <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.velocity/${velocity-bundle-version}</bundle>
-    <bundle>mvn:javax.mail/mail/${javax-mail-version}</bundle>
+    <bundle>mvn:http://download.java.net/maven/2!javax.mail/mail/${javax-mail-version}</bundle>
     <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.neethi/${neethi-bundle-version}</bundle>
     <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.abdera/${abdera-bundle-version}</bundle>
     <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-${jaxws.api.version}/${servicemix-specs-version}</bundle>
@@ -330,7 +330,7 @@
     <bundle>mvn:org.fusesource.hawtdb/hawtdb/${hawtdb-version}</bundle>
     <bundle>mvn:org.fusesource.hawtbuf/hawtbuf/${hawtbuf-version}</bundle>
     <bundle>mvn:org.apache.camel/camel-hawtdb/${pom.version}</bundle>
-  </feature>  
+  </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>
@@ -455,7 +455,7 @@
   <feature name='camel-mail' version='${pom.version}'>
     <bundle>mvn:org.springframework/spring-context/${spring-version}</bundle>
     <bundle>mvn:org.springframework/spring-context-support/${spring-version}</bundle>
-    <bundle>mvn:javax.mail/mail/${javax-mail-version}</bundle>
+    <bundle>mvn:http://download.java.net/maven/2!javax.mail/mail/${javax-mail-version}</bundle>
     <feature version='${pom.version}'>camel-core</feature>
     <bundle>mvn:org.apache.camel/camel-mail/${pom.version}</bundle>
   </feature>
@@ -473,7 +473,7 @@
     <bundle>mvn:org.apache.camel/camel-mvel/${pom.version}</bundle>
   </feature>
   <feature name='camel-nagios' version='${pom.version}'>
-    <feature version='${pom.version}'>camel-core</feature>
+    <feature version='${pom.version}'>camel-core</feature>    
     <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jsendnsca-core/${jsendnsca-bundle-version}</bundle>
     <bundle>mvn:org.apache.camel/camel-nagios/${pom.version}</bundle>
   </feature>
@@ -481,7 +481,7 @@
     <feature version='${pom.version}'>camel-core</feature>
     <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.netty/${netty-bundle-version}</bundle>
     <bundle>mvn:org.apache.camel/camel-netty/${pom.version}</bundle>
-  </feature>  
+  </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>
@@ -564,9 +564,9 @@
   </feature>
   <feature name='camel-shiro' version='${pom.version}'>
     <feature version='${pom.version}'>camel-core</feature>
- <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.shiro/${shiro-bundle-version}</bundle>
- <bundle>mvn:org.apache.camel/camel-shiro/${pom.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.shiro/${shiro-bundle-version}</bundle>
+    <bundle>mvn:org.apache.camel/camel-shiro/${pom.version}</bundle>
   </feature>
   <feature name='camel-smpp' version='${pom.version}'>
     <feature version='${pom.version}'>camel-core</feature>
@@ -604,7 +604,7 @@
   </feature>
   <feature name='camel-spring-ws' version='${pom.version}'>
     <feature version='${pom.version}'>camel-spring</feature>
-    <bundle>mvn:javax.mail/mail/${javax-mail-version}</bundle>
+    <bundle>mvn:http://download.java.net/maven/2!javax.mail/mail/${javax-mail-version}</bundle>
     <bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms-spec-version}</bundle>
     <bundle>mvn:org.springframework/spring-jms/${spring-version}</bundle>
     <bundle>mvn:org.springframework/spring-web/${spring-version}</bundle>

Modified: camel/trunk/platforms/karaf/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/pom.xml?rev=1068934&r1=1068933&r2=1068934&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/pom.xml (original)
+++ camel/trunk/platforms/karaf/pom.xml Wed Feb  9 15:21:19 2011
@@ -34,8 +34,7 @@
     <name>Camel :: Platforms :: Apache Karaf</name>
 
     <properties>
-      <karaf-version>2.1.0</karaf-version>
-      <features-maven-plugin-version>2.1.0</features-maven-plugin-version>
+      <karaf-version>2.1.4-SNAPSHOT</karaf-version>
     </properties>
 
     <modules>