- Fixed up cglib typo in testing docbook, should be 2.2.0 instead of 2.1.3. - Added relativePath to extender/pom.xml and used correct compendium groupId, artifactId and version in extender/pom.xml - Added relativePath to integration-test/bundles/blueprint/config.bundles/pom.xml and removed unnecessary groupId definition. - Added relativePath to integration-test/bundles/blueprint/error.bundles/pom.xml and removed unnecessary groupId definition. - Added relativePath to integration-test/bundles/blueprint/simple.bundles/pom.xml and removed unnecessary groupId definition. - Added relativePath to integration-test/bundles/blueprint/waiting.bundles/pom.xml and removed unnecessary groupId definition. - Added relativePath to integration-test/bundles/blueprint/pom.xml, removed unnecessary <properties/>, <dependencies/> and <plugins/> as they are declared in the parent. - Added relativePath to integration-test/bundles/cardinality.0to1.bundle/pom.xml, removed unnecessary groupId definition and replaced deprecated maven property ${project.parent.version} with ${project.version}. - Added relativePath to integration-test/bundles/config.bundle/async.nowait.bundle/pom.xml and removed unnecessary groupId definition. - Added relativePath to integration-test/bundles/config.bundle/async.wait.bundle/pom.xml and removed unnecessary groupId definition. - Added relativePath to integration-test/bundles/config.bundle/no.publish.bundle/pom.xml and removed unnecessary groupId definition. - Added relativePath to integration-test/bundles/config.bundle/sync.nowait.bundle/pom.xml and removed unnecessary groupId definition. - Added relativePath to integration-test/bundles/config.bundle/sync.tail.bundle/pom.xml and removed unnecessary groupId definition. - Added relativePath to integration-test/bundles/config.bundle/sync.wait.bundle/pom.xml and removed unnecessary groupId definition. - Added relativePath to integration-test/bundles/config.bundle/config.bundle/pom.xml, removed unnecessary groupId definition, removed unnecessary <properties/>, <dependencies/> and <plugins/> as they are declared in the parent. - Added relativePath to integration-test/bundles/config.file.with.dots.bundle/pom.xml and removed unnecessary groupId definition. - Added relativePath to integration-test/bundles/configuration.test.bundle/pom.xml and removed unnecessary groupId definition. - Added relativePath to integration-test/bundles/deadlock.bundle/pom.xml and removed unnecessary groupId definition. - Added relativePath to integration-test/bundles/dependency.factory.bundle/pom.xml and removed unnecessary groupId definition. - Added relativePath to integration-test/bundles/dependency.test.bundle/pom.xml, removed unnecessary groupId definition and replaced deprecated maven property ${project.parent.version} with ${project.version}. - Added relativePath to integration-test/bundles/embedded.ns.bundle/pom.xml and removed unnecessary groupId definition. - Added relativePath to integration-test/bundles/error.bundle/pom.xml, removed unnecessary groupId definition and replaced deprecated maven property ${project.parent.version} with ${project.version}. - Added relativePath to integration-test/bundles/export.import.dependency.bundle/pom.xml and removed unnecessary groupId definition. - Added relativePath to integration-test/bundles/extender.fragment.bundle/pom.xml and removed unnecessary groupId definition. - Added relativePath to integration-test/bundles/extender.listener.bundle/pom.xml and removed unnecessary groupId definition. - Added relativePath to integration-test/bundles/extender.version.bundle/pom.xml and removed unnecessary groupId definition. - Added relativePath to integration-test/bundles/io.fragment.1.bundle/pom.xml and removed unnecessary groupId definition. - Added relativePath to integration-test/bundles/io.fragment.2.bundle/pom.xml and removed unnecessary groupId definition. - Added relativePath to integration-test/bundles/jdk.proxy.bundle/pom.xml and removed unnecessary groupId definition. - Added relativePath to integration-test/bundles/jdk5/component.scan.bundle/pom.xml and removed unnecessary groupId definition. - Added relativePath to integration-test/bundles/jdk5/pom.xml, removed unnecessary groupId definition, fixed up parent groupId, removed unnecessary <properties/>, <dependencies/> and <plugins/> as they are declared in the parent. - Added relativePath to integration-test/bundles/lifecycle.test.bundle/pom.xml and removed unnecessary groupId definition. - Added relativePath to integration-test/bundles/namespace.own.consumer.bundle/pom.xml and removed unnecessary groupId definition. - Added relativePath to integration-test/bundles/proxy.creator.bundle/pom.xml and removed unnecessary groupId definition. - Added relativePath to integration-test/bundles/proxy.destruction.test.bundle/pom.xml, removed unnecessary groupId definition and replaced deprecated maven property ${project.parent.version} with ${project.version}. - Added relativePath to integration-test/bundles/proxy.listener/pom.xml and removed unnecessary groupId definition. - Added relativePath to integration-test/bundles/reference.test.bundle/pom.xml, removed unnecessary groupId definition and replaced deprecated maven property ${project.parent.version} with ${project.version}. - Added relativePath to integration-test/bundles/scoped.a.bundle/pom.xml and removed unnecessary groupId definition. - Added relativePath to integration-test/bundles/scoped.b.bundle/pom.xml and removed unnecessary groupId definition. - Added relativePath to integration-test/bundles/scoped.common.bundle/pom.xml and removed unnecessary groupId definition. - Added relativePath to integration-test/bundles/service.listener.bundle/pom.xml, removed unnecessary groupId definition and replaced deprecated maven property ${project.parent.version} with ${project.version}. - Added relativePath to integration-test/bundles/simple.service.2.bundle/pom.xml and removed unnecessary groupId definition. - Added relativePath to integration-test/bundles/simple.service.3.bundle/pom.xml and removed unnecessary groupId definition. - Added relativePath to integration-test/bundles/simple.service.bundle.2.identical/pom.xml, removed unnecessary groupId definition and replaced deprecated maven property ${project.parent.version} with ${project.version}. - Added relativePath to integration-test/bundles/simple.service.bundle.identical/pom.xml, removed unnecessary groupId definition and replaced deprecated maven property ${project.parent.version} with ${project.version}. - Added relativePath to integration-test/bundles/simple.service.bundle/pom.xml and removed unnecessary groupId definition. - Added relativePath to integration-test/bundles/tccl.bundle/pom.xml, removed unnecessary groupId definition and replaced deprecated maven property ${project.parent.version} with ${project.version}. - Added relativePath to integration-test/bundles/tccl.intf.bundle/pom.xml and removed unnecessary groupId definition. - Added relativePath to integration-test/bundles/trivial.bundle/pom.xml and removed unnecessary groupId definition. - Added relativePath to integration-test/bundles/trivial.test.bundle/pom.xml, removed unnecessary groupId definition and replaced deprecated maven property ${project.parent.version} with ${project.version}. - Added relativePath to integration-test/bundles/pom.xml, removed unnecessary groupId definition, removed commented out and no longer existing modules, removed the declaration of the maven-deploy-plugin (not needed since the packaging type is pom), moved the declaration of the maven-jar-plugin to the pluginManagement section and replaced the deprecated maven property ${pom.artifactId} with ${project.artifactId}. - Updated the constant in CallingResourceOnDifferentBundlesTest that referrers to the spring-core artifact name as we are now using the official spring dependency. - Added support for NonOSGiLoaderProxyTest to compile using java 7, missing method in javax.sql.DataSource. - Fixed type in integration-tests/tests/src/test/resources/log4j.properties, looked like a copy and paste mistake. - Added relativePath to integration-test/tests/pom.xml, removed unnecessary groupId definition, removed <properties/> (already present in the parent), corrected the artifactId for the osgi compendium dependency, removed all the no longer needed web dependencies, removed maven-deploy-plugin definition (already declared in the parent) and updated the test framework system property from spring to blueprint. - Added relativePath to integration-test/pom.xml, removed unnecessary groupId definition, moved the maven-deploy-plugin declaration to the pluginManagement section and renamed the groupId from *module to *parent. - Added relativePath to io/pom.xml, removed unnecessary groupId definition, update spring dependency to the official artifactId. - Updated lib/readme.txt with the correct version of dependencies currently in use in the project, removed no longer used dependencies. - Added relativePath to mock/pom.xml and removed unnecessary groupId definition. - Updated EquinoxPlatform to put all temporary files under the test-support modules target directory (as is standard maven practice). - Updated AbstractConfigurableOsgiTests to remove the spring specific deprecated osgi framework selector system property, now only uses the blueprint specific property. - Fixed spelling typo in AbstractOnTheFlyBundleCreatorTests. - Updated boot-bundles.properties with newer dependency versions, updated some dependencies to the official artifactId's (spring and slf4j) and replaced commons-logging with jcl-over-slf4j. - Added relativePath to test-support/pom.xml, removed unnecessary groupId definition, fixed typo in jarjar.dep property, updated junit dependency version, updated spring dependencies to the official artifactIds, updated knopflerfish dependency to the official groupId, moved the maven-surefire-plugin to the pluginManagement section. - Updated /pom.xml - Made maven 3.0.3 a prerequisite for running the build. - Added missing source encoding property. - Added missing env.* property's, without which the build won't run. - Use the official knopflerfish version (don't worry - the same exact binary as before) - The gemini.blueprint.version.range.nq property now uses the maven property ${project.version} instead of a custom one with exactly the same value. - Removed a bunch of commented out modules, that don't exist anyway. - Removed some no longer existent dependencies (gemini-blueprint-web, gemini-blueprint-annotation, spring-osgi-web-extender) which were causing the build the fail. - Replaced all spring dependency artifactId's with the official ones, as the official spring dependencies have long contained the correct osgi metadata. - Excluded all references to commons-logging, replaced by jcl-over-slf4j. - Removed a bunch of spring web dependencies, that are no longer used. - Updated the dependency on osgi compendium to the official artifactId and version. - Added the org.osgi.core dependency, so that unit tests (not including integration tests) will compile, run and pass. You no longer need to specify a osgi implementation profile. The API is standard and exists separate from the containers we test with, so why not use it. - Updated junit to version 4.9.0. - Updated log4j to the latest version and now uses the official groupId and artifactId, as the official binaries contain the correct osgi metadata. - Added missing version info for the maven-compiler-plugin. - Updated jarjar dependency to the official groupId, artifactId and version. - Cleaned up usages of maven property's in the bundlor plugin. - Tried to update to the latest version of the bundlor plugin - fixed up the config, and I can see it is producing the "correct" osgi metadata (the current plugin isn't) but it does not run, so left it commented out to come back to later. Not even sure how the current version of the plugin works as the metadata is products is incorrect (or so I think..) - Removed no longer existent samples profile/module. - Specify versions for the reporting plugins. - Added knopflerfish maven repo to the list of repositories, needed to use the official dependency.

