You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ac...@apache.org on 2016/05/27 07:23:12 UTC

[4/6] servicemix-bundles git commit: Merge branch 'SM-2999' of https://github.com/lburgazzoli/apache-servicemix-bundles

Merge branch 'SM-2999' 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/2a0f1387
Tree: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/tree/2a0f1387
Diff: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/diff/2a0f1387

Branch: refs/heads/master
Commit: 2a0f1387cf2051f4772ba549d262f67b96fad257
Parents: 2c6faee ddb6aaa
Author: Andrea Cosentino <an...@gmail.com>
Authored: Fri May 27 09:17:22 2016 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Fri May 27 09:17:22 2016 +0200

----------------------------------------------------------------------
 okhttp-3.3.0/pom.xml                            | 216 +++++++++++++++++++
 .../src/main/resources/OSGI-INF/bundle.info     |  11 +
 pom.xml                                         |   1 +
 3 files changed, 228 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/2a0f1387/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index f7c7454,0375d00..177424b
--- a/pom.xml
+++ b/pom.xml
@@@ -69,8 -69,7 +69,9 @@@
          <module>kafka_2.10-0.10.0.0</module>
          <module>kafka-clients-0.10.0.0</module>
          <module>facebook4j-2.4.4</module>
 +        <module>hystrix-event-stream-1.5.3</module>
 +        <module>hystrix-1.5.3</module>
+         <module>okhttp-3.3.0</module>
      </modules>
  
  </project>