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/03/30 07:30:38 UTC

[servicemix-bundles] 04/07: [SM-5078] Create OSGi bundle for azure-core-http-okhttp 1.7.10

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

commit 001a579e26f7988b6488848df876ff5c4e44ce88
Author: Jean-Baptiste Onofré <jb...@apache.org>
AuthorDate: Tue Mar 29 14:59:58 2022 +0200

    [SM-5078] Create OSGi bundle for azure-core-http-okhttp 1.7.10
---
 .../pom.xml                                        | 55 ++++++++++++++++++++--
 .../src/main/resources/OSGI-INF/bundle.info        |  0
 pom.xml                                            |  1 +
 3 files changed, 52 insertions(+), 4 deletions(-)

diff --git a/azure-core-http-okhttp-1.7.3/pom.xml b/azure-core-http-okhttp-1.7.10/pom.xml
similarity index 71%
rename from azure-core-http-okhttp-1.7.3/pom.xml
rename to azure-core-http-okhttp-1.7.10/pom.xml
index 3c39561..5d1b172 100644
--- a/azure-core-http-okhttp-1.7.3/pom.xml
+++ b/azure-core-http-okhttp-1.7.10/pom.xml
@@ -30,7 +30,7 @@
 
     <groupId>org.apache.servicemix.bundles</groupId>
     <artifactId>org.apache.servicemix.bundles.azure-core-http-okhttp</artifactId>
-    <version>1.7.3_2-SNAPSHOT</version>
+    <version>1.7.10_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.azure</pkgGroupId>
         <pkgArtifactId>azure-core-http-okhttp</pkgArtifactId>
-        <pkgVersion>1.7.3</pkgVersion>
+        <pkgVersion>1.7.10</pkgVersion>
         <servicemix.osgi.export.pkg>
             com.azure.core.http.okhttp
          </servicemix.osgi.export.pkg>
@@ -53,9 +52,17 @@
 	    !com.azure.core.http.okhttp.implementation,
 	    org.reactivestreams;resolution:=optional,
 	    reactor*;resolution:=optional,
+            android*;resolution:=optional,
+	    org.conscrypt*;resolution:=optional,
+	    org.openjsse*;resolution:=optional,
+	    org.bouncycastle*;resolution:=optional,
+	    com.sun*;resolution:=optional,
             *
         </servicemix.osgi.import.pkg>
-        <servicemix.osgi.private.pkg>
+	<servicemix.osgi.private.pkg>
+	    okhttp3*,
+	    kotlin*,
+	    okio*,
             META-INF.services
         </servicemix.osgi.private.pkg>
     </properties>
@@ -67,6 +74,41 @@
             <version>${pkgVersion}</version>
         </dependency>
 
+	<!-- https://mvnrepository.com/artifact/com.squareup.okhttp3/okhttp -->
+	<dependency>
+	    <groupId>com.squareup.okhttp3</groupId>
+	    <artifactId>okhttp</artifactId>
+	    <version>4.9.3</version>
+	</dependency>
+
+	<!-- https://mvnrepository.com/artifact/com.squareup.okio/okio -->
+	<dependency>
+	    <groupId>com.squareup.okio</groupId>
+	    <artifactId>okio</artifactId>
+	    <version>2.8.0</version>
+	</dependency>
+
+	<!-- https://mvnrepository.com/artifact/org.jetbrains.kotlin/kotlin-stdlib -->
+	<dependency>
+	    <groupId>org.jetbrains.kotlin</groupId>
+ 	    <artifactId>kotlin-stdlib</artifactId>
+	    <version>1.6.10</version>
+	</dependency>
+
+	<!-- https://mvnrepository.com/artifact/org.jetbrains.kotlin/kotlin-stdlib-common -->
+	<dependency>
+	    <groupId>org.jetbrains.kotlin</groupId>
+	    <artifactId>kotlin-stdlib-common</artifactId>
+	    <version>1.6.10</version>
+	</dependency>
+
+	<!-- https://mvnrepository.com/artifact/org.jetbrains/annotations -->
+	<dependency>
+	    <groupId>org.jetbrains</groupId>
+	    <artifactId>annotations</artifactId>
+	    <version>23.0.0</version>
+	</dependency>
+
         <!-- sources -->
         <dependency>
             <groupId>${pkgGroupId}</groupId>
@@ -92,6 +134,11 @@
                             <artifactSet>
                                 <includes>
                                     <include>${pkgGroupId}:${pkgArtifactId}</include>
+				    <include>com.squareup.okhttp3:okhttp</include>
+				    <include>com.squareup.okio:okio</include>
+				    <include>org.jetbrains.kotlin:kotlin-stdlib</include>
+				    <include>org.jetbrains.kotlin:kotlin-stdlib-common</include>
+				    <include>org.jetbrains:anotations</include>
                                 </includes>
                             </artifactSet>
                             <filters>
diff --git a/azure-core-http-okhttp-1.7.3/src/main/resources/OSGI-INF/bundle.info b/azure-core-http-okhttp-1.7.10/src/main/resources/OSGI-INF/bundle.info
similarity index 100%
rename from azure-core-http-okhttp-1.7.3/src/main/resources/OSGI-INF/bundle.info
rename to azure-core-http-okhttp-1.7.10/src/main/resources/OSGI-INF/bundle.info
diff --git a/pom.xml b/pom.xml
index 82ae7d5..036f4fc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -94,6 +94,7 @@
       <module>azure-core-1.26.0</module>
       <module>azure-core-amqp-2.4.1</module>
       <module>azure-core-http-netty-1.11.8</module>
+      <module>azure-core-http-okhttp-1.7.10</module>
     </modules>
 
 </project>