commit: 401a2543b75cd1c0c3223484a0b3926bff0e3167 [log] [tgz]
author: Aaron Whiteside <aaronjwhiteside@gmail.com> Wed Apr 04 22:41:28 2012 -0400
committer: Glyn Normington <gnormington@vmware.com> Mon May 21 14:13:54 2012 +0100
tree: d9c92c80e472e89741496fc511ffad5cbfe48692
parent: 0ea40a99c2c60dd35d7b51f6a12cc32afcea48a2 [diff]
diff --git a/integration-tests/bundles/blueprint/config.bundle/pom.xml b/integration-tests/bundles/blueprint/config.bundle/pom.xml
index 994413d..a088d44 100644
--- a/integration-tests/bundles/blueprint/config.bundle/pom.xml
+++ b/integration-tests/bundles/blueprint/config.bundle/pom.xml

@@ -1,14 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <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">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
     <parent>
         <groupId>org.eclipse.gemini.blueprint.iandt.blueprint</groupId>
         <artifactId>bundles</artifactId>
         <version>1.0.1.BUILD-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.eclipse.gemini.blueprint.iandt.blueprint</groupId>
+
     <artifactId>config.bundle</artifactId>
 	<packaging>jar</packaging>
     <name>Eclipse Gemini Blueprint Test Bundle: Configuration test bundle</name>

diff --git a/integration-tests/bundles/blueprint/error.bundle/pom.xml b/integration-tests/bundles/blueprint/error.bundle/pom.xml
index 8aa30ec..7539634 100644
--- a/integration-tests/bundles/blueprint/error.bundle/pom.xml
+++ b/integration-tests/bundles/blueprint/error.bundle/pom.xml

@@ -1,14 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <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">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
     <parent>
         <groupId>org.eclipse.gemini.blueprint.iandt.blueprint</groupId>
         <artifactId>bundles</artifactId>
         <version>1.0.1.BUILD-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.eclipse.gemini.blueprint.iandt.blueprint</groupId>
+
     <artifactId>error.bundle</artifactId>
 	<packaging>jar</packaging>
     <name>Eclipse Gemini Blueprint Test Bundle: Error bundle</name>

diff --git a/integration-tests/bundles/blueprint/pom.xml b/integration-tests/bundles/blueprint/pom.xml
index 3110148..c63ceed 100644
--- a/integration-tests/bundles/blueprint/pom.xml
+++ b/integration-tests/bundles/blueprint/pom.xml

@@ -1,61 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
-  <parent>
-    <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
-    <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
-    <version>1.0.1.BUILD-SNAPSHOT</version>
-  </parent>
-  
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.eclipse.gemini.blueprint.iandt.blueprint</groupId>
-  <artifactId>bundles</artifactId>
-  <packaging>pom</packaging>
-  <name>Gemini Blueprint Integration Testing Bundles</name>
-  <url>http://www.eclipse.org/gemini/blueprint/</url>
-  
-  <properties>
-    <!-- root, empty package -->
-    <!-- plugin not yet enabled to avoid further problems -->
-	<spring.osgi.import.pkg>!org.springframework.osgi.blueprint.iandt, *</spring.osgi.import.pkg>
-	<spring.osgi.export.pkg>${pom.artifactId}*</spring.osgi.export.pkg>
-  	<clover.skip>true</clover.skip>
-  </properties>
-  
-  <!-- shared dependencies -->
-  <dependencies>
-        <dependency>
-            <groupId>org.eclipse.gemini.blueprint</groupId>
-            <artifactId>gemini-blueprint-core</artifactId>
-            <scope>provided</scope>
-        </dependency>
-  </dependencies>
-  
-  <modules>
-    <module>simple.bundle</module>
-    <module>error.bundle</module>
-    <module>waiting.bundle</module>
-    <module>config.bundle</module>
-  </modules>
+<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>
 
- <build>
-    <plugins>
-	   <plugin>
-        <artifactId>maven-deploy-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>    
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <configuration>
-          <archive>
-            <manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
-          </archive>
-        </configuration>
-      </plugin>
-    </plugins>
-    
- </build>
+    <parent>
+        <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
+        <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
+        <version>1.0.1.BUILD-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <groupId>org.eclipse.gemini.blueprint.iandt.blueprint</groupId>
+    <artifactId>bundles</artifactId>
+    <packaging>pom</packaging>
+    <name>Gemini Blueprint Integration Testing Bundles</name>
+    <url>http://www.eclipse.org/gemini/blueprint/</url>
+
+    <modules>
+        <module>simple.bundle</module>
+        <module>error.bundle</module>
+        <module>waiting.bundle</module>
+        <module>config.bundle</module>
+    </modules>
 
 </project>

diff --git a/integration-tests/bundles/blueprint/simple.bundle/pom.xml b/integration-tests/bundles/blueprint/simple.bundle/pom.xml
index 2198f00..6afd7f0 100644
--- a/integration-tests/bundles/blueprint/simple.bundle/pom.xml
+++ b/integration-tests/bundles/blueprint/simple.bundle/pom.xml

@@ -1,14 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <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">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
     <parent>
         <groupId>org.eclipse.gemini.blueprint.iandt.blueprint</groupId>
         <artifactId>bundles</artifactId>
         <version>1.0.1.BUILD-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.eclipse.gemini.blueprint.iandt.blueprint</groupId>
+
     <artifactId>simple.bundle</artifactId>
 	<packaging>jar</packaging>
     <name>Eclipse Gemini Blueprint Test Bundle: Simple service test bundle</name>

diff --git a/integration-tests/bundles/blueprint/waiting.bundle/pom.xml b/integration-tests/bundles/blueprint/waiting.bundle/pom.xml
index 87fe1fc..e41272b 100644
--- a/integration-tests/bundles/blueprint/waiting.bundle/pom.xml
+++ b/integration-tests/bundles/blueprint/waiting.bundle/pom.xml

@@ -1,14 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <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">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
     <parent>
         <groupId>org.eclipse.gemini.blueprint.iandt.blueprint</groupId>
         <artifactId>bundles</artifactId>
         <version>1.0.1.BUILD-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.eclipse.gemini.blueprint.iandt.blueprint</groupId>
+
     <artifactId>waiting.bundle</artifactId>
 	<packaging>jar</packaging>
     <name>Eclipse Gemini Blueprint Test Bundle: Waiting bundle</name>

