Updates to latest version and ensuring the build still runs and tests pass
diff --git a/build.properties b/build.properties
index c3a22f5..cde1333 100644
--- a/build.properties
+++ b/build.properties
@@ -1,7 +1,7 @@
 version=2.4.0
 release.type=integration
 natural.name=greenpages
-project.name=Virgo Web Server Samples
+project.name=Virgo Greenpages Sample
 project.key=VWSS
 ivy.cache.dir=${basedir}/../ivy-cache
 integration.repo.dir=${basedir}/../integration-repo
diff --git a/solution/greenpages.app/pom.xml b/solution/greenpages.app/pom.xml
index 88d60a8..163e819 100644
--- a/solution/greenpages.app/pom.xml
+++ b/solution/greenpages.app/pom.xml
@@ -5,14 +5,14 @@
 		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

 

 	<parent>

-		<groupId>com.springsource.dmserver</groupId>

+		<groupId>org.eclipse.virgo</groupId>

 		<artifactId>greenpages.parent-solution</artifactId>

-		<version>2.3.0.RELEASE</version>

+		<version>2.4.0.RELEASE</version>

 		<relativePath>../parent</relativePath>

 	</parent>

 

 	<modelVersion>4.0.0</modelVersion>

-	<groupId>com.springsource.dmserver</groupId>

+	<groupId>org.eclipse.virgo</groupId>

 	<artifactId>greenpages.app-solution</artifactId>

 	<name>greenpages.app</name>

 	<packaging>jar</packaging>

diff --git a/solution/greenpages.app/src/main/resources/META-INF/MANIFEST.MF b/solution/greenpages.app/src/main/resources/META-INF/MANIFEST.MF
index f4deb17..3fb434a 100644
--- a/solution/greenpages.app/src/main/resources/META-INF/MANIFEST.MF
+++ b/solution/greenpages.app/src/main/resources/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0

 Export-Package: greenpages;version="2.3.0"

 Bundle-Vendor: SpringSource Inc.

-Bundle-Version: 2.3.0

+Bundle-Version: 2.4.0

 Tool: Bundlor 1.0.0.RELEASE

 Bundle-Name: GreenPages Service

 Bundle-ManifestVersion: 2

diff --git a/solution/greenpages.app/template.mf b/solution/greenpages.app/template.mf
index 94c4bf2..8d58604 100644
--- a/solution/greenpages.app/template.mf
+++ b/solution/greenpages.app/template.mf
@@ -3,7 +3,7 @@
 Bundle-Name: GreenPages Service
 Bundle-SymbolicName: greenpages
 Bundle-Vendor: SpringSource Inc.
-Bundle-Version: 2.3.0
+Bundle-Version: 2.4.0
 Import-Template: 
  org.springframework.*;version="[3.0, 3.1)"
 Excluded-Exports: 
diff --git a/solution/greenpages.db/pom.xml b/solution/greenpages.db/pom.xml
index 20cbe5a..be88bac 100644
--- a/solution/greenpages.db/pom.xml
+++ b/solution/greenpages.db/pom.xml
@@ -5,14 +5,14 @@
 		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

 

 	<parent>

-		<groupId>com.springsource.dmserver</groupId>

+		<groupId>org.eclipse.virgo</groupId>

 		<artifactId>greenpages.parent-solution</artifactId>

-		<version>2.3.0.RELEASE</version>

+		<version>2.4.0.RELEASE</version>

 		<relativePath>../parent</relativePath>

 	</parent>

 

 	<modelVersion>4.0.0</modelVersion>

-	<groupId>com.springsource.dmserver</groupId>

+	<groupId>org.eclipse.virgo</groupId>

 	<artifactId>greenpages.db-solution</artifactId>

 	<name>greenpages.db</name>

 	<packaging>jar</packaging>

diff --git a/solution/greenpages.db/src/main/resources/META-INF/MANIFEST.MF b/solution/greenpages.db/src/main/resources/META-INF/MANIFEST.MF
index 44b620d..41e8f13 100644
--- a/solution/greenpages.db/src/main/resources/META-INF/MANIFEST.MF
+++ b/solution/greenpages.db/src/main/resources/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0

 Bundle-Vendor: SpringSource Inc.

 Bundle-Classpath: .

