You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ff...@apache.org on 2015/12/08 03:27:23 UTC
[2/2] servicemix-bundles git commit: Merge branch 'SM-2761' of
https://github.com/oscerd/servicemix-bundles
Merge branch 'SM-2761' of https://github.com/oscerd/servicemix-bundles
Conflicts:
pom.xml
Project: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/commit/87206077
Tree: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/tree/87206077
Diff: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/diff/87206077
Branch: refs/heads/master
Commit: 87206077f293bd5a3dea099ae906a197376d33c0
Parents: 09b7fc4 57fdd35
Author: Freeman Fang <fr...@gmail.com>
Authored: Tue Dec 8 10:26:54 2015 +0800
Committer: Freeman Fang <fr...@gmail.com>
Committed: Tue Dec 8 10:26:54 2015 +0800
----------------------------------------------------------------------
elasticsearch-2.0.1/pom.xml | 136 +++++++++++++++++++
.../src/main/resources/OSGI-INF/bundle.info | 17 +++
pom.xml | 1 +
3 files changed, 154 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/87206077/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index ced4f48,fcd3b37..bf23be2
--- a/pom.xml
+++ b/pom.xml
@@@ -47,7 -47,7 +47,8 @@@
<module>facebook4j-2.4.1</module>
<module>docker-java-2.1.2</module>
<module>aws-java-sdk-1.10.38</module>
+ <module>aws-java-sdk-1.10.39</module>
+ <module>elasticsearch-2.0.1</module>
</modules>
</project>