servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ksobkow...@apache.org
Subject [1/4] git commit: SM-2350: Upgrade to Karaf 2.4.0
Date Mon, 22 Sep 2014 20:06:55 GMT
Repository: servicemix
Updated Branches:
  refs/heads/servicemix-5.3.x 4857379d3 -> fdb416efb


SM-2350: Upgrade to Karaf 2.4.0


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

Branch: refs/heads/servicemix-5.3.x
Commit: 81edd62eb42dfae3d7e6d641cc7223a227311df7
Parents: 4857379
Author: Krzysztof Sobkowiak <krzys.sobkowiak@gmail.com>
Authored: Mon Sep 22 21:18:50 2014 +0200
Committer: Krzysztof Sobkowiak <krzys.sobkowiak@gmail.com>
Committed: Mon Sep 22 21:18:50 2014 +0200

----------------------------------------------------------------------
 assembly/pom.xml                                |  1 +
 .../etc/org.apache.karaf.features.cfg           |  4 +--
 .../src/main/filtered-resources/examples.xml    | 14 ++++-----
 .../src/main/filtered-resources/features.xml    |  2 +-
 .../resources/etc/org.ops4j.pax.logging.cfg     |  6 ++--
 .../src/main/resources/etc/system.properties    | 33 ++++++++++++++++++++
 .../src/main/resources/etc/users.properties     | 16 ++++++++--
 itests/pom.xml                                  |  2 +-
 .../servicemix/itests/BasicAssemblyTests.scala  |  2 +-
 .../itests/IntegrationTestConfigurations.scala  |  2 +-
 parent/pom.xml                                  |  8 ++---
 pom.xml                                         | 10 +++---
 12 files changed, 73 insertions(+), 27 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/servicemix/blob/81edd62e/assembly/pom.xml
----------------------------------------------------------------------
diff --git a/assembly/pom.xml b/assembly/pom.xml
index e2bedf7..3caf8b3 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -144,6 +144,7 @@
                         <configuration>
                             <descriptors>
                                 <descriptor>mvn:org.apache.karaf.assemblies.features/standard/${karaf.version}/xml/features</descriptor>
+                                <descriptor>mvn:org.apache.karaf.assemblies.features/spring/${karaf.version}/xml/features</descriptor>
                                 <descriptor>mvn:org.apache.karaf.assemblies.features/enterprise/${karaf.version}/xml/features</descriptor>
                                 <descriptor>mvn:org.apache.activemq/activemq-karaf/${activemq.version}/xml/features</descriptor>
                                 <descriptor>mvn:org.apache.camel.karaf/apache-camel/${camel.version}/xml/features</descriptor>

http://git-wip-us.apache.org/repos/asf/servicemix/blob/81edd62e/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 23bf5db..3db4fa6 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
@@ -25,12 +25,12 @@ respectStartLvlDuringFeatureStartup=true
 #
 # Comma separated list of features repositories to register by default
 #
-featuresRepositories=mvn:org.apache.karaf.assemblies.features/standard/${karaf.version}/xml/features,mvn:org.apache.karaf.assemblies.features/enterprise/${karaf.version}/xml/features,mvn:org.apache.servicemix/apache-servicemix/${version}/xml/internal,mvn:org.apache.servicemix/apache-servicemix/${version}/xml/features,mvn:org.apache.servicemix/apache-servicemix/${version}/xml/examples,mvn:org.apache.camel.karaf/apache-camel/${camel.version}/xml/features,mvn:org.apache.activemq/activemq-karaf/${activemq.version}/xml/features
+featuresRepositories=mvn:org.apache.karaf.assemblies.features/standard/${karaf.version}/xml/features,mvn:org.apache.karaf.assemblies.features/spring/${karaf.version}/xml/features,mvn:org.apache.karaf.assemblies.features/enterprise/${karaf.version}/xml/features,mvn:org.apache.servicemix/apache-servicemix/${version}/xml/internal,mvn:org.apache.servicemix/apache-servicemix/${version}/xml/features,mvn:org.apache.servicemix/apache-servicemix/${version}/xml/examples,mvn:org.apache.camel.karaf/apache-camel/${camel.version}/xml/features,mvn:org.apache.activemq/activemq-karaf/${activemq.version}/xml/features
 
 #
 # Comma separated list of features to install at startup
 #