-Bundle-Version: 2.3.0

+Bundle-Version: 2.4.0

 Tool: Bundlor 1.0.0.RELEASE

 Bundle-Name: GreenPages DataSource

 Bundle-ManifestVersion: 2

diff --git a/solution/greenpages.db/template.mf b/solution/greenpages.db/template.mf
index 5ec6409..4135246 100644
--- a/solution/greenpages.db/template.mf
+++ b/solution/greenpages.db/template.mf
@@ -3,7 +3,7 @@
 Bundle-Name: GreenPages DataSource
 Bundle-SymbolicName: greenpages.db
 Bundle-Vendor: SpringSource Inc.
-Bundle-Version: 2.3.0
+Bundle-Version: 2.4.0
 Import-Package: 
  org.h2;version="[1.0.71, 1.0.71]"
 Import-Template: 
diff --git a/solution/greenpages.jpa/pom.xml b/solution/greenpages.jpa/pom.xml
index 9e59068..8be7f4e 100644
--- a/solution/greenpages.jpa/pom.xml
+++ b/solution/greenpages.jpa/pom.xml
@@ -5,21 +5,21 @@
 		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

 

 	<parent>

-		<groupId>com.springsource.dmserver</groupId>

+		<groupId>org.eclipse.virgo</groupId>

 		<artifactId>greenpages.parent-solution</artifactId>

-		<version>2.3.0.RELEASE</version>

+		<version>2.4.0.RELEASE</version>

 		<relativePath>../parent</relativePath>

 	</parent>

 

 	<modelVersion>4.0.0</modelVersion>

-	<groupId>com.springsource.dmserver</groupId>

+	<groupId>org.eclipse.virgo</groupId>

 	<artifactId>greenpages.jpa-solution</artifactId>

 	<name>greenpages.jpa</name>

 	<packaging>jar</packaging>

 

 	<dependencies>

 		<dependency>

-			<groupId>com.springsource.dmserver</groupId>

+			<groupId>org.eclipse.virgo</groupId>

 			<artifactId>greenpages.app-solution</artifactId>

 			<version>${project.version}</version>

 		</dependency>

diff --git a/solution/greenpages.jpa/src/main/resources/META-INF/MANIFEST.MF b/solution/greenpages.jpa/src/main/resources/META-INF/MANIFEST.MF
index 4cff74c..89eb8ac 100644
--- a/solution/greenpages.jpa/src/main/resources/META-INF/MANIFEST.MF
+++ b/solution/greenpages.jpa/src/main/resources/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
  0, 1.0.0]",com.springsource.org.eclipse.persistence.jpa;version="[1.0

  .0, 1.0.0]"

 Bundle-Vendor: SpringSource Inc.

-Bundle-Version: 2.3.0

+Bundle-Version: 2.4.0

 Tool: Bundlor 1.0.0.RELEASE

 Bundle-Name: GreenPages JPA

 Bundle-ManifestVersion: 2

diff --git a/solution/greenpages.jpa/template.mf b/solution/greenpages.jpa/template.mf
index 9e141d3..89ef91b 100644
--- a/solution/greenpages.jpa/template.mf
+++ b/solution/greenpages.jpa/template.mf
@@ -3,7 +3,7 @@
 Bundle-Name: GreenPages JPA
 Bundle-SymbolicName: greenpages.jpa
 Bundle-Vendor: SpringSource Inc.
-Bundle-Version: 2.3.0
+Bundle-Version: 2.4.0
 Import-Template: 
  org.springframework.*;version="[3.0, 3.1)",
  greenpages;version="[2.3, 2.4)",
diff --git a/solution/greenpages.web/pom.xml b/solution/greenpages.web/pom.xml
index 299a2d1..60af4d3 100644
--- a/solution/greenpages.web/pom.xml
+++ b/solution/greenpages.web/pom.xml
@@ -5,21 +5,21 @@
 		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

 

 	<parent>

-		<groupId>com.springsource.dmserver</groupId>

+		<groupId>org.eclipse.virgo</groupId>

 		<artifactId>greenpages.parent-solution</artifactId>

-		<version>2.3.0.RELEASE</version>

