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 2016/03/23 16:06:42 UTC
[1/2] servicemix-bundles git commit: SM-2892 : Create OSGi bundle or
Squareup OkHttp 3.2.0
Repository: servicemix-bundles
Updated Branches:
refs/heads/master 6d3ebc703 -> 04f6e5ce7
SM-2892 : Create OSGi bundle or Squareup OkHttp 3.2.0
Project: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/commit/748b7005
Tree: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/tree/748b7005
Diff: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/diff/748b7005
Branch: refs/heads/master
Commit: 748b700565f3042ed069f557c32ffc05e17f012e
Parents: 3283fd3
Author: lburgazzoli <lb...@gmail.com>
Authored: Mon Feb 29 12:12:47 2016 +0100
Committer: lburgazzoli <lb...@gmail.com>
Committed: Mon Feb 29 12:12:47 2016 +0100
----------------------------------------------------------------------
okhttp-3.2.0/pom.xml | 215 +++++++++++++++++++
.../src/main/resources/OSGI-INF/bundle.info | 11 +
pom.xml | 1 +
3 files changed, 227 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/748b7005/okhttp-3.2.0/pom.xml
----------------------------------------------------------------------
diff --git a/okhttp-3.2.0/pom.xml b/okhttp-3.2.0/pom.xml
new file mode 100644
index 0000000..e320b54
--- /dev/null
+++ b/okhttp-3.2.0/pom.xml
@@ -0,0 +1,215 @@
+<?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>12</version>
+ <relativePath>../bundles-pom/pom.xml</relativePath>
+ </parent>
+
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.okhttp</artifactId>
+ <version>3.2.0_1-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.2.0</pkgVersion>
+ <servicemix.osgi.export.pkg>
+ okhttp3.*;version=${pkgVersion};-split-package:=merge-first
+ </servicemix.osgi.export.pkg>
+ <servicemix.osgi.import.pkg>
+ org.apache.http.*;resolution:=optional,
+ android.util.*;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-ws</artifactId>
+ <version>${pkgVersion}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>${pkgGroupId}</groupId>
+ <artifactId>okhttp</artifactId>
+ </exclusion>
+ </exclusions>
+ </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-ws</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-ws</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-ws</artifact>
+ <excludes>
+ <exclude>**</exclude>
+ </excludes>
+ </filter>
+ <filter>
+ <artifact>${pkgGroupId}:okhttp-ws</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/748b7005/okhttp-3.2.0/src/main/resources/OSGI-INF/bundle.info
----------------------------------------------------------------------
diff --git a/okhttp-3.2.0/src/main/resources/OSGI-INF/bundle.info b/okhttp-3.2.0/src/main/resources/OSGI-INF/bundle.info
new file mode 100644
index 0000000..b06d196
--- /dev/null
+++ b/okhttp-3.2.0/src/main/resources/OSGI-INF/bundle.info
@@ -0,0 +1,11 @@
+\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
http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/748b7005/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 92b311f..20f2b42 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,6 +53,7 @@
<module>lucene-queryparser-5.5.0</module>
<module>lucene-sandbox-5.5.0</module>
<module>solr-solrj-5.5.0</module>
+ <module>okhttp-3.2.0</module>
</modules>
</project>
[2/2] servicemix-bundles git commit: SM-2892 - This closes #60,
closes #59, closes #58
Posted by jb...@apache.org.
SM-2892 - This closes #60, closes #59, closes #58
Merge branch 'squareup-okhttp-3' of https://github.com/lburgazzoli/apache-servicemix-bundles
Project: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/commit/04f6e5ce
Tree: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/tree/04f6e5ce
Diff: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/diff/04f6e5ce
Branch: refs/heads/master
Commit: 04f6e5ce78529e66c8416355d0161a96d515077c
Parents: 6d3ebc7 748b700
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Wed Mar 23 16:01:40 2016 +0100
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Wed Mar 23 16:01:40 2016 +0100
----------------------------------------------------------------------
okhttp-3.2.0/pom.xml | 215 +++++++++++++++++++
.../src/main/resources/OSGI-INF/bundle.info | 11 +
pom.xml | 1 +
3 files changed, 227 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/04f6e5ce/okhttp-3.2.0/pom.xml
----------------------------------------------------------------------
diff --cc okhttp-3.2.0/pom.xml
index 0000000,e320b54..8be1e70
mode 000000,100644..100644
--- a/okhttp-3.2.0/pom.xml
+++ b/okhttp-3.2.0/pom.xml
@@@ -1,0 -1,215 +1,215 @@@
+ <?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>12</version>
+ <relativePath>../bundles-pom/pom.xml</relativePath>
+ </parent>
+
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.okhttp</artifactId>
+ <version>3.2.0_1-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.2.0</pkgVersion>
+ <servicemix.osgi.export.pkg>
- okhttp3.*;version=${pkgVersion};-split-package:=merge-first
++ okhttp3
+ </servicemix.osgi.export.pkg>
+ <servicemix.osgi.import.pkg>
+ org.apache.http.*;resolution:=optional,
+ android.util.*;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-ws</artifactId>
+ <version>${pkgVersion}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>${pkgGroupId}</groupId>
+ <artifactId>okhttp</artifactId>
+ </exclusion>
+ </exclusions>
+ </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-ws</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-ws</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-ws</artifact>
+ <excludes>
+ <exclude>**</exclude>
+ </excludes>
+ </filter>
+ <filter>
+ <artifact>${pkgGroupId}:okhttp-ws</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/04f6e5ce/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index cf79460,20f2b42..f4f4820
--- a/pom.xml
+++ b/pom.xml
@@@ -55,15 -53,7 +55,16 @@@
<module>lucene-queryparser-5.5.0</module>
<module>lucene-sandbox-5.5.0</module>
<module>solr-solrj-5.5.0</module>
+ <module>jedis-2.8.0</module>
+ <module>aws-java-sdk-1.10.60</module>
+ <module>xstream-1.4.9</module>
+ <module>elasticsearch-2.2.1</module>
+ <module>facebook4j-2.4.3</module>
+ <module>gson-2.1</module>
+ <module>ironmq-3.0.3</module>
+ <module>okio-1.6.0</module>
+ <module>okhttp-2.7.5</module>
+ <module>okhttp-3.2.0</module>
</modules>
</project>