-featuresBoot=config,kar,ssh,management,joda-time,eventadmin,activemq-broker-noweb,jaxrs-api,activemq-camel,cxf,camel-cxf,camel-blueprint,activemq-service,war
+featuresBoot=karaf-framework,shell,features,service-security,admin,config,kar,ssh,management,deployer,diagnostic,joda-time,eventadmin,activemq-broker-noweb,jaxrs-api,activemq-camel,cxf,camel-cxf,camel-blueprint,activemq-service,war
 
 #
 # Defines if the boot features are started in asynchronous mode (in a dedicated thread)

http://git-wip-us.apache.org/repos/asf/servicemix/blob/81edd62e/assembly/src/main/filtered-resources/examples.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/filtered-resources/examples.xml b/assembly/src/main/filtered-resources/examples.xml
index fde72fa..9ba6061 100644
--- a/assembly/src/main/filtered-resources/examples.xml
+++ b/assembly/src/main/filtered-resources/examples.xml
@@ -31,12 +31,12 @@
     <feature name="examples-cxf-osgi" version="${version}" resolver="(obr)">
         <feature version="${cxf.version}">cxf</feature>
         <bundle dependency="true">mvn:commons-io/commons-io/${commons-io.version}</bundle>
-        <bundle dependency="true">mvn:org.springframework/org.springframework.beans/${spring.version}</bundle>
+        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-beans/${spring.version}</bundle>
         <bundle>mvn:org.apache.servicemix.examples/cxf-osgi/${version}</bundle>
     </feature>
     <feature name="examples-cxf-jaxrs" version="${version}" resolver="(obr)">
         <feature version="${cxf.version}">cxf</feature>
-        <bundle dependency="true">mvn:org.springframework/org.springframework.beans/${spring.version}</bundle>
+        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-beans/${spring.version}</bundle>
 	<bundle dependency="true">mvn:commons-codec/commons-codec/${commons-codec.bundle.version}</bundle>
         <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons-httpclient.bundle.version}</bundle>
         <bundle>mvn:org.apache.servicemix.examples/cxf-jaxrs/${version}</bundle>
@@ -44,14 +44,14 @@
     <feature name="examples-cxf-jaxrs-blueprint" version="${version}" resolver="(obr)">
         <feature version="${cxf.version}">cxf</feature>
         <feature version="${version}">swagger</feature>
-        <bundle dependency="true">mvn:org.springframework/org.springframework.beans/${spring.version}</bundle>
+        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-beans/${spring.version}</bundle>
 	<bundle dependency="true">mvn:commons-codec/commons-codec/${commons-codec.bundle.version}</bundle>
         <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons-httpclient.bundle.version}</bundle>
         <bundle>mvn:org.apache.servicemix.examples/cxf-jaxrs-blueprint/${version}</bundle>
     </feature>
     <feature name="examples-cxf-jaxws-blueprint" version="${version}" resolver="(obr)">
         <feature version="${cxf.version}">cxf</feature>
-        <bundle dependency="true">mvn:org.springframework/org.springframework.beans/${spring.version}</bundle>
+        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-beans/${spring.version}</bundle>
 	<bundle dependency="true">mvn:commons-codec/commons-codec/${commons-codec.bundle.version}</bundle>
         <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons-httpclient.bundle.version}</bundle>
         <bundle>mvn:org.apache.servicemix.examples/cxf-jaxws-blueprint/${version}</bundle>
@@ -107,14 +107,14 @@
     </feature>
     <feature name="examples-cxf-ws-addressing" version="${version}" resolver="(obr)">
         <feature version="${cxf.version}">cxf-core</feature>
-        <bundle dependency="true">mvn:org.springframework/org.springframework.beans/${spring.version}</bundle>
+        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-beans/${spring.version}</bundle>
         <bundle dependency="true">mvn:commons-io/commons-io/${commons-io.version}</bundle>
         <bundle>mvn:org.apache.servicemix.examples/cxf-ws-addressing/${version}</bundle>
     </feature>
     <feature name="examples-cxf-ws-security-osgi" version="${version}" resolver="(obr)">
         <feature version="${cxf.version}">cxf-core</feature>
         <feature version="${cxf.version}">cxf-ws-security</feature>
-        <bundle dependency="true">mvn:org.springframework/org.springframework.beans/${spring.version}</bundle>
+        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-beans/${spring.version}</bundle>
         <bundle>mvn:org.apache.servicemix.examples/cxf-ws-security-osgi/${version}</bundle>
     </feature>
     <feature name="examples-cxf-ws-security-blueprint" version="${version}" resolver="(obr)">
@@ -127,7 +127,7 @@
         <feature version="${cxf.version}">cxf-ws-security</feature>
         <feature version="${cxf.version}">cxf-ws-rm</feature>
         <bundle dependency="true">mvn:org.apache.cxf/cxf-bundle-compatible/${cxf.version}</bundle>
