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/11/12 02:51:08 UTC
[2/2] servicemix-bundles git commit: Merge branch 'aws-sdk-1.10.32'
of https://github.com/oscerd/servicemix-bundles
Merge branch 'aws-sdk-1.10.32' 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/0d1e8214
Tree: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/tree/0d1e8214
Diff: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/diff/0d1e8214
Branch: refs/heads/master
Commit: 0d1e8214e8b4ce8a94c67ff0d37d4f1ccfbe9ab3
Parents: 84a57b7 6ff53dd
Author: Freeman Fang <fr...@gmail.com>
Authored: Thu Nov 12 09:50:32 2015 +0800
Committer: Freeman Fang <fr...@gmail.com>
Committed: Thu Nov 12 09:50:32 2015 +0800
----------------------------------------------------------------------
aws-java-sdk-1.10.32/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/0d1e8214/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index c5eb0e6,955a82d..8c8a8df
--- a/pom.xml
+++ b/pom.xml
@@@ -44,7 -44,7 +44,8 @@@
<modules>
<!-- add modules for all bundles to released in the next batch here -->
<module>cglib-3.2.0</module>
+ <module>aws-java-sdk-1.10.31</module>
+ <module>aws-java-sdk-1.10.32</module>
</modules>
</project>