servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ksobkow...@apache.org
Subject servicemix git commit: SM-2556: Upgrade to Karaf 3.0.4
Date Fri, 03 Jul 2015 14:45:01 GMT
Repository: servicemix
Updated Branches:
  refs/heads/master 255351e28 -> 96bb1c32d


SM-2556: Upgrade to Karaf 3.0.4


Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/96bb1c32
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/96bb1c32
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/96bb1c32

Branch: refs/heads/master
Commit: 96bb1c32d63332279249aa5b9c2dd71b63702b1a
Parents: 255351e
Author: Krzysztof Sobkowiak <krzys.sobkowiak@gmail.com>
Authored: Tue Jun 30 23:29:40 2015 +0200
Committer: Krzysztof Sobkowiak <krzys.sobkowiak@gmail.com>
Committed: Fri Jul 3 16:44:38 2015 +0200

----------------------------------------------------------------------
 .../etc/org.apache.karaf.features.cfg                 |  2 +-
 assembly/src/main/resources/etc/custom.properties     |  2 +-
 .../src/main/resources/etc/org.ops4j.pax.url.mvn.cfg  |  3 ++-
 assembly/src/main/resources/etc/system.properties     | 13 +++++++++++++
 parent/pom.xml                                        | 14 +++++++-------
 5 files changed, 24 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/servicemix/blob/96bb1c32/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
----------------------------------------------------------------------
diff --git a/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg b/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
index 38869e9..ab83c53 100644
--- a/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
+++ b/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
@@ -52,6 +52,7 @@ featuresRepositories=\
 #
 featuresBoot=\
     (obr,\
+    eventadmin,\
     war),\
     config,\
     standard,\
@@ -59,7 +60,6 @@ featuresBoot=\
     kar,\
     ssh,\
     management,\
-    eventadmin,\
     activemq-broker-noweb,\
     jaxrs-api,\
     activemq-camel,\

http://git-wip-us.apache.org/repos/asf/servicemix/blob/96bb1c32/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 53965f1..e882671 100644
--- a/assembly/src/main/resources/etc/custom.properties
+++ b/assembly/src/main/resources/etc/custom.properties
@@ -27,7 +27,7 @@ karaf.systemBundlesStartLevel=50
 # javax.transaction is needed to avoid class loader constraint violation when using javax.sql
 # as servicemix is using sun saaj impl bundle, we should ignore the package of saaj
 # as servicemix is using sun jaxb impl bundle, we should ignore the package of jaxb
-org.osgi.framework.bootdelegation=org.apache.karaf.jaas.boot,!com.sun.xml.messaging.saaj.*,!com.sun.xml.internal.bind.*,sun.*,com.sun.*,javax.transaction,javax.transaction.*,org.apache.xalan.processor,org.apache.xpath.jaxp,org.apache.xml.dtm.ref,org.apache.xerces.jaxp.datatype,org.apache.xerces.stax,org.apache.xerces.parsers,org.apache.xerces.jaxp,org.apache.xerces.jaxp.validation,org.apache.xerces.dom
+org.osgi.framework.bootdelegation=org.apache.karaf.jaas.boot,org.apache.karaf.jaas.boot.principal,!com.sun.xml.messaging.saaj.*,!com.sun.xml.internal.bind.*,sun.*,com.sun.*,javax.transaction,javax.transaction.*,javax.xml.crypto,javax.xml.crypto.*,org.apache.xalan.processor,org.apache.xpath.jaxp,org.apache.xml.dtm.ref,org.apache.xerces.jaxp.datatype,org.apache.xerces.stax,org.apache.xerces.parsers,org.apache.xerces.jaxp,org.apache.xerces.jaxp.validation,org.apache.xerces.dom
 
 
 org.osgi.framework.system.packages.extra = \

http://git-wip-us.apache.org/repos/asf/servicemix/blob/96bb1c32/assembly/src/main/resources/etc/org.ops4j.pax.url.mvn.cfg
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/etc/org.ops4j.pax.url.mvn.cfg b/assembly/src/main/resources/etc/org.ops4j.pax.url.mvn.cfg
index 54ee0ae..d0092d7 100644
--- a/assembly/src/main/resources/etc/org.ops4j.pax.url.mvn.cfg
+++ b/assembly/src/main/resources/etc/org.ops4j.pax.url.mvn.cfg
@@ -69,7 +69,8 @@ org.ops4j.pax.url.mvn.useFallbackRepositories=false
 #
 org.ops4j.pax.url.mvn.defaultRepositories=\
     file:${karaf.home}/${karaf.default.repository}@id=system.repository@snapshots,\
-    file:${karaf.data}/kar@id=kar.repository@multi@snapshots
+    file:${karaf.data}/kar@id=kar.repository@multi@snapshots,\
+    file:${karaf.base}/${karaf.default.repository}@id=child.system.repository@snapshots,\
     file:${karaf.home}/local-repo@snapshots@id=system.local-repo
 
 # Use the default local repo (e.g.~/.m2/repository) as a "remote" repo

http://git-wip-us.apache.org/repos/asf/servicemix/blob/96bb1c32/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 4f8214b..55277fb 100644
--- a/assembly/src/main/resources/etc/system.properties
+++ b/assembly/src/main/resources/etc/system.properties
@@ -123,6 +123,19 @@ karaf.secured.services = (&(osgi.command.scope=*)(osgi.command.function=*))
 #org.osgi.framework.trust.repositories=${karaf.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/96bb1c32/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index e083ddc..83bf05d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -41,9 +41,9 @@
         <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.2</aries.blueprint.core.version>
+        <aries.blueprint.core.version>1.4.3</aries.blueprint.core.version>
         <aries.proxy.version>1.0.4</aries.proxy.version>
-        <aries.transaction.version>1.0.1</aries.transaction.version>
+        <aries.transaction.version>1.1.1</aries.transaction.version>
         <aries.util.version>1.1.0</aries.util.version>
         <camel.version>2.15.2</camel.version>
         <commons-codec.bundle.version>1.10</commons-codec.bundle.version>
@@ -59,7 +59,7 @@
         <drools.version>5.6.0.Final</drools.version>
         <drools6.version>6.2.0.Final</drools6.version>
         <fasterxml.jackson.version>2.4.3</fasterxml.jackson.version>
-        <felix.bundlerepository.version>2.0.2</felix.bundlerepository.version>
+        <felix.bundlerepository.version>2.0.4</felix.bundlerepository.version>
         <felix.webconsole.plugins.scriptconsole.version>1.0.0</felix.webconsole.plugins.scriptconsole.version>
         <geronimo-atinject.version>1.0</geronimo-atinject.version>
         <geronimo-connector.version>2.1.3</geronimo-connector.version>
@@ -74,19 +74,19 @@
         <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.3</karaf.version>
+        <karaf.version>3.0.4</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.1</pax.logging.version>
-        <pax.url.version>2.3.0</pax.url.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>
         <scala-2.10.version>2.10.4</scala-2.10.version>
         <scala-xml.version>1.0.4</scala-xml.version>
         <scala.version>2.11.5</scala.version>
-        <servicemix.specs.version>2.4.0</servicemix.specs.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>
         <swagger.bundle.version>1.3.12_1</swagger.bundle.version>


Mime
View raw message