+		<version>2.4.0.RELEASE</version>

 		<relativePath>../parent</relativePath>

 	</parent>

 

 	<modelVersion>4.0.0</modelVersion>

-	<groupId>com.springsource.dmserver</groupId>

+	<groupId>org.eclipse.virgo</groupId>

 	<artifactId>greenpages.web-solution</artifactId>

 	<name>greenpages.web</name>

 	<packaging>war</packaging>

 

 	<dependencies>

 		<dependency>

-			<groupId>com.springsource.dmserver</groupId>

+			<groupId>org.eclipse.virgo</groupId>

 			<artifactId>greenpages.app-solution</artifactId>

 			<version>${project.version}</version>

 		</dependency>

@@ -40,7 +40,7 @@
 			<scope>provided</scope>

 		</dependency>

 		<dependency>

-			<groupId>com.springsource.dmserver</groupId>

+			<groupId>org.eclipse.virgo</groupId>

 			<artifactId>greenpages.jpa-solution</artifactId>

 			<version>${project.version}</version>

 			<scope>test</scope>

diff --git a/solution/greenpages.web/src/main/webapp/META-INF/MANIFEST.MF b/solution/greenpages.web/src/main/webapp/META-INF/MANIFEST.MF
index 800858b..7ce4eb1 100644
--- a/solution/greenpages.web/src/main/webapp/META-INF/MANIFEST.MF
+++ b/solution/greenpages.web/src/main/webapp/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0

 Import-Bundle: com.springsource.org.apache.taglibs.standard;version="[

  1.1.2,1.3)"

-Bundle-Version: 2.3.0

+Bundle-Version: 2.4.0

 Tool: Bundlor 1.0.0.RELEASE

 Bundle-Name: GreenPages Web

 Import-Library: org.springframework.spring;version="[3.0, 3.1)"

diff --git a/solution/greenpages.web/template.mf b/solution/greenpages.web/template.mf
index 700e234..ad46c19 100644
--- a/solution/greenpages.web/template.mf
+++ b/solution/greenpages.web/template.mf
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: GreenPages Web
 Bundle-SymbolicName: greenpages.web
-Bundle-Version: 2.3.0
+Bundle-Version: 2.4.0
 Web-ContextPath: greenpages
 Import-Template: 
  org.springframework.*;version="[3.0, 3.1)",
diff --git a/solution/greenpages/META-INF/MANIFEST.MF b/solution/greenpages/META-INF/MANIFEST.MF
index 1466c15..cf8e80e 100644
--- a/solution/greenpages/META-INF/MANIFEST.MF
+++ b/solution/greenpages/META-INF/MANIFEST.MF
@@ -1,5 +1,5 @@
 Manifest-Version: 1.0

 Application-SymbolicName: greenpages

-Application-Version: 2.3.0.RELEASE

+Application-Version: 2.4.0.RELEASE

 Application-Name: Greenpages PAR

 

diff --git a/solution/greenpages/pom.xml b/solution/greenpages/pom.xml
index b7d3ee6..d785391 100644
--- a/solution/greenpages/pom.xml
+++ b/solution/greenpages/pom.xml
@@ -5,14 +5,14 @@
 		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
 	<parent>
-		<groupId>com.springsource.dmserver</groupId>
+		<groupId>org.eclipse.virgo</groupId>
 		<artifactId>greenpages.parent-solution</artifactId>
-		<version>2.3.0.RELEASE</version>
+		<version>2.4.0.RELEASE</version>
 		<relativePath>../parent</relativePath>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>com.springsource.dmserver</groupId>
+	<groupId>org.eclipse.virgo</groupId>
 	<artifactId>greenpages-solution</artifactId>
 	<name>GreenPages PAR</name>
 	<description>GreenPages PAR</description>
@@ -20,22 +20,22 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>com.springsource.dmserver</groupId>
+			<groupId>org.eclipse.virgo</groupId>
 			<artifactId>greenpages.app-solution</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>com.springsource.dmserver</groupId>
+			<groupId>org.eclipse.virgo</groupId>
 			<artifactId>greenpages.jpa-solution</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>com.springsource.dmserver</groupId>
