517645: Provide a java 7 backport of gemini blueprint 2.1.0 for Virgo
- Corrected version to be OSGi-compliant
- Corrected backport for ShutdownSorter
- Adapted test dependencies to build with JDK 1.7
Signed-off-by: ootto <olaf@x100.de>
diff --git a/core/pom.xml b/core/pom.xml
index e6cc64f..c369c1d 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.1.0.JAVA7-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/extender/pom.xml b/extender/pom.xml
index 81add6a..f0fbc3d 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.1.0.JAVA7-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 1d867f8..2a00faf 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
@@ -103,7 +103,7 @@
it.remove();
}
}
- filteredUsingBundles.toArray(new Bundle[filteredUsingBundles.size()]);
+ usingBundles = filteredUsingBundles.toArray(new Bundle[filteredUsingBundles.size()]);
}
if (!isEmpty(usingBundles)) {
diff --git a/extensions/pom.xml b/extensions/pom.xml
index 2476f80..fd96ba7 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.1.0.JAVA7-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 c3ef172..1156e55 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.1.0.JAVA7-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 cb0c33f..650f25b 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.1.0.JAVA7-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/integration-tests/bundles/blueprint/pom.xml b/integration-tests/bundles/blueprint/pom.xml
index 8235eb8..de48137 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.1.0.JAVA7-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 d42de94..019eb81 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.1.0.JAVA7-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 edc3c13..1d49b15 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.1.0.JAVA7-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 d48c139..4ed05f0 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.1.0.JAVA7-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 8afe756..5319485 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.1.0.JAVA7-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 c19337e..e40cb28 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.1.0.JAVA7-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 acde810..efa36e6 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.1.0.JAVA7-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 5534556..385cf5f 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.1.0.JAVA7-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 e181378..539606a 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.1.0.JAVA7-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 60d1aaf..581acbd 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.1.0.JAVA7-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 969df34..4dbdd46 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.1.0.JAVA7-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 77c7848..2435508 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.1.0.JAVA7-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 c3f7a7e..67eb246 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.1.0.JAVA7-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 59d0eef..e2cf363 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.1.0.JAVA7-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 01419c2..ac81862 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.1.0.JAVA7-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 29e387c..78967aa 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.1.0.JAVA7-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 97798c9..55b5e45 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.1.0.JAVA7-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 011611d..fc2aad7 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.1.0.JAVA7-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 3baaa80..4f04ef3 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.1.0.JAVA7-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 2ca6bda..15ea8b3 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.1.0.JAVA7-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 092dbb0..7b55030 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.1.0.JAVA7-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 8526699..6f4abb0 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.1.0.JAVA7-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 2349a45..63e5c98 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.1.0.JAVA7-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 7addb68..16fba58 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.1.0.JAVA7-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 31480f3..dd19263 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.1.0.JAVA7-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/integration-tests/bundles/jdk5/pom.xml b/integration-tests/bundles/jdk5/pom.xml
index 7011649..6ed2c1a 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.1.0.JAVA7-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 14bc272..ddb6ba9 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.1.0.JAVA7-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 d8b782a..81008af 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.1.0.JAVA7-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/integration-tests/bundles/pom.xml b/integration-tests/bundles/pom.xml
index f2c345c..1f81c7b 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.1.0.JAVA7-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 92fb020..b0cfec0 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.1.0.JAVA7-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 ae071af..b525faf 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.1.0.JAVA7-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 5333a69..b83f590 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.1.0.JAVA7-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 5da52cc..9be4dd2 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.1.0.JAVA7-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 8063071..fc14203 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.1.0.JAVA7-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 2c35c35..6c9d7e9 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.1.0.JAVA7-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 6d35846..60c3a3a 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.1.0.JAVA7-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 cabf9cf..4d42afa 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.1.0.JAVA7-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 aa0f9f4..31e409d 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.1.0.JAVA7-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 3094e0c..1af1e7e 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.1.0.JAVA7-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 a92bc89..cfb3c1f 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.1.0.JAVA7-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 692e83b..5bc3775 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.1.0.JAVA7-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 d072487..157e84f 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.1.0.JAVA7-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 b219c6d..3fa8e7c 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.1.0.JAVA7-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 fb68d78..ea1bae3 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.1.0.JAVA7-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 4241962..7aff7e4 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.1.0.JAVA7-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 55e15ca..4a50f7b 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.1.0.JAVA7-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 bf9e7d0..2c96c7c 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.1.0.JAVA7-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 65a4fc0..3914543 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.1.0.JAVA7-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/integration-tests/tests/pom.xml b/integration-tests/tests/pom.xml
index e167d10..4ace488 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.1.0.JAVA7-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/io/pom.xml b/io/pom.xml
index 04cfee5..f07a56c 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.1.0.JAVA7-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/mock/pom.xml b/mock/pom.xml
index 91c9bea..d8bc4f8 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.1.0.JAVA7-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/pom.xml b/pom.xml
index 0348287..d4c01c5 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.1.0.JAVA7-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>3.6.2</version>
+ <version>2.8.0</version>
<scope>test</scope>
</dependency>
diff --git a/test-support/pom.xml b/test-support/pom.xml
index 2ebcb60..5d29421 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.1.0.JAVA7-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
