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/04 02:53:10 UTC
[2/2] servicemix-bundles git commit: Merge branch 'SM-2757' of
https://github.com/oscerd/servicemix-bundles
Merge branch 'SM-2757' 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/92c2bf54
Tree: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/tree/92c2bf54
Diff: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/diff/92c2bf54
Branch: refs/heads/master
Commit: 92c2bf547c47d129750a78c3417241eaf2302ba2
Parents: 83bbab2 d283f21
Author: Freeman Fang <fr...@gmail.com>
Authored: Fri Dec 4 09:52:51 2015 +0800
Committer: Freeman Fang <fr...@gmail.com>
Committed: Fri Dec 4 09:52:51 2015 +0800
----------------------------------------------------------------------
docker-java-2.1.2/pom.xml | 107 +++++++++++++++++++
.../src/main/resources/OSGI-INF/bundle.info | 11 ++
pom.xml | 1 +
3 files changed, 119 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/92c2bf54/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index e835235,1e1845e..144c9d5
--- a/pom.xml
+++ b/pom.xml
@@@ -43,8 -43,7 +43,9 @@@
<modules>
<!-- add modules for all bundles to released in the next batch here -->
+ <module>facebook4j-2.4.0</module>
+ <module>facebook4j-2.4.1</module>
+ <module>docker-java-2.1.2</module>
</modules>
</project>