+			<groupId>org.eclipse.virgo</groupId>
 			<artifactId>greenpages.db-solution</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>com.springsource.dmserver</groupId>
+			<groupId>org.eclipse.virgo</groupId>
 			<artifactId>greenpages.web-solution</artifactId>
 			<version>${project.version}</version>
 			<type>war</type>
@@ -71,7 +71,7 @@
 						<configuration>
 							<outputDirectory>${project.build.directory}/par-provided</outputDirectory>
 							<overWriteIfNewer>true</overWriteIfNewer>
-							<excludeGroupIds>com.springsource.dmserver,org.apache.log4j</excludeGroupIds>
+							<excludeGroupIds>org.eclipse.virgo,org.apache.log4j</excludeGroupIds>
 						</configuration>
 					</execution>
 				</executions>
diff --git a/solution/parent/pom.xml b/solution/parent/pom.xml
index 9d74b9d..920a0a7 100644
--- a/solution/parent/pom.xml
+++ b/solution/parent/pom.xml
@@ -5,9 +5,9 @@
 		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>com.springsource.dmserver</groupId>
+	<groupId>org.eclipse.virgo</groupId>
 	<artifactId>greenpages.parent-solution</artifactId>
-	<version>2.3.0.RELEASE</version>
+	<version>2.4.0.RELEASE</version>
 	<name>greenpages.parent</name>
 	<packaging>pom</packaging>
 
@@ -66,13 +66,13 @@
 			<dependency>
 				<groupId>org.junit</groupId>
 				<artifactId>com.springsource.org.junit</artifactId>
-				<version>4.5.0</version>
+				<version>4.7.0</version>
 				<scope>test</scope>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework</groupId>
 				<artifactId>org.springframework.test</artifactId>
-			    <version>3.0.0.M3</version>
+			    <version>3.0.0.RELEASE</version>
 				<scope>test</scope>
 			</dependency>
 			<dependency>
@@ -84,7 +84,7 @@
 			<dependency>
 				<groupId>org.springframework</groupId>
 				<artifactId>org.springframework.aspects</artifactId>
-			    <version>3.0.0.M3</version>
+			    <version>3.0.0.RELEASE</version>
 				<scope>test</scope>
 			</dependency>
 			<dependency>
diff --git a/solution/pom.xml b/solution/pom.xml
index 9b78a56..25a4a62 100644
--- a/solution/pom.xml
+++ b/solution/pom.xml
@@ -5,9 +5,9 @@
 		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>com.springsource.dmserver</groupId>
+	<groupId>org.eclipse.virgo</groupId>
 	<artifactId>greenpages-top-level-solution</artifactId>
-	<version>2.3.0.RELEASE</version>
+	<version>2.4.0.RELEASE</version>
     <name>GreenPages App Build</name>
 	<packaging>pom</packaging>
 	<modules>
diff --git a/start/greenpages.app/pom.xml b/start/greenpages.app/pom.xml
index 401064a..6257efe 100644
--- a/start/greenpages.app/pom.xml
+++ b/start/greenpages.app/pom.xml
@@ -5,14 +5,14 @@
 		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

 

 	<parent>

-		<groupId>com.springsource.dmserver</groupId>

+		<groupId>org.eclipse.virgo</groupId>

 		<artifactId>greenpages.parent</artifactId>

-		<version>2.3.0.RELEASE</version>

+		<version>2.4.0.RELEASE</version>

 		<relativePath>../parent</relativePath>

 	</parent>

 

 	<modelVersion>4.0.0</modelVersion>

-	<groupId>com.springsource.dmserver</groupId>

+	<groupId>org.eclipse.virgo</groupId>

 	<artifactId>greenpages.app</artifactId>

 	<name>greenpages.app</name>

 	<packaging>jar</packaging>

diff --git a/start/greenpages.app/src/main/resources/META-INF/MANIFEST.MF b/start/greenpages.app/src/main/resources/META-INF/MANIFEST.MF
index 60edcf0..ccfb155 100644
--- a/start/greenpages.app/src/main/resources/META-INF/MANIFEST.MF
+++ b/start/greenpages.app/src/main/resources/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Export-Package: greenpages;version="2.3.0",greenpages.internal;version

  ="2.3.0";uses:="greenpages"

 Bundle-Vendor: SpringSource Inc.

