Merge branch 'SM-2756' 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/83bbab2c
Tree: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/tree/83bbab2c
Diff: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/diff/83bbab2c
Branch: refs/heads/master
Commit: 83bbab2c458f54d880ae72d013dad2fafe13ffd7
Parents: 9428f22 f63183e
Author: Freeman Fang <[email protected]>
Authored: Fri Dec 4 09:44:41 2015 +0800
Committer: Freeman Fang <[email protected]>
Committed: Fri Dec 4 09:44:41 2015 +0800
----------------------------------------------------------------------
facebook4j-2.4.1/pom.xml | 109 +++++++++++++++++++
.../src/main/resources/OSGI-INF/bundle.info | 11 ++
pom.xml | 2 +
3 files changed, 122 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/83bbab2c/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index bd215bc,990a655..e835235
--- a/pom.xml
+++ b/pom.xml
@@@ -42,7 -42,8 +42,9 @@@
<name>Apache ServiceMix :: Bundles</name>
<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>
</modules>
</project>
