From c4dc8725fb7c18cf54526076de7000a7cb0fac62 Mon Sep 17 00:00:00 2001
From: jwilson <jwilson@squareup.com>
Date: Thu, 14 Jan 2016 15:44:21 -0800
Subject: [PATCH] Revert "Make OkHttp OSGi ready"

This reverts commit 2b29196ee2ee0e3cac5cf1fb452d36a2d829a24f.
---
 okhttp-apache/pom.xml              | 15 ---------------
 okhttp-logging-interceptor/pom.xml | 21 ---------------------
 okhttp-urlconnection/pom.xml       | 24 ------------------------
 okhttp-ws/pom.xml                  | 18 ------------------
 okhttp/pom.xml                     | 20 --------------------
 pom.xml                            | 18 ------------------
 6 files changed, 116 deletions(-)

diff --git a/okhttp-apache/pom.xml b/okhttp-apache/pom.xml
index 927b83af3b41..dcf813e04fe4 100644
--- a/okhttp-apache/pom.xml
+++ b/okhttp-apache/pom.xml
@@ -9,7 +9,6 @@
     <version>3.1.0-SNAPSHOT</version>
   </parent>
 
-  <packaging>bundle</packaging>
   <artifactId>okhttp-apache</artifactId>
   <name>OkHttp Apache HttpClient</name>
 
@@ -57,20 +56,6 @@
           </links>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <extensions>true</extensions>
-        <configuration>
-          <instructions>
-            <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
-            <Bundle-Version>${project.version}</Bundle-Version>
-            <Export-Package>
-              okhttp3.apache.*
-            </Export-Package>
-          </instructions>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/okhttp-logging-interceptor/pom.xml b/okhttp-logging-interceptor/pom.xml
index 72b2fca8c7c2..789f0360756d 100644
--- a/okhttp-logging-interceptor/pom.xml
+++ b/okhttp-logging-interceptor/pom.xml
@@ -9,7 +9,6 @@
     <version>3.1.0-SNAPSHOT</version>
   </parent>
 
-  <packaging>bundle</packaging>
   <artifactId>logging-interceptor</artifactId>
   <name>OkHttp Logging Interceptor</name>
 
@@ -38,24 +37,4 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <extensions>true</extensions>
-        <configuration>
-          <instructions>
-            <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
-            <Bundle-Version>${project.version}</Bundle-Version>
-            <Export-Package>
-              okhttp3.logging.*
-            </Export-Package>
-          </instructions>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
 </project>
diff --git a/okhttp-urlconnection/pom.xml b/okhttp-urlconnection/pom.xml
index f1b31f565eda..5004d5fb0d64 100644
--- a/okhttp-urlconnection/pom.xml
+++ b/okhttp-urlconnection/pom.xml
@@ -9,7 +9,6 @@
     <version>3.1.0-SNAPSHOT</version>
   </parent>
 
-  <packaging>bundle</packaging>
   <artifactId>okhttp-urlconnection</artifactId>
   <name>OkHttp URLConnection</name>
 
@@ -51,29 +50,6 @@
           </links>
         </configuration>
       </plugin>
-
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <extensions>true</extensions>
-        <configuration>
-          <instructions>
-            <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
-            <Bundle-Version>${project.version}</Bundle-Version>
-            <Require-Bundle>
-              com.squareup.okhttp3.okhttp
-            </Require-Bundle>
-            <Export-Package>
-              !okhttp3.internal.*,
-              okhttp3.*;-split-package:=merge-first
-            </Export-Package>
-            <Import-Package>
-              android.*;resolution:=optional,
-              *
-            </Import-Package>
-          </instructions>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/okhttp-ws/pom.xml b/okhttp-ws/pom.xml
index aa52f2d8449e..3841ecc74e22 100644
--- a/okhttp-ws/pom.xml
+++ b/okhttp-ws/pom.xml
@@ -9,7 +9,6 @@
     <version>3.1.0-SNAPSHOT</version>
   </parent>
 
-  <packaging>bundle</packaging>
   <artifactId>okhttp-ws</artifactId>
   <name>OkHttp Web Sockets</name>
 
@@ -33,23 +32,6 @@
           </links>
         </configuration>
       </plugin>
-
-
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <extensions>true</extensions>
-        <configuration>
-          <instructions>
-            <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
-            <Bundle-Version>${project.version}</Bundle-Version>
-            <Export-Package>
-              !okhttp3.internal.ws.*,
-              okhttp3.ws.*;-noimport:=true
-            </Export-Package>
-          </instructions>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/okhttp/pom.xml b/okhttp/pom.xml
index a0d48293b17e..8629395db616 100644
--- a/okhttp/pom.xml
+++ b/okhttp/pom.xml
@@ -9,7 +9,6 @@
     <version>3.1.0-SNAPSHOT</version>
   </parent>
 
-  <packaging>bundle</packaging>
   <artifactId>okhttp</artifactId>
   <name>OkHttp</name>
 
@@ -49,25 +48,6 @@
           </links>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <extensions>true</extensions>
-        <configuration>
-          <instructions>
-            <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
-            <Bundle-Version>${project.version}</Bundle-Version>
-            <Export-Package>
-              okhttp3.internal.*;-noimport:=true,
-              okhttp3.*;-noimport:=true
-            </Export-Package>
-            <Import-Package>
-              android.*;resolution:=optional,
-              *
-            </Import-Package>
-          </instructions>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/pom.xml b/pom.xml
index 90994b99a091..772e8a417ce3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,9 +58,6 @@
 
     <!-- Test Dependencies -->
     <junit.version>4.11</junit.version>
-
-    <!-- Plugin Dependencies -->
-    <maven.bundle.plugin.version>3.0.1</maven.bundle.plugin.version>
   </properties>
 
   <scm>
@@ -171,21 +168,6 @@
           <artifactId>maven-javadoc-plugin</artifactId>
           <version>2.9</version>
         </plugin>
-
-        <plugin>
-          <groupId>org.apache.felix</groupId>
-          <artifactId>maven-bundle-plugin</artifactId>
-          <version>${maven.bundle.plugin.version}</version>
-          <extensions>true</extensions>
-          <executions>
-            <execution>
-              <goals>
-                <goal>manifest</goal>
-              </goals>
-            </execution>
-          </executions>
-        </plugin>
-
       </plugins>
     </pluginManagement>