-        <bundle dependency="true">mvn:org.springframework/org.springframework.beans/${spring.version}</bundle>
+        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-beans/${spring.version}</bundle>
         <bundle dependency="true">mvn:commons-io/commons-io/${commons-io.version}</bundle>
         <bundle>mvn:org.apache.servicemix.examples/cxf-ws-security-signature/${version}</bundle>
     </feature>

http://git-wip-us.apache.org/repos/asf/servicemix/blob/81edd62e/assembly/src/main/filtered-resources/features.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/filtered-resources/features.xml b/assembly/src/main/filtered-resources/features.xml
index fa9cc43..d11ba52 100644
--- a/assembly/src/main/filtered-resources/features.xml
+++ b/assembly/src/main/filtered-resources/features.xml
@@ -35,7 +35,7 @@
         <feature version="${cxf.version}">cxf-specs</feature>
         <feature version="[1.0,1.1)">transaction</feature>
         <feature version="${camel.version}">camel</feature>
-        <feature version="${spring.version}">spring-orm</feature>
+        <feature version="[3.2,3.3)">spring-orm</feature>
         <feature version="${drools.version}">drools</feature>
         <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.joda-time/${jodatime.bundle.version}</bundle>
         <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.wsdl4j/${wsdl4j.bundle.version}</bundle>

http://git-wip-us.apache.org/repos/asf/servicemix/blob/81edd62e/assembly/src/main/resources/etc/org.ops4j.pax.logging.cfg
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/etc/org.ops4j.pax.logging.cfg b/assembly/src/main/resources/etc/org.ops4j.pax.logging.cfg
index 61414fc..4c94b0f 100644
--- a/assembly/src/main/resources/etc/org.ops4j.pax.logging.cfg
+++ b/assembly/src/main/resources/etc/org.ops4j.pax.logging.cfg
@@ -27,12 +27,12 @@ log4j.logger.org.apache.sshd.server.channel.ChannelSession = INFO
 # CONSOLE appender not used by default
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} | %-5.5p | %-16.16t | %-32.32c{1}
| %X{bundle.id} - %X{bundle.name} - %X{bundle.version} | %m%n
+log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} | %-5.5p | %-16.16t | %-32.32c{1}
| %X{bundle.id} - %X{bundle.name} - %X{bundle.version} | %m%n
 
 # File appender
 log4j.appender.out=org.apache.log4j.RollingFileAppender
 log4j.appender.out.layout=org.apache.log4j.PatternLayout
-log4j.appender.out.layout.ConversionPattern=%d{ABSOLUTE} | %-5.5p | %-16.16t | %-32.32c{1}
| %X{bundle.id} - %X{bundle.name} - %X{bundle.version} | %m%n
+log4j.appender.out.layout.ConversionPattern=%d{ISO8601} | %-5.5p | %-16.16t | %-32.32c{1}
| %X{bundle.id} - %X{bundle.name} - %X{bundle.version} | %m%n
 log4j.appender.out.file=${karaf.data}/log/servicemix.log
 log4j.appender.out.append=true
 log4j.appender.out.maxFileSize=1MB
@@ -44,6 +44,6 @@ log4j.appender.sift.key=bundle.name
 log4j.appender.sift.default=servicemix
 log4j.appender.sift.appender=org.apache.log4j.FileAppender
 log4j.appender.sift.appender.layout=org.apache.log4j.PatternLayout
-log4j.appender.sift.appender.layout.ConversionPattern=%d{ABSOLUTE} | %-5.5p | %-16.16t |
%-32.32c{1} | %m%n
+log4j.appender.sift.appender.layout.ConversionPattern=%d{ISO8601} | %-5.5p | %-16.16t | %-32.32c{1}
| %m%n
 log4j.appender.sift.appender.file=${karaf.data}/log/$\\{bundle.name\\}.log
 log4j.appender.sift.appender.append=true

http://git-wip-us.apache.org/repos/asf/servicemix/blob/81edd62e/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 101a824..e5ab5e2 100644
--- a/assembly/src/main/resources/etc/system.properties
+++ b/assembly/src/main/resources/etc/system.properties
@@ -70,6 +70,17 @@ karaf.shell.init.script=${karaf.home}/etc/shell.init.script
 karaf.admin.role=admin
 
 #
