Author: gertv
Date: Tue Oct 20 06:54:55 2009
New Revision: 826977
URL: http://svn.apache.org/viewvc?rev=826977&view=rev
Log:
CAMEL-2080: Enable features-maven-plugin validate goal for karaf features build
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=826977&r1=826976&r2=826977&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/pom.xml (original)
+++ camel/trunk/platforms/karaf/features/pom.xml Tue Oct 20 06:54:55 2009
@@ -42,7 +42,7 @@
<bcel-bundle-version>5.2_1-SNAPSHOT</bcel-bundle-version>
<dom4j-bundle-version>1.6.1_1-SNAPSHOT</dom4j-bundle-version>
<cglib-version>2.1_3_3-SNAPSHOT</cglib-version>
-
<commons-beanutils-bundle-version>1.7.0_2-SNAPSHOT</commons-beanutils-bundle-version>
+
<commons-beanutils-bundle-version>1.7.0_1</commons-beanutils-bundle-version>
<commons-dbcp-bundle-version>1.2.2_4-SNAPSHOT</commons-dbcp-bundle-version>
<commons-csv-version>1.0-r706899_2-SNAPSHOT</commons-csv-version>
<commons-codec-bundle-version>1.3_1-SNAPSHOT</commons-codec-bundle-version>
@@ -95,7 +95,7 @@
<servicemix-specs-version>1.4-SNAPSHOT</servicemix-specs-version>
<servlet-api-2.5-version>1.1.2</servlet-api-2.5-version>
<serp-bundle-version>1.13.1_1-SNAPSHOT</serp-bundle-version>
- <snmp4j-bundle-version>1.8.1_2-SNAPSHOT</snmp4j-bundle-version>
+ <snmp4j-bundle-version>1.8.1_1</snmp4j-bundle-version>
<smack-bundle-version>3.0.4_1</smack-bundle-version>
<spring-version>2.5.6.SEC01</spring-version>
<spring-osgi-version>1.2.0</spring-osgi-version>
@@ -116,6 +116,36 @@
<woodstox-bundle-version>3.2.7_1</woodstox-bundle-version>
<wsdl4j-bundle-version>1.6.1_1</wsdl4j-bundle-version>
</properties>
+
+ <repositories>
+ <!-- ServiceMix repo (for org.osgi:org.osgi.impl.bundle.jmx) -->
+ <repository>
+ <id>servicemix</id>
+ <name>Apache ServiceMix Repository</name>
+ <url>http://svn.apache.org/repos/asf/servicemix/m2-repo</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+
+ <dependencies>
+ <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>
+ <version>1.4</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
<build>
<resources>
@@ -139,6 +169,20 @@
</executions>
</plugin>
<plugin>
+ <groupId>org.apache.felix.karaf.tooling</groupId>
+ <artifactId>features-maven-plugin</artifactId>
+ <version>${karaf-version}</version>
+ <executions>
+ <execution>
+ <id>validate</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>validate</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
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=826977&r1=826976&r2=826977&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 20 06:54:55 2009
@@ -1,6 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<features>
+
<repository>mvn:org.apache.felix.karaf/apache-felix-karaf/${karaf-version}/xml/features</repository>
+ <feature name='camel' version='${pom.version}'>
+ <feature version='${pom.version}'>camel-core</feature>
+ <feature version='${pom.version}'>camel-spring</feature>
+ <feature version='${pom.version}'>camel-osgi</feature>
+ </feature>
<feature name='camel-core' version='${pom.version}'>
+ <feature version="${spring-version}">spring</feature>
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${servicemix-specs-version}</bundle>
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-2.1/${servicemix-specs-version}</bundle>
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${servicemix-specs-version}</bundle>
@@ -10,26 +17,19 @@
</feature>
<feature name='camel-spring' version='${pom.version}'>
<bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version}</bundle>
-
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/${aopalliance-bundle-version}</bundle>
- <bundle>mvn:org.springframework/spring-core/${spring-version}</bundle>
- <bundle>mvn:org.springframework/spring-beans/${spring-version}</bundle>
- <bundle>mvn:org.springframework/spring-context/${spring-version}</bundle>
- <bundle>mvn:org.springframework/spring-aop/${spring-version}</bundle>
+ <feature version='${spring-version}'>spring</feature>
<bundle>mvn:org.springframework/spring-tx/${spring-version}</bundle>
<feature version='${pom.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-spring/${pom.version}</bundle>
</feature>
<feature name='camel-osgi' version='${pom.version}'>
<feature version='${pom.version}'>camel-spring</feature>
-
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cglib-version}</bundle>
-
<bundle>mvn:org.springframework.osgi/spring-osgi-io/${spring-osgi-version}</bundle>
-
<bundle>mvn:org.springframework.osgi/spring-osgi-core/${spring-osgi-version}</bundle>
-
<bundle>mvn:org.springframework.osgi/spring-osgi-extender/${spring-osgi-version}</bundle>
-
<bundle>mvn:org.springframework.osgi/spring-osgi-annotation/${spring-osgi-version}</bundle>
+ <feature version='${spring-osgi-version}'>spring-dm</feature>
<bundle>mvn:org.apache.camel/camel-osgi/${pom.version}</bundle>
</feature>
<feature name='camel-test' version='${pom.version}'>
<feature version='${pom.version}'>camel-spring</feature>
+
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.junit/${junit-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-test/${pom.version}</bundle>
</feature>
<feature name='camel-cxf' version='${pom.version}'>
@@ -74,13 +74,13 @@
</feature>
<feature name='camel-cache' version='${pom.version}'>
<feature version='${pom.version}'>camel-core</feature>
-
<bundle>mvn:net.sourceforge.ehcache/com.springsource.net.sf.ehcache/${spring-ehcache-version}</bundle>
+
<bundle>mvn:http://repository.springsource.com/maven/bundles/external!net.sourceforge.ehcache/com.springsource.net.sf.ehcache/${spring-ehcache-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-cache/${pom.version}</bundle>
</feature>
<feature name='camel-castor' version='${pom.version}'>
<feature version='${pom.version}'>camel-core</feature>
-
<bundle>mvn:org.codehaus.castor/com.springsource.org.castor/${spring-castor-bundle-version}</bundle>
+
<bundle>mvn:http://repository.springsource.com/maven/bundles/external!org.codehaus.castor/com.springsource.org.castor/${spring-castor-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-castor/${pom.version}</bundle>
</feature>
<feature name='camel-http' version='${pom.version}'>
@@ -132,6 +132,7 @@
<bundle>mvn:org.apache.camel/camel-atom/${pom.version}</bundle>
</feature>
<feature name='camel-bam' version='${pom.version}'>
+ <feature>http</feature>
<bundle>mvn:org.springframework/spring-tx/${spring-version}</bundle>
<bundle>mvn:org.springframework/spring-web/${spring-version}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version}</bundle>
@@ -140,6 +141,9 @@
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-dbcp/${commons-dbcp-bundle-version}</bundle>
<bundle>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms-spec-version}</bundle>
+
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cglib-version}</bundle>
+
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.java-persistence-api-1.1.1/${servicemix-specs-version}</bundle>
+ <bundle>mvn:org.springframework/spring-orm/${spring-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oscache/${oscache-bundle-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ibatis-sqlmap/${ibatis-bundle-version}</bundle>
<feature version='${pom.version}'>camel-core</feature>
@@ -180,8 +184,8 @@
<bundle>mvn:org.apache.camel/camel-ftp/${pom.version}</bundle>
</feature>
<feature name='camel-guice' version='${pom.version}'>
-
<bundle>mvn:org.guiceyfruit/guiceyfruit-core/${guiceyfruit-version}</bundle>
- <bundle>mvn:org.guiceyfruit/guice-all/${guiceyfruit-version}</bundle>
+
<bundle>mvn:http://guiceyfruit.googlecode.com/svn/repo/releases!org.guiceyfruit/guiceyfruit-core/${guiceyfruit-version}</bundle>
+
<bundle>mvn:http://guiceyfruit.googlecode.com/svn/repo/releases!org.guiceyfruit/guice-all/${guiceyfruit-version}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/${gernimo-annotation-spec-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/${aopalliance-bundle-version}</bundle>
<feature version='${pom.version}'>camel-core</feature>
@@ -197,6 +201,7 @@
<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>
+
<bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms-spec-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.bcel/${bcel-bundle-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xerces/${xerces-bundle-version}</bundle>
@@ -212,6 +217,7 @@
<bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${servlet-api-2.5-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-dbcp/${commons-dbcp-bundle-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oscache/${oscache-bundle-version}</bundle>
+
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cglib-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ibatis-sqlmap/${ibatis-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-ibatis/${pom.version}</bundle>
</feature>
@@ -328,8 +334,8 @@
<feature name='camel-restlet' version='${pom.version}'>
<feature version='${pom.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-restlet/${pom.version}</bundle>
- <bundle>mvn:org.restlet/org.restlet/${restlet-version}</bundle>
-
<bundle>mvn:com.noelios.restlet/com.noelios.restlet/${restlet-version}</bundle>
+
<bundle>mvn:http://maven.restlet.org!org.restlet/org.restlet/${restlet-version}</bundle>
+
<bundle>mvn:http://maven.restlet.org!com.noelios.restlet/com.noelios.restlet/${restlet-version}</bundle>
<feature version='${pom.version}'>camel-http</feature>
</feature>
<feature name='camel-rmi' version='${pom.version}'>
@@ -339,7 +345,7 @@
<feature name='camel-rss' version='${pom.version}'>
<feature version='${pom.version}'>camel-atom</feature>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version}</bundle>
- <bundle>mvn:rome/rome/1.0</bundle>
+ <bundle>mvn:http://download.java.net/maven/2!rome/rome/1.0</bundle>
<bundle>mvn:org.apache.camel/camel-rss/${pom.version}</bundle>
</feature>
<feature name='camel-saxon' version='${pom.version}'>
@@ -348,7 +354,7 @@
<bundle>mvn:org.apache.camel/camel-saxon/${pom.version}</bundle>
</feature>
<feature name='camel-scala' version='${pom.version}'>
- <bundle>mvn:org.scala-lang-osgi/scala-library/${scala-version}</bundle>
+
<bundle>mvn:http://www.scala-tools.com/repo-releases!org.scala-lang-osgi/scala-library/${scala-version}</bundle>
<feature version='${pom.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-scala/${pom.version}</bundle>
</feature>
@@ -363,14 +369,14 @@
<bundle>mvn:org.apache.camel/camel-snmp/${pom.version}</bundle>
</feature>
<feature name='camel-spring-integration' version='${pom.version}'>
-
<bundle>mvn:org.springframework.integration/org.springframework.integration/1.0.1.RELEASE</bundle>
+
<bundle>mvn:http://repository.springsource.com/maven/bundles/release!org.springframework.integration/org.springframework.integration/1.0.1.RELEASE</bundle>
<feature version='${pom.version}'>camel-spring</feature>
<bundle>mvn:org.apache.camel/camel-spring-integration/${pom.version}</bundle>
</feature>
<feature name='camel-spring-javaconfig' version='${pom.version}'>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cglib-version}</bundle>
-
<bundle>mvn:org.springframework/org.springframework.test/${spring-version}</bundle>
-
<bundle>mvn:org.springframework.javaconfig/org.springframework.config.java/${spring-javaconfig-version}</bundle>
+
<bundle>mvn:http://repository.springsource.com/maven/bundles/release!org.springframework/org.springframework.test/${spring-version}</bundle>
+
<bundle>mvn:http://svn.apache.org/repos/asf/camel/m2-repo!org.springframework.javaconfig/org.springframework.config.java/${spring-javaconfig-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cglib-version}</bundle>
<feature version='${pom.version}'>camel-spring</feature>
<bundle>mvn:org.apache.camel/camel-spring-javaconfig/${pom.version}</bundle>
Modified: camel/trunk/platforms/karaf/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/pom.xml?rev=826977&r1=826976&r2=826977&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/pom.xml (original)
+++ camel/trunk/platforms/karaf/pom.xml Tue Oct 20 06:54:55 2009
@@ -34,7 +34,7 @@
<name>Camel :: Platforms :: Apache Karaf</name>
<properties>
- <servicemix-kernel-version>1.1.0</servicemix-kernel-version>
+ <karaf-version>1.1.0-SNAPSHOT</karaf-version>
</properties>
<modules>
