Repository: servicemix Updated Branches: refs/heads/servicemix-5.4.x 11962e0ab -> e63ea2c28
SM-2555: Upgrade to Karaf 2.4.3 Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/af9ec44a Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/af9ec44a Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/af9ec44a Branch: refs/heads/servicemix-5.4.x Commit: af9ec44a9afb47af5a8ddfc6c83778feaf662cc2 Parents: 11962e0 Author: Krzysztof Sobkowiak <[email protected]> Authored: Mon Jul 13 21:41:13 2015 +0200 Committer: Krzysztof Sobkowiak <[email protected]> Committed: Mon Jul 13 21:41:13 2015 +0200 ---------------------------------------------------------------------- .../src/main/resources/etc/system.properties | 20 ++++++++++++++++++++ parent/pom.xml | 4 ++-- 2 files changed, 22 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/servicemix/blob/af9ec44a/assembly/src/main/resources/etc/system.properties ---------------------------------------------------------------------- diff --git a/assembly/src/main/resources/etc/system.properties b/assembly/src/main/resources/etc/system.properties index 75dfa1b..827aa56 100644 --- a/assembly/src/main/resources/etc/system.properties +++ b/assembly/src/main/resources/etc/system.properties @@ -113,6 +113,13 @@ org.apache.aries.proxy.weaving.disabled=org.objectweb.asm.*,org.slf4j.*,org.apac karaf.secured.services = (&(osgi.command.scope=*)(osgi.command.function=*)) # +# By default, if there's no ACL policy for a certain karaf command, this command is allowed to access +# without the RBAC. We can change this behavior by enable the following property, which means +# if a karaf command has no corresponding ACL then access it must have one of the karaf.secured.command.compulsory.roles +# +#karaf.secured.command.compulsory.roles=admin + +# # Security properties # # To enable OSGi security, uncomment the properties below, @@ -123,6 +130,19 @@ karaf.secured.services = (&(osgi.command.scope=*)(osgi.command.function=*)) #org.osgi.framework.trust.repositories=${karaf.home}/etc/trustStore.ks # +# HA/Lock configuration +# +# Karaf uses a lock mechanism to know which instance is the master (HA) +# The lock can be on the filesystem (default) or on a database. +# +# See http://karaf.apache.org/manual/latest/users-guide/failover.html for details. +# +# Even using a single instance, Karaf creates the lock file +# You can specify the location of the lock file using the +# karaf.lock.dir=/path/to/the/directory/containing/the/lock +# + +# # Default port for the OSGI HTTP Service # org.osgi.service.http.port=8181 http://git-wip-us.apache.org/repos/asf/servicemix/blob/af9ec44a/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 77c29b2..c29d04a 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -72,12 +72,12 @@ <jodatime2.bundle.version>2.6</jodatime2.bundle.version> <jpa.version>2.1.0</jpa.version> <json4s.bundle.version>3.2.11_1</json4s.bundle.version> - <karaf.version>2.4.2</karaf.version> + <karaf.version>2.4.3</karaf.version> <mvel2.version>2.2.1.Final</mvel2.version> <mybatis.version>3.2.7</mybatis.version> <osgi.version>5.0.0</osgi.version> <pax.exam.version>4.5.0</pax.exam.version> - <pax.logging.version>1.8.2</pax.logging.version> + <pax.logging.version>1.8.3</pax.logging.version> <pax.url.version>2.4.1</pax.url.version> <postgresql.version>9.1-901</postgresql.version> <reflections.bundle.version>0.9.9_1</reflections.bundle.version>
