Repository: jclouds-karaf Updated Branches: refs/heads/2.0.x b9dba1799 -> 82da67c54
JCLOUDS-1212: Replace OkHttp and Okio bundles by the ServiceMix ones Project: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/commit/82da67c5 Tree: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/tree/82da67c5 Diff: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/diff/82da67c5 Branch: refs/heads/2.0.x Commit: 82da67c54b6e560116f45a6e597a74cbff0e1f34 Parents: b9dba17 Author: Ignasi Barrera <[email protected]> Authored: Mon Nov 28 12:24:12 2016 +0100 Committer: Ignasi Barrera <[email protected]> Committed: Tue Nov 29 16:16:01 2016 +0100 ---------------------------------------------------------------------- bundles/okhttp/pom.xml | 88 ----------------------------- bundles/okio/pom.xml | 88 ----------------------------- bundles/pom.xml | 2 - feature/src/main/resources/feature.xml | 4 +- pom.xml | 2 + 5 files changed, 4 insertions(+), 180 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/82da67c5/bundles/okhttp/pom.xml ---------------------------------------------------------------------- diff --git a/bundles/okhttp/pom.xml b/bundles/okhttp/pom.xml deleted file mode 100644 index f398a83..0000000 --- a/bundles/okhttp/pom.xml +++ /dev/null @@ -1,88 +0,0 @@ -<?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.1-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/82da67c5/bundles/okio/pom.xml ---------------------------------------------------------------------- diff --git a/bundles/okio/pom.xml b/bundles/okio/pom.xml deleted file mode 100644 index 58a216e..0000000 --- a/bundles/okio/pom.xml +++ /dev/null @@ -1,88 +0,0 @@ -<?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.1-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/82da67c5/bundles/pom.xml ---------------------------------------------------------------------- diff --git a/bundles/pom.xml b/bundles/pom.xml index b5e925d..2420b86 100644 --- a/bundles/pom.xml +++ b/bundles/pom.xml @@ -31,8 +31,6 @@ 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/82da67c5/feature/src/main/resources/feature.xml ---------------------------------------------------------------------- diff --git a/feature/src/main/resources/feature.xml b/feature/src/main/resources/feature.xml index dd73a36..25872ef 100644 --- a/feature/src/main/resources/feature.xml +++ b/feature/src/main/resources/feature.xml @@ -350,8 +350,8 @@ limitations under the License. <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.servicemix.bundles/org.apache.servicemix.bundles.okio/${okio.bundle.version}</bundle> + <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.okhttp/${okhttp.bundle.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> http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/82da67c5/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 16a1bf3..13e8fd0 100644 --- a/pom.xml +++ b/pom.xml @@ -220,6 +220,8 @@ limitations under the License. <snakeyaml.version>1.11</snakeyaml.version> <okhttp.version>2.2.0</okhttp.version> <okio.version>1.2.0</okio.version> + <okhttp.bundle.version>${okhttp.version}_1</okhttp.bundle.version> + <okio.bundle.version>${okio.version}_1</okio.bundle.version> <!-- Plugin Versions --> <depends-maven-plugin.version>1.2</depends-maven-plugin.version>
