528188 - Update to Spring 5

Signed-off-by: ootto <olaf@x100.de>
diff --git a/core/pom.xml b/core/pom.xml
index 781781e..4051e4c 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>gemini-blueprint</artifactId>
         <groupId>org.eclipse.gemini.blueprint</groupId>
-        <version>2.2.0.M1-SNAPSHOT</version>
+        <version>3.0.0.M1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/core/src/main/java/org/eclipse/gemini/blueprint/util/OsgiStringUtils.java b/core/src/main/java/org/eclipse/gemini/blueprint/util/OsgiStringUtils.java
index 9ccde10..981568a 100644
--- a/core/src/main/java/org/eclipse/gemini/blueprint/util/OsgiStringUtils.java
+++ b/core/src/main/java/org/eclipse/gemini/blueprint/util/OsgiStringUtils.java
@@ -14,18 +14,18 @@
 

 package org.eclipse.gemini.blueprint.util;

 

-import java.util.Dictionary;

-

 import org.osgi.framework.Bundle;

 import org.osgi.framework.BundleEvent;

 import org.osgi.framework.FrameworkEvent;

 import org.osgi.framework.ServiceEvent;

 import org.osgi.framework.ServiceReference;

-import org.springframework.core.ConstantException;

 import org.springframework.core.Constants;

+import org.springframework.core.Constants.ConstantException;

 import org.springframework.util.Assert;

 import org.springframework.util.ObjectUtils;

 

+import java.util.Dictionary;