-Bundle-Version: 2.3.0

+Bundle-Version: 2.4.0

 Tool: Bundlor 1.0.0.RELEASE

 Bundle-Name: GreenPages Service

 Bundle-ManifestVersion: 2

diff --git a/start/greenpages.app/template.mf b/start/greenpages.app/template.mf
index 1f09265..1ac11c7 100644
--- a/start/greenpages.app/template.mf
+++ b/start/greenpages.app/template.mf
@@ -3,6 +3,6 @@
 Bundle-Name: GreenPages Service
 Bundle-SymbolicName: greenpages
 Bundle-Vendor: SpringSource Inc.
-Bundle-Version: 2.3.0
+Bundle-Version: 2.4.0
 Import-Template: 
  org.springframework.*;version="[3.0, 3.1)"
diff --git a/start/greenpages.jpa/pom.xml b/start/greenpages.jpa/pom.xml
index 64affd4..6d4dc61 100644
--- a/start/greenpages.jpa/pom.xml
+++ b/start/greenpages.jpa/pom.xml
@@ -5,21 +5,21 @@
 		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
 	<parent>
-		<groupId>com.springsource.dmserver</groupId>
+		<groupId>org.eclipse.virgo</groupId>
 		<artifactId>greenpages.parent</artifactId>
-		<version>2.3.0.RELEASE</version>
+		<version>2.4.0.RELEASE</version>
 		<relativePath>../parent</relativePath>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>com.springsource.dmserver</groupId>
+	<groupId>org.eclipse.virgo</groupId>
 	<artifactId>greenpages.jpa</artifactId>
 	<name>greenpages.jpa</name>
 	<packaging>jar</packaging>
 
 	<dependencies>
 		<dependency>
-			<groupId>com.springsource.dmserver</groupId>
+			<groupId>org.eclipse.virgo</groupId>
 			<artifactId>greenpages.app</artifactId>
 			<version>${project.version}</version>
 		</dependency>
diff --git a/start/greenpages.jpa/src/main/resources/META-INF/MANIFEST.MF b/start/greenpages.jpa/src/main/resources/META-INF/MANIFEST.MF
index 1f3ccdc..82ae187 100644
--- a/start/greenpages.jpa/src/main/resources/META-INF/MANIFEST.MF
+++ b/start/greenpages.jpa/src/main/resources/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
  .sql,org.junit,org.springframework.beans.factory.annotation,org.sprin

  gframework.core.io"

 Bundle-Vendor: SpringSource Inc.

-Bundle-Version: 2.3.0

+Bundle-Version: 2.4.0

 Tool: Bundlor 1.0.0.RELEASE

 Bundle-Name: GreenPages JPA

 Bundle-ManifestVersion: 2

diff --git a/start/greenpages.jpa/template.mf b/start/greenpages.jpa/template.mf
index 19c069c..359ec87 100644
--- a/start/greenpages.jpa/template.mf
+++ b/start/greenpages.jpa/template.mf
@@ -3,7 +3,7 @@
 Bundle-Name: GreenPages JPA
 Bundle-SymbolicName: greenpages.jpa
 Bundle-Vendor: SpringSource Inc.
-Bundle-Version: 2.3.0
+Bundle-Version: 2.4.0
 Import-Template: 
  org.springframework.*;version="[3.0, 3.1)",
  greenpages;version="[2.3, 2.4)",
diff --git a/start/greenpages.web/pom.xml b/start/greenpages.web/pom.xml
index effbd25..fdb34c2 100644
--- a/start/greenpages.web/pom.xml
+++ b/start/greenpages.web/pom.xml
@@ -3,14 +3,14 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

 

 	<parent>

-		<groupId>com.springsource.dmserver</groupId>

+		<groupId>org.eclipse.virgo</groupId>

 		<artifactId>greenpages.parent</artifactId>

-		<version>2.3.0.RELEASE</version>

+		<version>2.4.0.RELEASE</version>

 		<relativePath>../parent</relativePath>

 	</parent>

 

 	<modelVersion>4.0.0</modelVersion>

-	<groupId>com.springsource.dmserver</groupId>