diff --git a/integration-tests/bundles/cardinality.0to1.bundle/pom.xml b/integration-tests/bundles/cardinality.0to1.bundle/pom.xml
index 734cb90..e8d04f9 100644
--- a/integration-tests/bundles/cardinality.0to1.bundle/pom.xml
+++ b/integration-tests/bundles/cardinality.0to1.bundle/pom.xml

@@ -1,15 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <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">
-    <parent>
-        <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
-        <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
-        <version>1.0.1.BUILD-SNAPSHOT</version>
-    </parent>
-    
+         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.iandt</groupId>
+
+    <parent>
+        <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
+        <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
+        <version>1.0.1.BUILD-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
     <artifactId>cardinality0to1</artifactId>
     <packaging>jar</packaging>
     <name>Gemini Blueprint Test Bundle: Spring context service reference cardinality 0..1 bundle</name>
@@ -20,7 +21,7 @@
         <dependency>
             <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
             <artifactId>simple.service</artifactId>
-            <version>${project.parent.version}</version>
+            <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

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 64706cb..889343b 100644
--- a/integration-tests/bundles/config.bundle/async.nowait.bundle/pom.xml
+++ b/integration-tests/bundles/config.bundle/async.nowait.bundle/pom.xml

@@ -1,14 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <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">
-    <parent>
-        <artifactId>config.bundle</artifactId>
-        <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
-        <version>1.0.1.BUILD-SNAPSHOT</version>
-    </parent>
+         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.iandt</groupId>
+
+    <parent>
+        <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
+        <artifactId>config.bundle</artifactId>
+        <version>1.0.1.BUILD-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
     <artifactId>async-nowait-bundle</artifactId>
     <packaging>jar</packaging>
     <name>Gemini Blueprint Test Bundle: Async-NoWait-Bundle</name>

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 5096339..1786038 100644
--- a/integration-tests/bundles/config.bundle/async.wait.bundle/pom.xml
+++ b/integration-tests/bundles/config.bundle/async.wait.bundle/pom.xml

@@ -1,15 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <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">
-    <parent>
-        <artifactId>config.bundle</artifactId>
-        <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
-        <version>1.0.1.BUILD-SNAPSHOT</version>
-    </parent>
-    
+         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.iandt</groupId>
+
+    <parent>
+        <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
+        <artifactId>config.bundle</artifactId>
+        <version>1.0.1.BUILD-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
     <artifactId>async-wait-bundle</artifactId>
     <packaging>jar</packaging>
     <name>Gemini Blueprint Test Bundle: Async-Wait-Bundle</name>

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 e747a1b..17db9e4 100644
--- a/integration-tests/bundles/config.bundle/no.publish.bundle/pom.xml
+++ b/integration-tests/bundles/config.bundle/no.publish.bundle/pom.xml

@@ -1,15 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <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">
-    <parent>
-        <artifactId>config.bundle</artifactId>
-        <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
-        <version>1.0.1.BUILD-SNAPSHOT</version>
-    </parent>
-    
+         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.iandt</groupId>
+
+    <parent>
+        <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
+        <artifactId>config.bundle</artifactId>
+        <version>1.0.1.BUILD-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
     <artifactId>nopublish-bundle</artifactId>
     <packaging>jar</packaging>
     <name>Gemini Blueprint Test Bundle: NoPublish-Bundle</name>

diff --git a/integration-tests/bundles/config.bundle/pom.xml b/integration-tests/bundles/config.bundle/pom.xml
index 7900e9f..601ddd7 100644
--- a/integration-tests/bundles/config.bundle/pom.xml
+++ b/integration-tests/bundles/config.bundle/pom.xml

@@ -1,80 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
-  <parent>
-    <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
-    <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
-    <version>1.0.1.BUILD-SNAPSHOT</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>

-  <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
-  <artifactId>config.bundle</artifactId>
-  <packaging>pom</packaging>
-  <name>Gemini Blueprint Test Bundle: Integration testing bundles for configuration options</name>
-  <url>http://www.eclipse.org/gemini/blueprint/</url>
-  
-  <properties>
-    <!-- root, empty package -->
-    <!-- plugin not yet enabled to avoid further problems -->
-	<spring.osgi.import.pkg>!org.eclipse.gemini.blueprint.iandt, *</spring.osgi.import.pkg>
-	<spring.osgi.export.pkg>${pom.artifactId}*</spring.osgi.export.pkg>
-  </properties>
-  
-  <!-- shared dependencies -->
-  <dependencies>
-        <dependency>
-            <groupId>org.eclipse.gemini.blueprint</groupId>
-            <artifactId>gemini-blueprint-core</artifactId>
-            <version>${project.parent.version}</version>
-            <type>jar</type>
-            <scope>provided</scope>
-        </dependency>
-  </dependencies>
-  
-  <modules>
-    <module>no.publish.bundle</module>

-    <module>async.nowait.bundle</module>
-	<module>async.wait.bundle</module>
-    <module>sync.nowait.bundle</module>
-	<module>sync.tail.bundle</module>    
-    <module>sync.wait.bundle</module>

-  </modules>
+<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>
 
+    <parent>
+        <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
+        <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
+        <version>1.0.1.BUILD-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
 
- <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <configuration>
-          <archive>
-            <manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
-          </archive>
-        </configuration>
-      </plugin>
-    </plugins>
-    
- </build>
+    <artifactId>config.bundle</artifactId>
+    <packaging>pom</packaging>
+    <name>Gemini Blueprint Test Bundle: Integration testing bundles for configuration options</name>
+    <url>http://www.eclipse.org/gemini/blueprint/</url>
 
-   <!-- the above doesn't work, so we spell it out in full below
-  <reporting>
-   <excludeDefaults>true</excludeDefaults>
-   <plugins>
-     <plugin>
-       <groupId>org.apache.maven.plugins</groupId>
-       <artifactId>maven-project-info-reports-plugin</artifactId>
-       <inherited>true</inherited>
-       <reportSets>
-        <reportSet></reportSet>
-       </reportSets>
-     </plugin>   
-	<plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <configuration>
-        <excludePackageNames>*</excludePackageNames>
-        </configuration>
-     </plugin>   
-   </plugins>
-  </reporting>
-  -->
+    <modules>
+        <module>no.publish.bundle</module>
+        <module>async.nowait.bundle</module>
+        <module>async.wait.bundle</module>
+        <module>sync.nowait.bundle</module>
+        <module>sync.tail.bundle</module>
+        <module>sync.wait.bundle</module>
+    </modules>
+
 </project>

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 cc3a66c..9e77cc4 100644
--- a/integration-tests/bundles/config.bundle/sync.nowait.bundle/pom.xml
+++ b/integration-tests/bundles/config.bundle/sync.nowait.bundle/pom.xml

@@ -1,15 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <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">
-    <parent>
-        <artifactId>config.bundle</artifactId>
-        <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
-        <version>1.0.1.BUILD-SNAPSHOT</version>
-    </parent>
-    
+         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.iandt</groupId>
+
+    <parent>
+        <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
+        <artifactId>config.bundle</artifactId>
+        <version>1.0.1.BUILD-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
     <artifactId>sync-nowait-bundle</artifactId>
     <packaging>jar</packaging>
     <name>Gemini Blueprint Test Bundle: Sync-NoWait-Bundle</name>

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 5be564e..9433c19 100644
--- a/integration-tests/bundles/config.bundle/sync.tail.bundle/pom.xml
+++ b/integration-tests/bundles/config.bundle/sync.tail.bundle/pom.xml

@@ -1,15 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <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">
-    <parent>
-        <artifactId>config.bundle</artifactId>
-        <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
-        <version>1.0.1.BUILD-SNAPSHOT</version>
-    </parent>
-    
+         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.iandt</groupId>
+
+    <parent>
+        <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
+        <artifactId>config.bundle</artifactId>
+        <version>1.0.1.BUILD-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
     <artifactId>sync-tail-bundle</artifactId>
     <packaging>jar</packaging>
     <name>Gemini Blueprint Test Bundle: Sync-Tail-Bundle</name>

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 2435739..6456706 100644
--- a/integration-tests/bundles/config.bundle/sync.wait.bundle/pom.xml
+++ b/integration-tests/bundles/config.bundle/sync.wait.bundle/pom.xml

