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/06 08:36:07 UTC

[7/8] servicemix-bundles git commit: Merge branch 'SM-2981' of https://github.com/lburgazzoli/apache-servicemix-bundles

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

Branch: refs/heads/master
Commit: e9a166c4773f7cbfa3d2b74a4cd0e7f8193a66f8
Parents: 392f340 388ce96
Author: Andrea Cosentino <an...@gmail.com>
Authored: Fri May 6 10:29:45 2016 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Fri May 6 10:29:45 2016 +0200

----------------------------------------------------------------------
 orbitz-consul-client-0.11.1/pom.xml             | 120 +++++++++++++++++++
 .../src/main/resources/OSGI-INF/bundle.info     |  11 ++
 pom.xml                                         |   1 +
 3 files changed, 132 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/e9a166c4/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index aabe11a,ca67a36..ad46609
--- a/pom.xml
+++ b/pom.xml
@@@ -43,9 -43,55 +43,10 @@@
  
      <modules>
          <!-- add modules for all bundles to released in the next batch here -->
 -        <module>elasticsearch-2.3.0</module>
 -        <module>hystrix-event-stream-1.5.2</module>
 -        <module>hystrix-1.5.2</module>
 -        <module>hystrix-1.4.26</module>
 -        <module>hystrix-1.4.23</module>
 -        <module>hystrix-1.3.13</module>
 -        <module>jnats-0.4.1</module>
 -        <module>solr-solrj-6.0.0</module>
 -        <module>lucene-6.0.0</module>
 -        <module>lucene-analyzers-common-6.0.0</module>
 -        <module>lucene-queries-6.0.0</module>
 -        <module>lucene-queryparser-6.0.0</module>
 -        <module>lucene-sandbox-6.0.0</module>
 -        <module>okio-1.7.0</module>
 -        <module>retrofit-2.0.1</module>
 -        <module>spring-security-web-4.0.4.RELEASE</module>
 -        <module>spring-security-acl-4.0.4.RELEASE</module>
 -        <module>spring-security-taglibs-4.0.4.RELEASE</module>
 -        <module>jt400-9.0</module>
 -        <module>ironmq-3.0.3</module>
 -        <module>ironmq-3.0.4</module>
 -        <module>brave-zipkin-3.5.0</module>
 -        <module>jedis-2.4.0</module>
 -        <module>opensaml-3.2.0</module>
 -        <module>dbunit-2.5.2</module>
 -        <module>qpid-6.0.2</module>
 -        <module>elasticsearch-repository-hdfs-2.3.0</module>
 -        <module>spring-batch-core-3.0.7.RELEASE</module>
 -        <module>spring-batch-infrastructure-3.0.7.RELEASE</module>
 -        <module>swagger-annotations-1.3.13</module>
 -        <module>swagger-core-1.3.13</module>
 -        <module>swagger-jaxrs-1.3.13</module>
 -        <module>retrofit-2.0.2</module>
 -        <module>spring-xml-2.3.0.RELEASE</module>
 -        <module>ognl-3.1.4</module>
 -        <module>gae-1.9.36</module>
 -        <module>braintree-java-2.61.0</module>
 -        <module>aws-java-sdk-1.10.73</module>
 -        <module>htmlunit-2.21</module>
 -        <module>hbase-1.2.1</module>
 -        <module>quartz-2.2.3</module>
 -        <module>spring-ws-core-2.3.0.RELEASE</module>
 -        <module>spring-ws-security-2.3.0.RELEASE</module>
 -        <module>spring-ws-support-2.3.0.RELEASE</module>
 -        <module>spring-ws-test-2.3.0.RELEASE</module>
 -        <module>ant-1.9.7</module>
 -        <module>elasticsearch-2.3.1</module>
 -        <module>avro-1.8.0</module>
 +        <module>brave-zipkin-3.6.0</module>
 +        <module>orbitz-consul-client-0.11.0</module>
 +        <module>okio-1.8.0</module>
+         <module>orbitz-consul-client-0.11.1</module>
      </modules>
  
  </project>