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:30:28 UTC
[2/2] servicemix-bundles git commit: Merge branch 'SM-2762' of
https://github.com/oscerd/servicemix-bundles
Merge branch 'SM-2762' 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/5ed34c62
Tree: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/tree/5ed34c62
Diff: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/diff/5ed34c62
Branch: refs/heads/master
Commit: 5ed34c626ae787b1e8d308eab9e97619f808254b
Parents: 8720607 02db11f
Author: Freeman Fang <fr...@gmail.com>
Authored: Tue Dec 8 10:29:43 2015 +0800
Committer: Freeman Fang <fr...@gmail.com>
Committed: Tue Dec 8 10:29:43 2015 +0800
----------------------------------------------------------------------
gae-1.9.30/pom.xml | 146 +++++++++++++++++++
.../src/main/resources/OSGI-INF/bundle.info | 13 ++
pom.xml | 1 +
3 files changed, 160 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/5ed34c62/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index bf23be2,8f1f034..de675e4
--- a/pom.xml
+++ b/pom.xml
@@@ -47,8 -47,7 +47,9 @@@
<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>
+ <module>gae-1.9.30</module>
</modules>
</project>