@@ -1,15 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <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">
-    <parent>
-        <artifactId>config.bundle</artifactId>
-        <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
-        <version>1.0.1.BUILD-SNAPSHOT</version>
-    </parent>
-    
+         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.iandt</groupId>
+
+    <parent>
+        <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
+        <artifactId>config.bundle</artifactId>
+        <version>1.0.1.BUILD-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
     <artifactId>sync-wait-bundle</artifactId>
     <packaging>jar</packaging>
     <name>Gemini Blueprint Test Bundle: Sync-Wait-Bundle</name>

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 e81141b..8075d95 100644
--- a/integration-tests/bundles/config.file.with.dots.bundle/pom.xml
+++ b/integration-tests/bundles/config.file.with.dots.bundle/pom.xml

@@ -1,14 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <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">
-    <parent>
-        <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
-        <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
-        <version>1.0.1.BUILD-SNAPSHOT</version>
-    </parent>
+         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.iandt</groupId>
+
+    <parent>
+        <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
+        <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
+        <version>1.0.1.BUILD-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
     <artifactId>config-with-dots.bundle</artifactId>
     <packaging>jar</packaging>
     <name>Gemini Blueprint Test Bundle: Config File With Dots bundle</name>

diff --git a/integration-tests/bundles/configuration.test.bundle/pom.xml b/integration-tests/bundles/configuration.test.bundle/pom.xml
index 446d956..5e3f1a7 100644
--- a/integration-tests/bundles/configuration.test.bundle/pom.xml
+++ b/integration-tests/bundles/configuration.test.bundle/pom.xml

@@ -1,14 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <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">
-    <parent>
-        <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
-        <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
-        <version>1.0.1.BUILD-SNAPSHOT</version>
-    </parent>
+         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.iandt</groupId>
+
+    <parent>
+        <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
+        <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
+        <version>1.0.1.BUILD-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
     <artifactId>configuration</artifactId>
     <packaging>jar</packaging>
     <name>Gemini Blueprint Test Bundle: Configuration test bundle</name>

diff --git a/integration-tests/bundles/deadlock.bundle/pom.xml b/integration-tests/bundles/deadlock.bundle/pom.xml
index 42327af..ce24321 100644
--- a/integration-tests/bundles/deadlock.bundle/pom.xml
+++ b/integration-tests/bundles/deadlock.bundle/pom.xml

@@ -1,14 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <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">
-    <parent>
-        <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
-        <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
-        <version>1.0.1.BUILD-SNAPSHOT</version>
-    </parent>
+         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.iandt</groupId>
+
+    <parent>
+        <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
+        <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
+        <version>1.0.1.BUILD-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
     <artifactId>deadlock</artifactId>
     <packaging>jar</packaging>
     <name>Gemini Blueprint Test Bundle: Deadlock bundle</name>

diff --git a/integration-tests/bundles/dependency.factory.bundle/pom.xml b/integration-tests/bundles/dependency.factory.bundle/pom.xml
index 685d731..23034a5 100644
--- a/integration-tests/bundles/dependency.factory.bundle/pom.xml
+++ b/integration-tests/bundles/dependency.factory.bundle/pom.xml

@@ -1,14 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <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">
-    <parent>
-        <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
-        <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
-        <version>1.0.1.BUILD-SNAPSHOT</version>
-    </parent>
+         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.iandt</groupId>
+
+    <parent>
+        <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
+        <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
+        <version>1.0.1.BUILD-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
     <artifactId>dependendencies.factory</artifactId>
     <packaging>jar</packaging>
     <name>Gemini Blueprint Test Bundle: Simple service created by a factory which has a non trivial delay in createObject()</name>

diff --git a/integration-tests/bundles/dependency.test.bundle/pom.xml b/integration-tests/bundles/dependency.test.bundle/pom.xml
index 5e4a18b..98cee0c 100644
--- a/integration-tests/bundles/dependency.test.bundle/pom.xml
+++ b/integration-tests/bundles/dependency.test.bundle/pom.xml

@@ -1,14 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <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">
-    <parent>
-        <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
-        <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
-        <version>1.0.1.BUILD-SNAPSHOT</version>
-    </parent>
+         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.iandt</groupId>
+
+    <parent>
+        <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
+        <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
+        <version>1.0.1.BUILD-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
     <artifactId>dependencies</artifactId>
     <packaging>jar</packaging>
     <name>Gemini Blueprint Test Bundle: Spring context dependencies test bundle</name>
@@ -16,17 +18,16 @@
     <url>http://www.eclipse.org/gemini/blueprint/</url>
 
     <dependencies>
-  
         <dependency>
             <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
             <artifactId>simple.service</artifactId>
-            <version>${project.parent.version}</version>
+            <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
             <artifactId>simple.service2</artifactId>
-            <version>${project.parent.version}</version>
+            <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

diff --git a/integration-tests/bundles/embedded.ns.bundle/pom.xml b/integration-tests/bundles/embedded.ns.bundle/pom.xml
index 25bafd2..811d991 100644
--- a/integration-tests/bundles/embedded.ns.bundle/pom.xml
+++ b/integration-tests/bundles/embedded.ns.bundle/pom.xml

@@ -1,14 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <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">
-    <parent>
-        <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
-        <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
-        <version>1.0.1.BUILD-SNAPSHOT</version>
-    </parent>
+         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.iandt</groupId>
+
+    <parent>
+        <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
+        <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
+        <version>1.0.1.BUILD-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
     <artifactId>ns.embedded</artifactId>
 	<packaging>jar</packaging>
     <name>Gemini Blueprint Test Bundle: namespace test bundle</name>

diff --git a/integration-tests/bundles/error.bundle/pom.xml b/integration-tests/bundles/error.bundle/pom.xml
index ae95ade..7ccbb10 100644
--- a/integration-tests/bundles/error.bundle/pom.xml
+++ b/integration-tests/bundles/error.bundle/pom.xml

@@ -1,26 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <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">
-    <parent>
-        <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
-        <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
-        <version>1.0.1.BUILD-SNAPSHOT</version>
-    </parent>
+         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.iandt</groupId>
+
+    <parent>
+        <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
+        <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
+        <version>1.0.1.BUILD-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
     <artifactId>error</artifactId>
     <packaging>jar</packaging>
     <name>Gemini Blueprint Test Bundle: Error bundle</name>
     <description>An OSGi bundle with an error in imports which will force an error</description>
     <url>http://www.eclipse.org/gemini/blueprint/</url>
 
-
     <dependencies>
         <dependency>
             <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
             <artifactId>simple.service</artifactId>
-            <version>${project.parent.version}</version>
+            <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

diff --git a/integration-tests/bundles/export.import.dependency.bundle/pom.xml b/integration-tests/bundles/export.import.dependency.bundle/pom.xml
index e1185f3..eb45a34 100644
--- a/integration-tests/bundles/export.import.dependency.bundle/pom.xml
+++ b/integration-tests/bundles/export.import.dependency.bundle/pom.xml

@@ -1,14 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <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">
-    <parent>
-        <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
-        <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
-        <version>1.0.1.BUILD-SNAPSHOT</version>
-    </parent>
+         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.iandt</groupId>
+
+    <parent>
+        <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
+        <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
+        <version>1.0.1.BUILD-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
     <artifactId>export-import-dependency-bundle</artifactId>
     <packaging>jar</packaging>
     <name>Gemini Blueprint Test Bundle: Export Import Dependency Bundle</name>

diff --git a/integration-tests/bundles/extender.fragment.bundle/pom.xml b/integration-tests/bundles/extender.fragment.bundle/pom.xml
index dfee9cf..2714bc0 100644
--- a/integration-tests/bundles/extender.fragment.bundle/pom.xml
+++ b/integration-tests/bundles/extender.fragment.bundle/pom.xml

@@ -1,14 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <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">
-    <parent>
-        <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
-        <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
-        <version>1.0.1.BUILD-SNAPSHOT</version>
-    </parent>
+         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.iandt</groupId>
+
+    <parent>
+        <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
+        <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
+        <version>1.0.1.BUILD-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
     <artifactId>extender-fragment-bundle</artifactId>
     <packaging>jar</packaging>
     <name>Gemini Blueprint Test Bundle: Extender Configuration Fragment Bundle</name>

diff --git a/integration-tests/bundles/extender.listener.bundle/pom.xml b/integration-tests/bundles/extender.listener.bundle/pom.xml
index 7f9bb34..364dd28 100644
--- a/integration-tests/bundles/extender.listener.bundle/pom.xml
+++ b/integration-tests/bundles/extender.listener.bundle/pom.xml

@@ -1,14 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <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">
-    <parent>
-        <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
-        <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
-        <version>1.0.1.BUILD-SNAPSHOT</version>
-    </parent>
+         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.iandt</groupId>
+
+    <parent>
+        <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
+        <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
+        <version>1.0.1.BUILD-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
     <artifactId>extender.listener.bundle</artifactId>
     <packaging>jar</packaging>
     <name>Gemini Blueprint Test Bundle: Extender Event listener bundle Bundle</name>

