Repository: jclouds-karaf Updated Branches: refs/heads/master 011e811c0 -> 15d2f9992
Add built time karaf feature verification Project: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/commit/7e7f9cea Tree: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/tree/7e7f9cea Diff: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/diff/7e7f9cea Branch: refs/heads/master Commit: 7e7f9cea42068cac519abf6b03c27fdac35e990b Parents: 011e811 Author: Guillaume Nodet <[email protected]> Authored: Wed May 10 09:45:01 2017 +0200 Committer: Guillaume Nodet <[email protected]> Committed: Wed May 10 09:49:58 2017 +0200 ---------------------------------------------------------------------- feature-labs/pom.xml | 34 ++++++++++++++++++++++++++++++- feature/pom.xml | 33 +++++++++++++++++++++++++++++- feature/src/main/feature/feature.xml | 6 ++++-- 3 files changed, 69 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/7e7f9cea/feature-labs/pom.xml ---------------------------------------------------------------------- diff --git a/feature-labs/pom.xml b/feature-labs/pom.xml index fa2a66b..3d88eac 100644 --- a/feature-labs/pom.xml +++ b/feature-labs/pom.xml @@ -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> http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/7e7f9cea/feature/pom.xml ---------------------------------------------------------------------- diff --git a/feature/pom.xml b/feature/pom.xml index 2265bab..1163554 100644 --- a/feature/pom.xml +++ b/feature/pom.xml @@ -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> http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/7e7f9cea/feature/src/main/feature/feature.xml ---------------------------------------------------------------------- diff --git a/feature/src/main/feature/feature.xml b/feature/src/main/feature/feature.xml index ba24fd9..cedefa0 100644 --- a/feature/src/main/feature/feature.xml +++ b/feature/src/main/feature/feature.xml @@ -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>
