1
0
mirror of https://github.com/square/okhttp.git synced 2025-08-08 23:42:08 +03:00

Make OkHttp OSGi ready

This commit is contained in:
lburgazzoli
2016-01-05 09:22:11 +01:00
parent 20653ad0e1
commit 2b29196ee2
6 changed files with 116 additions and 0 deletions

View File

@@ -9,6 +9,7 @@
<version>3.0.0-SNAPSHOT</version> <version>3.0.0-SNAPSHOT</version>
</parent> </parent>
<packaging>bundle</packaging>
<artifactId>okhttp-apache</artifactId> <artifactId>okhttp-apache</artifactId>
<name>OkHttp Apache HttpClient</name> <name>OkHttp Apache HttpClient</name>
@@ -56,6 +57,20 @@
</links> </links>
</configuration> </configuration>
</plugin> </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> </plugins>
</build> </build>
</project> </project>

View File

@@ -9,6 +9,7 @@
<version>3.0.0-SNAPSHOT</version> <version>3.0.0-SNAPSHOT</version>
</parent> </parent>
<packaging>bundle</packaging>
<artifactId>logging-interceptor</artifactId> <artifactId>logging-interceptor</artifactId>
<name>OkHttp Logging Interceptor</name> <name>OkHttp Logging Interceptor</name>
@@ -37,4 +38,24 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </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> </project>

View File

@@ -9,6 +9,7 @@
<version>3.0.0-SNAPSHOT</version> <version>3.0.0-SNAPSHOT</version>
</parent> </parent>
<packaging>bundle</packaging>
<artifactId>okhttp-urlconnection</artifactId> <artifactId>okhttp-urlconnection</artifactId>
<name>OkHttp URLConnection</name> <name>OkHttp URLConnection</name>
@@ -50,6 +51,29 @@
</links> </links>
</configuration> </configuration>
</plugin> </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> </plugins>
</build> </build>
</project> </project>

View File

@@ -9,6 +9,7 @@
<version>3.0.0-SNAPSHOT</version> <version>3.0.0-SNAPSHOT</version>
</parent> </parent>
<packaging>bundle</packaging>
<artifactId>okhttp-ws</artifactId> <artifactId>okhttp-ws</artifactId>
<name>OkHttp Web Sockets</name> <name>OkHttp Web Sockets</name>
@@ -32,6 +33,23 @@
</links> </links>
</configuration> </configuration>
</plugin> </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> </plugins>
</build> </build>
</project> </project>

View File

@@ -9,6 +9,7 @@
<version>3.0.0-SNAPSHOT</version> <version>3.0.0-SNAPSHOT</version>
</parent> </parent>
<packaging>bundle</packaging>
<artifactId>okhttp</artifactId> <artifactId>okhttp</artifactId>
<name>OkHttp</name> <name>OkHttp</name>
@@ -48,6 +49,25 @@
</links> </links>
</configuration> </configuration>
</plugin> </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> </plugins>
</build> </build>
</project> </project>

18
pom.xml
View File

@@ -58,6 +58,9 @@
<!-- Test Dependencies --> <!-- Test Dependencies -->
<junit.version>4.11</junit.version> <junit.version>4.11</junit.version>
<!-- Plugin Dependencies -->
<maven.bundle.plugin.version>3.0.1</maven.bundle.plugin.version>
</properties> </properties>
<scm> <scm>
@@ -168,6 +171,21 @@
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
<version>2.9</version> <version>2.9</version>
</plugin> </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> </plugins>
</pluginManagement> </pluginManagement>