+# Roles to use when logging into a local Karaf console.
+# The syntax is the following:
+# [classname:]principal
+# where classname is the class name of the principal object
+# (defaults to org.apache.karaf.jaas.modules.RolePrincipal)
+# and principal is the name of the principal of that class
+# (defaults to admin).
+#
+karaf.local.roles = admin,manager,viewer
+
+#
 # Set this empty property to avoid errors when validating xml documents.
 #
 xml.catalog.files=
@@ -81,6 +92,15 @@ xml.catalog.files=
 jline.nobell=true
 
 #
+# Deletes the entire karaf.data directory at every start
+#
+karaf.clean.all = false
+#
+# Deletes the karaf.data/cache directory at every start
+#
+karaf.clean.cache = false
+
+#
 # ServiceMix specs options
 #
 org.apache.servicemix.specs.debug=false
@@ -128,3 +148,16 @@ org.apache.cxf.Logger=org.apache.cxf.common.logging.Slf4jLogger
 org.apache.aries.proxy.weaving.enabled=none
 # Classes not to weave - Aries default + Xerces which is known to have issues.
 org.apache.aries.proxy.weaving.disabled=org.objectweb.asm.*,org.slf4j.*,org.apache.log4j.*,javax.*,org.apache.xerces.*
+
+#
+# By default, only Karaf shell commands are secured, but additional services can be
+# secured by expanding this filter
+#
+#karaf.secured.services=(&(osgi.command.scope=*)(osgi.command.function=*))
+
+#
+# Security properties
+#
+#java.security.policy=${karaf.home}/etc/all.policy
+#org.osgi.framework.security=osgi
+#org.osgi.framework.trust.repositories=${karaf.home}/etc/trustStore.ks
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/servicemix/blob/81edd62e/assembly/src/main/resources/etc/users.properties
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/etc/users.properties b/assembly/src/main/resources/etc/users.properties
index 5087da1..e066450 100644
--- a/assembly/src/main/resources/etc/users.properties
+++ b/assembly/src/main/resources/etc/users.properties
@@ -18,8 +18,20 @@
 ################################################################################
 
 #
-smx=smx,admin
+# This file contains the users, groups, and roles.
+# Each line has to be of the format:
+#
+# USER=PASSWORD,ROLE1,ROLE2,...
+# USER=PASSWORD,_g_:GROUP,...
+# _g_\:GROUP=ROLE1,ROLE2,...
+#
+# All users, grousp, and roles entered in this file are available after Karaf startup
+# and modifiable via the JAAS command group. These users reside in a JAAS domain
+# with the name "karaf".
+#
+smx = smx,_g_:admingroup
+_g_\:admingroup = group,admin,manager,viewer
 
 # Workaround for SM-2267: sometimes, the webconsole configuration first hands out a ConnectionFactory
 # that uses karaf/karaf as the credentials before picking up the settings in system.properties
-karaf=karaf,admin
+karaf = karaf,_g_:admingroup

http://git-wip-us.apache.org/repos/asf/servicemix/blob/81edd62e/itests/pom.xml
----------------------------------------------------------------------
diff --git a/itests/pom.xml b/itests/pom.xml
index 32ec403..8644250 100644
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -85,7 +85,7 @@
 
       <dependency>
         <groupId>org.ops4j.pax.url</groupId>
-        <artifactId>pax-url-mvn</artifactId>
+        <artifactId>pax-url-aether</artifactId>
         <scope>test</scope>
       </dependency>
       

