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:38:48 UTC
[2/2] servicemix-bundles git commit: Merge branch 'SM-2755' of
https://github.com/oscerd/servicemix-bundles
Merge branch 'SM-2755' 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/9428f22e
Tree: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/tree/9428f22e
Diff: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/diff/9428f22e
Branch: refs/heads/master
Commit: 9428f22e831e6b4d3cc8c912b3ffe584417b2607
Parents: 2599a62 f9900ed
Author: Freeman Fang <fr...@gmail.com>
Authored: Fri Dec 4 09:38:25 2015 +0800
Committer: Freeman Fang <fr...@gmail.com>
Committed: Fri Dec 4 09:38:25 2015 +0800
----------------------------------------------------------------------
facebook4j-2.4.0/pom.xml | 109 +++++++++++++++++++
.../src/main/resources/OSGI-INF/bundle.info | 11 ++
pom.xml | 2 +-
3 files changed, 121 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/9428f22e/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 1829f65,55b8d69..bd215bc
--- a/pom.xml
+++ b/pom.xml
@@@ -42,7 -42,8 +42,7 @@@
<name>Apache ServiceMix :: Bundles</name>
<modules>
-- <!-- add modules for all bundles to released in the next batch here -->
+ <module>facebook4j-2.4.0</module>
</modules>
</project>