512392: Make gemini blueprint use the standard maven release process
- Cleaned up remaining outdated <repository> configs
- Adapted plugin versions for the recent most maven version
- Removed the old "release" module in favor of a profile-based approach
- Updated to the coming milestone release snapshot version
- Included all test bundles in the release build, with test execution disabled as test execution depends
on specific test profiles
Signed-off-by: Olaf Otto <olaf@x100.de>
diff --git a/core/pom.xml b/core/pom.xml
index ae12b73..c680f6c 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -7,7 +7,7 @@
<parent>
<artifactId>gemini-blueprint</artifactId>
<groupId>org.eclipse.gemini.blueprint</groupId>
- <version>2.0.0.RELEASE</version>
+ <version>2.1.0.M1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -78,7 +78,7 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>multithreadedtc</groupId>
+ <groupId>edu.umd.cs.mtc</groupId>
<artifactId>multithreadedtc</artifactId>
<version>1.01</version>
<scope>test</scope>
diff --git a/docs/pom.xml b/docs/pom.xml
index e6a6c4e..d43078b 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -7,7 +7,7 @@
<groupId>org.eclipse.gemini.blueprint</groupId>
<artifactId>gemini-blueprint</artifactId>
<packaging>pom</packaging>
- <version>2.0.0.RELEASE</version>
+ <version>2.1.0.M1-SNAPSHOT</version>
<name>Eclipse Gemini Blueprint</name>
<url>http://www.eclipse.org/gemini/blueprint/</url>
@@ -87,7 +87,7 @@
<!-- use extensions -->
<useExtensions>1</useExtensions>
<highlightSource>1</highlightSource>
- <highlightDefaultLanguage></highlightDefaultLanguage>
+ <highlightDefaultLanguage/>
<!-- callouts -->
<calloutsExtension>1</calloutsExtension>
<entities>
diff --git a/extender/pom.xml b/extender/pom.xml
index 519eb40..575539e 100644
--- a/extender/pom.xml
+++ b/extender/pom.xml
@@ -7,7 +7,7 @@
<parent>
<artifactId>gemini-blueprint</artifactId>
<groupId>org.eclipse.gemini.blueprint</groupId>
- <version>2.0.0.RELEASE</version>
+ <version>2.1.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 c072f2b..28bbecb 100644
--- a/integration-tests/bundles/blueprint/config.bundle/pom.xml
+++ b/integration-tests/bundles/blueprint/config.bundle/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt.blueprint</groupId>
<artifactId>bundles</artifactId>
- <version>2.0.0.RELEASE</version>
+ <version>2.1.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 611217d..170be13 100644
--- a/integration-tests/bundles/blueprint/error.bundle/pom.xml
+++ b/integration-tests/bundles/blueprint/error.bundle/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt.blueprint</groupId>
<artifactId>bundles</artifactId>
- <version>2.0.0.RELEASE</version>
+ <version>2.1.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 fbd52fb..0c4ef01 100644
--- a/integration-tests/bundles/blueprint/pom.xml
+++ b/integration-tests/bundles/blueprint/pom.xml
@@ -7,7 +7,7 @@
<parent>
<artifactId>gemini-blueprint-integration-test-bundles</artifactId>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
- <version>2.0.0.RELEASE</version>
+ <version>2.1.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 fb474c7..87c3dc2 100644
--- a/integration-tests/bundles/blueprint/simple.bundle/pom.xml
+++ b/integration-tests/bundles/blueprint/simple.bundle/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt.blueprint</groupId>
<artifactId>bundles</artifactId>
- <version>2.0.0.RELEASE</version>
+ <version>2.1.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 241fbda..dfe7089 100644
--- a/integration-tests/bundles/blueprint/waiting.bundle/pom.xml
+++ b/integration-tests/bundles/blueprint/waiting.bundle/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt.blueprint</groupId>
<artifactId>bundles</artifactId>
- <version>2.0.0.RELEASE</version>
+ <version>2.1.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 2e82465..be9a0c6 100644
--- a/integration-tests/bundles/cardinality.0to1.bundle/pom.xml
+++ b/integration-tests/bundles/cardinality.0to1.bundle/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>gemini-blueprint-integration-test-bundles</artifactId>
- <version>2.0.0.RELEASE</version>
+ <version>2.1.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 7a21297..2dbb196 100644
--- a/integration-tests/bundles/config.bundle/async.nowait.bundle/pom.xml
+++ b/integration-tests/bundles/config.bundle/async.nowait.bundle/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>config.bundle</artifactId>
- <version>2.0.0.RELEASE</version>
+ <version>2.1.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 b24cc95..edb2ad2 100644
--- a/integration-tests/bundles/config.bundle/async.wait.bundle/pom.xml
+++ b/integration-tests/bundles/config.bundle/async.wait.bundle/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>config.bundle</artifactId>
- <version>2.0.0.RELEASE</version>
+ <version>2.1.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 3c80877..3f32a3a 100644
--- a/integration-tests/bundles/config.bundle/no.publish.bundle/pom.xml
+++ b/integration-tests/bundles/config.bundle/no.publish.bundle/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>config.bundle</artifactId>
- <version>2.0.0.RELEASE</version>
+ <version>2.1.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 c428966..00cfc26 100644
--- a/integration-tests/bundles/config.bundle/pom.xml
+++ b/integration-tests/bundles/config.bundle/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>gemini-blueprint-integration-test-bundles</artifactId>
- <version>2.0.0.RELEASE</version>
+ <version>2.1.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 0b92225..9b7144d 100644
--- a/integration-tests/bundles/config.bundle/sync.nowait.bundle/pom.xml
+++ b/integration-tests/bundles/config.bundle/sync.nowait.bundle/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>config.bundle</artifactId>
- <version>2.0.0.RELEASE</version>
+ <version>2.1.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 f0a9c20..5457f4a 100644
--- a/integration-tests/bundles/config.bundle/sync.tail.bundle/pom.xml
+++ b/integration-tests/bundles/config.bundle/sync.tail.bundle/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>config.bundle</artifactId>
- <version>2.0.0.RELEASE</version>
+ <version>2.1.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 aa022af..74216b7 100644
--- a/integration-tests/bundles/config.bundle/sync.wait.bundle/pom.xml
+++ b/integration-tests/bundles/config.bundle/sync.wait.bundle/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>config.bundle</artifactId>
- <version>2.0.0.RELEASE</version>
+ <version>2.1.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 ca951ab..cc44276 100644
--- a/integration-tests/bundles/config.file.with.dots.bundle/pom.xml
+++ b/integration-tests/bundles/config.file.with.dots.bundle/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>gemini-blueprint-integration-test-bundles</artifactId>
- <version>2.0.0.RELEASE</version>
+ <version>2.1.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 f000dd8..74f2c0d 100644
--- a/integration-tests/bundles/configuration.test.bundle/pom.xml
+++ b/integration-tests/bundles/configuration.test.bundle/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>gemini-blueprint-integration-test-bundles</artifactId>
- <version>2.0.0.RELEASE</version>
+ <version>2.1.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 6b56b5a..5200096 100644
--- a/integration-tests/bundles/deadlock.bundle/pom.xml
+++ b/integration-tests/bundles/deadlock.bundle/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>gemini-blueprint-integration-test-bundles</artifactId>
- <version>2.0.0.RELEASE</version>
+ <version>2.1.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 bbca23c..98de147 100644
--- a/integration-tests/bundles/dependency.factory.bundle/pom.xml
+++ b/integration-tests/bundles/dependency.factory.bundle/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>gemini-blueprint-integration-test-bundles</artifactId>
- <version>2.0.0.RELEASE</version>
+ <version>2.1.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 7146e64..b27f438 100644
--- a/integration-tests/bundles/dependency.test.bundle/pom.xml
+++ b/integration-tests/bundles/dependency.test.bundle/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>gemini-blueprint-integration-test-bundles</artifactId>
- <version>2.0.0.RELEASE</version>
+ <version>2.1.0.M1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/integration-tests/bundles/embedded.ns.bundle/pom.xml b/integration-tests/bundles/embedded.ns.bundle/pom.xml
index 7767812..a879a61 100644
--- a/integration-tests/bundles/embedded.ns.bundle/pom.xml
+++ b/integration-tests/bundles/embedded.ns.bundle/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>gemini-blueprint-integration-test-bundles</artifactId>
- <version>2.0.0.RELEASE</version>
+ <version>2.1.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 4e7a36f..d81130c 100644
--- a/integration-tests/bundles/error.bundle/pom.xml
+++ b/integration-tests/bundles/error.bundle/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>gemini-blueprint-integration-test-bundles</artifactId>
- <version>2.0.0.RELEASE</version>
+ <version>2.1.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 e8f6319..82bca78 100644
--- a/integration-tests/bundles/export.import.dependency.bundle/pom.xml
+++ b/integration-tests/bundles/export.import.dependency.bundle/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>gemini-blueprint-integration-test-bundles</artifactId>
- <version>2.0.0.RELEASE</version>
+ <version>2.1.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 f8d013a..4d7df9f 100644
--- a/integration-tests/bundles/extender.fragment.bundle/pom.xml
+++ b/integration-tests/bundles/extender.fragment.bundle/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>gemini-blueprint-integration-test-bundles</artifactId>
- <version>2.0.0.RELEASE</version>
+ <version>2.1.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 03c77ae..39e975a 100644
--- a/integration-tests/bundles/extender.listener.bundle/pom.xml
+++ b/integration-tests/bundles/extender.listener.bundle/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>gemini-blueprint-integration-test-bundles</artifactId>
- <version>2.0.0.RELEASE</version>
+ <version>2.1.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 072a8eb..1985799 100644
--- a/integration-tests/bundles/extender.version.bundle/pom.xml
+++ b/integration-tests/bundles/extender.version.bundle/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>gemini-blueprint-integration-test-bundles</artifactId>
- <version>2.0.0.RELEASE</version>
+ <version>2.1.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 f1471e6..49d6e79 100644
--- a/integration-tests/bundles/io.fragment.1.bundle/pom.xml
+++ b/integration-tests/bundles/io.fragment.1.bundle/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>gemini-blueprint-integration-test-bundles</artifactId>
- <version>2.0.0.RELEASE</version>
+ <version>2.1.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 5b14bbe..d6d79bb 100644
--- a/integration-tests/bundles/io.fragment.2.bundle/pom.xml
+++ b/integration-tests/bundles/io.fragment.2.bundle/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>gemini-blueprint-integration-test-bundles</artifactId>
- <version>2.0.0.RELEASE</version>
+ <version>2.1.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 d29bb2f..fcd4348 100644
--- a/integration-tests/bundles/jdk.proxy.bundle/pom.xml
+++ b/integration-tests/bundles/jdk.proxy.bundle/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>gemini-blueprint-integration-test-bundles</artifactId>
- <version>2.0.0.RELEASE</version>
+ <version>2.1.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 7b13897..00ce38e 100644
--- a/integration-tests/bundles/jdk5/component.scan.bundle/pom.xml
+++ b/integration-tests/bundles/jdk5/component.scan.bundle/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>spring-osgi-jdk5-integration-test-bundles</artifactId>
- <version>2.0.0.RELEASE</version>
+ <version>2.1.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 67d495a..ce9964c 100644
--- a/integration-tests/bundles/jdk5/pom.xml
+++ b/integration-tests/bundles/jdk5/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>gemini-blueprint-integration-test-bundles</artifactId>
- <version>2.0.0.RELEASE</version>
+ <version>2.1.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 9baae76..1bb172d 100644
--- a/integration-tests/bundles/lifecycle.test.bundle/pom.xml
+++ b/integration-tests/bundles/lifecycle.test.bundle/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>gemini-blueprint-integration-test-bundles</artifactId>
- <version>2.0.0.RELEASE</version>
+ <version>2.1.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 7ccf1d0..cc24c4c 100644
--- a/integration-tests/bundles/namespace.own.consumer.bundle/pom.xml
+++ b/integration-tests/bundles/namespace.own.consumer.bundle/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>gemini-blueprint-integration-test-bundles</artifactId>
- <version>2.0.0.RELEASE</version>
+ <version>2.1.0.M1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/integration-tests/bundles/pom.xml b/integration-tests/bundles/pom.xml
index 89cf56d..68c0f99 100644
--- a/integration-tests/bundles/pom.xml
+++ b/integration-tests/bundles/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>gemini-blueprint-integration-tests-parent</artifactId>
- <version>2.0.0.RELEASE</version>
+ <version>2.1.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 00ca2b0..2db0b49 100644
--- a/integration-tests/bundles/proxy.creator.bundle/pom.xml
+++ b/integration-tests/bundles/proxy.creator.bundle/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>gemini-blueprint-integration-test-bundles</artifactId>
- <version>2.0.0.RELEASE</version>
+ <version>2.1.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 57c084f..5d78b54 100644
--- a/integration-tests/bundles/proxy.destruction.test.bundle/pom.xml
+++ b/integration-tests/bundles/proxy.destruction.test.bundle/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>gemini-blueprint-integration-test-bundles</artifactId>
- <version>2.0.0.RELEASE</version>
+ <version>2.1.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 a596dcd..994fe0d 100644
--- a/integration-tests/bundles/proxy.listener/pom.xml
+++ b/integration-tests/bundles/proxy.listener/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>gemini-blueprint-integration-test-bundles</artifactId>
- <version>2.0.0.RELEASE</version>
+ <version>2.1.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 9c592b7..56e6f69 100644
--- a/integration-tests/bundles/recursive.type.bundle/pom.xml
+++ b/integration-tests/bundles/recursive.type.bundle/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>gemini-blueprint-integration-test-bundles</artifactId>
- <version>2.0.0.RELEASE</version>
+ <version>2.1.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 1e4add5..dc93fa5 100644
--- a/integration-tests/bundles/reference.test.bundle/pom.xml
+++ b/integration-tests/bundles/reference.test.bundle/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>gemini-blueprint-integration-test-bundles</artifactId>
- <version>2.0.0.RELEASE</version>
+ <version>2.1.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 0098686..f77dad7 100644
--- a/integration-tests/bundles/scoped.a.bundle/pom.xml
+++ b/integration-tests/bundles/scoped.a.bundle/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>gemini-blueprint-integration-test-bundles</artifactId>
- <version>2.0.0.RELEASE</version>
+ <version>2.1.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 139e351..cd702b8 100644
--- a/integration-tests/bundles/scoped.b.bundle/pom.xml
+++ b/integration-tests/bundles/scoped.b.bundle/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>gemini-blueprint-integration-test-bundles</artifactId>
- <version>2.0.0.RELEASE</version>
+ <version>2.1.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 e6dd95b..ba13877 100644
--- a/integration-tests/bundles/scoped.common.bundle/pom.xml
+++ b/integration-tests/bundles/scoped.common.bundle/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>gemini-blueprint-integration-test-bundles</artifactId>
- <version>2.0.0.RELEASE</version>
+ <version>2.1.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 46fe936..70efe68 100644
--- a/integration-tests/bundles/service.listener.bundle/pom.xml
+++ b/integration-tests/bundles/service.listener.bundle/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>gemini-blueprint-integration-test-bundles</artifactId>
- <version>2.0.0.RELEASE</version>
+ <version>2.1.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 72e8127..e958597 100644
--- a/integration-tests/bundles/simple.service.2.bundle/pom.xml
+++ b/integration-tests/bundles/simple.service.2.bundle/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>gemini-blueprint-integration-test-bundles</artifactId>
- <version>2.0.0.RELEASE</version>
+ <version>2.1.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 cb9592f..be55ea3 100644
--- a/integration-tests/bundles/simple.service.3.bundle/pom.xml
+++ b/integration-tests/bundles/simple.service.3.bundle/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>gemini-blueprint-integration-test-bundles</artifactId>
- <version>2.0.0.RELEASE</version>
+ <version>2.1.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 ac37a0b..49c267b 100644
--- a/integration-tests/bundles/simple.service.bundle.2.identical/pom.xml
+++ b/integration-tests/bundles/simple.service.bundle.2.identical/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>gemini-blueprint-integration-test-bundles</artifactId>
- <version>2.0.0.RELEASE</version>
+ <version>2.1.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 52bb685..badcf4c 100644
--- a/integration-tests/bundles/simple.service.bundle.identical/pom.xml
+++ b/integration-tests/bundles/simple.service.bundle.identical/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>gemini-blueprint-integration-test-bundles</artifactId>
- <version>2.0.0.RELEASE</version>
+ <version>2.1.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 b080630..7eeebf1 100644
--- a/integration-tests/bundles/simple.service.bundle/pom.xml
+++ b/integration-tests/bundles/simple.service.bundle/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>gemini-blueprint-integration-test-bundles</artifactId>
- <version>2.0.0.RELEASE</version>
+ <version>2.1.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 7586714..69fcaa5 100644
--- a/integration-tests/bundles/tccl.bundle/pom.xml
+++ b/integration-tests/bundles/tccl.bundle/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>gemini-blueprint-integration-test-bundles</artifactId>
- <version>2.0.0.RELEASE</version>
+ <version>2.1.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 3edef70..7ff100d 100644
--- a/integration-tests/bundles/tccl.intf.bundle/pom.xml
+++ b/integration-tests/bundles/tccl.intf.bundle/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>gemini-blueprint-integration-test-bundles</artifactId>
- <version>2.0.0.RELEASE</version>
+ <version>2.1.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 f85b0da..b602f0c 100644
--- a/integration-tests/bundles/trivial.bundle/pom.xml
+++ b/integration-tests/bundles/trivial.bundle/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>gemini-blueprint-integration-test-bundles</artifactId>
- <version>2.0.0.RELEASE</version>
+ <version>2.1.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 14c3022..ab9cef9 100644
--- a/integration-tests/bundles/trivial.test.bundle/pom.xml
+++ b/integration-tests/bundles/trivial.test.bundle/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>gemini-blueprint-integration-test-bundles</artifactId>
- <version>2.0.0.RELEASE</version>
+ <version>2.1.0.M1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -30,9 +30,8 @@
<!-- JUnit is required at build time not just test time -->
<dependency>
- <groupId>org.junit</groupId>
- <artifactId>com.springsource.org.junit</artifactId>
- <scope>provided</scope>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.junit</artifactId>
</dependency>
</dependencies>
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 6e4a495..d6112d2 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint</groupId>
<artifactId>gemini-blueprint</artifactId>
- <version>2.0.0.RELEASE</version>
+ <version>2.1.0.M1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -26,15 +26,58 @@
<module>tests</module>
</modules>
+ <profiles>
+ <profile>
+ <id>release</id>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ </profile>
+ </profiles>
+
<build>
<pluginManagement>
<plugins>
<plugin>
- <artifactId>maven-deploy-plugin</artifactId>
+ <groupId>org.sonatype.plugins</groupId>
+ <artifactId>nexus-staging-maven-plugin</artifactId>
+ <configuration>
+ <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-source-plugin</artifactId>
+ <configuration>
+ <skipSource>true</skipSource>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
</build>
diff --git a/integration-tests/tests/pom.xml b/integration-tests/tests/pom.xml
index 1e1f390..395b034 100644
--- a/integration-tests/tests/pom.xml
+++ b/integration-tests/tests/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>gemini-blueprint-integration-tests-parent</artifactId>
- <version>2.0.0.RELEASE</version>
+ <version>2.1.0.M1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -68,105 +68,105 @@
<dependency>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>service.listener</artifactId>
- <version>${project.parent.version}</version>
+ <version>${project.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>lifecycle</artifactId>
- <version>${project.parent.version}</version>
+ <version>${project.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>recursive</artifactId>
- <version>${project.parent.version}</version>
+ <version>${project.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>reference.proxy</artifactId>
- <version>${project.parent.version}</version>
+ <version>${project.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>simple.service</artifactId>
- <version>${project.parent.version}</version>
+ <version>${project.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>simple.service2</artifactId>
- <version>${project.parent.version}</version>
+ <version>${project.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>cardinality0to1</artifactId>
- <version>${project.parent.version}</version>
+ <version>${project.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>scoped.bundle.a</artifactId>
- <version>${project.parent.version}</version>
+ <version>${project.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>scoped.bundle.b</artifactId>
- <version>${project.parent.version}</version>
+ <version>${project.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>scoped.bundle.common</artifactId>
- <version>${project.parent.version}</version>
+ <version>${project.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>configuration</artifactId>
- <version>${project.parent.version}</version>
+ <version>${project.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>dependencies</artifactId>
- <version>${project.parent.version}</version>
+ <version>${project.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>tccl.intf</artifactId>
- <version>${project.parent.version}</version>
+ <version>${project.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>proxy.listener</artifactId>
- <version>${project.parent.version}</version>
+ <version>${project.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.eclipse.gemini.blueprint.iandt</groupId>
<artifactId>component.scan.bundle</artifactId>
- <version>${project.parent.version}</version>
+ <version>${project.version}</version>
<scope>runtime</scope>
</dependency>
</dependencies>
@@ -175,12 +175,6 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <useDefaultManifestFile>true</useDefaultManifestFile>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
diff --git a/io/pom.xml b/io/pom.xml
index a5958f5..bcb9d47 100644
--- a/io/pom.xml
+++ b/io/pom.xml
@@ -7,7 +7,7 @@
<parent>
<artifactId>gemini-blueprint</artifactId>
<groupId>org.eclipse.gemini.blueprint</groupId>
- <version>2.0.0.RELEASE</version>
+ <version>2.1.0.M1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/mock/pom.xml b/mock/pom.xml
index 43c0421..a11b2d7 100644
--- a/mock/pom.xml
+++ b/mock/pom.xml
@@ -7,7 +7,7 @@
<parent>
<artifactId>gemini-blueprint</artifactId>
<groupId>org.eclipse.gemini.blueprint</groupId>
- <version>2.0.0.RELEASE</version>
+ <version>2.1.0.M1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/pom.xml b/pom.xml
index 6e610e6..b6e9b72 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,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.0.0.RELEASE</version>
+ <version>2.1.0.M1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Gemini Blueprint</name>
<url>http://www.eclipse.org/gemini/blueprint/</url>
@@ -36,8 +36,8 @@
<!-- other properties -->
<slf4j.version>1.7.5</slf4j.version>
<logback.version>1.0.13</logback.version>
- <env.buildPlan></env.buildPlan>
- <env.buildNumber></env.buildNumber>
+ <env.buildPlan/>
+ <env.buildNumber/>
<!-- compiled against osgi Revision -->
<osgi.ver>5.0.0</osgi.ver>
@@ -52,14 +52,14 @@
<!-- javadoc configuration -->
<javadoc.loc>${basedir}/docs/src/javadoc</javadoc.loc>
- <clover.ver>3.1.4</clover.ver>
- <clover.argLine></clover.argLine>
+ <clover.ver>4.0.6</clover.ver>
+ <clover.argLine/>
<clover.skip>false</clover.skip>
<findbugs.skip>false</findbugs.skip>
<!-- security options for integration testing -->
- <security.argLine></security.argLine>
+ <security.argLine/>
<policy.url>..${file.separator}policy.all</policy.url>
<!-- common version ranges -->
@@ -262,9 +262,9 @@
</dependency>
<dependency>
- <groupId>org.junit</groupId>
- <artifactId>com.springsource.org.junit</artifactId>
- <version>4.9.0</version>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.junit</artifactId>
+ <version>4.9_1</version>
</dependency>
<dependency>
@@ -307,8 +307,8 @@
<!-- junit -->
<dependency>
- <groupId>org.junit</groupId>
- <artifactId>com.springsource.org.junit</artifactId>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.junit</artifactId>
<scope>test</scope>
</dependency>
@@ -376,6 +376,29 @@
<pluginManagement>
<plugins>
<plugin>
+ <!--
+ Do not deploy using the default deploy plugin, but rather using the
+ nexus-staging-maven-plugin (see "release" profile).
+ -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <version>2.8.2</version>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>2.5.3</version>
+ <configuration>
+ <!-- one release version for all modules -->
+ <autoVersionSubmodules>true</autoVersionSubmodules>
+ <!-- Simple release tag format, e.g. "2.4.0" -->
+ <tagNameFormat>@{project.version}</tagNameFormat>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>biz.aQute.bnd</groupId>
<artifactId>bnd-maven-plugin</artifactId>
<version>3.3.0</version>
@@ -390,52 +413,47 @@
<plugin>
<groupId>pl.project13.maven</groupId>
<artifactId>git-commit-id-plugin</artifactId>
- <version>2.1.5</version>
+ <version>2.2.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.6</version>
+ <version>3.0.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>3.3</version>
+ <version>3.6</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
- <version>2.5.1</version>
+ <version>2.5.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.4</version>
+ <version>3.0.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
- <version>2.5</version>
+ <version>3.0.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
+ <version>3.6.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
- <version>2.9</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <version>2.8.1</version>
+ <version>3.5</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.16</version>
+ <version>2.19.1</version>
<dependencies>
<!-- force surefire to use new junit 4.7+ runner, it would normally auto detect this -->
<!-- but since we're not using the official junit dependency it is unable to do so.-->
@@ -443,94 +461,56 @@
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-junit47</artifactId>
- <version>2.16</version>
+ <version>2.19.1</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.4</version>
+ <version>3.0.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <version>2.4</version>
+ <version>3.0.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.9.1</version>
+ <version>2.10.4</version>
<configuration>
- <aggregate>true</aggregate>
- <stylesheetfile>${javadoc.loc}/javadoc.css</stylesheetfile>
- <overview>${javadoc.loc}/overview.html</overview>
- <groups>
- <group>
- <title>OSGi Blueprint Service</title>
- <packages>org.osgi.service.blueprint*</packages>
- </group>
- <group>
- <title>Eclipse Gemini Blueprint Core</title>
- <packages>org.eclipse.gemini.blueprint*</packages>
- </group>
- <group>
- <title>Eclipse Gemini Blueprint Extender</title>
- <packages>org.eclipse.gemini.blueprint.extender*</packages>
- </group>
- <group>
- <title>Eclipse Gemini Blueprint IO</title>
- <packages>org.eclipse.gemini.blueprint.io*</packages>
- </group>
- <group>
- <title>Eclipse Gemini Blueprint Integration Testing Framework</title>
- <packages>org.eclipse.gemini.blueprint.test*</packages>
- </group>
- <group>
- <title>Eclipse Gemini Blueprint Mock</title>
- <packages>org.eclipse.gemini.blueprint.mock*</packages>
- </group>
- </groups>
- <excludePackageNames>
- *internal:org.eclipse.gemini.blueprint.config:org.eclipse.gemini.blueprint.compendium.config:org.eclipse.gemini.blueprint.blueprint.config:org.eclipse.gemini.blueprint.blueprint.compendium.cm.config:org.eclipse.gemini.blueprint.iandt*
- </excludePackageNames>
-
- <breakiterator>true</breakiterator>
<quiet>true</quiet>
- <verbose>false</verbose>
- <show>protected</show>
- <source>1.7</source>
- <links>
- <link>http://download.oracle.com/javase/6/docs/api/</link>
- <link>http://docs.spring.io/autorepo/docs/spring-framework/4.2.x/javadoc-api/</link>
- <link>http://www2.osgi.org/javadoc/r4/</link>
- <link>http://cglib.sourceforge.net/apidocs</link>
- <!--<link>http://logging.apache.org/log4j/docs/api/</link>-->
- <link>http://jakarta.apache.org/commons/logging/apidocs/</link>
- <link>http://junit.org/junit/javadoc/4.9.0/</link>
- <link>http://aopalliance.sourceforge.net/doc/</link>
- </links>
+ <additionalparam>-Xdoclint:none</additionalparam>
</configuration>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
- <version>2.3</version>
+ <version>2.5</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jdepend-maven-plugin</artifactId>
- <version>2.0-beta-2</version>
+ <version>2.0</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
- <version>2.5.2</version>
+ <version>3.0.4</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.7</version>
+ <version>1.8</version>
</plugin>
<plugin>
<groupId>com.atlassian.maven.plugins</groupId>
@@ -540,17 +520,17 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
- <version>3.0.1</version>
+ <version>3.7</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.16</version>
+ <version>2.19.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.7</version>
+ <version>2.9</version>
</plugin>
</plugins>
</pluginManagement>
@@ -654,14 +634,6 @@
</configuration>
</plugin>
- <!-- =============== -->
- <!-- Javadocs -->
- <!-- =============== -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- </plugin>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
@@ -729,7 +701,7 @@
<!-- that's the default value -->
<dateFormat>dd.MM.yyyy '@' HH:mm:ss z</dateFormat>
<!-- true is default here, it prints some more information during the build -->
- <verbose>fasle</verbose>
+ <verbose>false</verbose>
<!--
If you'd like to tell the plugin where your .git directory is,
use this setting, otherwise we'll perform a search trying to
@@ -905,10 +877,73 @@
</profile>
<profile>
+ <!--
+ The release profile includes all sub modules as their versions must be updated
+ with regard to the release. It enables attaching the sources, signing all artifacts
+ (a prerequisite for releasing to maven central) and generates a all-in-one
+ release + documentation package via the assembly plugin.
+ -->
<id>release</id>
+
+ <modules>
+ <module>core</module>
+ <module>extender</module>
+ <module>integration-tests</module>
+ <module>io</module>
+ <module>mock</module>
+ <module>test-support</module>
+ </modules>
+
+ <dependencies>
+ <dependency>
+ <!--
+ The test sources are compiled against this generic dependency.
+ usually, test sources are compiled with regard to the framework chosen for
+ running the integration tests (e.g. felix, knopflerfish...). however, during release
+ they are simply compiled and not executed, thus we need this generic dependency.
+ -->
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+
<build>
<plugins>
<plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <inherited>false</inherited>
+ <executions>
+ <!-- w/o dependencies -->
+ <execution>
+ <id>wo-dependencies</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <appendAssemblyId>false</appendAssemblyId>
+ <descriptors>
+ <descriptor>src/assembly/no-dependencies.xml</descriptor>
+ </descriptors>
+ <attach>false</attach>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>site</id>
+ <goals>
+ <goal>site</goal>
+ </goals>
+ <phase>prepare-package</phase>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.6</version>
@@ -927,24 +962,26 @@
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.7</version>
<extensions>true</extensions>
+ <executions>
+ <execution>
+ <id>default-deploy</id>
+ <phase>deploy</phase>
+ <goals>
+ <goal>deploy</goal>
+ </goals>
+ </execution>
+ </executions>
<configuration>
<serverId>ossrh</serverId>
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
<autoReleaseAfterClose>false</autoReleaseAfterClose>
+ <!-- by default, local artifacts are gathered and deployed when the last project module
+ is built. However, the last project module may coincidentally not be deployed (e.g.
+ by skipping this plugin's execution), which results in nothing being deployed. Consequently,
+ deploy each module immediately after it was built. -->
+ <skipLocalStaging>true</skipLocalStaging>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-javadocs</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</profile>
@@ -983,40 +1020,6 @@
<name>maven repo</name>
<url>http://repo1.maven.org/maven2/</url>
</pluginRepository>
-
- <pluginRepository>
- <id>com.springsource.repository.bundles.release</id>
- <name>SpringSource Enterprise Bundle Repository - SpringSource Bundle Releases</name>
- <url>http://repository.springsource.com/maven/bundles/release/</url>
- </pluginRepository>
-
- <pluginRepository>
- <id>com.springsource.repository.bundles.milestone</id>
- <name>SpringSource Enterprise Bundle Repository - SpringSource Bundle Milestones</name>
- <url>http://repository.springsource.com/maven/bundles/milestone</url>
- </pluginRepository>
-
- <pluginRepository>
- <id>com.springsource.repository.bundles.snapshot</id>
- <name>SpringSource Enterprise Bundle Repository - SpringSource Bundle Snapshots</name>
- <url>http://repository.springsource.com/maven/bundles/snapshot</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </pluginRepository>
-
- <pluginRepository>
- <id>com.springsource.repository.bundles.external</id>
- <name>SpringSource Enterprise Bundle Repository - External Bundle Release</name>
- <url>http://repository.springsource.com/maven/bundles/external</url>
- </pluginRepository>
-
- <pluginRepository>
- <id>eclipse.virgo.build.bundles.release</id>
- <name>Eclipse Virgo Build</name>
- <url>http://build.eclipse.org/rt/virgo/maven/bundles/release</url>
- </pluginRepository>
-
</pluginRepositories>
<repositories>
@@ -1027,93 +1030,10 @@
</repository>
<repository>
- <id>knopflerfish</id>
- <name>knopflerfish repo</name>
- <url>http://www.knopflerfish.org/maven2/</url>
- </repository>
-
- <repository>
- <id>com.springsource.repository.bundles.release</id>
- <name>SpringSource Enterprise Bundle Repository - SpringSource Bundle Releases</name>
- <url>http://repository.springsource.com/maven/bundles/release/</url>
- </repository>
-
- <repository>
- <id>com.springsource.repository.bundles.external</id>
- <name>SpringSource Enterprise Bundle Repository - External Bundle Release</name>
- <url>http://repository.springsource.com/maven/bundles/external</url>
- </repository>
-
- <repository>
- <id>com.springsource.repository.bundles.milestone</id>
- <name>SpringSource Enterprise Bundle Repository - SpringSource Bundle Milestones</name>
- <url>http://repository.springsource.com/maven/bundles/milestone</url>
- </repository>
-
- <repository>
- <id>com.springsource.repository.bundles.snapshot</id>
- <name>SpringSource Enterprise Bundle Repository - Snapshots</name>
- <url>http://repository.springsource.com/maven/bundles/snapshot</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
-
- <repository>
- <id>spring-release</id>
- <name>Spring Portfolio Release Repository</name>
- <url>http://maven.springframework.org/release</url>
- </repository>
-
- <repository>
- <id>spring-external</id>
- <name>Spring Portfolio External Repository</name>
- <url>http://maven.springframework.org/external</url>
- </repository>
-
- <repository>
- <id>spring-milestone</id>
- <name>Spring Portfolio Milestone Repository</name>
- <url>http://maven.springframework.org/milestone</url>
- </repository>
-
- <repository>
- <id>spring-ext</id>
- <name>Spring External Dependencies Repository</name>
- <url>http://springframework.svn.sourceforge.net/svnroot/springframework/repos/repo-ext/</url>
- </repository>
-
- <!-- used when building against Spring snapshots -->
- <repository>
- <id>spring-snapshot</id>
- <name>Spring Portfolio Milestone Repository</name>
- <url>http://maven.springframework.org/snapshot</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
-
- <repository>
<id>knopflerfish-repo</id>
<name>Official Knopflerfish Repository</name>
<url>http://www.knopflerfish.org/maven2/</url>
</repository>
-
- <!--todo: is this still needed -->
- <repository>
- <id>i21-s3-osgi-repo</id>
- <name>i21 osgi artifacts repo</name>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <url>http://maven.springframework.org/osgi</url>
- </repository>
-
- <repository>
- <id>eclipse.virgo.build.bundles.release</id>
- <name>Eclipse Virgo Build</name>
- <url>http://build.eclipse.org/rt/virgo/maven/bundles/release</url>
- </repository>
</repositories>
</project>
diff --git a/release/pom.xml b/release/pom.xml
deleted file mode 100755
index d0cf485..0000000
--- a/release/pom.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.eclipse.gemini.blueprint.release</groupId>
- <artifactId>gemini-blueprint</artifactId>
- <name>Gemini Blueprint Distribution</name>
- <packaging>pom</packaging>
- <description>
- <!-- Use CDATA to keep it on a single line in the manifest -->
- <![CDATA[Gemini Blueprint Distribution - used to create a .zip package for distribution of the main sub modules.]]>
- </description>
-
- <parent>
- <groupId>org.eclipse.gemini.blueprint</groupId>
- <artifactId>gemini-blueprint</artifactId>
- <version>2.0.0.RELEASE</version>
- <relativePath>..</relativePath>
- </parent>
-
- <modules>
- <module>../mock</module>
- <module>../io</module>
- <module>../core</module>
- <module>../extender</module>
- <module>../test-support</module>
- </modules>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <inherited>false</inherited>
- <executions>
- <!-- w/o dependencies -->
- <execution>
- <id>wo-dependencies</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <appendAssemblyId>false</appendAssemblyId>
- <descriptors>
- <descriptor>src/assembly/no-dependencies.xml</descriptor>
- </descriptors>
- <attach>false</attach>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/release/src/assembly/docs.xml b/src/assembly/docs.xml
old mode 100755
new mode 100644
similarity index 65%
rename from release/src/assembly/docs.xml
rename to src/assembly/docs.xml
index 457bdee..df2f92b
--- a/release/src/assembly/docs.xml
+++ b/src/assembly/docs.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component>
- <fileSets>
- <!-- License/Changelog/Readme -->
- <fileSet>
- <directory>../</directory>
- <outputDirectory/>
- <includes>
- <include>changelog.txt</include>
- <include>epl-v10.html</include>
- <include>license-apache.txt</include>
- <include>notice.html</include>
- <include>readme.txt</include>
- </includes>
- <lineEnding>dos</lineEnding>
- <filtered>true</filtered>
- </fileSet>
-
- <!-- Documentation -->
- <fileSet>
- <directory>../target/site/apidocs</directory>
- <outputDirectory>docs/api</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>../docs/target/site/reference</directory>
- <outputDirectory>docs/reference</outputDirectory>
- </fileSet>
- </fileSets>
+<?xml version="1.0" encoding="UTF-8"?>
+<component
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://maven.apache.org/ASSEMBLY-COMPONENT/2.0.0"
+ xsi:schemaLocation="http://maven.apache.org/ASSEMBLY-COMPONENT/2.0.0 http://maven.apache.org/xsd/assembly-component-2.0.0.xsd">
+
+ <fileSets>
+ <!-- License/Changelog/Readme -->
+ <fileSet>
+ <directory>.</directory>
+ <outputDirectory/>
+ <includes>
+ <include>changelog.txt</include>
+ <include>epl-v10.html</include>
+ <include>license-apache.txt</include>
+ <include>notice.html</include>
+ <include>readme.txt</include>
+ </includes>
+ <lineEnding>dos</lineEnding>
+ <filtered>true</filtered>
+ </fileSet>
+
+ <!-- Documentation -->
+ <fileSet>
+ <directory>docs/target/site/reference</directory>
+ <outputDirectory>docs/reference</outputDirectory>
+ </fileSet>
+ </fileSets>
</component>
\ No newline at end of file
diff --git a/release/src/assembly/no-dependencies.xml b/src/assembly/no-dependencies.xml
old mode 100755
new mode 100644
similarity index 72%
rename from release/src/assembly/no-dependencies.xml
rename to src/assembly/no-dependencies.xml
index ca2a358..d584c87
--- a/release/src/assembly/no-dependencies.xml
+++ b/src/assembly/no-dependencies.xml
@@ -1,35 +1,42 @@
-<assembly>
- <id>no-dependencies</id>
- <formats>
- <format>zip</format>
- </formats>
- <componentDescriptors>
- <componentDescriptor>src/assembly/docs.xml</componentDescriptor>
- </componentDescriptors>
- <includeBaseDirectory>true</includeBaseDirectory>
- <moduleSets>
- <!-- mandatory jars -->
- <moduleSet>
- <includes>
- <include>org.eclipse.gemini.blueprint:gemini-blueprint-io</include>
- <include>org.eclipse.gemini.blueprint:gemini-blueprint-mock</include>
- <include>org.eclipse.gemini.blueprint:gemini-blueprint-core</include>
- <include>org.eclipse.gemini.blueprint:gemini-blueprint-extender</include>
- <include>org.eclipse.gemini.blueprint:gemini-blueprint-test</include>
- </includes>
- <!-- the .jar and -sources.jar will be included here -->
- <sources>
- <includeModuleDirectory>false</includeModuleDirectory>
- <fileSets>
- <fileSet>
- <directory>target</directory>
- <outputDirectory>dist</outputDirectory>
- <includes>
- <include>*.jar</include>
- </includes>
- </fileSet>
- </fileSets>
- </sources>
- </moduleSet>
- </moduleSets>
-</assembly>
+<assembly
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
+ xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
+ <id>no-dependencies</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <componentDescriptors>
+ <componentDescriptor>src/assembly/docs.xml</componentDescriptor>
+ </componentDescriptors>
+ <includeBaseDirectory>true</includeBaseDirectory>
+ <moduleSets>
+ <!-- mandatory jars -->
+ <moduleSet>
+ <includes>
+ <include>org.eclipse.gemini.blueprint:gemini-blueprint-io</include>
+ <include>org.eclipse.gemini.blueprint:gemini-blueprint-mock</include>
+ <include>org.eclipse.gemini.blueprint:gemini-blueprint-core</include>
+ <include>org.eclipse.gemini.blueprint:gemini-blueprint-extender</include>
+ <include>org.eclipse.gemini.blueprint:gemini-blueprint-test</include>
+ </includes>
+ <!-- the .jar and -sources.jar will be included here -->
+ <sources>
+ <includeModuleDirectory>false</includeModuleDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>target</directory>
+ <outputDirectory>dist</outputDirectory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ <excludes>
+ <!-- The shade plugin generates these build artifacts, which shall not be included in the distribution. -->
+ <exclude>original-*</exclude>
+ </excludes>
+ </fileSet>
+ </fileSets>
+ </sources>
+ </moduleSet>
+ </moduleSets>
+</assembly>
diff --git a/test-support/pom.xml b/test-support/pom.xml
index 9168d0e..3f51e1f 100644
--- a/test-support/pom.xml
+++ b/test-support/pom.xml
@@ -7,7 +7,7 @@
<parent>
<artifactId>gemini-blueprint</artifactId>
<groupId>org.eclipse.gemini.blueprint</groupId>
- <version>2.0.0.RELEASE</version>
+ <version>2.1.0.M1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -36,8 +36,8 @@
<dependencies>
<dependency>
- <groupId>org.junit</groupId>
- <artifactId>com.springsource.org.junit</artifactId>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.junit</artifactId>
</dependency>
<dependency>
@@ -46,22 +46,22 @@
</dependency>
<dependency>
- <groupId>org.objectweb.asm</groupId>
- <artifactId>com.springsource.org.objectweb.asm</artifactId>
- <version>2.2.3</version>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.asm</artifactId>
+ <version>2.2.3_1</version>
</dependency>
<dependency>
<groupId>org.eclipse.gemini.blueprint</groupId>
<artifactId>gemini-blueprint-core</artifactId>
- <version>${project.parent.version}</version>
+ <version>${project.version}</version>
</dependency>
<!-- used for getting Counter util in -->
<dependency>
<groupId>org.eclipse.gemini.blueprint</groupId>
<artifactId>gemini-blueprint-extender</artifactId>
- <version>${project.parent.version}</version>
+ <version>${project.version}</version>
<optional>true</optional>
</dependency>
@@ -95,7 +95,6 @@
<dependency>
<groupId>org.eclipse.gemini.blueprint</groupId>
<artifactId>gemini-blueprint-mock</artifactId>
- <version>${project.parent.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
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 fff2024..40f25a3 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
@@ -16,13 +16,13 @@
#
# versioning
-ignore.junit.version=4.9.0
+ignore.junit.version=4.9_1
ignore.logback.version=1.0.13
-ignore.spring.version=4.2.4.RELEASE_1
-ignore.gemini.blueprint.version=2.0.0.RELEASE
+ignore.spring.version=4.2.5.RELEASE_1
+ignore.gemini.blueprint.version=${project.version}
ignore.slf4j.version=1.7.5
-ignore.asm.version=2.2.3
+ignore.asm.version=2.2.3_1
# groupIds
ignore.servicemix.bundles.groupId=org.apache.servicemix.bundles
@@ -37,7 +37,7 @@
# dependencies
# junit
-org.junit,com.springsource.org.junit,${ignore.junit.version}=
+org.apache.servicemix.bundles,org.apache.servicemix.bundles.junit,${ignore.junit.version}=
# slf4j
${ignore.slf4j.groupId},slf4j-api,${ignore.slf4j.version}=
${ignore.slf4j.groupId},jcl-over-slf4j,${ignore.slf4j.version}=
@@ -48,7 +48,7 @@
${ignore.servicemix.bundles.groupId},${ignore.servicemix.bundles.groupId}.aopalliance,1.0_6=
# asm
-org.objectweb.asm,com.springsource.org.objectweb.asm,${ignore.asm.version}=
+org.apache.servicemix.bundles,org.apache.servicemix.bundles.asm,${ignore.asm.version}=
# spring libs
${ignore.servicemix.bundles.groupId},${ignore.servicemix.bundles.groupId}.spring-beans,${ignore.spring.version}=