Merge branch 'karaf-2.x' of https://git-wip-us.apache.org/repos/asf/karaf into karaf-2.x
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/900d5e3c Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/900d5e3c Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/900d5e3c Branch: refs/heads/karaf-2.x Commit: 900d5e3cf0398e1cd1d337e415d813b37d13f794 Parents: e551284 cc9e6e6 Author: Jean-Baptiste Onofré <[email protected]> Authored: Thu Sep 4 08:36:48 2014 +0200 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Thu Sep 4 08:36:48 2014 +0200 ---------------------------------------------------------------------- .../java/org/apache/karaf/admin/internal/AdminServiceImpl.java | 6 +++--- pom.xml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/900d5e3c/pom.xml ---------------------------------------------------------------------- diff --cc pom.xml index a611f53,c5c9b98..1747f78 --- a/pom.xml +++ b/pom.xml @@@ -200,10 -200,10 +200,10 @@@ <pax.base.version>1.4.0</pax.base.version> <pax.cdi.version>0.8.0</pax.cdi.version> <pax.exam.version>4.1.0</pax.exam.version> - <pax.logging.version>1.7.3</pax.logging.version> + <pax.logging.version>1.7.4</pax.logging.version> <pax.url.version>2.1.0</pax.url.version> <pax.swissbox.version>1.7.1</pax.swissbox.version> - <pax.web.version>3.1.2-SNAPSHOT</pax.web.version> + <pax.web.version>3.1.2</pax.web.version> <pax.tinybundles.version>1.3.2</pax.tinybundles.version> <plexus.utils.version>3.0</plexus.utils.version> <portlet-api.version>2.0</portlet-api.version>