diff --git a/integration-tests/bundles/extender.version.bundle/pom.xml b/integration-tests/bundles/extender.version.bundle/pom.xml
index 8c2fda9..6adfdfe 100644
--- a/integration-tests/bundles/extender.version.bundle/pom.xml
+++ b/integration-tests/bundles/extender.version.bundle/pom.xml

@@ -1,14 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <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">
-    <parent>
-        <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
-        <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
-        <version>1.0.1.BUILD-SNAPSHOT</version>
-    </parent>
+         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.iandt</groupId>
+
+    <parent>
+        <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
+        <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
+        <version>1.0.1.BUILD-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
     <artifactId>extender-version-bundle</artifactId>
     <packaging>jar</packaging>
     <name>Gemini Blueprint Test Bundle: ExtenderVersion-Test-Bundle</name>

diff --git a/integration-tests/bundles/io.fragment.1.bundle/pom.xml b/integration-tests/bundles/io.fragment.1.bundle/pom.xml
index 0eaf6a5..dfc3139 100644
--- a/integration-tests/bundles/io.fragment.1.bundle/pom.xml
+++ b/integration-tests/bundles/io.fragment.1.bundle/pom.xml

@@ -1,14 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <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">
-    <parent>
-        <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
-        <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
-        <version>1.0.1.BUILD-SNAPSHOT</version>
-    </parent>
+         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.iandt</groupId>
+
+    <parent>
+        <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
+        <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
+        <version>1.0.1.BUILD-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
     <artifactId>io.fragment.1.bundle</artifactId>
 	<packaging>jar</packaging>
     <name>Gemini Blueprint Test Bundle: IO fragment 1 bundle</name>

diff --git a/integration-tests/bundles/io.fragment.2.bundle/pom.xml b/integration-tests/bundles/io.fragment.2.bundle/pom.xml
index dc65952..f794e4c 100644
--- a/integration-tests/bundles/io.fragment.2.bundle/pom.xml
+++ b/integration-tests/bundles/io.fragment.2.bundle/pom.xml

@@ -1,14 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <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">
-    <parent>
-        <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
-        <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
-        <version>1.0.1.BUILD-SNAPSHOT</version>
-    </parent>
+         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.iandt</groupId>
+
+    <parent>
+        <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
+        <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
+        <version>1.0.1.BUILD-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
     <artifactId>io.fragment.2.bundle</artifactId>
 	<packaging>jar</packaging>
     <name>Gemini Blueprint Test Bundle: IO fragment 2 bundle</name>

diff --git a/integration-tests/bundles/jdk.proxy.bundle/pom.xml b/integration-tests/bundles/jdk.proxy.bundle/pom.xml
index 21872b2..777c1ec 100644
--- a/integration-tests/bundles/jdk.proxy.bundle/pom.xml
+++ b/integration-tests/bundles/jdk.proxy.bundle/pom.xml

@@ -1,21 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <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">
-    <parent>
-        <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
-        <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
-        <version>1.0.1.BUILD-SNAPSHOT</version>
-    </parent>
-    
+         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.iandt</groupId>
+
+    <parent>
+        <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
+        <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
+        <version>1.0.1.BUILD-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
     <artifactId>jdk.proxy</artifactId>
     <packaging>jar</packaging>
     <name>Gemini Blueprint Test Bundle: JDK proxy test</name>
     <description>An OSGi bundle for JDK proxy testing</description>
     <url>http://www.eclipse.org/gemini/blueprint/</url>
-
-
-</project>
-
+</project>
\ No newline at end of file

diff --git a/integration-tests/bundles/jdk5/component.scan.bundle/pom.xml b/integration-tests/bundles/jdk5/component.scan.bundle/pom.xml
index 7692ce4..b845fae 100644
--- a/integration-tests/bundles/jdk5/component.scan.bundle/pom.xml
+++ b/integration-tests/bundles/jdk5/component.scan.bundle/pom.xml

@@ -1,19 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <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">
-    <parent>
-        <artifactId>spring-osgi-jdk5-integration-test-bundles</artifactId>
-        <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
-        <version>1.0.1.BUILD-SNAPSHOT</version>
-    </parent>
+         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.iandt</groupId>
+
+    <parent>
+        <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
+        <artifactId>spring-osgi-jdk5-integration-test-bundles</artifactId>
+        <version>1.0.1.BUILD-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
     <artifactId>component.scan.bundle</artifactId>
     <packaging>jar</packaging>
     <name>Gemini Blueprint Test Bundle: @Component beans bundle</name>
     <description>An OSGi bundle with Spring annotated components</description>
     <url>http://www.eclipse.org/gemini/blueprint/</url>
-
-</project>
-
+</project>
\ No newline at end of file

diff --git a/integration-tests/bundles/jdk5/pom.xml b/integration-tests/bundles/jdk5/pom.xml
index 55d9527..0b6c421 100644
--- a/integration-tests/bundles/jdk5/pom.xml
+++ b/integration-tests/bundles/jdk5/pom.xml

@@ -1,73 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
-  <parent>
-    <artifactId>gemini-blueprint</artifactId>
-    <groupId>org.eclipse.gemini.blueprint</groupId>
-    <version>1.0.1.BUILD-SNAPSHOT</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>spring-osgi-jdk5-integration-test-bundles</artifactId>
-  <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
-  <packaging>pom</packaging>
-  <name>Eclipse Gemini Blueprint JDK5 Integration Testing Bundles</name>
-  <url>http://www.eclipse.org/gemini/blueprint/</url>
-  
-  <properties>
-	
-	<bundlor.enabled>false</bundlor.enabled>
-  </properties>
-  
-  <!-- shared dependencies -->
-  <dependencies>
-     <dependency>
-         <groupId>org.eclipse.gemini.blueprint</groupId>
-         <artifactId>gemini-blueprint-core</artifactId>
-         <version>${project.parent.version}</version>
-         <type>jar</type>
-         <scope>provided</scope>
-     </dependency>
-     <!--
-     <dependency>
-       <groupId>org.eclipse.gemini.blueprint</groupId>
-       <artifactId>gemini-blueprint-annotation</artifactId>
-       <version>${project.parent.version}</version>
-       <scope>provided</scope>
-     </dependency>
-        -->
-  </dependencies>
-  
-  <modules>
-    <!--
-    <module>annotation.dependency.test.bundle</module>
-    <module>annotation.test.bundle</module>
-    -->
-    <module>component.scan.bundle</module>
-  </modules>
-  
- 
-	<build>
-	  <plugins>
-		  <plugin>
-			<artifactId>maven-compiler-plugin</artifactId>
-			  <groupId>org.apache.maven.plugins</groupId>
-			  <configuration>
-				<source>1.5</source>
-				<target>1.5</target>
-				<debug>true</debug>
-			  </configuration>
-		  </plugin>
-		
-		  <plugin>
-			<groupId>org.apache.maven.plugins</groupId>
-			<artifactId>maven-jar-plugin</artifactId>
-			<configuration>
-			  <archive>
-				<manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
-			  </archive>
-			</configuration>
-		  </plugin>
-		</plugins>
+<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>
 
-	</build>
- 
+    <parent>
+        <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
+        <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
+        <version>1.0.1.BUILD-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>spring-osgi-jdk5-integration-test-bundles</artifactId>
+    <packaging>pom</packaging>
+    <name>Eclipse Gemini Blueprint JDK5 Integration Testing Bundles</name>
+    <url>http://www.eclipse.org/gemini/blueprint/</url>
+
+    <modules>
+        <module>component.scan.bundle</module>
+    </modules>
+
 </project>

diff --git a/integration-tests/bundles/lifecycle.test.bundle/pom.xml b/integration-tests/bundles/lifecycle.test.bundle/pom.xml
index 70782bc..0cafcb2 100644
--- a/integration-tests/bundles/lifecycle.test.bundle/pom.xml
+++ b/integration-tests/bundles/lifecycle.test.bundle/pom.xml

@@ -1,22 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <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">
-    <parent>
-        <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
-        <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
-        <version>1.0.1.BUILD-SNAPSHOT</version>
-    </parent>
+         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.iandt</groupId>
+
+    <parent>
+        <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
+        <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
+        <version>1.0.1.BUILD-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
     <artifactId>lifecycle</artifactId>
     <packaging>jar</packaging>
     <name>Gemini Blueprint Test Bundle: Spring context lifecycle test bundle</name>
     <description>An OSGi bundle that tests the lifecycle of the Spring Application context</description>
     <url>http://www.eclipse.org/gemini/blueprint/</url>