+	<groupId>org.eclipse.virgo</groupId>

 	<artifactId>greenpages.web</artifactId>

 	<name>greenpages.web</name>

 	<packaging>war</packaging>

diff --git a/start/greenpages.web/src/main/webapp/META-INF/MANIFEST.MF b/start/greenpages.web/src/main/webapp/META-INF/MANIFEST.MF
index 795ff6e..3793b05 100644
--- a/start/greenpages.web/src/main/webapp/META-INF/MANIFEST.MF
+++ b/start/greenpages.web/src/main/webapp/META-INF/MANIFEST.MF
@@ -12,5 +12,5 @@
 Bundle-ManifestVersion: 2

 Bundle-SymbolicName: greenpages.web

 Tool: Bundlor 1.0.0.M6

-Bundle-Version: 2.0

+Bundle-Version: 3.0.0

 

diff --git a/start/greenpages.web/template.mf b/start/greenpages.web/template.mf
index ee059ce..4131b0d 100644
--- a/start/greenpages.web/template.mf
+++ b/start/greenpages.web/template.mf
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: GreenPages Web
 Bundle-SymbolicName: greenpages.web
-Bundle-Version: 2.3.0
+Bundle-Version: 2.4.0
 Import-Package: 
  javax.servlet.jsp.jstl.core;version="[1.1.2,1.2.0)",
  org.eclipse.virgo.web.dm;version="[2.0.0, 3.0.0)",
diff --git a/start/parent/pom.xml b/start/parent/pom.xml
index 2340e1c..2be683b 100644
--- a/start/parent/pom.xml
+++ b/start/parent/pom.xml
@@ -5,9 +5,9 @@
 		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>com.springsource.dmserver</groupId>
+	<groupId>org.eclipse.virgo</groupId>
 	<artifactId>greenpages.parent</artifactId>
-	<version>2.3.0.RELEASE</version>
+	<version>2.4.0.RELEASE</version>
 	<name>greenpages.parent</name>
 	<packaging>pom</packaging>
 
@@ -17,7 +17,7 @@
 			    <groupId>org.springframework</groupId>
 			    <artifactId>org.springframework.spring-library</artifactId>
 			    <type>libd</type>
-			    <version>3.0.0.M3</version>
+			    <version>3.0.0</version>
 				<scope>provided</scope>
 			</dependency>
 			<dependency>
@@ -66,25 +66,25 @@
 			<dependency>
 				<groupId>org.junit</groupId>
 				<artifactId>com.springsource.org.junit</artifactId>
-				<version>4.5.0</version>
+				<version>4.7.0</version>
 				<scope>test</scope>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework</groupId>
 				<artifactId>org.springframework.test</artifactId>
-			    <version>3.0.0.M3</version>
+			    <version>3.0.0.RELEASE</version>
 				<scope>test</scope>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework</groupId>
 				<artifactId>org.springframework.instrument</artifactId>
-			    <version>3.0.0.M3</version>
+			    <version>3.0.0</version>
 				<scope>test</scope>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework</groupId>
 				<artifactId>org.springframework.aspects</artifactId>
-			    <version>3.0.0.M3</version>
+			    <version>3.0.0.RELEASE</version>
 				<scope>test</scope>
 			</dependency>
 			<dependency>
diff --git a/start/pom.xml b/start/pom.xml
index 0e745d8..7db9398 100644
--- a/start/pom.xml
+++ b/start/pom.xml
@@ -5,9 +5,9 @@
 		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>com.springsource.dmserver</groupId>
+	<groupId>org.eclipse.virgo</groupId>
 	<artifactId>greenpages-top-level</artifactId>
-	<version>2.3.0.RELEASE</version>
+	<version>2.4.0.RELEASE</version>
     <name>GreenPages App Build</name>
 	<packaging>pom</packaging>
 	<modules>
diff --git a/virgo-build b/virgo-build
index 6dba074..9ada5de 160000
--- a/virgo-build
+++ b/virgo-build
@@ -1 +1 @@
-Subproject commit 6dba074d21093fec0aa5157df0f77ad1743e239d
+Subproject commit 9ada5de967ea8805e7c8142d3647d0500100fa5a