[servicemix-bundles] branch master updated: [SM-5417] Clean okhttp and okio bundles

[jbonofre]

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 2eb4d093a [SM-5417] Clean okhttp and okio bundles
2eb4d093a is described below

commit 2eb4d093a183831655329cfa78aa40515eb94358
Author: Jean-Baptiste Onofré <jbono...@apache.org>
AuthorDate: Sun Jan 1 18:35:24 2023 +0100

    [SM-5417] Clean okhttp and okio bundles
---
 okhttp-4.10.0/pom.xml | 5 ++++-
 okio-3.2.0/pom.xml    | 5 +++--
 pom.xml               | 2 ++
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/okhttp-4.10.0/pom.xml b/okhttp-4.10.0/pom.xml
index 397d854e4..bb2ac6e4e 100644
--- a/okhttp-4.10.0/pom.xml
+++ b/okhttp-4.10.0/pom.xml
@@ -39,7 +39,6 @@
         
<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>
@@ -51,6 +50,7 @@
             okhttp3
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
+            !okhttp3*,
             okio;version="[3.0.0,4)",
             org.apache.http.*;resolution:=optional,
             org.bouncycastle.*;resolution:=optional,
@@ -60,6 +60,9 @@
             android.security.*;resolution:=optional,
             android.util.*;resolution:=optional,
             org.conscrypt.*;resolution:=optional,
+            kotlin*;resolution:=optional,
+            sun.security.ssl;resolution:=optional,
+            dalvik.system;resolution:=optional,
             *
         </servicemix.osgi.import.pkg>
     </properties>
diff --git a/okio-3.2.0/pom.xml b/okio-3.2.0/pom.xml
index 0f2730f6d..b12a807f7 100644
--- a/okio-3.2.0/pom.xml
+++ b/okio-3.2.0/pom.xml
@@ -39,18 +39,19 @@
         
<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.okio</pkgGroupId>
         <pkgArtifactId>okio</pkgArtifactId>
         <pkgVersion>3.2.0</pkgVersion>
-       <servicemix.osgi.source.version>3.2.0.1</servicemix.osgi.source.version>
+             
<servicemix.osgi.source.version>3.2.0.1</servicemix.osgi.source.version>
         <servicemix.osgi.export.pkg>
             okio
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
+            !okio*,
+            kotlin*;resolution:=optional,
             *
         </servicemix.osgi.import.pkg>
     </properties>
diff --git a/pom.xml b/pom.xml
index a2ce5decc..358f591ef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -111,6 +111,8 @@
       <module>spring-security-taglibs-5.8.1</module>
       <module>spring-security-test-5.8.1</module>
       <module>spring-security-web-5.8.1</module>
+      <module>okhttp-4.10.0</module>
+      <module>okio-3.2.0</module>
     </modules>
 
 </project>