You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ac...@apache.org on 2018/06/28 12:06:48 UTC
[2/2] servicemix-bundles git commit: Merge branch 'master' of
https://git1-us-west.apache.org/repos/asf/servicemix-bundles
Merge branch 'master' of https://git1-us-west.apache.org/repos/asf/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/73eb0b5b
Tree: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/tree/73eb0b5b
Diff: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/diff/73eb0b5b
Branch: refs/heads/master
Commit: 73eb0b5bd3a7d1e7feebd80ee34152ab688c65fa
Parents: 0fb463c 2e61b17
Author: Andrea Cosentino <an...@gmail.com>
Authored: Thu Jun 28 14:04:55 2018 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Thu Jun 28 14:04:55 2018 +0200
----------------------------------------------------------------------
grpc-1.12.0/pom.xml | 109 --------
.../src/main/resources/OSGI-INF/bundle.info | 16 --
grpc-1.13.1/pom.xml | 108 ++++++++
.../src/main/resources/OSGI-INF/bundle.info | 16 ++
libphonenumber-8.9.7/pom.xml | 105 --------
.../src/main/resources/OSGI-INF/bundle.info | 12 -
libphonenumber-8.9.8/pom.xml | 104 ++++++++
.../src/main/resources/OSGI-INF/bundle.info | 12 +
pom.xml | 57 +++-
spring-aop-4.3.17.RELEASE/pom.xml | 176 -------------
.../src/main/resources/OSGI-INF/bundle.info | 11 -
spring-aop-4.3.18.RELEASE/pom.xml | 175 +++++++++++++
.../src/main/resources/OSGI-INF/bundle.info | 11 +
spring-aop-5.0.6.RELEASE/pom.xml | 176 -------------
.../src/main/resources/OSGI-INF/bundle.info | 11 -
spring-aop-5.0.7.RELEASE/pom.xml | 175 +++++++++++++
.../src/main/resources/OSGI-INF/bundle.info | 11 +
spring-aspects-4.3.17.RELEASE/pom.xml | 146 -----------
.../src/main/resources/OSGI-INF/bundle.info | 11 -
spring-aspects-4.3.18.RELEASE/pom.xml | 145 +++++++++++
.../src/main/resources/OSGI-INF/bundle.info | 11 +
spring-aspects-5.0.6.RELEASE/pom.xml | 146 -----------
.../src/main/resources/OSGI-INF/bundle.info | 11 -
spring-aspects-5.0.7.RELEASE/pom.xml | 145 +++++++++++
.../src/main/resources/OSGI-INF/bundle.info | 11 +
spring-beans-4.3.17.RELEASE/pom.xml | 141 ----------
.../src/main/resources/OSGI-INF/bundle.info | 11 -
spring-beans-4.3.18.RELEASE/pom.xml | 140 ++++++++++
.../src/main/resources/OSGI-INF/bundle.info | 11 +
spring-beans-5.0.6.RELEASE/pom.xml | 141 ----------
.../src/main/resources/OSGI-INF/bundle.info | 11 -
spring-beans-5.0.7.RELEASE/pom.xml | 140 ++++++++++
.../src/main/resources/OSGI-INF/bundle.info | 11 +
spring-context-4.3.17.RELEASE/pom.xml | 244 -----------------
.../src/main/resources/OSGI-INF/bundle.info | 11 -
spring-context-4.3.18.RELEASE/pom.xml | 243 +++++++++++++++++
.../src/main/resources/OSGI-INF/bundle.info | 11 +
spring-context-5.0.6.RELEASE/pom.xml | 248 ------------------
.../src/main/resources/OSGI-INF/bundle.info | 11 -
spring-context-5.0.7.RELEASE/pom.xml | 247 ++++++++++++++++++
.../src/main/resources/OSGI-INF/bundle.info | 11 +
spring-context-support-4.3.17.RELEASE/pom.xml | 204 ---------------
.../src/main/resources/OSGI-INF/bundle.info | 11 -
spring-context-support-4.3.18.RELEASE/pom.xml | 203 +++++++++++++++
.../src/main/resources/OSGI-INF/bundle.info | 11 +
spring-context-support-5.0.6.RELEASE/pom.xml | 204 ---------------
.../src/main/resources/OSGI-INF/bundle.info | 11 -
spring-context-support-5.0.7.RELEASE/pom.xml | 203 +++++++++++++++
.../src/main/resources/OSGI-INF/bundle.info | 11 +
spring-core-4.3.17.RELEASE/pom.xml | 149 -----------
.../src/main/resources/OSGI-INF/bundle.info | 11 -
spring-core-4.3.18.RELEASE/pom.xml | 148 +++++++++++
.../src/main/resources/OSGI-INF/bundle.info | 11 +
spring-core-5.0.6.RELEASE/pom.xml | 149 -----------
.../src/main/resources/OSGI-INF/bundle.info | 11 -
spring-core-5.0.7.RELEASE/pom.xml | 148 +++++++++++
.../src/main/resources/OSGI-INF/bundle.info | 11 +
spring-expression-4.3.17.RELEASE/pom.xml | 123 ---------
.../src/main/resources/OSGI-INF/bundle.info | 11 -
spring-expression-4.3.18.RELEASE/pom.xml | 122 +++++++++
.../src/main/resources/OSGI-INF/bundle.info | 11 +
spring-expression-5.0.6.RELEASE/pom.xml | 123 ---------
.../src/main/resources/OSGI-INF/bundle.info | 11 -
spring-expression-5.0.7.RELEASE/pom.xml | 122 +++++++++
.../src/main/resources/OSGI-INF/bundle.info | 11 +
spring-instrument-4.3.17.RELEASE/pom.xml | 116 ---------
.../src/main/resources/OSGI-INF/bundle.info | 11 -
spring-instrument-4.3.18.RELEASE/pom.xml | 115 ++++++++
.../src/main/resources/OSGI-INF/bundle.info | 11 +
spring-instrument-5.0.6.RELEASE/pom.xml | 116 ---------
.../src/main/resources/OSGI-INF/bundle.info | 11 -
spring-instrument-5.0.7.RELEASE/pom.xml | 115 ++++++++
.../src/main/resources/OSGI-INF/bundle.info | 11 +
spring-jdbc-4.3.17.RELEASE/pom.xml | 173 ------------
.../src/main/resources/OSGI-INF/bundle.info | 11 -
spring-jdbc-4.3.18.RELEASE/pom.xml | 172 ++++++++++++
.../src/main/resources/OSGI-INF/bundle.info | 11 +
spring-jdbc-5.0.6.RELEASE/pom.xml | 173 ------------
.../src/main/resources/OSGI-INF/bundle.info | 11 -
spring-jdbc-5.0.7.RELEASE/pom.xml | 172 ++++++++++++
.../src/main/resources/OSGI-INF/bundle.info | 11 +
spring-jms-4.3.17.RELEASE/pom.xml | 235 -----------------
.../src/main/resources/OSGI-INF/bundle.info | 11 -
spring-jms-4.3.18.RELEASE/pom.xml | 234 +++++++++++++++++
.../src/main/resources/OSGI-INF/bundle.info | 11 +
spring-jms-5.0.6.RELEASE/pom.xml | 235 -----------------
.../src/main/resources/OSGI-INF/bundle.info | 11 -
spring-jms-5.0.7.RELEASE/pom.xml | 234 +++++++++++++++++
.../src/main/resources/OSGI-INF/bundle.info | 11 +
spring-messaging-4.3.17.RELEASE/pom.xml | 179 -------------
.../src/main/resources/OSGI-INF/bundle.info | 11 -
spring-messaging-4.3.18.RELEASE/pom.xml | 178 +++++++++++++
.../src/main/resources/OSGI-INF/bundle.info | 11 +
spring-messaging-5.0.6.RELEASE/pom.xml | 179 -------------
.../src/main/resources/OSGI-INF/bundle.info | 11 -
spring-messaging-5.0.7.RELEASE/pom.xml | 178 +++++++++++++
.../src/main/resources/OSGI-INF/bundle.info | 11 +
spring-orm-4.3.17.RELEASE/pom.xml | 261 -------------------
.../src/main/resources/OSGI-INF/bundle.info | 11 -
spring-orm-4.3.18.RELEASE/pom.xml | 260 ++++++++++++++++++
.../src/main/resources/OSGI-INF/bundle.info | 11 +
spring-orm-5.0.6.RELEASE/pom.xml | 261 -------------------
.../src/main/resources/OSGI-INF/bundle.info | 11 -
spring-orm-5.0.7.RELEASE/pom.xml | 260 ++++++++++++++++++
.../src/main/resources/OSGI-INF/bundle.info | 11 +
spring-oxm-4.3.17.RELEASE/pom.xml | 174 -------------
.../src/main/resources/OSGI-INF/bundle.info | 11 -
spring-oxm-4.3.18.RELEASE/pom.xml | 173 ++++++++++++
.../src/main/resources/OSGI-INF/bundle.info | 11 +
spring-oxm-5.0.6.RELEASE/pom.xml | 174 -------------
.../src/main/resources/OSGI-INF/bundle.info | 11 -
spring-oxm-5.0.7.RELEASE/pom.xml | 173 ++++++++++++
.../src/main/resources/OSGI-INF/bundle.info | 11 +
spring-security-acl-5.0.5.RELEASE/pom.xml | 120 ---------
.../src/main/resources/OSGI-INF/bundle.info | 11 -
spring-security-acl-5.0.6.RELEASE/pom.xml | 119 +++++++++
.../src/main/resources/OSGI-INF/bundle.info | 11 +
spring-security-aspects-5.0.5.RELEASE/pom.xml | 106 --------
.../src/main/resources/OSGI-INF/bundle.info | 11 -
spring-security-aspects-5.0.6.RELEASE/pom.xml | 105 ++++++++
.../src/main/resources/OSGI-INF/bundle.info | 11 +
spring-security-cas-5.0.5.RELEASE/pom.xml | 105 --------
.../src/main/resources/OSGI-INF/bundle.info | 11 -
spring-security-cas-5.0.6.RELEASE/pom.xml | 104 ++++++++
.../src/main/resources/OSGI-INF/bundle.info | 11 +
spring-security-config-5.0.5.RELEASE/pom.xml | 105 --------
.../src/main/resources/OSGI-INF/bundle.info | 11 -
spring-security-config-5.0.6.RELEASE/pom.xml | 104 ++++++++
.../src/main/resources/OSGI-INF/bundle.info | 11 +
spring-security-core-5.0.5.RELEASE/pom.xml | 105 --------
.../src/main/resources/OSGI-INF/bundle.info | 11 -
spring-security-core-5.0.6.RELEASE/pom.xml | 104 ++++++++
.../src/main/resources/OSGI-INF/bundle.info | 11 +
spring-security-crypto-5.0.5.RELEASE/pom.xml | 105 --------
.../src/main/resources/OSGI-INF/bundle.info | 11 -
spring-security-crypto-5.0.6.RELEASE/pom.xml | 104 ++++++++
.../src/main/resources/OSGI-INF/bundle.info | 11 +
spring-security-data-5.0.5.RELEASE/pom.xml | 105 --------
.../src/main/resources/OSGI-INF/bundle.info | 11 -
spring-security-data-5.0.6.RELEASE/pom.xml | 104 ++++++++
.../src/main/resources/OSGI-INF/bundle.info | 11 +
spring-security-ldap-5.0.5.RELEASE/pom.xml | 107 --------
.../src/main/resources/OSGI-INF/bundle.info | 11 -
spring-security-ldap-5.0.6.RELEASE/pom.xml | 106 ++++++++
.../src/main/resources/OSGI-INF/bundle.info | 11 +
spring-security-messaging-5.0.5.RELEASE/pom.xml | 105 --------
.../src/main/resources/OSGI-INF/bundle.info | 11 -
spring-security-messaging-5.0.6.RELEASE/pom.xml | 104 ++++++++
.../src/main/resources/OSGI-INF/bundle.info | 11 +
.../pom.xml | 106 --------
.../src/main/resources/OSGI-INF/bundle.info | 11 -
.../pom.xml | 105 ++++++++
.../src/main/resources/OSGI-INF/bundle.info | 11 +
.../pom.xml | 106 --------
.../src/main/resources/OSGI-INF/bundle.info | 11 -
.../pom.xml | 105 ++++++++
.../src/main/resources/OSGI-INF/bundle.info | 11 +
.../pom.xml | 106 --------
.../src/main/resources/OSGI-INF/bundle.info | 11 -
.../pom.xml | 105 ++++++++
.../src/main/resources/OSGI-INF/bundle.info | 11 +
spring-security-remoting-5.0.5.RELEASE/pom.xml | 105 --------
.../src/main/resources/OSGI-INF/bundle.info | 11 -
spring-security-remoting-5.0.6.RELEASE/pom.xml | 104 ++++++++
.../src/main/resources/OSGI-INF/bundle.info | 11 +
spring-security-taglibs-5.0.5.RELEASE/pom.xml | 106 --------
.../src/main/resources/OSGI-INF/bundle.info | 11 -
spring-security-taglibs-5.0.6.RELEASE/pom.xml | 105 ++++++++
.../src/main/resources/OSGI-INF/bundle.info | 11 +
spring-security-test-5.0.5.RELEASE/pom.xml | 106 --------
.../src/main/resources/OSGI-INF/bundle.info | 11 -
spring-security-test-5.0.6.RELEASE/pom.xml | 105 ++++++++
.../src/main/resources/OSGI-INF/bundle.info | 11 +
spring-security-web-5.0.5.RELEASE/pom.xml | 106 --------
.../src/main/resources/OSGI-INF/bundle.info | 11 -
spring-security-web-5.0.6.RELEASE/pom.xml | 105 ++++++++
.../src/main/resources/OSGI-INF/bundle.info | 11 +
spring-test-4.3.17.RELEASE/pom.xml | 226 ----------------
.../src/main/resources/OSGI-INF/bundle.info | 11 -
spring-test-4.3.18.RELEASE/pom.xml | 225 ++++++++++++++++
.../src/main/resources/OSGI-INF/bundle.info | 11 +
spring-test-5.0.6.RELEASE/pom.xml | 226 ----------------
.../src/main/resources/OSGI-INF/bundle.info | 11 -
spring-test-5.0.7.RELEASE/pom.xml | 225 ++++++++++++++++
.../src/main/resources/OSGI-INF/bundle.info | 11 +
spring-tx-4.3.17.RELEASE/pom.xml | 175 -------------
.../src/main/resources/OSGI-INF/bundle.info | 11 -
spring-tx-4.3.18.RELEASE/pom.xml | 174 +++++++++++++
.../src/main/resources/OSGI-INF/bundle.info | 11 +
spring-tx-5.0.6.RELEASE/pom.xml | 175 -------------
.../src/main/resources/OSGI-INF/bundle.info | 11 -
spring-tx-5.0.7.RELEASE/pom.xml | 174 +++++++++++++
.../src/main/resources/OSGI-INF/bundle.info | 11 +
spring-web-4.3.17.RELEASE/pom.xml | 214 ---------------
.../src/main/resources/OSGI-INF/bundle.info | 11 -
spring-web-4.3.18.RELEASE/pom.xml | 213 +++++++++++++++
.../src/main/resources/OSGI-INF/bundle.info | 11 +
spring-web-5.0.6.RELEASE/pom.xml | 214 ---------------
.../src/main/resources/OSGI-INF/bundle.info | 11 -
spring-web-5.0.7.RELEASE/pom.xml | 213 +++++++++++++++
.../src/main/resources/OSGI-INF/bundle.info | 11 +
spring-webmvc-4.3.17.RELEASE/pom.xml | 222 ----------------
.../src/main/resources/OSGI-INF/bundle.info | 11 -
spring-webmvc-4.3.18.RELEASE/pom.xml | 221 ++++++++++++++++
.../src/main/resources/OSGI-INF/bundle.info | 11 +
spring-webmvc-5.0.6.RELEASE/pom.xml | 222 ----------------
.../src/main/resources/OSGI-INF/bundle.info | 11 -
spring-webmvc-5.0.7.RELEASE/pom.xml | 221 ++++++++++++++++
.../src/main/resources/OSGI-INF/bundle.info | 11 +
spring-webmvc-portlet-4.3.17.RELEASE/pom.xml | 164 ------------
.../src/main/resources/OSGI-INF/bundle.info | 11 -
spring-webmvc-portlet-4.3.18.RELEASE/pom.xml | 163 ++++++++++++
.../src/main/resources/OSGI-INF/bundle.info | 11 +
spring-websocket-4.3.17.RELEASE/pom.xml | 223 ----------------
.../src/main/resources/OSGI-INF/bundle.info | 11 -
spring-websocket-4.3.18.RELEASE/pom.xml | 222 ++++++++++++++++
.../src/main/resources/OSGI-INF/bundle.info | 11 +
spring-websocket-5.0.6.RELEASE/pom.xml | 223 ----------------
.../src/main/resources/OSGI-INF/bundle.info | 11 -
spring-websocket-5.0.7.RELEASE/pom.xml | 222 ++++++++++++++++
.../src/main/resources/OSGI-INF/bundle.info | 11 +
thymeleaf-3.0.9.RELEASE/pom.xml | 99 +++++++
.../src/main/resources/OSGI-INF/bundle.info | 15 ++
223 files changed, 9574 insertions(+), 9460 deletions(-)
----------------------------------------------------------------------