-
-    <dependencies>
-  
-    </dependencies> 
-</project>
-
+</project>
\ No newline at end of file

diff --git a/integration-tests/bundles/namespace.own.consumer.bundle/pom.xml b/integration-tests/bundles/namespace.own.consumer.bundle/pom.xml
index b022297..a3c934b 100644
--- a/integration-tests/bundles/namespace.own.consumer.bundle/pom.xml
+++ b/integration-tests/bundles/namespace.own.consumer.bundle/pom.xml

@@ -1,18 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <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">
-    <parent>
-        <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
-        <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
-        <version>1.0.1.BUILD-SNAPSHOT</version>
-    </parent>
+         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.iandt</groupId>
+
+    <parent>
+        <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
+        <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
+        <version>1.0.1.BUILD-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
     <artifactId>ns.own.consumer</artifactId>
 	<packaging>jar</packaging>
     <name>Gemini Blueprint Test Bundle: namespace provider and consumer bundle</name>
     <description>A simple namespace bundle that provides and uses its own namespace</description>
     <url>http://www.eclipse.org/gemini/blueprint/</url>
-</project>
-
+</project>
\ No newline at end of file

diff --git a/integration-tests/bundles/pom.xml b/integration-tests/bundles/pom.xml
index 53a30b8..e0e8fde 100644
--- a/integration-tests/bundles/pom.xml
+++ b/integration-tests/bundles/pom.xml

@@ -1,104 +1,94 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
-  <parent>
-    <artifactId>gemini-blueprint</artifactId>
-    <groupId>org.eclipse.gemini.blueprint</groupId>
-    <version>1.0.1.BUILD-SNAPSHOT</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
-  <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
-  <packaging>pom</packaging>
-  <name>Eclipse Gemini Blueprint Integration Testing Bundles</name>
-  <url>http://www.eclipse.org/gemini/blueprint/</url>
-  
-  <properties>
-    <!-- root, empty package -->
-    <!-- plugin not yet enabled to avoid further problems -->
-	<spring.osgi.import.pkg>!org.eclipse.gemini.blueprint.iandt, *</spring.osgi.import.pkg>
-	<spring.osgi.export.pkg>${pom.artifactId}*</spring.osgi.export.pkg>
-  	<clover.skip>true</clover.skip>
-    <bundlor.enabled>false</bundlor.enabled>  	
-  </properties>
-  
-  <!-- shared dependencies -->
-  <dependencies>
+<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>
+
+    <parent>
+        <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
+        <artifactId>gemini-blueprint-integration-tests-parent</artifactId>
+        <version>1.0.1.BUILD-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
+    <packaging>pom</packaging>
+    <name>Eclipse Gemini Blueprint Integration Testing Bundles</name>
+    <url>http://www.eclipse.org/gemini/blueprint/</url>
+
+    <properties>
+        <!-- root, empty package -->
+        <!-- plugin not yet enabled to avoid further problems -->
+        <spring.osgi.import.pkg>!org.eclipse.gemini.blueprint.iandt, *</spring.osgi.import.pkg>
+        <spring.osgi.export.pkg>${project.artifactId}*</spring.osgi.export.pkg>
+        <clover.skip>true</clover.skip>
+        <bundlor.enabled>false</bundlor.enabled>
+    </properties>
+
+    <!-- shared dependencies -->
+    <dependencies>
         <dependency>
             <groupId>org.eclipse.gemini.blueprint</groupId>
             <artifactId>gemini-blueprint-core</artifactId>
             <scope>provided</scope>
         </dependency>
-  </dependencies>
-  
-  <modules>
-    <module>simple.service.bundle</module>
-    <module>simple.service.bundle.identical</module>
-    <module>simple.service.bundle.2.identical</module>
-    <module>simple.service.2.bundle</module>
-    <module>simple.service.3.bundle</module>
-    <module>dependency.factory.bundle</module>
-    <module>trivial.bundle</module>
-    <module>trivial.test.bundle</module>
-    <module>lifecycle.test.bundle</module>
-    <module>service.listener.bundle</module>
-    <module>reference.test.bundle</module>
-    <module>proxy.destruction.test.bundle</module>
-    <module>dependency.test.bundle</module>
-    <module>cardinality.0to1.bundle</module>
-    <module>scoped.a.bundle</module>    
-    <module>scoped.b.bundle</module>    
-    <module>scoped.common.bundle</module>
-    <module>io.fragment.1.bundle</module>    
-    <module>io.fragment.2.bundle</module>
-    <module>error.bundle</module>
-    <module>deadlock.bundle</module>
-    <module>configuration.test.bundle</module>
-    <module>extender.version.bundle</module>
-    <module>config.bundle</module>
-    <module>tccl.intf.bundle</module>    
-    <module>tccl.bundle</module>
-    <module>config.file.with.dots.bundle</module>
-    <module>proxy.creator.bundle</module>
-    <module>extender.fragment.bundle</module>
-    <module>jdk.proxy.bundle</module>
-    <module>extender.listener.bundle</module>
-    <module>namespace.own.consumer.bundle</module>
-    <module>proxy.listener</module>
-    <module>export.import.dependency.bundle</module>
-    <!--
-    <module>web.bundles</module>
-    -->
-    <module>jdk5</module>
+    </dependencies>
 
-    <!-- lazy bundles 
-    <module>lazy.companion.bundle</module>
-    <module>lazy.basic</module>
-    <module>lazy.export.no.import</module>
-    <module>lazy.export.import</module>
-    -->
-    <!-- blueprint bundles  -->
-    <module>blueprint</module>
-  </modules>
+    <modules>
+        <module>simple.service.bundle</module>
+        <module>simple.service.bundle.identical</module>
+        <module>simple.service.bundle.2.identical</module>
+        <module>simple.service.2.bundle</module>
+        <module>simple.service.3.bundle</module>
+        <module>dependency.factory.bundle</module>
+        <module>trivial.bundle</module>
+        <module>trivial.test.bundle</module>
+        <module>lifecycle.test.bundle</module>
+        <module>service.listener.bundle</module>
+        <module>reference.test.bundle</module>
+        <module>proxy.destruction.test.bundle</module>
+        <module>dependency.test.bundle</module>
+        <module>cardinality.0to1.bundle</module>
+        <module>scoped.a.bundle</module>
+        <module>scoped.b.bundle</module>
+        <module>scoped.common.bundle</module>
+        <module>io.fragment.1.bundle</module>
+        <module>io.fragment.2.bundle</module>
+        <module>error.bundle</module>
+        <module>deadlock.bundle</module>
+        <module>configuration.test.bundle</module>
+        <module>extender.version.bundle</module>
+        <module>config.bundle</module>
+        <module>tccl.intf.bundle</module>
+        <module>tccl.bundle</module>
+        <module>config.file.with.dots.bundle</module>
+        <module>proxy.creator.bundle</module>
+        <module>extender.fragment.bundle</module>
+        <module>jdk.proxy.bundle</module>
+        <module>extender.listener.bundle</module>
+        <module>namespace.own.consumer.bundle</module>
+        <module>proxy.listener</module>
+        <module>export.import.dependency.bundle</module>
+        <module>jdk5</module>
 
- <build>
-    <plugins>
-	   <plugin>
-        <artifactId>maven-deploy-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>    
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <configuration>
-          <archive>
-            <manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
-          </archive>
-        </configuration>
-      </plugin>
-    </plugins>
-    
- </build>
+        <!-- blueprint bundles  -->
+        <module>blueprint</module>
+    </modules>
+
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-jar-plugin</artifactId>
+                    <configuration>
+                        <archive>
+                            <manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
+                        </archive>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
 
 </project>
\ No newline at end of file

diff --git a/integration-tests/bundles/proxy.creator.bundle/pom.xml b/integration-tests/bundles/proxy.creator.bundle/pom.xml
index eb94eef..ce76202 100644
--- a/integration-tests/bundles/proxy.creator.bundle/pom.xml
+++ b/integration-tests/bundles/proxy.creator.bundle/pom.xml

@@ -1,20 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <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">
-    <parent>
-        <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
-        <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
-        <version>1.0.1.BUILD-SNAPSHOT</version>
-    </parent>
-    
+         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.iandt</groupId>
+
+    <parent>
+        <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
+        <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
+        <version>1.0.1.BUILD-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
     <artifactId>proxy.creator</artifactId>
     <packaging>jar</packaging>
     <name>Gemini Blueprint Test Bundle: Spring Proxy Creator bundle</name>
     <description>An OSGi bundle that creates proxies internally and is updated</description>
     <url>http://www.eclipse.org/gemini/blueprint/</url>
 