http://git-wip-us.apache.org/repos/asf/servicemix/blob/81edd62e/itests/src/test/scala/org/apache/servicemix/itests/BasicAssemblyTests.scala
----------------------------------------------------------------------
diff --git a/itests/src/test/scala/org/apache/servicemix/itests/BasicAssemblyTests.scala b/itests/src/test/scala/org/apache/servicemix/itests/BasicAssemblyTests.scala
index 477531b..4ebbe18 100644
--- a/itests/src/test/scala/org/apache/servicemix/itests/BasicAssemblyTests.scala
+++ b/itests/src/test/scala/org/apache/servicemix/itests/BasicAssemblyTests.scala
@@ -32,7 +32,7 @@ trait BasicAssemblyTests { self: IntegrationTestSupport =>
 
   def isActive(bundle: Bundle) = Bundle.ACTIVE == bundle.getState
   def isResolved(bundle: Bundle) = Bundle.RESOLVED == bundle.getState
-  def isFragment(bundle: Bundle) = bundle.getHeaders("Fragement-Host").isEmpty
+  def isFragment(bundle: Bundle) = bundle.getHeaders().get("Fragment-Host") != null
 
 
   @Test

http://git-wip-us.apache.org/repos/asf/servicemix/blob/81edd62e/itests/src/test/scala/org/apache/servicemix/itests/IntegrationTestConfigurations.scala
----------------------------------------------------------------------
diff --git a/itests/src/test/scala/org/apache/servicemix/itests/IntegrationTestConfigurations.scala
b/itests/src/test/scala/org/apache/servicemix/itests/IntegrationTestConfigurations.scala
index 2120d53..5acbfd2 100644
--- a/itests/src/test/scala/org/apache/servicemix/itests/IntegrationTestConfigurations.scala
+++ b/itests/src/test/scala/org/apache/servicemix/itests/IntegrationTestConfigurations.scala
@@ -51,7 +51,7 @@ trait IntegrationTestConfigurations {
       karafDistributionConfiguration().
         frameworkUrl(
           maven().groupId("org.apache.servicemix").artifactId(artifact).`type`("zip").versionAsInProject()).
-        karafVersion("2.3.8").name("Apache ServiceMix (${name})").
+        karafVersion("2.4.0").name("Apache ServiceMix (${name})").
         unpackDirectory(new File(s"target/pax-exam/${artifact}")).
         useDeployFolder(false),
       keepRuntimeFolder(),

http://git-wip-us.apache.org/repos/asf/servicemix/blob/81edd62e/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index fdd7072..9cf6046 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -42,11 +42,11 @@
     <camel.version>2.13.2</camel.version>
     <cxf.version>2.7.11</cxf.version>
 
-    <felix.bundlerepository.version>1.6.6</felix.bundlerepository.version>
-    <karaf.version>2.3.8</karaf.version>
-    <aries.proxy.version>1.0.2</aries.proxy.version>
+    <felix.bundlerepository.version>2.0.2</felix.bundlerepository.version>
+    <karaf.version>2.4.0</karaf.version>
+    <aries.proxy.version>1.0.3</aries.proxy.version>
     <aries.util.version>1.1.0</aries.util.version>
-    <aries.blueprint.core.version>1.4.0</aries.blueprint.core.version>
+    <aries.blueprint.core.version>1.4.1</aries.blueprint.core.version>
     <pax.logging.version>1.7.4</pax.logging.version>
 
     <akka.version>2.2.3</akka.version>

http://git-wip-us.apache.org/repos/asf/servicemix/blob/81edd62e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 856bf35..46c9783 100644
--- a/pom.xml
+++ b/pom.xml
@@ -72,7 +72,7 @@
         <geronimo-connector.version>2.1.3</geronimo-connector.version>
         <geronimo-j2ee-connector.version>2.0.0</geronimo-j2ee-connector.version>
         <geronimo-jms.version>1.1.1</geronimo-jms.version>
-        <geronimo-servlet.version>1.1.2</geronimo-servlet.version>
+        <geronimo-servlet.version>1.0</geronimo-servlet.version>
         <geronimo-ws-metadata.version>1.1.3</geronimo-ws-metadata.version>
         <geronimo-atinject.version>1.0</geronimo-atinject.version>
 
@@ -84,7 +84,7 @@
         <derby.bundle.version>10.9.1.0_1</derby.bundle.version>
         <drools.bundle.version>${drools.version}_1</drools.bundle.version>
         <jaxb.api.version>2.2</jaxb.api.version>
-        <osgi.version>4.3.1</osgi.version>
+        <osgi.version>5.0.0</osgi.version>
         <scala.bundle.version>2.10.2_1</scala.bundle.version>
         <wsdl4j.bundle.version>1.6.2_6</wsdl4j.bundle.version>
         <swagger.bundle.version>1.3.0_1</swagger.bundle.version>
@@ -127,10 +127,10 @@
         <xml.api.version>2.11.0-20110622</xml.api.version>
         <xalan.version>2.7.1</xalan.version>
         <pax.exam.version>4.1.0</pax.exam.version>
-        <pax.url.version>1.3.7</pax.url.version>
+        <pax.url.version>2.2.0</pax.url.version>
         <postgresql.version>9.1-901</postgresql.version>
         <slf4j.version>1.7.5</slf4j.version>
-        <spring.version>3.2.4.RELEASE</spring.version>
+        <spring.version>3.2.9.RELEASE_1</spring.version>
         <wss4j.version>1.6.15</wss4j.version>
     </properties>
     
@@ -196,7 +196,7 @@
            </dependency>
            <dependency>
                <groupId>org.ops4j.pax.url</groupId>
-               <artifactId>pax-url-mvn</artifactId>
+               <artifactId>pax-url-aether</artifactId>
                <version>${pax.url.version}</version>
            </dependency>
 


Mime
View raw message