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 2016/01/16 08:02:30 UTC
[2/2] servicemix-bundles git commit: Merge branch 'SM-2812' of
https://github.com/oscerd/servicemix-bundles
Merge branch 'SM-2812' 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/a390d01a
Tree: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/tree/a390d01a
Diff: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/diff/a390d01a
Branch: refs/heads/master
Commit: a390d01a00aa6f348da4f2f61cc43889b1b0c801
Parents: 3b99aa5 6aa368b
Author: Freeman Fang <fr...@gmail.com>
Authored: Sat Jan 16 15:02:07 2016 +0800
Committer: Freeman Fang <fr...@gmail.com>
Committed: Sat Jan 16 15:02:07 2016 +0800
----------------------------------------------------------------------
bazaarvoice-jolt-0.0.20/pom.xml | 129 +++++++++++++++++++
.../src/main/resources/OSGI-INF/bundle.info | 12 ++
pom.xml | 1 +
3 files changed, 142 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/a390d01a/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 10e9fe6,89a9988..1eec20d
--- a/pom.xml
+++ b/pom.xml
@@@ -43,7 -43,7 +43,8 @@@
<modules>
<!-- add modules for all bundles to released in the next batch here -->
+ <module>facebook4j-2.4.2</module>
+ <module>bazaarvoice-jolt-0.0.20</module>
</modules>
</project>