-</project>
-
+</project>
\ No newline at end of file

diff --git a/integration-tests/bundles/proxy.destruction.test.bundle/pom.xml b/integration-tests/bundles/proxy.destruction.test.bundle/pom.xml
index 94cc9d0..ff4fae6 100644
--- a/integration-tests/bundles/proxy.destruction.test.bundle/pom.xml
+++ b/integration-tests/bundles/proxy.destruction.test.bundle/pom.xml

@@ -1,14 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <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">
-    <parent>
-        <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
-        <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
-        <version>1.0.1.BUILD-SNAPSHOT</version>
-    </parent>
+         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.iandt</groupId>
+
+    <parent>
+        <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
+        <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
+        <version>1.0.1.BUILD-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
     <artifactId>proxy.destruction</artifactId>
     <packaging>jar</packaging>
     <name>Gemini Blueprint Test Bundle: Spring context service reference destruction test bundle</name>
@@ -19,7 +21,7 @@
         <dependency>
             <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
             <artifactId>simple.service</artifactId>
-            <version>${project.parent.version}</version>
+            <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

diff --git a/integration-tests/bundles/proxy.listener/pom.xml b/integration-tests/bundles/proxy.listener/pom.xml
index cbf9816..ef7fd85 100644
--- a/integration-tests/bundles/proxy.listener/pom.xml
+++ b/integration-tests/bundles/proxy.listener/pom.xml

@@ -1,14 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <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">
-    <parent>
-        <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
-        <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
-        <version>1.0.1.BUILD-SNAPSHOT</version>
-    </parent>
+         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.iandt</groupId>
+
+    <parent>
+        <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
+        <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
+        <version>1.0.1.BUILD-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
     <artifactId>proxy.listener</artifactId>
     <packaging>jar</packaging>
     <name>Gemini Blueprint Test Bundle: Just a listener exported as a service</name>

diff --git a/integration-tests/bundles/reference.test.bundle/pom.xml b/integration-tests/bundles/reference.test.bundle/pom.xml
index 47cdc83..7f609ba 100644
--- a/integration-tests/bundles/reference.test.bundle/pom.xml
+++ b/integration-tests/bundles/reference.test.bundle/pom.xml

@@ -1,14 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <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">
-    <parent>
-        <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
-        <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
-        <version>1.0.1.BUILD-SNAPSHOT</version>
-    </parent>
+         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.iandt</groupId>
+
+    <parent>
+        <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
+        <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
+        <version>1.0.1.BUILD-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
     <artifactId>reference.proxy</artifactId>
     <packaging>jar</packaging>
     <name>Gemini Blueprint Test Bundle: Spring context service reference lifecycle test bundle</name>
@@ -19,7 +21,7 @@
         <dependency>
             <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
             <artifactId>simple.service</artifactId>
-            <version>${project.parent.version}</version>
+            <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

diff --git a/integration-tests/bundles/scoped.a.bundle/pom.xml b/integration-tests/bundles/scoped.a.bundle/pom.xml
index 217c5b3..57bde81 100644
--- a/integration-tests/bundles/scoped.a.bundle/pom.xml
+++ b/integration-tests/bundles/scoped.a.bundle/pom.xml

@@ -1,22 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <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">
-    <parent>
-        <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
-        <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
-        <version>1.0.1.BUILD-SNAPSHOT</version>
-    </parent>
+         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.iandt</groupId>
+
+    <parent>
+        <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
+        <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
+        <version>1.0.1.BUILD-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
     <artifactId>scoped.bundle.a</artifactId>
     <packaging>jar</packaging>
     <name>Gemini Blueprint Test Bundle: Bundle scoping test bundle - A</name>
     <description>An OSGi bundle which tests 'bundle' scoped beans</description>
     <url>http://www.eclipse.org/gemini/blueprint/</url>
-
-    <dependencies>
- 
-    </dependencies>
 </project>
 

diff --git a/integration-tests/bundles/scoped.b.bundle/pom.xml b/integration-tests/bundles/scoped.b.bundle/pom.xml
index ce7f008..8015f80 100644
--- a/integration-tests/bundles/scoped.b.bundle/pom.xml
+++ b/integration-tests/bundles/scoped.b.bundle/pom.xml

@@ -1,22 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <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">
-    <parent>
-        <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
-        <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
-        <version>1.0.1.BUILD-SNAPSHOT</version>
-    </parent>
+         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.iandt</groupId>
+
+    <parent>
+        <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
+        <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
+        <version>1.0.1.BUILD-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
     <artifactId>scoped.bundle.b</artifactId>
 	<packaging>jar</packaging>
     <name>Gemini Blueprint Test Bundle: Bundle scoping test bundle - B</name>
     <description>An OSGi bundle which tests 'bundle' scoped beans</description>
     <url>http://www.eclipse.org/gemini/blueprint/</url>
 
-    <dependencies>
-
-    </dependencies>
-</project>
-
+</project>
\ No newline at end of file

diff --git a/integration-tests/bundles/scoped.common.bundle/pom.xml b/integration-tests/bundles/scoped.common.bundle/pom.xml
index 2070619..c5a367c 100644
--- a/integration-tests/bundles/scoped.common.bundle/pom.xml
+++ b/integration-tests/bundles/scoped.common.bundle/pom.xml

@@ -1,22 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <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">
-    <parent>
-        <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
-        <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
-        <version>1.0.1.BUILD-SNAPSHOT</version>
-    </parent>
+         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.iandt</groupId>
+
+    <parent>
+        <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
+        <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
+        <version>1.0.1.BUILD-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
     <artifactId>scoped.bundle.common</artifactId>
 	<packaging>jar</packaging>
     <name>Gemini Blueprint Test Bundle: Bundle scoping test bundle - Common</name>
     <description>An OSGi bundle which tests 'bundle' scoped beans</description>
     <url>http://www.eclipse.org/gemini/blueprint/</url>
-
-    <dependencies>
-
-    </dependencies>
 </project>
 

diff --git a/integration-tests/bundles/service.listener.bundle/pom.xml b/integration-tests/bundles/service.listener.bundle/pom.xml
index 714b78a..c7c56b7 100644
--- a/integration-tests/bundles/service.listener.bundle/pom.xml
+++ b/integration-tests/bundles/service.listener.bundle/pom.xml

@@ -1,14 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <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">
-    <parent>
-        <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
-        <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
-        <version>1.0.1.BUILD-SNAPSHOT</version>
-    </parent>
+         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.iandt</groupId>
+
+    <parent>
+        <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
+        <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
+        <version>1.0.1.BUILD-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
     <artifactId>service.listener</artifactId>
 	<packaging>jar</packaging>
     <name>Gemini Blueprint Test Bundle: Spring context service listener test bundle</name>
@@ -16,11 +18,10 @@
     <url>http://www.eclipse.org/gemini/blueprint/</url>
 
     <dependencies>
-
         <dependency>
             <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
             <artifactId>simple.service</artifactId>
-            <version>${project.parent.version}</version>
+            <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

diff --git a/integration-tests/bundles/simple.service.2.bundle/pom.xml b/integration-tests/bundles/simple.service.2.bundle/pom.xml
index 837c951..0bbdefd 100644
--- a/integration-tests/bundles/simple.service.2.bundle/pom.xml
+++ b/integration-tests/bundles/simple.service.2.bundle/pom.xml

@@ -1,14 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <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">
-    <parent>
-        <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
-        <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
-        <version>1.0.1.BUILD-SNAPSHOT</version>
-    </parent>
+         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.iandt</groupId>
+
+    <parent>
+        <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
+        <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
+        <version>1.0.1.BUILD-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
     <artifactId>simple.service2</artifactId>
 	<packaging>jar</packaging>
     <name>Gemini Blueprint Test Bundle: Simple service test bundle 2</name>

diff --git a/integration-tests/bundles/simple.service.3.bundle/pom.xml b/integration-tests/bundles/simple.service.3.bundle/pom.xml
index 6e79efe..462ceac 100644
--- a/integration-tests/bundles/simple.service.3.bundle/pom.xml
+++ b/integration-tests/bundles/simple.service.3.bundle/pom.xml

