Google Git
Sign in
eclipse/gemini.blueprint/org.eclipse.gemini.blueprint/82696ce50150570d10dc029085c783fafbb047ed^!/.
commit
82696ce50150570d10dc029085c783fafbb047ed
[log] [tgz]
author
ootto <olaf@x100.de>
Sat Jun 10 15:45:58 2017 +0200
committer
ootto <olaf@x100.de>
Sat Jun 10 15:45:58 2017 +0200
tree
8228d745c6912bf0b03655e18f54187d25bee235
parent
10dc4a3581c2d3be585ef270b76c721cd881af0c [diff]
Update after feature branch merge

Signed-off-by: ootto <olaf@x100.de>

diff --git a/core/pom.xml b/core/pom.xml
index c369c1d..781781e 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.1.0.JAVA7-SNAPSHOT</version>
+        <version>2.2.0.M1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/extender/pom.xml b/extender/pom.xml
index f0fbc3d..d54653e 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.1.0.JAVA7-SNAPSHOT</version>
+        <version>2.2.0.M1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/extender/src/main/java/org/eclipse/gemini/blueprint/extender/internal/dependencies/shutdown/ShutdownSorter.java b/extender/src/main/java/org/eclipse/gemini/blueprint/extender/internal/dependencies/shutdown/ShutdownSorter.java
index 2a00faf..4c406be 100644
--- a/extender/src/main/java/org/eclipse/gemini/blueprint/extender/internal/dependencies/shutdown/ShutdownSorter.java
+++ b/extender/src/main/java/org/eclipse/gemini/blueprint/extender/internal/dependencies/shutdown/ShutdownSorter.java

@@ -7,13 +7,18 @@
  * http://www.eclipse.org/legal/epl-v10.html and the Apache License v2.0

  * is available at http://www.opensource.org/licenses/apache2.0.php.

  * You may elect to redistribute this code under either of these licenses. 

- * 

+ *

  * Contributors:

  *   VMware Inc.

  *****************************************************************************/

 

 package org.eclipse.gemini.blueprint.extender.internal.dependencies.shutdown;

 

+import java.util.ArrayList;

+import java.util.Arrays;

+import java.util.Collection;

+import java.util.Comparator;

+import java.util.List;

 import org.apache.commons.logging.Log;

 import org.apache.commons.logging.LogFactory;

 import org.eclipse.gemini.blueprint.util.OsgiServiceReferenceUtils;

@@ -21,16 +26,9 @@
 import org.osgi.framework.Bundle;

 import org.osgi.framework.ServiceReference;

 

-import java.util.ArrayList;

-import java.util.Arrays;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.Comparator;

-import java.util.Iterator;

-import java.util.LinkedList;

-import java.util.List;

 

-import static java.util.Collections.addAll;

+import static java.util.Arrays.stream;

+import static java.util.stream.Collectors.toList;

 import static org.springframework.util.ObjectUtils.isEmpty;

 

 /**

@@ -38,7 +36,7 @@
  * in OSGi 4.2 release. Since sorting out the entire graph from the beginning is difficult (shutting down some bundles,

  * might allow others to be destroyed), this utility is meant to be called multiple times until the list is being

  * depleted.

- * 

+ *

  * @author Costin Leau

  */

 public abstract class ShutdownSorter {

@@ -49,7 +47,7 @@
 	 * Sorts the given bundles. The method extracts the bundles about to be destroyed from the given lists and returns

 	 * them to the user. Since shutting down a bundle can influence the destruction of the others, this method should be

 	 * called after all the returned bundles have been destroyed until the list is empty.

-	 * 

+	 *

 	 * @param managedBundles

 	 * @return sorted collection of Bundles

 	 */

@@ -95,15 +93,7 @@
                         Bundle[] usingBundles = serviceReference.getUsingBundles();

 

 						if (!isEmpty(usingBundles)) {

-							Collection<Bundle> filteredUsingBundles = new LinkedList<>();

-							addAll(filteredUsingBundles, usingBundles);

-							Iterator<Bundle> it = filteredUsingBundles.iterator();

-							while (it.hasNext()) {

-								if (!unsortedManagedBundles.contains(it.next())) {

-									it.remove();

-								}

-							}

-							usingBundles = filteredUsingBundles.toArray(new Bundle[filteredUsingBundles.size()]);

+							usingBundles = stream(usingBundles).filter(unsortedManagedBundles::contains).collect(toList()).toArray(new Bundle[]{});

 						}

 

                         if (!isEmpty(usingBundles)) {

@@ -128,7 +118,7 @@
 		    }

 		}

 

