commit f2091ab0870928d4b75e0089dbe0462d8e91ab7c
author Rickard Öberg <rickardoberg@gmail.com> Mon Nov 08 14:51:43 2010 +0100
committer Rickard Öberg <rickardoberg@gmail.com> Mon Nov 08 14:51:43 2010 +0100
tree 876221969584bf6ec9e2f7bb59b71cc532e9df1c
parent feae187d786e8ee5107c7de865f1e9570dc0e7e6
parent 2964bd0a6444b00eef9e7061f3f6c93f4396cded

Merge branch 'master' of git@github.com:Qi4j/qi4j-sandbox

Conflicts:
	extensions/osgi/bootstrap/pom.xml
	extensions/osgi/example/pom.xml
	extensions/osgi/integrationTests/pom.xml
	extensions/osgi/testBootstrap/pom.xml
	extensions/pom.xml
	libraries/entityproxy/pom.xml
	libraries/pom.xml

extensions/pom.xml

diff --git a/extensions/pom.xml b/extensions/pom.xml
index 3ba14ac..3ad34bd 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -6,7 +6,6 @@
     <version>1.3-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.qi4j.sandbox</groupId>
   <artifactId>sb-extensions-root</artifactId>
   <version>1.3-SNAPSHOT</version>
   <name>Qi4j Sandbox Extensions - Build POM</name>

libraries/entityproxy/pom.xml

diff --git a/libraries/entityproxy/pom.xml b/libraries/entityproxy/pom.xml
index 750f7a4..7dcfb78 100644
--- a/libraries/entityproxy/pom.xml
+++ b/libraries/entityproxy/pom.xml
@@ -48,4 +48,4 @@
       </plugin>
    </plugins>
   </build>
-</project>
\ No newline at end of file
+</project>

libraries/pom.xml

diff --git a/libraries/pom.xml b/libraries/pom.xml
index f31e270..bafc586 100644
--- a/libraries/pom.xml
+++ b/libraries/pom.xml
@@ -1,10 +1,13 @@
 <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/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.qi4j.sandbox</groupId>
+  <parent>
+    <groupId>org.qi4j.sandbox</groupId>
+    <artifactId>qi4j-sandbox</artifactId>
+    <version>1.3-SNAPSHOT</version>
+  </parent>
   <artifactId>sb-libraries-root</artifactId>
   <name>Qi4j Sandbox Libraries - Build POM</name>
-  <version>1.3-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <modules>