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:13 UTC

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

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

Branch: refs/heads/master
Commit: c5a9e503d020c4df880ce5cb1e767a586f7fdf39
Parents: 2a0f138 85aa1c0
Author: Andrea Cosentino <an...@gmail.com>
Authored: Fri May 27 09:19:26 2016 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Fri May 27 09:19:26 2016 +0200

----------------------------------------------------------------------
 pom.xml                                      |  1 +
 spring-security-config-3.2.8.RELEASE/pom.xml | 31 +++++++++++++----------
 2 files changed, 18 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/c5a9e503/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 177424b,415be75..e65e7aa
--- a/pom.xml
+++ b/pom.xml
@@@ -69,9 -69,7 +69,10 @@@
          <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>
+         <module>spring-security-config-3.2.8.RELEASE</module>
      </modules>
  
  </project>