You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by jb...@apache.org on 2019/03/26 10:18:01 UTC

[servicemix-bundles] branch master updated: [SM-4017] Create OSGi bundle for okhttp 3.14.0

This is an automated email from the ASF dual-hosted git repository.

jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicemix-bundles.git


The following commit(s) were added to refs/heads/master by this push:
     new 82719df  [SM-4017] Create OSGi bundle for okhttp 3.14.0
82719df is described below

commit 82719dfdf2497bb96b77898420348952b2557623
Author: Jean-Baptiste Onofré <jb...@apache.org>
AuthorDate: Tue Mar 26 11:17:36 2019 +0100

    [SM-4017] Create OSGi bundle for okhttp 3.14.0
---
 {okhttp-3.13.1 => okhttp-3.14.0}/pom.xml           | 23 ++--------------------
 .../src/main/resources/OSGI-INF/bundle.info        |  0
 pom.xml                                            |  1 +
 3 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/okhttp-3.13.1/pom.xml b/okhttp-3.14.0/pom.xml
similarity index 90%
rename from okhttp-3.13.1/pom.xml
rename to okhttp-3.14.0/pom.xml
index fe12c50..8e37612 100644
--- a/okhttp-3.13.1/pom.xml
+++ b/okhttp-3.14.0/pom.xml
@@ -30,7 +30,7 @@
 
     <groupId>org.apache.servicemix.bundles</groupId>
     <artifactId>org.apache.servicemix.bundles.okhttp</artifactId>
-    <version>3.13.1_2-SNAPSHOT</version>
+    <version>3.14.0_1-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
     <description>This OSGi bundle wraps ${pkgArtifactId} ${pkgVersion} jar file.</description>
@@ -39,13 +39,12 @@
         <connection>scm:git:https://gitbox.apache.org/repos/asf/servicemix-bundles.git</connection>
         <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/servicemix-bundles.git</developerConnection>
         <url>https://gitbox.apache.org/repos/asf?p=servicemix-bundles.git</url>
-    <tag>HEAD</tag>
   </scm>
 
     <properties>
         <pkgGroupId>com.squareup.okhttp3</pkgGroupId>
         <pkgArtifactId>okhttp</pkgArtifactId>
-        <pkgVersion>3.13.1</pkgVersion>
+        <pkgVersion>3.14.0</pkgVersion>
         <servicemix.osgi.export.pkg>
             okhttp3
         </servicemix.osgi.export.pkg>
@@ -78,17 +77,6 @@
         </dependency>
         <dependency>
             <groupId>${pkgGroupId}</groupId>
-            <artifactId>okhttp-apache</artifactId>
-            <version>${pkgVersion}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>${pkgGroupId}</groupId>
-                    <artifactId>okhttp</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>${pkgGroupId}</groupId>
             <artifactId>logging-interceptor</artifactId>
             <version>${pkgVersion}</version>
             <exclusions>
@@ -116,13 +104,6 @@
         </dependency>
         <dependency>
             <groupId>${pkgGroupId}</groupId>
-            <artifactId>okhttp-apache</artifactId>
-            <version>${pkgVersion}</version>
-            <classifier>sources</classifier>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>${pkgGroupId}</groupId>
             <artifactId>logging-interceptor</artifactId>
             <version>${pkgVersion}</version>
             <classifier>sources</classifier>
diff --git a/okhttp-3.13.1/src/main/resources/OSGI-INF/bundle.info b/okhttp-3.14.0/src/main/resources/OSGI-INF/bundle.info
similarity index 100%
rename from okhttp-3.13.1/src/main/resources/OSGI-INF/bundle.info
rename to okhttp-3.14.0/src/main/resources/OSGI-INF/bundle.info
diff --git a/pom.xml b/pom.xml
index f580715..1fd48e7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,6 +60,7 @@
       <module>lucene-queries-8.0.0</module>
       <module>lucene-queryparser-8.0.0</module>
       <module>lucene-sandbox-8.0.0</module>
+      <module>okhttp-3.14.0</module>
     </modules>
 
 </project>