Index: pom.xml
===================================================================
--- pom.xml	(revision 1361534)
+++ pom.xml	(working copy)
@@ -132,7 +132,7 @@
         <felix.eventadmin-plugin.version>1.0.2</felix.eventadmin-plugin.version>
         <felix.obr.version>1.0.2</felix.obr.version>
         <aries.application.version>0.3</aries.application.version>
-        <aries.blueprint.version>0.3.2</aries.blueprint.version>
+        <aries.blueprint.version>0.4</aries.blueprint.version>
         <aries.jmx.api.version>0.3</aries.jmx.api.version>
         <aries.jmx.core.version>0.3.1</aries.jmx.core.version>
         <aries.jmx.blueprint.version>0.3</aries.jmx.blueprint.version>
@@ -142,13 +142,13 @@
         <aries.jndi.rmi.version>0.3</aries.jndi.rmi.version>
         <aries.jndi.url.version>0.3</aries.jndi.url.version>
         <aries.jndi.legacy.version>0.3</aries.jndi.legacy.version>
-        <aries.proxy.version>0.3.1</aries.proxy.version>
+        <aries.proxy.version>0.4.1</aries.proxy.version>
         <aries.transaction.version>0.3</aries.transaction.version>
         <jansi.version>1.9</jansi.version>
         <aries.transaction.blueprint.version>0.3</aries.transaction.blueprint.version>
         <aries.transaction.manager.version>0.3.1</aries.transaction.manager.version>
         <aries.transaction.wrappers.version>0.3</aries.transaction.wrappers.version>
-        <aries.util.version>0.3.1</aries.util.version>
+        <aries.util.version>0.4</aries.util.version>
         <jline.version>2.7</jline.version>
         <jsw.version>3.2.3</jsw.version>
         <log4j.version>1.2.16</log4j.version>
Index: shell/config/pom.xml
===================================================================
--- shell/config/pom.xml	(revision 1361534)
+++ shell/config/pom.xml	(working copy)
@@ -65,6 +65,11 @@
         
         <dependency>
             <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.slf4j</groupId>
             <artifactId>slf4j-jdk14</artifactId>
             <scope>test</scope>
         </dependency>
Index: shell/dev/pom.xml
===================================================================
--- shell/dev/pom.xml	(revision 1361534)
+++ shell/dev/pom.xml	(working copy)
@@ -51,6 +51,12 @@
         </dependency>
 
         <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
+
+
+        <dependency>
             <groupId>org.ops4j.pax.url</groupId>
             <artifactId>pax-url-mvn</artifactId>
             <scope>provided</scope>
Index: shell/osgi/pom.xml
===================================================================
--- shell/osgi/pom.xml	(revision 1361534)
+++ shell/osgi/pom.xml	(working copy)
@@ -48,6 +48,12 @@
         </dependency>
 
         <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
+
+
+        <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
             <scope>provided</scope>
Index: shell/commands/pom.xml
===================================================================
--- shell/commands/pom.xml	(revision 1361534)
+++ shell/commands/pom.xml	(working copy)
@@ -60,6 +60,12 @@
             <artifactId>org.osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>
+
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
Index: jaas/jasypt/pom.xml
===================================================================
--- jaas/jasypt/pom.xml	(revision 1361534)
+++ jaas/jasypt/pom.xml	(working copy)
@@ -58,6 +58,12 @@
             <artifactId>org.apache.aries.blueprint</artifactId>
             <scope>provided</scope>
         </dependency>
+        
+        <dependency>
+            <groupId>org.apache.aries</groupId>
+            <artifactId>org.apache.aries.util</artifactId>
+            <scope>test</scope>
+        </dependency>
 
         <dependency>
             <groupId>org.osgi</groupId>
Index: jaas/jasypt/src/main/java/org/apache/karaf/jaas/jasypt/handler/NamespaceHandler.java
===================================================================
--- jaas/jasypt/src/main/java/org/apache/karaf/jaas/jasypt/handler/NamespaceHandler.java	(revision 1361534)
+++ jaas/jasypt/src/main/java/org/apache/karaf/jaas/jasypt/handler/NamespaceHandler.java	(working copy)
@@ -21,7 +21,7 @@
 import java.util.Set;
 
 import org.apache.aries.blueprint.ParserContext;
-import org.apache.aries.blueprint.ext.PlaceholdersUtils;
+import org.apache.aries.blueprint.utils.PlaceholdersUtils;
 import org.apache.aries.blueprint.mutable.MutableBeanMetadata;
 import org.apache.aries.blueprint.mutable.MutableCollectionMetadata;
 import org.apache.aries.blueprint.mutable.MutableRefMetadata;