+

 /**

  * Utility class for creating nice string representations of various OSGi classes.

  * 

@@ -60,7 +60,6 @@
 		} catch (ConstantException cex) {

 			return UNKNOWN_EVENT_TYPE;

 		}

-

 	}

 

 	/**

diff --git a/extender/pom.xml b/extender/pom.xml
index d54653e..09a5c17 100644
--- a/extender/pom.xml
+++ b/extender/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>gemini-blueprint</artifactId>
         <groupId>org.eclipse.gemini.blueprint</groupId>
-        <version>2.2.0.M1-SNAPSHOT</version>
+        <version>3.0.0.M1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/extensions/pom.xml b/extensions/pom.xml
index 185284c..791bf21 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>gemini-blueprint</artifactId>
         <groupId>org.eclipse.gemini.blueprint</groupId>
-        <version>2.2.0.M1-SNAPSHOT</version>
+        <version>3.0.0.M1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/integration-tests/bundles/blueprint/config.bundle/pom.xml b/integration-tests/bundles/blueprint/config.bundle/pom.xml
index 073ab69..a92bc65 100644
--- a/integration-tests/bundles/blueprint/config.bundle/pom.xml
+++ b/integration-tests/bundles/blueprint/config.bundle/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.eclipse.gemini.blueprint.iandt.blueprint</groupId>
         <artifactId>bundles</artifactId>
-        <version>2.2.0.M1-SNAPSHOT</version>
+        <version>3.0.0.M1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/integration-tests/bundles/blueprint/error.bundle/pom.xml b/integration-tests/bundles/blueprint/error.bundle/pom.xml
index 2211091..0a33304 100644
--- a/integration-tests/bundles/blueprint/error.bundle/pom.xml
+++ b/integration-tests/bundles/blueprint/error.bundle/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.eclipse.gemini.blueprint.iandt.blueprint</groupId>
         <artifactId>bundles</artifactId>
-        <version>2.2.0.M1-SNAPSHOT</version>
+        <version>3.0.0.M1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/integration-tests/bundles/blueprint/pom.xml b/integration-tests/bundles/blueprint/pom.xml
index 157ef07..bd1cc75 100644
--- a/integration-tests/bundles/blueprint/pom.xml
+++ b/integration-tests/bundles/blueprint/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
         <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
-        <version>2.2.0.M1-SNAPSHOT</version>
+        <version>3.0.0.M1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/integration-tests/bundles/blueprint/simple.bundle/pom.xml b/integration-tests/bundles/blueprint/simple.bundle/pom.xml
index 4ef0d3a..bd686b2 100644
--- a/integration-tests/bundles/blueprint/simple.bundle/pom.xml
+++ b/integration-tests/bundles/blueprint/simple.bundle/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.eclipse.gemini.blueprint.iandt.blueprint</groupId>
         <artifactId>bundles</artifactId>
-        <version>2.2.0.M1-SNAPSHOT</version>
+        <version>3.0.0.M1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/integration-tests/bundles/blueprint/waiting.bundle/pom.xml b/integration-tests/bundles/blueprint/waiting.bundle/pom.xml
index 2d00f6e..ed7640b 100644
--- a/integration-tests/bundles/blueprint/waiting.bundle/pom.xml
+++ b/integration-tests/bundles/blueprint/waiting.bundle/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.eclipse.gemini.blueprint.iandt.blueprint</groupId>
         <artifactId>bundles</artifactId>
-        <version>2.2.0.M1-SNAPSHOT</version>
+        <version>3.0.0.M1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/integration-tests/bundles/cardinality.0to1.bundle/pom.xml b/integration-tests/bundles/cardinality.0to1.bundle/pom.xml
index e51bf8d..b4b180f 100644
--- a/integration-tests/bundles/cardinality.0to1.bundle/pom.xml
+++ b/integration-tests/bundles/cardinality.0to1.bundle/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
         <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
-        <version>2.2.0.M1-SNAPSHOT</version>
+        <version>3.0.0.M1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/integration-tests/bundles/config.bundle/async.nowait.bundle/pom.xml b/integration-tests/bundles/config.bundle/async.nowait.bundle/pom.xml
index a9f8b0f..3e1120c 100644
--- a/integration-tests/bundles/config.bundle/async.nowait.bundle/pom.xml
+++ b/integration-tests/bundles/config.bundle/async.nowait.bundle/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
         <artifactId>config.bundle</artifactId>
-        <version>2.2.0.M1-SNAPSHOT</version>
+        <version>3.0.0.M1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/integration-tests/bundles/config.bundle/async.wait.bundle/pom.xml b/integration-tests/bundles/config.bundle/async.wait.bundle/pom.xml
index b74774b..2b7f6d9 100644
--- a/integration-tests/bundles/config.bundle/async.wait.bundle/pom.xml
+++ b/integration-tests/bundles/config.bundle/async.wait.bundle/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
         <artifactId>config.bundle</artifactId>
-        <version>2.2.0.M1-SNAPSHOT</version>
+        <version>3.0.0.M1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/integration-tests/bundles/config.bundle/no.publish.bundle/pom.xml b/integration-tests/bundles/config.bundle/no.publish.bundle/pom.xml
index 9661968..6bb79df 100644
--- a/integration-tests/bundles/config.bundle/no.publish.bundle/pom.xml
+++ b/integration-tests/bundles/config.bundle/no.publish.bundle/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
         <artifactId>config.bundle</artifactId>
-        <version>2.2.0.M1-SNAPSHOT</version>
+        <version>3.0.0.M1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/integration-tests/bundles/config.bundle/pom.xml b/integration-tests/bundles/config.bundle/pom.xml
index 325aef1..5e08934 100644
--- a/integration-tests/bundles/config.bundle/pom.xml
+++ b/integration-tests/bundles/config.bundle/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
         <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
-        <version>2.2.0.M1-SNAPSHOT</version>
+        <version>3.0.0.M1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/integration-tests/bundles/config.bundle/sync.nowait.bundle/pom.xml b/integration-tests/bundles/config.bundle/sync.nowait.bundle/pom.xml
index 0e6614b..958798b 100644
--- a/integration-tests/bundles/config.bundle/sync.nowait.bundle/pom.xml
+++ b/integration-tests/bundles/config.bundle/sync.nowait.bundle/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
         <artifactId>config.bundle</artifactId>
-        <version>2.2.0.M1-SNAPSHOT</version>
+        <version>3.0.0.M1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/integration-tests/bundles/config.bundle/sync.tail.bundle/pom.xml b/integration-tests/bundles/config.bundle/sync.tail.bundle/pom.xml
index 8f32fab..8fa9d81 100644
--- a/integration-tests/bundles/config.bundle/sync.tail.bundle/pom.xml
+++ b/integration-tests/bundles/config.bundle/sync.tail.bundle/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
         <artifactId>config.bundle</artifactId>
-        <version>2.2.0.M1-SNAPSHOT</version>
+        <version>3.0.0.M1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/integration-tests/bundles/config.bundle/sync.wait.bundle/pom.xml b/integration-tests/bundles/config.bundle/sync.wait.bundle/pom.xml
index cb62c70..50a2a31 100644
--- a/integration-tests/bundles/config.bundle/sync.wait.bundle/pom.xml
+++ b/integration-tests/bundles/config.bundle/sync.wait.bundle/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
         <artifactId>config.bundle</artifactId>
-        <version>2.2.0.M1-SNAPSHOT</version>
+        <version>3.0.0.M1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/integration-tests/bundles/config.file.with.dots.bundle/pom.xml b/integration-tests/bundles/config.file.with.dots.bundle/pom.xml
index 2318a82..f7d19f4 100644
--- a/integration-tests/bundles/config.file.with.dots.bundle/pom.xml
+++ b/integration-tests/bundles/config.file.with.dots.bundle/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
         <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
-        <version>2.2.0.M1-SNAPSHOT</version>
+        <version>3.0.0.M1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/integration-tests/bundles/configuration.test.bundle/pom.xml b/integration-tests/bundles/configuration.test.bundle/pom.xml
index ea92aa9..d3c73bf 100644
--- a/integration-tests/bundles/configuration.test.bundle/pom.xml
+++ b/integration-tests/bundles/configuration.test.bundle/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
         <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
-        <version>2.2.0.M1-SNAPSHOT</version>
+        <version>3.0.0.M1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/integration-tests/bundles/deadlock.bundle/pom.xml b/integration-tests/bundles/deadlock.bundle/pom.xml
index 82dcdfa..7b92366 100644
--- a/integration-tests/bundles/deadlock.bundle/pom.xml
+++ b/integration-tests/bundles/deadlock.bundle/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
         <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
-        <version>2.2.0.M1-SNAPSHOT</version>
+        <version>3.0.0.M1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/integration-tests/bundles/dependency.factory.bundle/pom.xml b/integration-tests/bundles/dependency.factory.bundle/pom.xml
index 36d1cb4..d7268ef 100644
--- a/integration-tests/bundles/dependency.factory.bundle/pom.xml
+++ b/integration-tests/bundles/dependency.factory.bundle/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
         <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
-        <version>2.2.0.M1-SNAPSHOT</version>
+        <version>3.0.0.M1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/integration-tests/bundles/dependency.test.bundle/pom.xml b/integration-tests/bundles/dependency.test.bundle/pom.xml
index e2a540b..92518f9 100644
--- a/integration-tests/bundles/dependency.test.bundle/pom.xml
+++ b/integration-tests/bundles/dependency.test.bundle/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
         <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
-        <version>2.2.0.M1-SNAPSHOT</version>
+        <version>3.0.0.M1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/integration-tests/bundles/error.bundle/pom.xml b/integration-tests/bundles/error.bundle/pom.xml
index abf89b5..19c9ddf 100644
--- a/integration-tests/bundles/error.bundle/pom.xml
+++ b/integration-tests/bundles/error.bundle/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
         <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
-        <version>2.2.0.M1-SNAPSHOT</version>
+        <version>3.0.0.M1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/integration-tests/bundles/export.import.dependency.bundle/pom.xml b/integration-tests/bundles/export.import.dependency.bundle/pom.xml
index 4aa5641..db3b5b6 100644
--- a/integration-tests/bundles/export.import.dependency.bundle/pom.xml
+++ b/integration-tests/bundles/export.import.dependency.bundle/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
         <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
-        <version>2.2.0.M1-SNAPSHOT</version>
+        <version>3.0.0.M1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/integration-tests/bundles/extender.fragment.bundle/pom.xml b/integration-tests/bundles/extender.fragment.bundle/pom.xml
index bc2e202..44ed2a4 100644
--- a/integration-tests/bundles/extender.fragment.bundle/pom.xml
+++ b/integration-tests/bundles/extender.fragment.bundle/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
         <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
-        <version>2.2.0.M1-SNAPSHOT</version>
+        <version>3.0.0.M1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/integration-tests/bundles/extender.listener.bundle/pom.xml b/integration-tests/bundles/extender.listener.bundle/pom.xml
index 543a4d8..795c417 100644
--- a/integration-tests/bundles/extender.listener.bundle/pom.xml
+++ b/integration-tests/bundles/extender.listener.bundle/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
         <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
-        <version>2.2.0.M1-SNAPSHOT</version>
+        <version>3.0.0.M1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/integration-tests/bundles/extender.version.bundle/pom.xml b/integration-tests/bundles/extender.version.bundle/pom.xml
index 38503fd..c968148 100644
--- a/integration-tests/bundles/extender.version.bundle/pom.xml
+++ b/integration-tests/bundles/extender.version.bundle/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
         <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
-        <version>2.2.0.M1-SNAPSHOT</version>
+        <version>3.0.0.M1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/integration-tests/bundles/io.fragment.1.bundle/pom.xml b/integration-tests/bundles/io.fragment.1.bundle/pom.xml
index 21daacc..881ccc0 100644
--- a/integration-tests/bundles/io.fragment.1.bundle/pom.xml
+++ b/integration-tests/bundles/io.fragment.1.bundle/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
         <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
-        <version>2.2.0.M1-SNAPSHOT</version>
+        <version>3.0.0.M1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/integration-tests/bundles/io.fragment.2.bundle/pom.xml b/integration-tests/bundles/io.fragment.2.bundle/pom.xml
index 7197f08..51db3a3 100644
--- a/integration-tests/bundles/io.fragment.2.bundle/pom.xml
+++ b/integration-tests/bundles/io.fragment.2.bundle/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
         <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
-        <version>2.2.0.M1-SNAPSHOT</version>
+        <version>3.0.0.M1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/integration-tests/bundles/jdk.proxy.bundle/pom.xml b/integration-tests/bundles/jdk.proxy.bundle/pom.xml
index 2811684..108a031 100644
--- a/integration-tests/bundles/jdk.proxy.bundle/pom.xml
+++ b/integration-tests/bundles/jdk.proxy.bundle/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
         <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
-        <version>2.2.0.M1-SNAPSHOT</version>
+        <version>3.0.0.M1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/integration-tests/bundles/jdk5/component.scan.bundle/pom.xml b/integration-tests/bundles/jdk5/component.scan.bundle/pom.xml
index 738922f..9dbe2e9 100644
--- a/integration-tests/bundles/jdk5/component.scan.bundle/pom.xml
+++ b/integration-tests/bundles/jdk5/component.scan.bundle/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
         <artifactId>spring-osgi-jdk5-integration-test-bundles</artifactId>
-        <version>2.2.0.M1-SNAPSHOT</version>
+        <version>3.0.0.M1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/integration-tests/bundles/jdk5/pom.xml b/integration-tests/bundles/jdk5/pom.xml
index 1e11f2b..741a564 100644
--- a/integration-tests/bundles/jdk5/pom.xml
+++ b/integration-tests/bundles/jdk5/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
         <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
-        <version>2.2.0.M1-SNAPSHOT</version>
+        <version>3.0.0.M1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/integration-tests/bundles/lifecycle.test.bundle/pom.xml b/integration-tests/bundles/lifecycle.test.bundle/pom.xml
index 38a442f..b0fbc50 100644
--- a/integration-tests/bundles/lifecycle.test.bundle/pom.xml
+++ b/integration-tests/bundles/lifecycle.test.bundle/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
         <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
-        <version>2.2.0.M1-SNAPSHOT</version>
+        <version>3.0.0.M1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/integration-tests/bundles/namespace.own.consumer.bundle/pom.xml b/integration-tests/bundles/namespace.own.consumer.bundle/pom.xml
index c5530ef..f835d66 100644
--- a/integration-tests/bundles/namespace.own.consumer.bundle/pom.xml
+++ b/integration-tests/bundles/namespace.own.consumer.bundle/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
         <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
-        <version>2.2.0.M1-SNAPSHOT</version>
+        <version>3.0.0.M1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/integration-tests/bundles/pom.xml b/integration-tests/bundles/pom.xml
index 421cb78..97cf69d 100644
--- a/integration-tests/bundles/pom.xml
+++ b/integration-tests/bundles/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
         <artifactId>gemini-blueprint-integration-tests-parent</artifactId>
-        <version>2.2.0.M1-SNAPSHOT</version>
+        <version>3.0.0.M1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/integration-tests/bundles/proxy.creator.bundle/pom.xml b/integration-tests/bundles/proxy.creator.bundle/pom.xml
index a0047b4..78247f5 100644
--- a/integration-tests/bundles/proxy.creator.bundle/pom.xml
+++ b/integration-tests/bundles/proxy.creator.bundle/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
         <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
-        <version>2.2.0.M1-SNAPSHOT</version>
+        <version>3.0.0.M1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/integration-tests/bundles/proxy.destruction.test.bundle/pom.xml b/integration-tests/bundles/proxy.destruction.test.bundle/pom.xml
index 9d0d467..9df791d 100644
--- a/integration-tests/bundles/proxy.destruction.test.bundle/pom.xml
+++ b/integration-tests/bundles/proxy.destruction.test.bundle/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
         <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
-        <version>2.2.0.M1-SNAPSHOT</version>
+        <version>3.0.0.M1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/integration-tests/bundles/proxy.listener/pom.xml b/integration-tests/bundles/proxy.listener/pom.xml
index d47b9a7..8af11c5 100644
--- a/integration-tests/bundles/proxy.listener/pom.xml
+++ b/integration-tests/bundles/proxy.listener/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
         <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
-        <version>2.2.0.M1-SNAPSHOT</version>
+        <version>3.0.0.M1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/integration-tests/bundles/recursive.type.bundle/pom.xml b/integration-tests/bundles/recursive.type.bundle/pom.xml
index c4db735..52150f0 100644
--- a/integration-tests/bundles/recursive.type.bundle/pom.xml
+++ b/integration-tests/bundles/recursive.type.bundle/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
 		<artifactId>gemini-blueprint-integration-test-bundles</artifactId>
-		<version>2.2.0.M1-SNAPSHOT</version>
+		<version>3.0.0.M1-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/integration-tests/bundles/reference.test.bundle/pom.xml b/integration-tests/bundles/reference.test.bundle/pom.xml
index 8cb1aee..14b096b 100644
--- a/integration-tests/bundles/reference.test.bundle/pom.xml
+++ b/integration-tests/bundles/reference.test.bundle/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
         <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
-        <version>2.2.0.M1-SNAPSHOT</version>
+        <version>3.0.0.M1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/integration-tests/bundles/scoped.a.bundle/pom.xml b/integration-tests/bundles/scoped.a.bundle/pom.xml
index 7ec1e72..0e56218 100644
--- a/integration-tests/bundles/scoped.a.bundle/pom.xml
+++ b/integration-tests/bundles/scoped.a.bundle/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
         <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
-        <version>2.2.0.M1-SNAPSHOT</version>
+        <version>3.0.0.M1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/integration-tests/bundles/scoped.b.bundle/pom.xml b/integration-tests/bundles/scoped.b.bundle/pom.xml
index 037c75f..01a66f6 100644
--- a/integration-tests/bundles/scoped.b.bundle/pom.xml
+++ b/integration-tests/bundles/scoped.b.bundle/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
         <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
-        <version>2.2.0.M1-SNAPSHOT</version>
+        <version>3.0.0.M1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/integration-tests/bundles/scoped.common.bundle/pom.xml b/integration-tests/bundles/scoped.common.bundle/pom.xml
index a719924..aa1132e 100644
--- a/integration-tests/bundles/scoped.common.bundle/pom.xml
+++ b/integration-tests/bundles/scoped.common.bundle/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
         <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
-        <version>2.2.0.M1-SNAPSHOT</version>
+        <version>3.0.0.M1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/integration-tests/bundles/service.listener.bundle/pom.xml b/integration-tests/bundles/service.listener.bundle/pom.xml
index e75c92c..0c66bdf 100644
--- a/integration-tests/bundles/service.listener.bundle/pom.xml
+++ b/integration-tests/bundles/service.listener.bundle/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
         <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
-        <version>2.2.0.M1-SNAPSHOT</version>
+        <version>3.0.0.M1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/integration-tests/bundles/simple.service.2.bundle/pom.xml b/integration-tests/bundles/simple.service.2.bundle/pom.xml
index 203df9b..6138ccf 100644
--- a/integration-tests/bundles/simple.service.2.bundle/pom.xml
+++ b/integration-tests/bundles/simple.service.2.bundle/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
         <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
-        <version>2.2.0.M1-SNAPSHOT</version>
+        <version>3.0.0.M1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/integration-tests/bundles/simple.service.3.bundle/pom.xml b/integration-tests/bundles/simple.service.3.bundle/pom.xml
index 1d8d1b5..0f01715 100644
--- a/integration-tests/bundles/simple.service.3.bundle/pom.xml
+++ b/integration-tests/bundles/simple.service.3.bundle/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
         <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
-        <version>2.2.0.M1-SNAPSHOT</version>
+        <version>3.0.0.M1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/integration-tests/bundles/simple.service.bundle.2.identical/pom.xml b/integration-tests/bundles/simple.service.bundle.2.identical/pom.xml
index 50d8544..a1f4a40 100644
--- a/integration-tests/bundles/simple.service.bundle.2.identical/pom.xml
+++ b/integration-tests/bundles/simple.service.bundle.2.identical/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
         <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
-        <version>2.2.0.M1-SNAPSHOT</version>
+        <version>3.0.0.M1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/integration-tests/bundles/simple.service.bundle.identical/pom.xml b/integration-tests/bundles/simple.service.bundle.identical/pom.xml
index b4c1364..0e9854f 100644
--- a/integration-tests/bundles/simple.service.bundle.identical/pom.xml
+++ b/integration-tests/bundles/simple.service.bundle.identical/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
         <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
-        <version>2.2.0.M1-SNAPSHOT</version>
+        <version>3.0.0.M1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/integration-tests/bundles/simple.service.bundle/pom.xml b/integration-tests/bundles/simple.service.bundle/pom.xml
index 6dd7705..348f85d 100644
--- a/integration-tests/bundles/simple.service.bundle/pom.xml
+++ b/integration-tests/bundles/simple.service.bundle/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
         <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
-        <version>2.2.0.M1-SNAPSHOT</version>
+        <version>3.0.0.M1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/integration-tests/bundles/tccl.bundle/pom.xml b/integration-tests/bundles/tccl.bundle/pom.xml
index efcbe16..28f714b 100644
--- a/integration-tests/bundles/tccl.bundle/pom.xml
+++ b/integration-tests/bundles/tccl.bundle/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
         <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
-        <version>2.2.0.M1-SNAPSHOT</version>
+        <version>3.0.0.M1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/integration-tests/bundles/tccl.intf.bundle/pom.xml b/integration-tests/bundles/tccl.intf.bundle/pom.xml
index 1923d86..9ed05b7 100644
--- a/integration-tests/bundles/tccl.intf.bundle/pom.xml
+++ b/integration-tests/bundles/tccl.intf.bundle/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
         <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
-        <version>2.2.0.M1-SNAPSHOT</version>
+        <version>3.0.0.M1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/integration-tests/bundles/trivial.bundle/pom.xml b/integration-tests/bundles/trivial.bundle/pom.xml
index c17b1a7..0687c88 100644
--- a/integration-tests/bundles/trivial.bundle/pom.xml
+++ b/integration-tests/bundles/trivial.bundle/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
         <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
-        <version>2.2.0.M1-SNAPSHOT</version>
+        <version>3.0.0.M1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/integration-tests/bundles/trivial.test.bundle/pom.xml b/integration-tests/bundles/trivial.test.bundle/pom.xml
index aa22a86..fbc313e 100644
--- a/integration-tests/bundles/trivial.test.bundle/pom.xml
+++ b/integration-tests/bundles/trivial.test.bundle/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
         <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
-        <version>2.2.0.M1-SNAPSHOT</version>
+        <version>3.0.0.M1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index ff5e43d..1754117 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.eclipse.gemini.blueprint</groupId>
         <artifactId>gemini-blueprint</artifactId>
-        <version>2.2.0.M1-SNAPSHOT</version>
+        <version>3.0.0.M1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/integration-tests/tests/pom.xml b/integration-tests/tests/pom.xml
index be7d372..f04d676 100644
--- a/integration-tests/tests/pom.xml
+++ b/integration-tests/tests/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
         <artifactId>gemini-blueprint-integration-tests-parent</artifactId>
-        <version>2.2.0.M1-SNAPSHOT</version>
+        <version>3.0.0.M1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/io/pom.xml b/io/pom.xml
index b256f9f..fafc7c0 100644
--- a/io/pom.xml
+++ b/io/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>gemini-blueprint</artifactId>
         <groupId>org.eclipse.gemini.blueprint</groupId>
-        <version>2.2.0.M1-SNAPSHOT</version>
+        <version>3.0.0.M1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/io/src/main/java/org/eclipse/gemini/blueprint/io/OsgiBundleResourcePatternResolver.java b/io/src/main/java/org/eclipse/gemini/blueprint/io/OsgiBundleResourcePatternResolver.java
index 2cca736..a0fbbba 100644
--- a/io/src/main/java/org/eclipse/gemini/blueprint/io/OsgiBundleResourcePatternResolver.java
+++ b/io/src/main/java/org/eclipse/gemini/blueprint/io/OsgiBundleResourcePatternResolver.java
@@ -439,9 +439,6 @@
 

 	/**

 	 * Checks the jar entries from the Bundle-Classpath for the given pattern.

-	 * 

-	 * @param list

-	 * @param ur

 	 */

 	private void findBundleClassPathMatchingJarEntries(List<String> list, URL url, String pattern) throws IOException {

 		// get the stream to the resource and read it as a jar

@@ -566,7 +563,8 @@
 		for (int i = 0; i < rootDirResources.length; i++) {

 			Resource rootDirResource = rootDirResources[i];

 			if (isJarResource(rootDirResource)) {

-				result.addAll(doFindPathMatchingJarResources(rootDirResource, subPattern));

+				// FIXME: Spring 5 Migration

+				result.addAll(doFindPathMatchingJarResources(rootDirResource, new URL(""), subPattern));

 			} else {

 				result.addAll(doFindPathMatchingFileResources(rootDirResource, subPattern, searchType));

 			}

@@ -579,7 +577,7 @@
 

 	/**

 	 * {@inheritDoc}

-	 * 

+	 *

 	 * Overrides the default check up since computing the URL can be fairly expensive operation as there is no caching

 	 * (due to the framework dynamic nature).

 	 */

@@ -598,7 +596,7 @@
 

 	/**

 	 * Based on the search type, uses the appropriate searching method.

-	 * 

+	 *

 	 * @see OsgiBundleResource#BUNDLE_URL_PREFIX

 	 * @see org.springframework.core.io.support.PathMatchingResourcePatternResolver#getResources(java.lang.String)

 	 */

diff --git a/mock/pom.xml b/mock/pom.xml
index b60f55d..918ccab 100644
--- a/mock/pom.xml
+++ b/mock/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>gemini-blueprint</artifactId>
         <groupId>org.eclipse.gemini.blueprint</groupId>
-        <version>2.2.0.M1-SNAPSHOT</version>
+        <version>3.0.0.M1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/pom.xml b/pom.xml
index 7b26f12..be5f12f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <groupId>org.eclipse.gemini.blueprint</groupId>
     <artifactId>gemini-blueprint</artifactId>
     <!-- Note: When updating the version, ensure it is a valid OSGi version -->
-    <version>2.2.0.M1-SNAPSHOT</version>
+    <version>3.0.0.M1-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Gemini Blueprint</name>
     <url>http://www.eclipse.org/gemini/blueprint/</url>
@@ -23,8 +23,8 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- Spring version -->
-        <spring.maven.artifact.version>4.3.7.RELEASE_1</spring.maven.artifact.version>
-        <spring.base.version>4.3.0</spring.base.version>
+        <spring.maven.artifact.version>5.0.2.RELEASE_1</spring.maven.artifact.version>
+        <spring.base.version>5.0.0</spring.base.version>
 
         <symName.prefix>org.eclipse.gemini.blueprint</symName.prefix>
         <spring.osgi.symbolic.name>${project.groupId}.${project.artifactId}</spring.osgi.symbolic.name>
@@ -61,7 +61,7 @@
         <policy.url>..${file.separator}policy.all</policy.url>
 
         <!-- common version ranges -->
-        <spring.version.range.nq>[${spring.base.version},4.4)</spring.version.range.nq>
+        <spring.version.range.nq>[${spring.base.version},6)</spring.version.range.nq>
         <spring.version.range>"${spring.version.range.nq}"</spring.version.range>
         <gemini.blueprint.version.range.nq>[${project.version},${project.version}]</gemini.blueprint.version.range.nq>
         <gemini.blueprint.version.range>"${gemini.blueprint.version.range.nq}"</gemini.blueprint.version.range>
diff --git a/test-support/pom.xml b/test-support/pom.xml
index 563d173..1992b93 100644
--- a/test-support/pom.xml
+++ b/test-support/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>gemini-blueprint</artifactId>
         <groupId>org.eclipse.gemini.blueprint</groupId>
-        <version>2.2.0.M1-SNAPSHOT</version>
+        <version>3.0.0.M1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/test-support/src/main/resources/org/eclipse/gemini/blueprint/test/internal/boot-bundles.properties b/test-support/src/main/resources/org/eclipse/gemini/blueprint/test/internal/boot-bundles.properties
index 0cd2970..cdcadf3 100644
--- a/test-support/src/main/resources/org/eclipse/gemini/blueprint/test/internal/boot-bundles.properties
+++ b/test-support/src/main/resources/org/eclipse/gemini/blueprint/test/internal/boot-bundles.properties
@@ -19,7 +19,7 @@
 ignore.junit.version=4.12_1
 ignore.logback.version=1.0.13
 
-ignore.spring.version=4.3.7.RELEASE_1
+ignore.spring.version=5.0.2.RELEASE_1
 ignore.gemini.blueprint.version=${project.version}
 ignore.slf4j.version=1.7.5
 ignore.assertj.version=3.6.2