Repository: jclouds-karaf Updated Branches: refs/heads/master ed2a6b470 -> b1152f3dc
JCLOUDS-664: Added Azure ARM to jclouds-karaf Project: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/commit/b1152f3d Tree: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/tree/b1152f3d Diff: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/diff/b1152f3d Branch: refs/heads/master Commit: b1152f3dc6f929edb6de26d7f14a8127689f91bc Parents: ed2a6b4 Author: Ignasi Barrera <n...@apache.org> Authored: Sat Sep 17 00:59:35 2016 +0200 Committer: Ignasi Barrera <n...@apache.org> Committed: Wed Sep 21 10:44:28 2016 +0200 ---------------------------------------------------------------------- bundles/okhttp/pom.xml | 88 ++++++++++++++++++++ bundles/okio/pom.xml | 88 ++++++++++++++++++++ bundles/pom.xml | 2 + feature/pom.xml | 1 + feature/src/main/resources/feature.xml | 10 +++ .../itests/MiscFeaturesInstallationTest.java | 5 ++ pom.xml | 2 + 7 files changed, 196 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/b1152f3d/bundles/okhttp/pom.xml ---------------------------------------------------------------------- diff --git a/bundles/okhttp/pom.xml b/bundles/okhttp/pom.xml new file mode 100644 index 0000000..b69736a --- /dev/null +++ b/bundles/okhttp/pom.xml @@ -0,0 +1,88 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +Licensed to the Apache Software Foundation (ASF) under one or more +contributor license agreements. See the NOTICE file distributed with +this work for additional information regarding copyright ownership. +The ASF licenses this file to You under the Apache License, Version 2.0 +(the "License"); you may not use this file except in compliance with +the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +--> + +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.jclouds.karaf</groupId> + <artifactId>bundles</artifactId> + <version>2.0.0-SNAPSHOT</version> + </parent> + + <!-- + This is a bundle for the OkHttp library. Support for OSGi was added in OkHttp 3.0.0 but rolled back + in 3.0.1. Previous versions don't provide OSGi bundles. + To be removed once this is merged: https://github.com/apache/servicemix-bundles/pull/85 + --> + <groupId>org.apache.jclouds.karaf.bundles</groupId> + <artifactId>okhttp</artifactId> + <name>jclouds :: Karaf :: OkHttp (shaded bundle)</name> + <packaging>bundle</packaging> + + <dependencies> + <dependency> + <groupId>com.squareup.okhttp</groupId> + <artifactId>okhttp</artifactId> + <version>${okhttp.version}</version> + </dependency> + </dependencies> + + <properties> + <export.packages>com.squareup.okhttp*;version="${okhttp.version}"</export.packages> + <import.packages>*</import.packages> + </properties> + + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>2.3.7</version> + <configuration> + <instructions> + <Export-Package>${export.packages}</Export-Package> + <Import-Package>${import.packages}</Import-Package> + </instructions> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> + <version>2.4.3</version> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>shade</goal> + </goals> + <configuration> + <!-- the RAT plugin complains if we use the default location and we don't want it in the SCM --> + <dependencyReducedPomLocation>${project.build.directory}/dependency-reduced-pom.xml</dependencyReducedPomLocation> + <artifactSet> + <includes> + <include>com.squareup.okhttp:okhttp</include> + </includes> + </artifactSet> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + +</project> http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/b1152f3d/bundles/okio/pom.xml ---------------------------------------------------------------------- diff --git a/bundles/okio/pom.xml b/bundles/okio/pom.xml new file mode 100644 index 0000000..5532108 --- /dev/null +++ b/bundles/okio/pom.xml @@ -0,0 +1,88 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +Licensed to the Apache Software Foundation (ASF) under one or more +contributor license agreements. See the NOTICE file distributed with +this work for additional information regarding copyright ownership. +The ASF licenses this file to You under the Apache License, Version 2.0 +(the "License"); you may not use this file except in compliance with +the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +--> + +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.jclouds.karaf</groupId> + <artifactId>bundles</artifactId> + <version>2.0.0-SNAPSHOT</version> + </parent> + + <!-- + ServiceMix bundles for Okio start at version 1.6.0, but our current OkHttp driver uses OkHttp 2.2.0 that depends + on Okio 1.2.0. + To be removed once this is merged: https://github.com/apache/servicemix-bundles/pull/86 + --> + <groupId>org.apache.jclouds.karaf.bundles</groupId> + <artifactId>okio</artifactId> + <name>jclouds :: Karaf :: Okio (shaded bundle)</name> + <packaging>bundle</packaging> + + <dependencies> + <dependency> + <groupId>com.squareup.okio</groupId> + <artifactId>okio</artifactId> + <version>${okio.version}</version> + </dependency> + </dependencies> + + <properties> + <export.packages>okio*;version="${okio.version}"</export.packages> + <import.packages>*</import.packages> + </properties> + + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>2.3.7</version> + <configuration> + <instructions> + <Export-Package>${export.packages}</Export-Package> + <Import-Package>${import.packages}</Import-Package> + </instructions> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> + <version>2.4.3</version> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>shade</goal> + </goals> + <configuration> + <!-- the RAT plugin complains if we use the default location and we don't want it in the SCM --> + <dependencyReducedPomLocation>${project.build.directory}/dependency-reduced-pom.xml</dependencyReducedPomLocation> + <artifactSet> + <includes> + <include>com.squareup.okio:okio</include> + </includes> + </artifactSet> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + +</project> http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/b1152f3d/bundles/pom.xml ---------------------------------------------------------------------- diff --git a/bundles/pom.xml b/bundles/pom.xml index 087d08b..bd079bd 100644 --- a/bundles/pom.xml +++ b/bundles/pom.xml @@ -31,6 +31,8 @@ limitations under the License. <modules> <module>jsch-agentproxy-jsch</module> + <module>okio</module> + <module>okhttp</module> </modules> </project> http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/b1152f3d/feature/pom.xml ---------------------------------------------------------------------- diff --git a/feature/pom.xml b/feature/pom.xml index a64c5a8..34717dc 100644 --- a/feature/pom.xml +++ b/feature/pom.xml @@ -125,6 +125,7 @@ limitations under the License. <feature>jclouds-aws-sqs</feature> <feature>jclouds-aws-sts</feature> <feature>jclouds-azureblob</feature> + <feature>jclouds-azurecompute-arm</feature> <feature>jclouds-b2</feature> <feature>jclouds-cloudsigma2-hnl</feature> <feature>jclouds-cloudsigma2-lvs</feature> http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/b1152f3d/feature/src/main/resources/feature.xml ---------------------------------------------------------------------- diff --git a/feature/src/main/resources/feature.xml b/feature/src/main/resources/feature.xml index 2a9e191..dd73a36 100644 --- a/feature/src/main/resources/feature.xml +++ b/feature/src/main/resources/feature.xml @@ -346,6 +346,16 @@ limitations under the License. <bundle>mvn:org.apache.jclouds.provider/google-compute-engine/${jclouds.version}</bundle> </feature> + <feature name='jclouds-azurecompute-arm' description='Components to access Azure Compute ARM' version='${project.version}' resolver='(obr)'> + <feature version='${project.version}'>jclouds-compute</feature> + <feature version='${project.version}'>jclouds-azureblob</feature> + <bundle dependency='true'>mvn:org.apache.jclouds.api/oauth/${jclouds.version}</bundle> + <bundle dependency='true'>mvn:org.apache.jclouds.karaf.bundles/okio/${project.version}</bundle> + <bundle dependency='true'>mvn:org.apache.jclouds.karaf.bundles/okhttp/${project.version}</bundle> + <bundle dependency='true'>mvn:org.apache.jclouds.driver/jclouds-okhttp/${jclouds.version}</bundle> + <bundle>mvn:org.apache.jclouds.labs/azurecompute-arm/${jclouds.version}</bundle> + </feature> + <feature name='jclouds-profitbricks' description='Components to access ProfitBricks' version='${project.version}' resolver='(obr)'> <feature version='${project.version}'>jclouds-compute</feature> <bundle>mvn:org.apache.jclouds.provider/profitbricks/${jclouds.version}</bundle> http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/b1152f3d/itests/src/test/java/org/jclouds/karaf/itests/MiscFeaturesInstallationTest.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/jclouds/karaf/itests/MiscFeaturesInstallationTest.java b/itests/src/test/java/org/jclouds/karaf/itests/MiscFeaturesInstallationTest.java index fa6f317..2bc5140 100644 --- a/itests/src/test/java/org/jclouds/karaf/itests/MiscFeaturesInstallationTest.java +++ b/itests/src/test/java/org/jclouds/karaf/itests/MiscFeaturesInstallationTest.java @@ -85,6 +85,11 @@ public class MiscFeaturesInstallationTest extends JcloudsFeaturesTestSupport { } @Test + public void testAzureComputeArmFeature() throws Exception { + installAndCheckFeature("jclouds-azurecompute-arm"); + } + + @Test public void testDynectFeature() throws Exception { installAndCheckFeature("jclouds-dynect"); } http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/b1152f3d/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 2cf463c..a043e55 100644 --- a/pom.xml +++ b/pom.xml @@ -218,6 +218,8 @@ limitations under the License. <pax-url-aether.version>1.4.0.RC1</pax-url-aether.version> <slf4j.version>1.5.8</slf4j.version> <snakeyaml.version>1.11</snakeyaml.version> + <okhttp.version>2.2.0</okhttp.version> + <okio.version>1.2.0</okio.version> <!-- Plugin Versions --> <depends-maven-plugin.version>1.2</depends-maven-plugin.version>