-		Collections.sort(unused, ReverseBundleIdSorter.INSTANCE);

+		unused.sort(ReverseBundleIdSorter.INSTANCE);

 

 		return unused;

 	}


diff --git a/extensions/pom.xml b/extensions/pom.xml
index fd96ba7..185284c 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.1.0.JAVA7-SNAPSHOT</version>
+        <version>2.2.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 1156e55..073ab69 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.1.0.JAVA7-SNAPSHOT</version>
+        <version>2.2.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 650f25b..2211091 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.1.0.JAVA7-SNAPSHOT</version>
+        <version>2.2.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 de48137..157ef07 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.1.0.JAVA7-SNAPSHOT</version>
+        <version>2.2.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 019eb81..4ef0d3a 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.1.0.JAVA7-SNAPSHOT</version>
+        <version>2.2.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 1d49b15..2d00f6e 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.1.0.JAVA7-SNAPSHOT</version>
+        <version>2.2.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 4ed05f0..e51bf8d 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.1.0.JAVA7-SNAPSHOT</version>
+        <version>2.2.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 5319485..a9f8b0f 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.1.0.JAVA7-SNAPSHOT</version>
+        <version>2.2.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 e40cb28..b74774b 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.1.0.JAVA7-SNAPSHOT</version>
+        <version>2.2.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 efa36e6..9661968 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.1.0.JAVA7-SNAPSHOT</version>
+        <version>2.2.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 385cf5f..325aef1 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.1.0.JAVA7-SNAPSHOT</version>
+        <version>2.2.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 539606a..0e6614b 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.1.0.JAVA7-SNAPSHOT</version>
+        <version>2.2.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 581acbd..8f32fab 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.1.0.JAVA7-SNAPSHOT</version>
+        <version>2.2.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 4dbdd46..cb62c70 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.1.0.JAVA7-SNAPSHOT</version>
+        <version>2.2.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 2435508..2318a82 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.1.0.JAVA7-SNAPSHOT</version>
+        <version>2.2.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 67eb246..ea92aa9 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.1.0.JAVA7-SNAPSHOT</version>
+        <version>2.2.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 e2cf363..82dcdfa 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.1.0.JAVA7-SNAPSHOT</version>
+        <version>2.2.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 ac81862..36d1cb4 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.1.0.JAVA7-SNAPSHOT</version>
+        <version>2.2.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 78967aa..e2a540b 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.1.0.JAVA7-SNAPSHOT</version>
+        <version>2.2.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 55b5e45..abf89b5 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.1.0.JAVA7-SNAPSHOT</version>
+        <version>2.2.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 fc2aad7..4aa5641 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.1.0.JAVA7-SNAPSHOT</version>
+        <version>2.2.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 4f04ef3..bc2e202 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.1.0.JAVA7-SNAPSHOT</version>
+        <version>2.2.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 15ea8b3..543a4d8 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.1.0.JAVA7-SNAPSHOT</version>
+        <version>2.2.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 7b55030..38503fd 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.1.0.JAVA7-SNAPSHOT</version>
+        <version>2.2.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 6f4abb0..21daacc 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.1.0.JAVA7-SNAPSHOT</version>
+        <version>2.2.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 63e5c98..7197f08 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.1.0.JAVA7-SNAPSHOT</version>
+        <version>2.2.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 16fba58..2811684 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.1.0.JAVA7-SNAPSHOT</version>
+        <version>2.2.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 dd19263..738922f 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.1.0.JAVA7-SNAPSHOT</version>
+        <version>2.2.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 6ed2c1a..1e11f2b 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.1.0.JAVA7-SNAPSHOT</version>
+        <version>2.2.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 ddb6ba9..38a442f 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.1.0.JAVA7-SNAPSHOT</version>
+        <version>2.2.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 81008af..c5530ef 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.1.0.JAVA7-SNAPSHOT</version>
+        <version>2.2.0.M1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/integration-tests/bundles/pom.xml b/integration-tests/bundles/pom.xml
index 1f81c7b..421cb78 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.1.0.JAVA7-SNAPSHOT</version>
+        <version>2.2.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 b0cfec0..a0047b4 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.1.0.JAVA7-SNAPSHOT</version>
+        <version>2.2.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 b525faf..9d0d467 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.1.0.JAVA7-SNAPSHOT</version>
+        <version>2.2.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 b83f590..d47b9a7 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.1.0.JAVA7-SNAPSHOT</version>
+        <version>2.2.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 9be4dd2..c4db735 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.1.0.JAVA7-SNAPSHOT</version>
+		<version>2.2.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 fc14203..8cb1aee 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.1.0.JAVA7-SNAPSHOT</version>
+        <version>2.2.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 6c9d7e9..7ec1e72 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.1.0.JAVA7-SNAPSHOT</version>
+        <version>2.2.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 60c3a3a..037c75f 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.1.0.JAVA7-SNAPSHOT</version>
+        <version>2.2.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 4d42afa..a719924 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.1.0.JAVA7-SNAPSHOT</version>
+        <version>2.2.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 31e409d..e75c92c 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.1.0.JAVA7-SNAPSHOT</version>
+        <version>2.2.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 1af1e7e..203df9b 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.1.0.JAVA7-SNAPSHOT</version>
+        <version>2.2.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 cfb3c1f..1d8d1b5 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.1.0.JAVA7-SNAPSHOT</version>
+        <version>2.2.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 5bc3775..50d8544 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.1.0.JAVA7-SNAPSHOT</version>
+        <version>2.2.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 157e84f..b4c1364 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.1.0.JAVA7-SNAPSHOT</version>
+        <version>2.2.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 3fa8e7c..6dd7705 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.1.0.JAVA7-SNAPSHOT</version>
+        <version>2.2.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 ea1bae3..efcbe16 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.1.0.JAVA7-SNAPSHOT</version>
+        <version>2.2.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 7aff7e4..1923d86 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.1.0.JAVA7-SNAPSHOT</version>
+        <version>2.2.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 4a50f7b..c17b1a7 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.1.0.JAVA7-SNAPSHOT</version>
+        <version>2.2.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 2c96c7c..aa22a86 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.1.0.JAVA7-SNAPSHOT</version>
+        <version>2.2.0.M1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 3914543..ff5e43d 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.1.0.JAVA7-SNAPSHOT</version>
+        <version>2.2.0.M1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/integration-tests/tests/pom.xml b/integration-tests/tests/pom.xml
index 4ace488..be7d372 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.1.0.JAVA7-SNAPSHOT</version>
+        <version>2.2.0.M1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/io/pom.xml b/io/pom.xml
index f07a56c..b256f9f 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.1.0.JAVA7-SNAPSHOT</version>
+        <version>2.2.0.M1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/mock/pom.xml b/mock/pom.xml
index d8bc4f8..b60f55d 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.1.0.JAVA7-SNAPSHOT</version>
+        <version>2.2.0.M1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/pom.xml b/pom.xml
index d4c01c5..7b26f12 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.1.0.JAVA7-SNAPSHOT</version>
+    <version>2.2.0.M1-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Gemini Blueprint</name>
     <url>http://www.eclipse.org/gemini/blueprint/</url>
@@ -336,7 +336,7 @@
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
-            <version>2.8.0</version>
+            <version>3.6.2</version>
             <scope>test</scope>
         </dependency>
 
@@ -542,8 +542,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.6.1</version>
                 <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
+                    <source>1.8</source>
+                    <target>1.8</target>
                 </configuration>
             </plugin>
             <plugin>

diff --git a/test-support/pom.xml b/test-support/pom.xml
index 5d29421..563d173 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.1.0.JAVA7-SNAPSHOT</version>
+        <version>2.2.0.M1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>