Add built time karaf feature verification
authorGuillaume Nodet <gnodet@apache.org>
Wed, 10 May 2017 07:45:01 +0000 (09:45 +0200)
committerGuillaume Nodet <gnodet@apache.org>
Wed, 10 May 2017 07:49:58 +0000 (09:49 +0200)
feature-labs/pom.xml
feature/pom.xml
feature/src/main/feature/feature.xml

index fa2a66b..3d88eac 100644 (file)
@@ -32,13 +32,45 @@ limitations under the License.
     <packaging>feature</packaging>
     <name>jclouds :: Karaf :: Feature Labs</name>
 
+    <properties>
+        <karaf.plugin.version>4.1.1</karaf.plugin.version>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>framework</artifactId>
+            <version>${karaf.version}</version>
+            <type>kar</type>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
     <build>
         <plugins>
             <plugin>
                 <groupId>org.apache.karaf.tooling</groupId>
                 <artifactId>karaf-maven-plugin</artifactId>
-                <version>${karaf.version}</version>
+                <version>${karaf.plugin.version}</version>
                 <extensions>true</extensions>
+                <configuration>
+                  <descriptors>
+                      <descriptor>mvn:org.apache.karaf.features/framework/${karaf.version}/xml/features</descriptor>
+                      <descriptor>mvn:org.apache.karaf.features/standard/${karaf.version}/xml/features</descriptor>
+                      <descriptor>file:${project.build.directory}/feature/feature.xml</descriptor>
+                  </descriptors>
+                  <distribution>org.apache.karaf.features:framework</distribution>
+                  <javase>1.8</javase>
+                  <framework>
+                      <feature>framework</feature>
+                      <feature>shell-compat</feature>
+                  </framework>
+                  <features>
+                      jclouds*
+                  </features>
+                  <verifyTransitive>false</verifyTransitive>
+                  <enableGeneration>false</enableGeneration>
+                </configuration>
             </plugin>
         </plugins>
     </build>
index 2265bab..1163554 100644 (file)
@@ -29,6 +29,20 @@ limitations under the License.
   <packaging>feature</packaging>
   <name>jclouds :: Karaf :: Feature</name>
 
+  <properties>
+         <karaf.plugin.version>4.1.1</karaf.plugin.version>
+  </properties>
+
+  <dependencies>
+      <dependency>
+          <groupId>org.apache.karaf.features</groupId>
+          <artifactId>framework</artifactId>
+          <version>${karaf.version}</version>
+          <type>kar</type>
+          <scope>provided</scope>
+      </dependency>
+  </dependencies>
+
   <build>
     <plugins>
       <!-- Attaches config files referenced in feature.xml (mvn protocol) as artifacts -->
@@ -63,8 +77,25 @@ limitations under the License.
       <plugin>
         <groupId>org.apache.karaf.tooling</groupId>
         <artifactId>karaf-maven-plugin</artifactId>
-        <version>${karaf.version}</version>
+        <version>${karaf.plugin.version}</version>
         <extensions>true</extensions>
+        <configuration>
+            <descriptors>
+                <descriptor>mvn:org.apache.karaf.features/framework/${karaf.version}/xml/features</descriptor>
+                <descriptor>mvn:org.apache.karaf.features/standard/${karaf.version}/xml/features</descriptor>
+                <descriptor>file:${project.build.directory}/feature/feature.xml</descriptor>
+            </descriptors>
+            <distribution>org.apache.karaf.features:framework</distribution>
+            <javase>1.8</javase>
+            <framework>
+                <feature>framework</feature>
+                <feature>shell-compat</feature>
+            </framework>
+            <features>
+                jclouds*
+            </features>
+            <enableGeneration>false</enableGeneration>
+          </configuration>
       </plugin>
     </plugins>
   </build>
index ba24fd9..cedefa0 100644 (file)
@@ -84,7 +84,7 @@ limitations under the License.
     </feature>
 
     <feature name='jclouds-loadbalancer' description='jclouds - loadbalancer' version='${project.version}'>
-        <feature version='${project.version}'>jclouds</feature>
+        <feature version='${project.version}'>jclouds-compute</feature>
         <bundle>mvn:org.apache.jclouds/jclouds-loadbalancer/${jclouds.version}</bundle>
     </feature>
 
@@ -211,6 +211,7 @@ limitations under the License.
         <feature version='${project.version}'>jclouds-compute</feature>
         <feature version='${project.version}'>jclouds-loadbalancer</feature>
         <feature version='${project.version}'>jclouds-api-openstack-keystone</feature>
+        <feature version='${project.version}'>jclouds-api-rackspace-cloudidentity</feature>
         <bundle>mvn:org.apache.jclouds.api/rackspace-cloudloadbalancers/${jclouds.version}</bundle>
     </feature>
 
@@ -596,8 +597,9 @@ limitations under the License.
         <bundle>mvn:org.apache.jclouds.karaf.chef/commands/${project.version}</bundle>
     </feature>
 
-     <feature name="jclouds-url-handler" description="Url Handler for jclouds Blobs" version="${project.version}">
+    <feature name="jclouds-url-handler" description="Url Handler for jclouds Blobs" version="${project.version}">
         <feature version='${project.version}'>jclouds</feature>
+        <feature version='${project.version}'>jclouds-services</feature>
         <bundle>mvn:org.apache.jclouds.karaf/urlhandler/${project.version}</bundle>
     </feature>