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 2022/05/27 16:40:04 UTC

[servicemix-bundles] branch master updated: [SM-5180] Create OSGi bundle for okhttp 4.9.3

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 5a31e20cb [SM-5180] Create OSGi bundle for okhttp 4.9.3
     new 1f5975db5 This closes #173
5a31e20cb is described below

commit 5a31e20cba8a7a4b53595cb2e29dc9164cca7b4d
Author: Ciprian Ciubotariu <ch...@gmx.net>
AuthorDate: Fri May 27 03:28:22 2022 +0300

    [SM-5180] Create OSGi bundle for okhttp 4.9.3
---
 {okhttp-4.9.0 => okhttp-4.9.3}/pom.xml                     | 14 +++++++++-----
 .../src/main/resources/OSGI-INF/bundle.info                |  0
 pom.xml                                                    |  1 +
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/okhttp-4.9.0/pom.xml b/okhttp-4.9.3/pom.xml
similarity index 94%
rename from okhttp-4.9.0/pom.xml
rename to okhttp-4.9.3/pom.xml
index 81c2a91a0..2f7648112 100644
--- a/okhttp-4.9.0/pom.xml
+++ b/okhttp-4.9.3/pom.xml
@@ -24,13 +24,13 @@
     <parent>
         <groupId>org.apache.servicemix.bundles</groupId>
         <artifactId>bundles-pom</artifactId>
-        <version>14</version>
+        <version>15-SNAPSHOT</version>
         <relativePath>../bundles-pom/pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.servicemix.bundles</groupId>
     <artifactId>org.apache.servicemix.bundles.okhttp</artifactId>
-    <version>4.9.0_2-SNAPSHOT</version>
+    <version>4.9.3_1-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
     <description>This OSGi bundle wraps ${pkgArtifactId} ${pkgVersion} jar file.</description>
@@ -39,21 +39,25 @@
         <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>4.9.0</pkgVersion>
+        <pkgVersion>4.9.3</pkgVersion>
+        <servicemix.osgi.source.version>4.9.3.1</servicemix.osgi.source.version>
         <servicemix.osgi.export.pkg>
             okhttp3
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
             okio;version="[1.11.0,3)",
             org.apache.http.*;resolution:=optional,
-            android.util.*;resolution:=optional,
+	          org.bouncycastle.*;resolution:=optional,
+	          org.openjsse.*;resolution:=optional,
+            android.net.*;resolution:=optional,
             android.os.*;resolution:=optional,
+            android.security.*;resolution:=optional,
+            android.util.*;resolution:=optional,
             org.conscrypt.*;resolution:=optional,
             *
         </servicemix.osgi.import.pkg>
diff --git a/okhttp-4.9.0/src/main/resources/OSGI-INF/bundle.info b/okhttp-4.9.3/src/main/resources/OSGI-INF/bundle.info
similarity index 100%
rename from okhttp-4.9.0/src/main/resources/OSGI-INF/bundle.info
rename to okhttp-4.9.3/src/main/resources/OSGI-INF/bundle.info
diff --git a/pom.xml b/pom.xml
index 1d1f9388b..48a786e13 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,6 +43,7 @@
     <modules>
       <module>bundles-pom</module>
       <module>azure-core-http-okhttp-1.9.0</module>
+      <module>okhttp-4.9.3</module>
     </modules>
 
 </project>