@@ -1,14 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <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">
-    <parent>
-        <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
-        <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
-        <version>1.0.1.BUILD-SNAPSHOT</version>
-    </parent>
+         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.iandt</groupId>
+
+    <parent>
+        <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
+        <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
+        <version>1.0.1.BUILD-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
     <artifactId>simple.service3</artifactId>
 	<packaging>jar</packaging>
     <name>Gemini Blueprint Test Bundle: Simple service test bundle 3</name>

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 3872b89..33717dd 100644
--- a/integration-tests/bundles/simple.service.bundle.2.identical/pom.xml
+++ b/integration-tests/bundles/simple.service.bundle.2.identical/pom.xml

@@ -1,14 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <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">
-    <parent>
-        <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
-        <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
-        <version>1.0.1.BUILD-SNAPSHOT</version>
-    </parent>
+         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.iandt</groupId>
+
+    <parent>
+        <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
+        <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
+        <version>1.0.1.BUILD-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
     <artifactId>simple.service.2.identical</artifactId>
 	<packaging>jar</packaging>
     <name>Gemini Blueprint Test Bundle: Simple service test bundle (impl differs)</name>
@@ -19,7 +21,7 @@
         <dependency>
             <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
             <artifactId>simple.service</artifactId>
-            <version>${project.parent.version}</version>
+            <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

diff --git a/integration-tests/bundles/simple.service.bundle.identical/pom.xml b/integration-tests/bundles/simple.service.bundle.identical/pom.xml
index ef0b70a..151208a 100644
--- a/integration-tests/bundles/simple.service.bundle.identical/pom.xml
+++ b/integration-tests/bundles/simple.service.bundle.identical/pom.xml

@@ -1,14 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <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">
-    <parent>
-        <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
-        <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
-        <version>1.0.1.BUILD-SNAPSHOT</version>
-    </parent>
+         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.iandt</groupId>
+
+    <parent>
+        <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
+        <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
+        <version>1.0.1.BUILD-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
     <artifactId>simple.service.identical</artifactId>
 	<packaging>jar</packaging>
     <name>Gemini Blueprint Test Bundle: Simple service test bundle (impl differs)</name>
@@ -19,7 +21,7 @@
         <dependency>
             <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
             <artifactId>simple.service</artifactId>
-            <version>${project.parent.version}</version>
+            <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

diff --git a/integration-tests/bundles/simple.service.bundle/pom.xml b/integration-tests/bundles/simple.service.bundle/pom.xml
index c14a45f..f027132 100644
--- a/integration-tests/bundles/simple.service.bundle/pom.xml
+++ b/integration-tests/bundles/simple.service.bundle/pom.xml

@@ -1,14 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <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">
-    <parent>
-        <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
-        <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
-        <version>1.0.1.BUILD-SNAPSHOT</version>
-    </parent>
+         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.iandt</groupId>
+
+    <parent>
+        <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
+        <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
+        <version>1.0.1.BUILD-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
     <artifactId>simple.service</artifactId>
 	<packaging>jar</packaging>
     <name>Gemini Blueprint Test Bundle: Simple service test bundle</name>

diff --git a/integration-tests/bundles/tccl.bundle/pom.xml b/integration-tests/bundles/tccl.bundle/pom.xml
index 2915ca0..e5e8bdf 100644
--- a/integration-tests/bundles/tccl.bundle/pom.xml
+++ b/integration-tests/bundles/tccl.bundle/pom.xml

@@ -1,14 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <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">
-    <parent>
-        <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
-        <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
-        <version>1.0.1.BUILD-SNAPSHOT</version>
-    </parent>
+         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.iandt</groupId>
+
+    <parent>
+        <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
+        <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
+        <version>1.0.1.BUILD-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
     <artifactId>tccl</artifactId>
     <packaging>jar</packaging>
     <name>Gemini Blueprint Test Bundle: Spring service TCCL management test bundle</name>
@@ -19,7 +21,7 @@
         <dependency>
             <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
             <artifactId>tccl.intf</artifactId>
-            <version>${project.parent.version}</version>
+            <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

diff --git a/integration-tests/bundles/tccl.intf.bundle/pom.xml b/integration-tests/bundles/tccl.intf.bundle/pom.xml
index babe1bf..63063ba 100644
--- a/integration-tests/bundles/tccl.intf.bundle/pom.xml
+++ b/integration-tests/bundles/tccl.intf.bundle/pom.xml

@@ -1,14 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <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">
-    <parent>
-        <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
-        <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
-        <version>1.0.1.BUILD-SNAPSHOT</version>
-    </parent>
+         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.iandt</groupId>
+
+    <parent>
+        <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
+        <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
+        <version>1.0.1.BUILD-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
     <artifactId>tccl.intf</artifactId>
     <packaging>jar</packaging>
     <name>Gemini Blueprint Test Bundle: Spring service TCCL management inteface test bundle</name>

diff --git a/integration-tests/bundles/trivial.bundle/pom.xml b/integration-tests/bundles/trivial.bundle/pom.xml
index b1f4289..71c6e07 100644
--- a/integration-tests/bundles/trivial.bundle/pom.xml
+++ b/integration-tests/bundles/trivial.bundle/pom.xml

@@ -1,16 +1,20 @@
-<?xml version="1.0"?><project>
-  <parent>
-    <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
-    <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
-    <version>1.0.1.BUILD-SNAPSHOT</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
-  <artifactId>trivial</artifactId>
-  <packaging>jar</packaging>
-  <name>Gemini Blueprint Test Bundle: Trivial OSGi bundle</name>
-  <description>An OSGi bundle that contains and exports just one class
-  </description>
-  <url>http://www.eclipse.org/gemini/blueprint/</url>
-  
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+
+    <parent>
+        <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
+        <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
+        <version>1.0.1.BUILD-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>trivial</artifactId>
+    <packaging>jar</packaging>
+    <name>Gemini Blueprint Test Bundle: Trivial OSGi bundle</name>
+    <description>An OSGi bundle that contains and exports just one class</description>
+    <url>http://www.eclipse.org/gemini/blueprint/</url>
+
 </project>
\ No newline at end of file

diff --git a/integration-tests/bundles/trivial.test.bundle/pom.xml b/integration-tests/bundles/trivial.test.bundle/pom.xml
index a236cfe..5706b98 100644
--- a/integration-tests/bundles/trivial.test.bundle/pom.xml
+++ b/integration-tests/bundles/trivial.test.bundle/pom.xml

@@ -1,33 +1,40 @@
-<?xml version="1.0"?><project>
-  <parent>
-    <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
-    <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
-    <version>1.0.1.BUILD-SNAPSHOT</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
-  <artifactId>trivial.tests</artifactId>
-  <packaging>jar</packaging>
-  <name>Gemini Blueprint Test Bundle: Simple test that uses trivial bundle</name>
-  <description>Contains a single test case that exercises function in 
-   org.springframework.osgi.trivial bundle. Used as a basic proof of 
-   concept for the test harness support.</description>
-  <url>http://www.eclipse.org/gemini/blueprint/</url>
-  <dependencies>
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
 
-    <dependency>
-      <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
-      <artifactId>trivial</artifactId>
-      <version>${project.parent.version}</version>
-      <scope>provided</scope>
-    </dependency>
-  
-    <!-- JUnit is required at build time not just test time -->
-    <dependency>
-	  <groupId>org.junit</groupId>
-	  <artifactId>com.springsource.junit</artifactId>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
+    <parent>
+        <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
+        <artifactId>gemini-blueprint-integration-test-bundles</artifactId>
+        <version>1.0.1.BUILD-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>trivial.tests</artifactId>
+    <packaging>jar</packaging>
+    <name>Gemini Blueprint Test Bundle: Simple test that uses trivial bundle</name>
+    <description>Contains a single test case that exercises function in
+        org.springframework.osgi.trivial bundle. Used as a basic proof of
+        concept for the test harness support.
+    </description>
+    <url>http://www.eclipse.org/gemini/blueprint/</url>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.eclipse.gemini.blueprint.iandt</groupId>
+            <artifactId>trivial</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <!-- JUnit is required at build time not just test time -->
+        <dependency>
+            <groupId>org.junit</groupId>
+            <artifactId>com.springsource.org.junit</artifactId>
+            <version>4.9.0</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
 
 </project>
\ No newline at end of file
commit	401a2543b75cd1c0c3223484a0b3926bff0e3167	[log] [tgz]
author	Aaron Whiteside <aaronjwhiteside@gmail.com>	Wed Apr 04 22:41:28 2012 -0400
committer	Glyn Normington <gnormington@vmware.com>	Mon May 21 14:13:54 2012 +0100
tree	d9c92c80e472e89741496fc511ffad5cbfe48692
parent	0ea40a99c2c60dd35d7b51f6a12cc32afcea48a2 [diff]