servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject [servicemix-bundles] branch master updated: [SM-4364] Create OSGi bundle for okhttp 4.5.0
Date Mon, 27 Apr 2020 08:51:35 GMT
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 bda5fe9  [SM-4364] Create OSGi bundle for okhttp 4.5.0
bda5fe9 is described below

commit bda5fe99e6531bcf62e14cc9354d79d48b2f0879
Author: Jean-Baptiste Onofré <jbonofre@apache.org>
AuthorDate: Mon Apr 27 10:51:04 2020 +0200

    [SM-4364] Create OSGi bundle for okhttp 4.5.0
---
 .../src/main/resources/OSGI-INF/bundle.info        |  11 --
 okhttp-4.4.1/pom.xml                               | 169 ---------------------
 {okhttp-4.3.1 => okhttp-4.5.0}/pom.xml             |   5 +-
 .../src/main/resources/OSGI-INF/bundle.info        |   0
 pom.xml                                            |   1 +
 5 files changed, 3 insertions(+), 183 deletions(-)

diff --git a/okhttp-4.3.1/src/main/resources/OSGI-INF/bundle.info b/okhttp-4.3.1/src/main/resources/OSGI-INF/bundle.info
deleted file mode 100644
index b06d196..0000000
--- a/okhttp-4.3.1/src/main/resources/OSGI-INF/bundle.info
+++ /dev/null
@@ -1,11 +0,0 @@
-\u001B[1mSYNOPSIS\u001B[0m
-    ${project.description}
-
-    Original Maven URL:
-        \u001B[33mmvn:${pkgGroupId}/${pkgArtifactId}\u001B[0m
-
-\u001B[1mDESCRIPTION\u001B[0m
-    An HTTP & HTTP/2 client for Android and Java applications.
-
-\u001B[1mSEE ALSO\u001B[0m
-    \u001B[36mhttp://square.github.io/okhttp/\u001B[0m
diff --git a/okhttp-4.4.1/pom.xml b/okhttp-4.4.1/pom.xml
deleted file mode 100644
index 4bdb8b2..0000000
--- a/okhttp-4.4.1/pom.xml
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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">
-
-    <!--
-
-        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.
-    -->
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.servicemix.bundles</groupId>
-        <artifactId>bundles-pom</artifactId>
-        <version>14</version>
-        <relativePath>../bundles-pom/pom.xml</relativePath>
-    </parent>
-
-    <groupId>org.apache.servicemix.bundles</groupId>
-    <artifactId>org.apache.servicemix.bundles.okhttp</artifactId>
-    <version>4.4.1_2-SNAPSHOT</version>
-    <packaging>bundle</packaging>
-    <name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
-    <description>This OSGi bundle wraps ${pkgArtifactId} ${pkgVersion} jar file.</description>
-
-    <scm>
-        <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.4.1</pkgVersion>
-        <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,
-            android.os.*;resolution:=optional,
-            org.conscrypt.*;resolution:=optional,
-            *
-        </servicemix.osgi.import.pkg>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>${pkgGroupId}</groupId>
-            <artifactId>okhttp</artifactId>
-            <version>${pkgVersion}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pkgGroupId}</groupId>
-            <artifactId>okhttp-urlconnection</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>
-                <exclusion>
-                    <groupId>${pkgGroupId}</groupId>
-                    <artifactId>okhttp</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <!-- sources -->
-        <dependency>
-            <groupId>${pkgGroupId}</groupId>
-            <artifactId>okhttp</artifactId>
-            <version>${pkgVersion}</version>
-            <classifier>sources</classifier>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>${pkgGroupId}</groupId>
-            <artifactId>okhttp-urlconnection</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>
-            <optional>true</optional>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-                            <artifactSet>
-                                <includes>
-                                    <include>${pkgGroupId}:okhttp</include>
-                                    <include>${pkgGroupId}:okhttp-urlconnection</include>
-                                    <include>${pkgGroupId}:okhttp-apache</include>
-                                    <include>${pkgGroupId}:logging-interceptor</include>
-                                </includes>
-                            </artifactSet>
-                            <filters>
-                                <filter>
-                                    <artifact>${pkgGroupId}:okhttp</artifact>
-                                    <excludes>
-                                        <exclude>**</exclude>
-                                    </excludes>
-                                </filter>
-                                <filter>
-                                    <artifact>${pkgGroupId}:okhttp-urlconnection</artifact>
-                                    <excludes>
-                                        <exclude>**</exclude>
-                                    </excludes>
-                                </filter>
-                                <filter>
-                                    <artifact>${pkgGroupId}:okhttp-apache</artifact>
-                                    <excludes>
-                                        <exclude>**</exclude>
-                                    </excludes>
-                                </filter>
-                                <filter>
-                                    <artifact>${pkgGroupId}:logging-interceptor</artifact>
-                                    <excludes>
-                                        <exclude>**</exclude>
-                                    </excludes>
-                                </filter>
-                            </filters>
-                            <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
-                            <createDependencyReducedPom>true</createDependencyReducedPom>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/okhttp-4.3.1/pom.xml b/okhttp-4.5.0/pom.xml
similarity index 98%
rename from okhttp-4.3.1/pom.xml
rename to okhttp-4.5.0/pom.xml
index b7cc98b..506672b 100644
--- a/okhttp-4.3.1/pom.xml
+++ b/okhttp-4.5.0/pom.xml
@@ -30,7 +30,7 @@
 
     <groupId>org.apache.servicemix.bundles</groupId>
     <artifactId>org.apache.servicemix.bundles.okhttp</artifactId>
-    <version>4.3.1_2-SNAPSHOT</version>
+    <version>4.5.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>4.3.1</pkgVersion>
+        <pkgVersion>4.5.0</pkgVersion>
         <servicemix.osgi.export.pkg>
             okhttp3
         </servicemix.osgi.export.pkg>
diff --git a/okhttp-4.4.1/src/main/resources/OSGI-INF/bundle.info b/okhttp-4.5.0/src/main/resources/OSGI-INF/bundle.info
similarity index 100%
rename from okhttp-4.4.1/src/main/resources/OSGI-INF/bundle.info
rename to okhttp-4.5.0/src/main/resources/OSGI-INF/bundle.info
diff --git a/pom.xml b/pom.xml
index a5b628d..a66b841 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,6 +57,7 @@
          <module>dnsjava-3.0.2</module>
          <module>okio-2.6.0</module>
          <module>grpc-1.29.0</module>
+         <module>okhttp-4.5.0</module>
     </modules>
 
 </project>


Mime
View raw message