Index: webconsole/gogo/pom.xml
===================================================================
--- webconsole/gogo/pom.xml	(revision 1361534)
+++ webconsole/gogo/pom.xml	(working copy)
@@ -62,6 +62,11 @@
             <groupId>org.apache.karaf.shell</groupId>
             <artifactId>org.apache.karaf.shell.console</artifactId>
         </dependency>
+                
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
             <artifactId>org.apache.servicemix.bundles.junit</artifactId>
Index: admin/core/pom.xml
===================================================================
--- admin/core/pom.xml	(revision 1361534)
+++ admin/core/pom.xml	(working copy)
@@ -66,6 +66,11 @@
         </dependency>
 
         <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
+
+        <dependency>
             <groupId>org.springframework.osgi</groupId>
             <artifactId>spring-osgi-core</artifactId>
             <scope>test</scope>
Index: karaf-2.2.x.patch
===================================================================
--- karaf-2.2.x.patch	(revision 0)
+++ karaf-2.2.x.patch	(revision 0)
@@ -0,0 +1,158 @@
+Index: pom.xml
+===================================================================
+--- pom.xml	(revision 1361534)
++++ pom.xml	(working copy)
+@@ -132,7 +132,7 @@
+         <felix.eventadmin-plugin.version>1.0.2</felix.eventadmin-plugin.version>
+         <felix.obr.version>1.0.2</felix.obr.version>
+         <aries.application.version>0.3</aries.application.version>
+-        <aries.blueprint.version>0.3.2</aries.blueprint.version>
++        <aries.blueprint.version>0.4</aries.blueprint.version>
+         <aries.jmx.api.version>0.3</aries.jmx.api.version>
+         <aries.jmx.core.version>0.3.1</aries.jmx.core.version>
+         <aries.jmx.blueprint.version>0.3</aries.jmx.blueprint.version>
+@@ -142,13 +142,13 @@
+         <aries.jndi.rmi.version>0.3</aries.jndi.rmi.version>
+         <aries.jndi.url.version>0.3</aries.jndi.url.version>
+         <aries.jndi.legacy.version>0.3</aries.jndi.legacy.version>
+-        <aries.proxy.version>0.3.1</aries.proxy.version>
++        <aries.proxy.version>0.4.1</aries.proxy.version>
+         <aries.transaction.version>0.3</aries.transaction.version>
+         <jansi.version>1.9</jansi.version>
+         <aries.transaction.blueprint.version>0.3</aries.transaction.blueprint.version>
+         <aries.transaction.manager.version>0.3.1</aries.transaction.manager.version>
+         <aries.transaction.wrappers.version>0.3</aries.transaction.wrappers.version>
+-        <aries.util.version>0.3.1</aries.util.version>
++        <aries.util.version>0.4</aries.util.version>
+         <jline.version>2.7</jline.version>
+         <jsw.version>3.2.3</jsw.version>
+         <log4j.version>1.2.16</log4j.version>
+Index: shell/config/pom.xml
+===================================================================
+--- shell/config/pom.xml	(revision 1361534)
++++ shell/config/pom.xml	(working copy)
+@@ -65,6 +65,11 @@
+         
+         <dependency>
+             <groupId>org.slf4j</groupId>
++            <artifactId>slf4j-api</artifactId>
++        </dependency>
++
++        <dependency>
++            <groupId>org.slf4j</groupId>
+             <artifactId>slf4j-jdk14</artifactId>
+             <scope>test</scope>
+         </dependency>
+Index: shell/dev/pom.xml
+===================================================================
+--- shell/dev/pom.xml	(revision 1361534)
++++ shell/dev/pom.xml	(working copy)
+@@ -51,6 +51,12 @@
+         </dependency>
+ 
+         <dependency>
++            <groupId>org.slf4j</groupId>
++            <artifactId>slf4j-api</artifactId>
++        </dependency>
++
++
++        <dependency>
+             <groupId>org.ops4j.pax.url</groupId>
+             <artifactId>pax-url-mvn</artifactId>
+             <scope>provided</scope>
+Index: shell/osgi/pom.xml
+===================================================================
+--- shell/osgi/pom.xml	(revision 1361534)
++++ shell/osgi/pom.xml	(working copy)
+@@ -48,6 +48,12 @@
+         </dependency>
+ 
+         <dependency>
++            <groupId>org.slf4j</groupId>
++            <artifactId>slf4j-api</artifactId>
++        </dependency>
++
++
++        <dependency>
+             <groupId>org.osgi</groupId>
+             <artifactId>org.osgi.core</artifactId>
+             <scope>provided</scope>
+Index: shell/commands/pom.xml
+===================================================================
+--- shell/commands/pom.xml	(revision 1361534)
++++ shell/commands/pom.xml	(working copy)
+@@ -60,6 +60,12 @@
+             <artifactId>org.osgi.core</artifactId>
+             <scope>provided</scope>
+         </dependency>
++
++        <dependency>
++            <groupId>org.slf4j</groupId>
++            <artifactId>slf4j-api</artifactId>
++        </dependency>
++
+         <dependency>
+             <groupId>org.slf4j</groupId>
+             <artifactId>slf4j-simple</artifactId>
+Index: jaas/jasypt/pom.xml
+===================================================================
+--- jaas/jasypt/pom.xml	(revision 1361534)
++++ jaas/jasypt/pom.xml	(working copy)
+@@ -58,6 +58,12 @@
+             <artifactId>org.apache.aries.blueprint</artifactId>
+             <scope>provided</scope>
+         </dependency>
++        
++        <dependency>
++            <groupId>org.apache.aries</groupId>
++            <artifactId>org.apache.aries.util</artifactId>
++            <scope>test</scope>
++        </dependency>
+ 
+         <dependency>
+             <groupId>org.osgi</groupId>
+Index: jaas/jasypt/src/main/java/org/apache/karaf/jaas/jasypt/handler/NamespaceHandler.java
+===================================================================
+--- jaas/jasypt/src/main/java/org/apache/karaf/jaas/jasypt/handler/NamespaceHandler.java	(revision 1361534)
++++ jaas/jasypt/src/main/java/org/apache/karaf/jaas/jasypt/handler/NamespaceHandler.java	(working copy)
+@@ -21,7 +21,7 @@
+ import java.util.Set;
+ 
+ import org.apache.aries.blueprint.ParserContext;
+-import org.apache.aries.blueprint.ext.PlaceholdersUtils;
++import org.apache.aries.blueprint.utils.PlaceholdersUtils;
+ import org.apache.aries.blueprint.mutable.MutableBeanMetadata;
+ import org.apache.aries.blueprint.mutable.MutableCollectionMetadata;
+ import org.apache.aries.blueprint.mutable.MutableRefMetadata;
+Index: webconsole/gogo/pom.xml
+===================================================================
+--- webconsole/gogo/pom.xml	(revision 1361534)
++++ webconsole/gogo/pom.xml	(working copy)
+@@ -62,6 +62,11 @@
+             <groupId>org.apache.karaf.shell</groupId>
+             <artifactId>org.apache.karaf.shell.console</artifactId>
+         </dependency>
++                
++        <dependency>
++            <groupId>org.slf4j</groupId>
++            <artifactId>slf4j-api</artifactId>
++        </dependency>
+         <dependency>
+             <groupId>org.apache.servicemix.bundles</groupId>
+             <artifactId>org.apache.servicemix.bundles.junit</artifactId>
+Index: admin/core/pom.xml
+===================================================================
+--- admin/core/pom.xml	(revision 1361534)
++++ admin/core/pom.xml	(working copy)
+@@ -66,6 +66,11 @@
+         </dependency>
+ 
+         <dependency>
++            <groupId>org.slf4j</groupId>
++            <artifactId>slf4j-api</artifactId>
++        </dependency>
++
++        <dependency>
+             <groupId>org.springframework.osgi</groupId>
+             <artifactId>spring-osgi-core</artifactId>
+             <scope>test</scope>
Index: tooling/features-maven-plugin/src/test/java/org/apache/karaf/tooling/features/BundleToArtifactTest.java
===================================================================
--- tooling/features-maven-plugin/src/test/java/org/apache/karaf/tooling/features/BundleToArtifactTest.java	(revision 1361534)
+++ tooling/features-maven-plugin/src/test/java/org/apache/karaf/tooling/features/BundleToArtifactTest.java	(working copy)
@@ -32,7 +32,7 @@
 import org.junit.Test;
 
 /**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
  */
 public class BundleToArtifactTest extends MojoSupport {
 
Index: features/core/pom.xml
===================================================================
--- features/core/pom.xml	(revision 1361534)
+++ features/core/pom.xml	(working copy)
@@ -71,6 +71,11 @@
         </dependency>
 
         <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
+
+        <dependency>
             <groupId>org.springframework.osgi</groupId>
             <artifactId>spring-osgi-core</artifactId>
             <scope>test</scope>