Merge branch 'SM-2738' 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/069cf2c7
Tree: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/tree/069cf2c7
Diff: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/diff/069cf2c7
Branch: refs/heads/master
Commit: 069cf2c75204994ac03db99ed835229326dfea9a
Parents: 006ffa5 d881be3
Author: Jean-Baptiste Onofré <[email protected]>
Authored: Thu Nov 26 06:55:46 2015 +0100
Committer: Jean-Baptiste Onofré <[email protected]>
Committed: Thu Nov 26 06:55:46 2015 +0100
----------------------------------------------------------------------
pom.xml | 19 ++
spring-aop-4.2.3.RELEASE/pom.xml | 176 +++++++++++++
.../src/main/resources/OSGI-INF/bundle.info | 11 +
spring-aspects-4.2.3.RELEASE/pom.xml | 146 +++++++++++
.../src/main/resources/OSGI-INF/bundle.info | 11 +
spring-beans-4.2.3.RELEASE/pom.xml | 141 ++++++++++
.../src/main/resources/OSGI-INF/bundle.info | 11 +
spring-context-4.2.3.RELEASE/pom.xml | 241 +++++++++++++++++
.../src/main/resources/OSGI-INF/bundle.info | 11 +
spring-context-support-4.2.3.RELEASE/pom.xml | 202 +++++++++++++++
.../src/main/resources/OSGI-INF/bundle.info | 11 +
spring-core-4.2.3.RELEASE/pom.xml | 149 +++++++++++
.../src/main/resources/OSGI-INF/bundle.info | 11 +
spring-expression-4.2.3.RELEASE/pom.xml | 123 +++++++++
.../src/main/resources/OSGI-INF/bundle.info | 11 +
spring-instrument-4.2.3.RELEASE/pom.xml | 105 ++++++++
.../src/main/resources/OSGI-INF/bundle.info | 11 +
spring-jdbc-4.2.3.RELEASE/pom.xml | 171 ++++++++++++
.../src/main/resources/OSGI-INF/bundle.info | 11 +
spring-jms-4.2.3.RELEASE/pom.xml | 235 +++++++++++++++++
.../src/main/resources/OSGI-INF/bundle.info | 11 +
spring-messaging-4.2.3.RELEASE/pom.xml | 179 +++++++++++++
.../src/main/resources/OSGI-INF/bundle.info | 11 +
spring-orm-4.2.3.RELEASE/pom.xml | 257 +++++++++++++++++++
.../src/main/resources/OSGI-INF/bundle.info | 11 +
spring-oxm-4.2.3.RELEASE/pom.xml | 174 +++++++++++++
.../src/main/resources/OSGI-INF/bundle.info | 11 +
spring-test-4.2.3.RELEASE/pom.xml | 222 ++++++++++++++++
.../src/main/resources/OSGI-INF/bundle.info | 11 +
spring-tx-4.2.3.RELEASE/pom.xml | 175 +++++++++++++
.../src/main/resources/OSGI-INF/bundle.info | 11 +
spring-web-4.2.3.RELEASE/pom.xml | 208 +++++++++++++++
.../src/main/resources/OSGI-INF/bundle.info | 11 +
spring-webmvc-4.2.3.RELEASE/pom.xml | 218 ++++++++++++++++
.../src/main/resources/OSGI-INF/bundle.info | 11 +
spring-webmvc-portlet-4.2.3.RELEASE/pom.xml | 164 ++++++++++++
.../src/main/resources/OSGI-INF/bundle.info | 11 +
spring-websocket-4.2.3.RELEASE/pom.xml | 223 ++++++++++++++++
.../src/main/resources/OSGI-INF/bundle.info | 11 +
39 files changed, 3737 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/069cf2c7/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 7e5b962,69231f3..af5fc6a
--- a/pom.xml
+++ b/pom.xml
@@@ -64,13 -63,25 +64,32 @@@
<module>spring-ldap-2.0.3.RELEASE</module>
<module>spring-ldap-2.0.4.RELEASE</module>
<module>gae-1.9.28</module>
+ <module>qpid-0.24</module>
+ <module>qpid-0.26</module>
+ <module>qpid-0.32</module>
+ <module>qpid-0.30</module>
+ <module>qpid-0.28</module>
+ <module>kafka_2.10-0.9.0.0</module>
+ <module>kafka-clients-0.9.0.0</module>
+ <module>spring-aop-4.2.3.RELEASE</module>
+ <module>spring-aspects-4.2.3.RELEASE</module>
+ <module>spring-beans-4.2.3.RELEASE</module>
+ <module>spring-context-4.2.3.RELEASE</module>
+ <module>spring-context-support-4.2.3.RELEASE</module>
+ <module>spring-core-4.2.3.RELEASE</module>
+ <module>spring-expression-4.2.3.RELEASE</module>
+ <module>spring-instrument-4.2.3.RELEASE</module>
+ <module>spring-jdbc-4.2.3.RELEASE</module>
+ <module>spring-jms-4.2.3.RELEASE</module>
+ <module>spring-messaging-4.2.3.RELEASE</module>
+ <module>spring-orm-4.2.3.RELEASE</module>
+ <module>spring-oxm-4.2.3.RELEASE</module>
+ <module>spring-test-4.2.3.RELEASE</module>
+ <module>spring-tx-4.2.3.RELEASE</module>
+ <module>spring-web-4.2.3.RELEASE</module>
+ <module>spring-webmvc-4.2.3.RELEASE</module>
+ <module>spring-webmvc-portlet-4.2.3.RELEASE</module>
+ <module>spring-websocket-4.2.3.RELEASE</module>
</modules>
</project>
