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 2018/03/25 07:35:13 UTC
[4/4] servicemix-bundles git commit: Remove old okhttp bundle
Remove old okhttp bundle
Project: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/commit/bfde8ae5
Tree: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/tree/bfde8ae5
Diff: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/diff/bfde8ae5
Branch: refs/heads/master
Commit: bfde8ae5b10d8e396d553d7e10fec79a68175680
Parents: f3aafce
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Sun Mar 25 09:30:58 2018 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Sun Mar 25 09:30:58 2018 +0200
----------------------------------------------------------------------
okhttp-3.9.1/pom.xml | 186 -------------------
.../src/main/resources/OSGI-INF/bundle.info | 11 --
2 files changed, 197 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/bfde8ae5/okhttp-3.9.1/pom.xml
----------------------------------------------------------------------
diff --git a/okhttp-3.9.1/pom.xml b/okhttp-3.9.1/pom.xml
deleted file mode 100644
index 8d0788c..0000000
--- a/okhttp-3.9.1/pom.xml
+++ /dev/null
@@ -1,186 +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>13</version>
- <relativePath>../bundles-pom/pom.xml</relativePath>
- </parent>
-
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.okhttp</artifactId>
- <version>3.9.1_3-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://git-wip-us.apache.org/repos/asf/servicemix-bundles.git</connection>
- <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/servicemix-bundles.git</developerConnection>
- <url>https://git-wip-us.apache.org/repos/asf?p=servicemix-bundles.git</url>
- <tag>HEAD</tag>
- </scm>
-
- <properties>
- <pkgGroupId>com.squareup.okhttp3</pkgGroupId>
- <pkgArtifactId>okhttp</pkgArtifactId>
- <pkgVersion>3.9.1</pkgVersion>
- <servicemix.osgi.export.pkg>
- okhttp3
- </servicemix.osgi.export.pkg>
- <servicemix.osgi.import.pkg>
- okio;version="[1.11.0,2)",
- org.apache.http.*;resolution:=optional,
- android.util.*;resolution:=optional,
- android.os.*;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>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>
- <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>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>
- <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>
http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/bfde8ae5/okhttp-3.9.1/src/main/resources/OSGI-INF/bundle.info
----------------------------------------------------------------------
diff --git a/okhttp-3.9.1/src/main/resources/OSGI-INF/bundle.info b/okhttp-3.9.1/src/main/resources/OSGI-INF/bundle.info
deleted file mode 100644
index b06d196..0000000
--- a/okhttp-3.9.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