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 03:02:57 UTC
[2/2] servicemix-bundles git commit: Merge branch 'SM-2758' of
https://github.com/oscerd/servicemix-bundles
Merge branch 'SM-2758' 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/f47d6a88
Tree: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/tree/f47d6a88
Diff: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/diff/f47d6a88
Branch: refs/heads/master
Commit: f47d6a8831447dea298d197d52436f09c016b252
Parents: 92c2bf5 f083dca
Author: Freeman Fang <fr...@gmail.com>
Authored: Fri Dec 4 10:02:32 2015 +0800
Committer: Freeman Fang <fr...@gmail.com>
Committed: Fri Dec 4 10:02:32 2015 +0800
----------------------------------------------------------------------
aws-java-sdk-1.10.38/pom.xml | 161 +++++++++++++++++++
.../src/main/resources/OSGI-INF/bundle.info | 24 +++
pom.xml | 1 +
3 files changed, 186 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/f47d6a88/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 144c9d5,47837bf..37bbdbb
--- a/pom.xml
+++ b/pom.xml
@@@ -43,9 -43,7 +43,10 @@@
<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>
+ <module>aws-java-sdk-1.10.38</module>
</modules>
</project>