You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ks...@apache.org on 2015/10/09 20:41:14 UTC
[1/2] servicemix git commit: SM-2675: Upgrade to depends-maven-plugin
1.3.0
Repository: servicemix
Updated Branches:
refs/heads/master 045ab1f8f -> d430f0b9c
SM-2675: Upgrade to depends-maven-plugin 1.3.0
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/bdbaed4a
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/bdbaed4a
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/bdbaed4a
Branch: refs/heads/master
Commit: bdbaed4a045e8887a46134c6419dec11bffbc3c3
Parents: 045ab1f
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Mon Oct 5 23:08:13 2015 +0200
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Mon Oct 5 23:08:13 2015 +0200
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/bdbaed4a/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 91d0335..28adf9f 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -100,7 +100,7 @@
<xml.api.version>2.11.0-20110622</xml.api.version>
<cxf.codegen-plugin.version>${cxf.version}</cxf.codegen-plugin.version>
- <depends-maven-plugin.version>1.2</depends-maven-plugin.version>
+ <depends-maven-plugin.version>1.3</depends-maven-plugin.version>
<maven-bundle-plugin.version>2.5.4</maven-bundle-plugin.version>
<maven-archetype-packaging-version>2.0</maven-archetype-packaging-version>
[2/2] servicemix git commit: SM-2671: Upgrade to Karaf 3.0.5
Posted by ks...@apache.org.
SM-2671: Upgrade to Karaf 3.0.5
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/d430f0b9
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/d430f0b9
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/d430f0b9
Branch: refs/heads/master
Commit: d430f0b9c91e7ac3227f2b44848017e8fe8f6f00
Parents: bdbaed4
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Fri Oct 9 20:38:29 2015 +0200
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Fri Oct 9 20:38:29 2015 +0200
----------------------------------------------------------------------
.../src/main/resources/etc/custom.properties | 84 ++++++++++----------
.../src/main/resources/etc/system.properties | 7 ++
parent/pom.xml | 10 +--
3 files changed, 54 insertions(+), 47 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/d430f0b9/assembly/src/main/resources/etc/custom.properties
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/etc/custom.properties b/assembly/src/main/resources/etc/custom.properties
index e882671..6764f76 100644
--- a/assembly/src/main/resources/etc/custom.properties
+++ b/assembly/src/main/resources/etc/custom.properties
@@ -37,48 +37,48 @@ org.osgi.framework.system.packages.extra = \
com.sun.org.apache.xerces.internal.jaxp, \
com.sun.org.apache.xerces.internal.xni, \
com.sun.jndi.ldap, \
- org.apache.xalan.extensions; version="2.7.1", \
- org.apache.xalan.xsltc.compiler; version="2.7.1", \
- org.apache.xalan.xsltc.cmdline.getopt; version="2.7.1", \
- org.apache.xalan.xsltc.util; version="2.7.1", \
- org.apache.xalan.transformer; version="2.7.1", \
- org.apache.xalan.xsltc.trax; version="2.7.1", \
- org.apache.xalan.processor; version="2.7.1", \
- org.apache.xalan.lib; version="2.7.1", \
- org.apache.xalan.trace; version="2.7.1", \
- org.apache.xalan.xsltc.compiler.util; version="2.7.1", \
- org.apache.xalan.templates; version="2.7.1", \
- org.apache.xalan.xsltc; version="2.7.1", \
- org.apache.xalan.xsltc.runtime; version="2.7.1", \
- org.apache.xalan; version="2.7.1", \
- org.apache.xalan.xslt; version="2.7.1", \
- org.apache.xalan.lib.sql; version="2.7.1", \
- org.apache.xalan.xsltc.runtime.output; version="2.7.1", \
- org.apache.xalan.xsltc.dom; version="2.7.1", \
- org.apache.xalan.client; version="2.7.1", \
- org.apache.xalan.xsltc.cmdline; version="2.7.1", \
- org.apache.xalan.serialize; version="2.7.1", \
- org.apache.xalan.res; version="2.7.1", \
- org.apache.xml.dtm.ref; version="2.7.1", \
- org.apache.xml.dtm; version="2.7.1", \
- org.apache.xml.dtm.ref.sax2dtm; version="2.7.1", \
- org.apache.xml.dtm.ref.dom2dtm; version="2.7.1", \
- org.apache.xml.res; version="2.7.1", \
- org.apache.xml.serializer.dom3; version="2.7.1", \
- org.apache.xml.serializer; version="2.7.1", \
- org.apache.xml.serializer.utils; version="2.7.1", \
- org.apache.xml.utils.res; version="2.7.1", \
- org.apache.xml.utils; version="2.7.1", \
- org.apache.xpath.functions; version="2.7.1", \
- org.apache.xpath.jaxp; version="2.7.1", \
- org.apache.xpath.patterns; version="2.7.1", \
- org.apache.xpath.objects; version="2.7.1", \
- org.apache.xpath.res; version="2.7.1", \
- org.apache.xpath; version="2.7.1", \
- org.apache.xpath.axes; version="2.7.1", \
- org.apache.xpath.compiler; version="2.7.1", \
- org.apache.xpath.operations; version="2.7.1", \
- org.apache.xpath.domapi; version="2.7.1", \
+ org.apache.xalan.extensions; version="2.7.2", \
+ org.apache.xalan.xsltc.compiler; version="2.7.2", \
+ org.apache.xalan.xsltc.cmdline.getopt; version="2.7.2", \
+ org.apache.xalan.xsltc.util; version="2.7.2", \
+ org.apache.xalan.transformer; version="2.7.2", \
+ org.apache.xalan.xsltc.trax; version="2.7.2", \
+ org.apache.xalan.processor; version="2.7.2", \
+ org.apache.xalan.lib; version="2.7.2", \
+ org.apache.xalan.trace; version="2.7.2", \
+ org.apache.xalan.xsltc.compiler.util; version="2.7.2", \
+ org.apache.xalan.templates; version="2.7.2", \
+ org.apache.xalan.xsltc; version="2.7.2", \
+ org.apache.xalan.xsltc.runtime; version="2.7.2", \
+ org.apache.xalan; version="2.7.2", \
+ org.apache.xalan.xslt; version="2.7.2", \
+ org.apache.xalan.lib.sql; version="2.7.2", \
+ org.apache.xalan.xsltc.runtime.output; version="2.7.2", \
+ org.apache.xalan.xsltc.dom; version="2.7.2", \
+ org.apache.xalan.client; version="2.7.2", \
+ org.apache.xalan.xsltc.cmdline; version="2.7.2", \
+ org.apache.xalan.serialize; version="2.7.2", \
+ org.apache.xalan.res; version="2.7.2", \
+ org.apache.xml.dtm.ref; version="2.7.2", \
+ org.apache.xml.dtm; version="2.7.2", \
+ org.apache.xml.dtm.ref.sax2dtm; version="2.7.2", \
+ org.apache.xml.dtm.ref.dom2dtm; version="2.7.2", \
+ org.apache.xml.res; version="2.7.2", \
+ org.apache.xml.serializer.dom3; version="2.7.2", \
+ org.apache.xml.serializer; version="2.7.2", \
+ org.apache.xml.serializer.utils; version="2.7.2", \
+ org.apache.xml.utils.res; version="2.7.2", \
+ org.apache.xml.utils; version="2.7.2", \
+ org.apache.xpath.functions; version="2.7.2", \
+ org.apache.xpath.jaxp; version="2.7.2", \
+ org.apache.xpath.patterns; version="2.7.2", \
+ org.apache.xpath.objects; version="2.7.2", \
+ org.apache.xpath.res; version="2.7.2", \
+ org.apache.xpath; version="2.7.2", \
+ org.apache.xpath.axes; version="2.7.2", \
+ org.apache.xpath.compiler; version="2.7.2", \
+ org.apache.xpath.operations; version="2.7.2", \
+ org.apache.xpath.domapi; version="2.7.2", \
org.apache.html.dom; version="2.11.0", \
org.apache.wml.dom; version="2.11.0", \
org.apache.wml; version="2.11.0", \
http://git-wip-us.apache.org/repos/asf/servicemix/blob/d430f0b9/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 55277fb..7f8b389 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,
http://git-wip-us.apache.org/repos/asf/servicemix/blob/d430f0b9/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 28adf9f..e3bf441 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -41,10 +41,10 @@
<activemq.version>5.11.1</activemq.version>
<activiti.version>5.17.0</activiti.version>
<akka.version>2.3.9</akka.version>
- <aries.blueprint.core.version>1.4.3</aries.blueprint.core.version>
+ <aries.blueprint.core.version>1.4.4</aries.blueprint.core.version>
<aries.proxy.version>1.0.4</aries.proxy.version>
<aries.transaction.version>1.1.1</aries.transaction.version>
- <aries.util.version>1.1.0</aries.util.version>
+ <aries.util.version>1.1.1</aries.util.version>
<camel.version>2.15.2</camel.version>
<commons-codec.bundle.version>1.10</commons-codec.bundle.version>
<commons-dbcp.version>1.4</commons-dbcp.version>
@@ -74,12 +74,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>3.0.4</karaf.version>
+ <karaf.version>3.0.5</karaf.version>
<mvel2.version>2.2.1.Final</mvel2.version>
<mybatis.version>3.2.8</mybatis.version>
<osgi.version>5.0.0</osgi.version>
<pax.exam.version>4.5.0</pax.exam.version>
- <pax.logging.version>1.8.3</pax.logging.version>
+ <pax.logging.version>1.8.4</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>
@@ -88,7 +88,7 @@
<scala.version>2.11.5</scala.version>
<servicemix.specs.version>2.5.0</servicemix.specs.version>
<slf4j.version>1.7.12</slf4j.version>
- <spring.version>3.2.11.RELEASE_1</spring.version>
+ <spring.version>3.2.14.RELEASE_1</spring.version>
<swagger.bundle.version>1.3.12_1</swagger.bundle.version>
<swagger.core.bundle.version>1.3.12_2</swagger.core.bundle.version>
<swagger.version>1.3.12</swagger.version>