diff --git a/jpa-moxy/round-trip/.project b/.project
similarity index 64%
rename from jpa-moxy/round-trip/.project
rename to .project
index 15966b8..b9b4caf 100644
--- a/jpa-moxy/round-trip/.project
+++ b/.project
@@ -1,23 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>round-trip</name>
+	<name>parent</name>
 	<comment></comment>
 	<projects>
 	</projects>
 	<buildSpec>
 		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
 			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 	</buildSpec>
 	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 	</natures>
 </projectDescription>
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/example.tar.gz b/example.tar.gz
new file mode 100644
index 0000000..f674345
--- /dev/null
+++ b/example.tar.gz
Binary files differ
diff --git a/jpa-moxy/jpa-moxy.simple/.classpath b/jpa-moxy/jpa-moxy.simple/.classpath
index dcfd78b..79eeb80 100644
--- a/jpa-moxy/jpa-moxy.simple/.classpath
+++ b/jpa-moxy/jpa-moxy.simple/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/java">
+	<classpathentry including="**/*.java" kind="src" output="target/classes" path="src/main/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
@@ -24,7 +24,7 @@
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
 		<attributes>
-			<attribute name="owner.project.facets" value="java"/>
+			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
diff --git a/jpa-moxy/jpa-moxy.simple/.project b/jpa-moxy/jpa-moxy.simple/.project
index d295585..396e749 100644
--- a/jpa-moxy/jpa-moxy.simple/.project
+++ b/jpa-moxy/jpa-moxy.simple/.project
@@ -16,12 +16,12 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
diff --git a/jpa-moxy/jpa-moxy.simple/Marshall-JSON.launch b/jpa-moxy/jpa-moxy.simple/Marshall-JSON.launch
deleted file mode 100644
index 33c47d0..0000000
--- a/jpa-moxy/jpa-moxy.simple/Marshall-JSON.launch
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/jpa-moxy.simple/src/main/java/eclipselink/example/jpamoxy/simple/Marshall.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="eclipselink.example.jpamoxy.simple.Marshall"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="json"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="jpa-moxy.simple"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
-</launchConfiguration>
diff --git a/jpa-moxy/jpa-moxy.simple/Marshall-XML.launch b/jpa-moxy/jpa-moxy.simple/Marshall-XML.launch
deleted file mode 100644
index 575becd..0000000
--- a/jpa-moxy/jpa-moxy.simple/Marshall-XML.launch
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/jpa-moxy.simple/src/main/java/eclipselink/example/jpamoxy/simple/Marshall.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="eclipselink.example.jpamoxy.simple.Marshall"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="xml"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="jpa-moxy.simple"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
-</launchConfiguration>
diff --git a/jpa-moxy/jpa-moxy.simple/Unmarshall-JSON.launch b/jpa-moxy/jpa-moxy.simple/Unmarshall-JSON.launch
deleted file mode 100644
index ff75534..0000000
--- a/jpa-moxy/jpa-moxy.simple/Unmarshall-JSON.launch
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/jpa-moxy.simple/src/main/java/eclipselink/example/jpamoxy/simple/Unmarshall.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="eclipselink.example.jpamoxy.simple.Unmarshall"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="json"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="jpa-moxy.simple"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
-</launchConfiguration>
diff --git a/jpa-moxy/jpa-moxy.simple/Unmarshall-XML.launch b/jpa-moxy/jpa-moxy.simple/Unmarshall-XML.launch
deleted file mode 100644
index 6b6c084..0000000
--- a/jpa-moxy/jpa-moxy.simple/Unmarshall-XML.launch
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/jpa-moxy.simple/src/main/java/eclipselink/example/jpamoxy/simple/Unmarshall.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="eclipselink.example.jpamoxy.simple.Unmarshall"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="xml"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="jpa-moxy.simple"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
-</launchConfiguration>
diff --git a/jpa-moxy/jpa-moxy.simple/pom.xml b/jpa-moxy/jpa-moxy.simple/pom.xml
index 82d4b3e..7c74b51 100644
--- a/jpa-moxy/jpa-moxy.simple/pom.xml
+++ b/jpa-moxy/jpa-moxy.simple/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>eclipselink.example.jpa-moxy</groupId>
 	<artifactId>jpa-moxy.simple</artifactId>
-	<version>2.4.2-SNAPSHOT</version>
+	<version>2.4.2</version>
 	<packaging>jar</packaging>
 
 	<name>JPA-MOXy Example</name>
@@ -37,7 +37,7 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<eclipselink.groupid>org.eclipse.persistence</eclipselink.groupid>
-		<eclipselink.version>2.4.2-SNAPSHOT</eclipselink.version>
+		<eclipselink.version>2.4.2</eclipselink.version>
 	</properties>
 
 	<repositories>
diff --git a/jpa-moxy/jpa-moxy.simple/src/main/java/eclipselink/example/jpamoxy/simple/model/Customer.java b/jpa-moxy/jpa-moxy.simple/src/main/java/eclipselink/example/jpamoxy/simple/model/Customer.java
index 77eaae2..0690b31 100755
--- a/jpa-moxy/jpa-moxy.simple/src/main/java/eclipselink/example/jpamoxy/simple/model/Customer.java
+++ b/jpa-moxy/jpa-moxy.simple/src/main/java/eclipselink/example/jpamoxy/simple/model/Customer.java
@@ -1,12 +1,11 @@
 package eclipselink.example.jpamoxy.simple.model;
 
-import static javax.persistence.CascadeType.*;
+import static javax.persistence.CascadeType.ALL;
 
 import java.io.Serializable;
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -53,7 +52,7 @@
 	@OneToMany(mappedBy="customer", cascade = ALL)
 	private Set<PhoneNumber> phoneNumbers = new HashSet<PhoneNumber>();
 
-    public Customer() {
+	public Customer() {
     }
 
 	public long getId() {
diff --git a/jpa-moxy/round-trip/.gitignore b/jpa-moxy/round-trip/.gitignore
deleted file mode 100644
index 5e56e04..0000000
--- a/jpa-moxy/round-trip/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/bin
diff --git a/jpa-moxy/round-trip/bin/.gitignore b/jpa-moxy/round-trip/bin/.gitignore
deleted file mode 100644
index 5e56e04..0000000
--- a/jpa-moxy/round-trip/bin/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/bin
diff --git a/jpa-moxy/round-trip/bin/.project b/jpa-moxy/round-trip/bin/.project
deleted file mode 100644
index 15966b8..0000000
--- a/jpa-moxy/round-trip/bin/.project
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>round-trip</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-	</natures>
-</projectDescription>
diff --git a/jpa/employee.dynamic/pom.xml b/jpa/employee.dynamic/pom.xml
index ff25945..219f7d0 100644
--- a/jpa/employee.dynamic/pom.xml
+++ b/jpa/employee.dynamic/pom.xml
@@ -5,8 +5,8 @@
     <parent>
 		<relativePath>..</relativePath>
 		<groupId>eclipselink.example.jpa</groupId>
-		<artifactId>examples</artifactId>
-		<version>2.4.2-SNAPSHOT</version>
+		<artifactId>parent</artifactId>
+		<version>2.4.2</version>
 	</parent>
 
 	<artifactId>employee.dynamic</artifactId>
diff --git a/jpa-moxy/round-trip/.project b/jpa/employee/.project
similarity index 64%
copy from jpa-moxy/round-trip/.project
copy to jpa/employee/.project
index 15966b8..fe7630a 100644
--- a/jpa-moxy/round-trip/.project
+++ b/jpa/employee/.project
@@ -1,23 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>round-trip</name>
+	<name>employee.parent</name>
 	<comment></comment>
 	<projects>
 	</projects>
 	<buildSpec>
 		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
 			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 	</buildSpec>
 	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 	</natures>
 </projectDescription>
diff --git a/jpa/employee/.settings/org.eclipse.core.resources.prefs b/jpa/employee/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/jpa/employee/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/jpa/employee/.settings/org.eclipse.m2e.core.prefs b/jpa/employee/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/jpa/employee/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/jpa/employee/employee.model/.classpath b/jpa/employee/employee.model/.classpath
index 4867487..50a092e 100644
--- a/jpa/employee/employee.model/.classpath
+++ b/jpa/employee/employee.model/.classpath
@@ -18,16 +18,16 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="org.eclipse.jst.component.nondependency" value=""/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
+		<attributes>
+			<attribute name="owner.project.facets" value="java"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/jpa/employee/employee.model/.settings/org.eclipse.jdt.core.prefs b/jpa/employee/employee.model/.settings/org.eclipse.jdt.core.prefs
index 69c31cd..443e085 100644
--- a/jpa/employee/employee.model/.settings/org.eclipse.jdt.core.prefs
+++ b/jpa/employee/employee.model/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,8 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/jpa/employee/employee.model/.settings/org.eclipse.wst.common.project.facet.core.xml b/jpa/employee/employee.model/.settings/org.eclipse.wst.common.project.facet.core.xml
index 08e864b..0bcc5bd 100644
--- a/jpa/employee/employee.model/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/jpa/employee/employee.model/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <faceted-project>
-  <installed facet="java" version="1.6"/>
   <installed facet="jpt.jpa" version="2.0"/>
   <installed facet="jst.utility" version="1.0"/>
+  <installed facet="java" version="1.7"/>
 </faceted-project>
diff --git a/jpa/employee/employee.model/.settings/org.eclipse.wst.validation.prefs b/jpa/employee/employee.model/.settings/org.eclipse.wst.validation.prefs
index f6a7fbd..7b84f02 100644
--- a/jpa/employee/employee.model/.settings/org.eclipse.wst.validation.prefs
+++ b/jpa/employee/employee.model/.settings/org.eclipse.wst.validation.prefs
@@ -2,6 +2,7 @@
 USER_BUILD_PREFERENCE=enabledBuildValidatorListorg.eclipse.jst.j2ee.internal.classpathdep.ClasspathDependencyValidator;
 USER_MANUAL_PREFERENCE=enabledManualValidatorListorg.eclipse.jst.j2ee.internal.classpathdep.ClasspathDependencyValidator;
 USER_PREFERENCE=overrideGlobalPreferencesfalse
+disabled=06target
 eclipse.preferences.version=1
 override=false
 suspend=false
diff --git a/jpa/employee/employee.model/pom.xml b/jpa/employee/employee.model/pom.xml
index 1f6ef52..3d016db 100644
--- a/jpa/employee/employee.model/pom.xml
+++ b/jpa/employee/employee.model/pom.xml
@@ -6,7 +6,7 @@
 		<relativePath>..</relativePath>
 		<groupId>eclipselink.example.jpa</groupId>
 		<artifactId>employee.parent</artifactId>
-		<version>2.4.2-SNAPSHOT</version>
+		<version>2.4.2</version>
 	</parent>
 
 	<artifactId>employee.model</artifactId>
@@ -166,11 +166,11 @@
 								</property>
 								<property>
 									<name>javax.persistence.jdbc.user</name>
-									<value>root</value>
+									<value>employee</value>
 								</property>
 								<property>
 									<name>javax.persistence.jdbc.password</name>
-									<value>password</value>
+									<value>employee</value>
 								</property>
 							</systemProperties>
 						</configuration>
diff --git a/jpa/employee/employee.model/src/eclipse/CascadeMergeTest.launch b/jpa/employee/employee.model/src/eclipse/CascadeMergeTest.launch
index c7c936d..61eb604 100644
--- a/jpa/employee/employee.model/src/eclipse/CascadeMergeTest.launch
+++ b/jpa/employee/employee.model/src/eclipse/CascadeMergeTest.launch
@@ -14,5 +14,5 @@
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="test.CascadeMergeTest"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="Employee Example - model"/>
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-javaagent:${system_property:user.home}/.m2/repository/org/eclipse/persistence/eclipselink/2.4.2-SNAPSHOT/eclipselink-2.4.2-SNAPSHOT.jar"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-javaagent:${system_property:user.home}/.m2/repository/org/eclipse/persistence/eclipselink/2.4.2/eclipselink-2.4.2.jar"/>
 </launchConfiguration>
diff --git a/jpa/employee/employee.model/src/eclipse/ConfigTest.launch b/jpa/employee/employee.model/src/eclipse/ConfigTest.launch
index 07ddb10..5ac2782 100644
--- a/jpa/employee/employee.model/src/eclipse/ConfigTest.launch
+++ b/jpa/employee/employee.model/src/eclipse/ConfigTest.launch
@@ -14,5 +14,5 @@
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="test.ConfigTest"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="Employee Example - eclipselink.example.jpa.employee.model"/>
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-javaagent:${system_property:user.home}/.m2/repository/org/eclipse/persistence/eclipselink/2.4.2-SNAPSHOT/eclipselink-2.4.2-SNAPSHOT.jar"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-javaagent:${system_property:user.home}/.m2/repository/org/eclipse/persistence/eclipselink/2.4.2/eclipselink-2.4.2.jar"/>
 </launchConfiguration>
diff --git a/jpa/employee/employee.model/src/eclipse/DiagnosticsTest.launch b/jpa/employee/employee.model/src/eclipse/DiagnosticsTest.launch
index 8977a42..73b5219 100644
--- a/jpa/employee/employee.model/src/eclipse/DiagnosticsTest.launch
+++ b/jpa/employee/employee.model/src/eclipse/DiagnosticsTest.launch
@@ -14,5 +14,5 @@
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="eclipselink.example.jpa.employee.test.services.DiagnosticsTest"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="employee.web"/>
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-javaagent:${system_property:user.home}/.m2/repository/org/eclipse/persistence/eclipselink/2.4.2-SNAPSHOT/eclipselink-2.4.2-SNAPSHOT.jar"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-javaagent:${system_property:user.home}/.m2/repository/org/eclipse/persistence/eclipselink/2.4.2/eclipselink-2.4.2.jar"/>
 </launchConfiguration>
diff --git a/jpa/employee/employee.model/src/eclipse/EditEmployeeTest.launch b/jpa/employee/employee.model/src/eclipse/EditEmployeeTest.launch
index 2918e4d..18bbc18 100644
--- a/jpa/employee/employee.model/src/eclipse/EditEmployeeTest.launch
+++ b/jpa/employee/employee.model/src/eclipse/EditEmployeeTest.launch
@@ -14,5 +14,5 @@
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="eclipselink.example.jpa.employee.test.services.EditEmployeeTest"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="employee.web"/>
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-javaagent:${system_property:user.home}/.m2/repository/org/eclipse/persistence/eclipselink/2.4.2-SNAPSHOT/eclipselink-2.4.2-SNAPSHOT.jar"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-javaagent:${system_property:user.home}/.m2/repository/org/eclipse/persistence/eclipselink/2.4.2/eclipselink-2.4.2.jar"/>
 </launchConfiguration>
diff --git a/jpa/employee/employee.model/src/eclipse/JavaSEExample.launch b/jpa/employee/employee.model/src/eclipse/JavaSEExample.launch
index fdc45ad..9a85a53 100644
--- a/jpa/employee/employee.model/src/eclipse/JavaSEExample.launch
+++ b/jpa/employee/employee.model/src/eclipse/JavaSEExample.launch
@@ -10,5 +10,5 @@
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="example.JavaSEExample"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="Employee Example - model"/>
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-javaagent:${system_property:user.home}/.m2/repository/org/eclipse/persistence/eclipselink/2.4.2-SNAPSHOT/eclipselink-2.4.2-SNAPSHOT.jar"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-javaagent:${system_property:user.home}/.m2/repository/org/eclipse/persistence/eclipselink/2.4.2/eclipselink-2.4.2.jar"/>
 </launchConfiguration>
diff --git a/jpa/employee/employee.model/src/eclipse/JavaSEExampleTest.launch b/jpa/employee/employee.model/src/eclipse/JavaSEExampleTest.launch
index f152b97..56d0a6b 100644
--- a/jpa/employee/employee.model/src/eclipse/JavaSEExampleTest.launch
+++ b/jpa/employee/employee.model/src/eclipse/JavaSEExampleTest.launch
@@ -14,5 +14,5 @@
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="test.JavaSEExampleTest"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="Employee Example - eclipselink.example.jpa.employee.model"/>
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-javaagent:${system_property:user.home}/.m2/repository/org/eclipse/persistence/eclipselink/2.4.2-SNAPSHOT/eclipselink-2.4.2-SNAPSHOT.jar"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-javaagent:${system_property:user.home}/.m2/repository/org/eclipse/persistence/eclipselink/2.4.2/eclipselink-2.4.2.jar"/>
 </launchConfiguration>
diff --git a/jpa/employee/employee.model/src/eclipse/PageEmployeesTest.launch b/jpa/employee/employee.model/src/eclipse/PageEmployeesTest.launch
index ef93444..552962e 100644
--- a/jpa/employee/employee.model/src/eclipse/PageEmployeesTest.launch
+++ b/jpa/employee/employee.model/src/eclipse/PageEmployeesTest.launch
@@ -15,5 +15,5 @@
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="eclipselink.example.jpa.employee.test.services.PageEmployeesTest"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="employee.web"/>
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-javaagent:${system_property:user.home}/.m2/repository/org/eclipse/persistence/eclipselink/2.4.2-SNAPSHOT/eclipselink-2.4.2-SNAPSHOT.jar"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-javaagent:${system_property:user.home}/.m2/repository/org/eclipse/persistence/eclipselink/2.4.2/eclipselink-2.4.2.jar"/>
 </launchConfiguration>
diff --git a/jpa/employee/employee.model/src/eclipse/PageIdsInEmployeesTest.launch b/jpa/employee/employee.model/src/eclipse/PageIdsInEmployeesTest.launch
index 3406a99..87e7581 100644
--- a/jpa/employee/employee.model/src/eclipse/PageIdsInEmployeesTest.launch
+++ b/jpa/employee/employee.model/src/eclipse/PageIdsInEmployeesTest.launch
@@ -15,5 +15,5 @@
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="eclipselink.example.jpa.employee.test.services.PageIdsInEmployeesTest"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="employee.web"/>
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-javaagent:${system_property:user.home}/.m2/repository/org/eclipse/persistence/eclipselink/2.4.2-SNAPSHOT/eclipselink-2.4.2-SNAPSHOT.jar"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-javaagent:${system_property:user.home}/.m2/repository/org/eclipse/persistence/eclipselink/2.4.2/eclipselink-2.4.2.jar"/>
 </launchConfiguration>
diff --git a/jpa/employee/employee.model/src/eclipse/StreamEmployeesTest.launch b/jpa/employee/employee.model/src/eclipse/StreamEmployeesTest.launch
index 284c19a..f9b32bd 100644
--- a/jpa/employee/employee.model/src/eclipse/StreamEmployeesTest.launch
+++ b/jpa/employee/employee.model/src/eclipse/StreamEmployeesTest.launch
@@ -15,5 +15,5 @@
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="eclipselink.example.jpa.employee.test.services.StreamEmployeesTest"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="employee.web"/>
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-javaagent:${system_property:user.home}/.m2/repository/org/eclipse/persistence/eclipselink/2.4.2-SNAPSHOT/eclipselink-2.4.2-SNAPSHOT.jar"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-javaagent:${system_property:user.home}/.m2/repository/org/eclipse/persistence/eclipselink/2.4.2/eclipselink-2.4.2.jar"/>
 </launchConfiguration>
diff --git a/jpa/employee/employee.model/src/eclipse/TestAdminService.launch b/jpa/employee/employee.model/src/eclipse/TestAdminService.launch
index 790e272..bc7e6dc 100644
--- a/jpa/employee/employee.model/src/eclipse/TestAdminService.launch
+++ b/jpa/employee/employee.model/src/eclipse/TestAdminService.launch
@@ -14,5 +14,5 @@
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="eclipselink.example.jpa.employee.test.services.TestAdminService"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="employee.web"/>
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-javaagent:${system_property:user.home}/.m2/repository/org/eclipse/persistence/eclipselink/2.4.2-SNAPSHOT/eclipselink-2.4.2-SNAPSHOT.jar"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-javaagent:${system_property:user.home}/.m2/repository/org/eclipse/persistence/eclipselink/2.4.2/eclipselink-2.4.2.jar"/>
 </launchConfiguration>
diff --git a/jpa/employee/employee.model/src/main/resources/META-INF/persistence.xml b/jpa/employee/employee.model/src/main/resources/META-INF/persistence.xml
index 730c4f2..202a0f6 100644
--- a/jpa/employee/employee.model/src/main/resources/META-INF/persistence.xml
+++ b/jpa/employee/employee.model/src/main/resources/META-INF/persistence.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
 	<persistence-unit name="employee" transaction-type="JTA">
-		<jta-data-source>jdbc/TLDS_examples</jta-data-source>
+		<jta-data-source>jdbc/employeeDS</jta-data-source>
 		<class>eclipselink.example.jpa.employee.model.Address</class>
 		<class>eclipselink.example.jpa.employee.model.Employee</class>
 		<class>eclipselink.example.jpa.employee.model.PhoneNumber</class>
diff --git a/jpa/employee/employee.web-js/.classpath b/jpa/employee/employee.web-js/.classpath
index 71e149c..6ffea0a 100644
--- a/jpa/employee/employee.web-js/.classpath
+++ b/jpa/employee/employee.web-js/.classpath
@@ -18,7 +18,7 @@
 			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
 		<attributes>
 			<attribute name="owner.project.facets" value="java"/>
 		</attributes>
diff --git a/jpa/employee/employee.web-js/.settings/org.eclipse.jdt.core.prefs b/jpa/employee/employee.web-js/.settings/org.eclipse.jdt.core.prefs
index 69c31cd..443e085 100644
--- a/jpa/employee/employee.web-js/.settings/org.eclipse.jdt.core.prefs
+++ b/jpa/employee/employee.web-js/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,8 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/jpa/employee/employee.web-js/.settings/org.eclipse.wst.common.component b/jpa/employee/employee.web-js/.settings/org.eclipse.wst.common.component
index 1b765cc..35a337b 100644
--- a/jpa/employee/employee.web-js/.settings/org.eclipse.wst.common.component
+++ b/jpa/employee/employee.web-js/.settings/org.eclipse.wst.common.component
@@ -3,7 +3,7 @@
         <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
         <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
-        <dependent-module archiveName="employee.model-2.4.2-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/employee.model/employee.model">
+        <dependent-module archiveName="employee.model-2.4.2.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/employee.model/employee.model">
             <dependency-type>uses</dependency-type>
         </dependent-module>
         <property name="java-output-path" value="/Employee Example - web - js/target/classes"/>
diff --git a/jpa/employee/employee.web-js/.settings/org.eclipse.wst.common.project.facet.core.xml b/jpa/employee/employee.web-js/.settings/org.eclipse.wst.common.project.facet.core.xml
index 7f7d424..87eed3e 100644
--- a/jpa/employee/employee.web-js/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/jpa/employee/employee.web-js/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -4,6 +4,6 @@
   <installed facet="wst.jsdt.web" version="1.0"/>
   <installed facet="jst.jaxrs" version="1.1"/>
   <installed facet="jst.web" version="3.0"/>
-  <installed facet="java" version="1.6"/>
   <installed facet="jst.jsf" version="2.0"/>
+  <installed facet="java" version="1.7"/>
 </faceted-project>
diff --git a/jpa/employee/employee.web-js/.settings/org.eclipse.wst.validation.prefs b/jpa/employee/employee.web-js/.settings/org.eclipse.wst.validation.prefs
new file mode 100644
index 0000000..04cad8c
--- /dev/null
+++ b/jpa/employee/employee.web-js/.settings/org.eclipse.wst.validation.prefs
@@ -0,0 +1,2 @@
+disabled=06target
+eclipse.preferences.version=1
diff --git a/jpa/employee/employee.web-js/pom.xml b/jpa/employee/employee.web-js/pom.xml
index 1ce48dc..4c238a4 100644
--- a/jpa/employee/employee.web-js/pom.xml
+++ b/jpa/employee/employee.web-js/pom.xml
@@ -6,7 +6,7 @@
 		<relativePath>..</relativePath>
 		<groupId>eclipselink.example.jpa</groupId>
 		<artifactId>employee.parent</artifactId>
-		<version>2.4.2-SNAPSHOT</version>
+		<version>2.4.2</version>
 	</parent>
 
 	<artifactId>employee.web-js</artifactId>
@@ -23,7 +23,7 @@
 		<dependency>
 			<groupId>eclipselink.example.jpa</groupId>
 			<artifactId>employee.model</artifactId>
-			<version>2.4.2-SNAPSHOT</version>
+			<version>2.4.2</version>
 		</dependency>
 
 	</dependencies>
diff --git a/jpa/employee/employee.web/.settings/org.eclipse.wst.common.component b/jpa/employee/employee.web/.settings/org.eclipse.wst.common.component
index d14264b..8c51fb6 100644
--- a/jpa/employee/employee.web/.settings/org.eclipse.wst.common.component
+++ b/jpa/employee/employee.web/.settings/org.eclipse.wst.common.component
@@ -4,7 +4,7 @@
         <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
-        <dependent-module archiveName="employee.model-2.4.2-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/employee.model/employee.model">
+        <dependent-module archiveName="employee.model-2.4.2.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/employee.model/employee.model">
             <dependency-type>uses</dependency-type>
         </dependent-module>
         <property name="java-output-path" value="/Employee Example - web/target/classes"/>
diff --git a/jpa/employee/employee.web/pom.xml b/jpa/employee/employee.web/pom.xml
index 920bd04..a092e8a 100644
--- a/jpa/employee/employee.web/pom.xml
+++ b/jpa/employee/employee.web/pom.xml
@@ -6,7 +6,7 @@
 		<relativePath>..</relativePath>
 		<groupId>eclipselink.example.jpa</groupId>
 		<artifactId>employee.parent</artifactId>
-		<version>2.4.2-SNAPSHOT</version>
+		<version>2.4.2</version>
 	</parent>
 
 	<artifactId>employee.web</artifactId>
diff --git a/jpa/employee/pom.xml b/jpa/employee/pom.xml
index 867fdfa..0985198 100644
--- a/jpa/employee/pom.xml
+++ b/jpa/employee/pom.xml
@@ -7,12 +7,10 @@
 		<relativePath>..</relativePath>
 		<groupId>eclipselink.example.jpa</groupId>
 		<artifactId>parent</artifactId>
-		<version>2.4.2-SNAPSHOT</version>
+		<version>2.4.2</version>
 	</parent>
     
-	<groupId>eclipselink.example.jpa</groupId>
 	<artifactId>employee.parent</artifactId>
-	<version>2.4.2-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>Employee Example</name>
@@ -21,8 +19,8 @@
 
 	<modules>
         <module>employee.model</module>
-        <module>employee.web</module>
         <module>employee.web-js</module>
+        <module>employee.web</module>
 	</modules>
 
 	<build>
diff --git a/jpa/polyglot/polyglot.client/pom.xml b/jpa/polyglot/polyglot.client/pom.xml
index c008c61..e118d3d 100644
--- a/jpa/polyglot/polyglot.client/pom.xml
+++ b/jpa/polyglot/polyglot.client/pom.xml
@@ -5,7 +5,7 @@
 		<relativePath>..</relativePath>
 		<groupId>eclipselink.example.polyglot</groupId>
 		<artifactId>parent</artifactId>
-		<version>2.4.2-SNAPSHOT</version>
+		<version>2.4.2</version>
 	</parent>
 
 	<artifactId>polyglot.client</artifactId>
@@ -15,7 +15,7 @@
 		<dependency>
 			<groupId>eclipselink.example.polyglot</groupId>
 			<artifactId>polyglot.composite</artifactId>
-			<version>2.4.2-SNAPSHOT</version>
+			<version>2.4.2</version>
 		</dependency>
 	</dependencies>
     
diff --git a/jpa/polyglot/polyglot.composite/pom.xml b/jpa/polyglot/polyglot.composite/pom.xml
index 376ed58..d7ccc27 100644
--- a/jpa/polyglot/polyglot.composite/pom.xml
+++ b/jpa/polyglot/polyglot.composite/pom.xml
@@ -6,7 +6,7 @@
 		<relativePath>..</relativePath>
 		<groupId>eclipselink.example.polyglot</groupId>
 		<artifactId>parent</artifactId>
-		<version>2.4.2-SNAPSHOT</version>
+		<version>2.4.2</version>
 	</parent>
 
 	<artifactId>polyglot.composite</artifactId>
diff --git a/jpa/polyglot/polyglot.nosql/pom.xml b/jpa/polyglot/polyglot.nosql/pom.xml
index fe32582..c5102e9 100644
--- a/jpa/polyglot/polyglot.nosql/pom.xml
+++ b/jpa/polyglot/polyglot.nosql/pom.xml
@@ -5,7 +5,7 @@
 		<relativePath>..</relativePath>
 		<groupId>eclipselink.example.polyglot</groupId>
 		<artifactId>parent</artifactId>
-		<version>2.4.2-SNAPSHOT</version>
+		<version>2.4.2</version>
 	</parent>
 
     <artifactId>polyglot.nosql</artifactId>
diff --git a/jpa/polyglot/polyglot.relational/pom.xml b/jpa/polyglot/polyglot.relational/pom.xml
index 43116e6..041039f 100644
--- a/jpa/polyglot/polyglot.relational/pom.xml
+++ b/jpa/polyglot/polyglot.relational/pom.xml
@@ -6,7 +6,7 @@
 		<relativePath>..</relativePath>
 		<groupId>eclipselink.example.polyglot</groupId>
 		<artifactId>parent</artifactId>
-		<version>2.4.2-SNAPSHOT</version>
+		<version>2.4.2</version>
 	</parent>
     
     <artifactId>polyglot.relational</artifactId>
diff --git a/jpa/polyglot/pom.xml b/jpa/polyglot/pom.xml
index 74a1541..209eb72 100644
--- a/jpa/polyglot/pom.xml
+++ b/jpa/polyglot/pom.xml
@@ -6,14 +6,14 @@
     <groupId>eclipselink.example.polyglot</groupId>
 	<artifactId>parent</artifactId>
 	<packaging>pom</packaging>
-    <version>2.4.2-SNAPSHOT</version>
+    <version>2.4.2</version>
 
 	<name>Polyglot Example</name>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <eclipselink.groupid>org.eclipse.persistence</eclipselink.groupid>
-        <eclipselink.version>2.4.2-SNAPSHOT</eclipselink.version>
+        <eclipselink.version>2.4.2</eclipselink.version>
     </properties>
 
 	<modules>
diff --git a/jpa/pom.xml b/jpa/pom.xml
index 978a21f..c9e198c 100644
--- a/jpa/pom.xml
+++ b/jpa/pom.xml
@@ -7,7 +7,7 @@
 		<relativePath>..</relativePath>
 		<groupId>eclipselink.example</groupId>
 		<artifactId>parent</artifactId>
-		<version>2.4.2-SNAPSHOT</version>
+		<version>2.4.2</version>
 	</parent>
     
     <groupId>eclipselink.example.jpa</groupId>
diff --git a/jpars/student/pom.xml b/jpars/student/pom.xml
index 798f175..9cbc829 100644
--- a/jpars/student/pom.xml
+++ b/jpars/student/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>eclipselink.example.jpars</groupId>
 	<artifactId>student</artifactId>
-	<version>2.4.2-SNAPSHOT</version>
+	<version>2.4.2</version>
 	<packaging>pom</packaging>
 
 	<name>Student</name>
@@ -38,7 +38,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<eclipselink.groupid>org.eclipse.persistence</eclipselink.groupid>
 		<eclipselink.artifactid>eclipselink</eclipselink.artifactid>
-		<eclipselink.version>2.4.2-SNAPSHOT</eclipselink.version>
+		<eclipselink.version>2.4.2</eclipselink.version>
 	</properties>
 
 	<repositories>
diff --git a/jpars/student/student.model/pom.xml b/jpars/student/student.model/pom.xml
index 9c720a3..e19d3a1 100644
--- a/jpars/student/student.model/pom.xml
+++ b/jpars/student/student.model/pom.xml
@@ -5,7 +5,7 @@
 		<relativePath>..</relativePath>
 		<groupId>eclipselink.example.jpars</groupId>
 		<artifactId>student</artifactId>
-		<version>2.4.2-SNAPSHOT</version>
+		<version>2.4.2</version>
 	</parent>
 
 	<artifactId>student.model</artifactId>
diff --git a/jpars/student/student.web/.settings/org.eclipse.wst.common.component b/jpars/student/student.web/.settings/org.eclipse.wst.common.component
index 4821c87..406f239 100644
--- a/jpars/student/student.web/.settings/org.eclipse.wst.common.component
+++ b/jpars/student/student.web/.settings/org.eclipse.wst.common.component
@@ -4,7 +4,7 @@
         <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
-        <dependent-module archiveName="student.model-2.4.2-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/jpars.student.model/jpars.student.model">
+        <dependent-module archiveName="student.model-2.4.2.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/jpars.student.model/jpars.student.model">
             <dependency-type>uses</dependency-type>
         </dependent-module>
         <property name="java-output-path" value="/jpars.student.web/target/classes"/>
diff --git a/jpars/student/student.web/pom.xml b/jpars/student/student.web/pom.xml
index 3a83d7a..d3679d7 100644
--- a/jpars/student/student.web/pom.xml
+++ b/jpars/student/student.web/pom.xml
@@ -6,7 +6,7 @@
 		<relativePath>..</relativePath>
 		<groupId>eclipselink.example.jpars</groupId>
 		<artifactId>student</artifactId>
-		<version>2.4.2-SNAPSHOT</version>
+		<version>2.4.2</version>
 	</parent>
 
 	<artifactId>student.web</artifactId>
@@ -44,7 +44,7 @@
 		<dependency>
 			<groupId>eclipselink.example.jpars</groupId>
 			<artifactId>student.model</artifactId>
-			<version>2.4.2-SNAPSHOT</version>
+			<version>2.4.2</version>
 		</dependency>
 		<dependency>
 			<groupId>javax</groupId>
diff --git a/moxy/json-dynamic/pom.xml b/moxy/json-dynamic/pom.xml
index 46b8391..54c95f0 100644
--- a/moxy/json-dynamic/pom.xml
+++ b/moxy/json-dynamic/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>eclipselink.example.moxy</groupId>
 	<artifactId>json-dynamic</artifactId>
-	<version>2.4.2-RC2</version>
+	<version>2.4.2</version>
 
 	<name>EclipseLink MOXy Dynamic JSON Example</name>
 	<url>http://wiki.eclipse.org/EclipseLink/Examples/MOXy</url>
@@ -42,7 +42,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<eclipselink.groupid>org.eclipse.persistence</eclipselink.groupid>
 		<eclipselink.artifactid>eclipselink</eclipselink.artifactid>
-		<eclipselink.version>2.4.2-RC2</eclipselink.version>
+		<eclipselink.version>2.4.2</eclipselink.version>
 	</properties>
 
 	<repositories>
diff --git a/moxy/json-simple/pom.xml b/moxy/json-simple/pom.xml
index 01d6d30..130a775 100644
--- a/moxy/json-simple/pom.xml
+++ b/moxy/json-simple/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>eclipselink.example.moxy</groupId>
 	<artifactId>json-simple</artifactId>
-	<version>2.4.2-RC2</version>
+	<version>2.4.2</version>
 
 	<name>EclipseLink MOXy Simple JSON Example</name>
 	<url>http://wiki.eclipse.org/EclipseLink/Examples/MOXy</url>
@@ -42,7 +42,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<eclipselink.groupid>org.eclipse.persistence</eclipselink.groupid>
 		<eclipselink.artifactid>eclipselink</eclipselink.artifactid>
-		<eclipselink.version>2.4.2-RC2</eclipselink.version>
+		<eclipselink.version>2.4.2</eclipselink.version>
 	</properties>
 
 	<repositories>
diff --git a/moxy/social-binding/pom.xml b/moxy/social-binding/pom.xml
index ce8564d..611b7f7 100644
--- a/moxy/social-binding/pom.xml
+++ b/moxy/social-binding/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>eclipselink.example.moxy</groupId>
     <artifactId>social-binding</artifactId>
-    <version>2.4.2-RC2</version>
+    <version>2.4.2</version>
 
     <name>EclipseLink Dynamic MOXy Social Binding Example</name>
     <url>http://wiki.eclipse.org/EclipseLink/Examples/MOXy</url>
@@ -36,7 +36,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <eclipselink.groupid>org.eclipse.persistence</eclipselink.groupid>
         <eclipselink.artifactid>eclipselink</eclipselink.artifactid>
-        <eclipselink.version>2.4.2-RC2</eclipselink.version>
+        <eclipselink.version>2.4.2</eclipselink.version>
     </properties>
 
     <repositories>
diff --git a/moxy/twitter/pom.xml b/moxy/twitter/pom.xml
index d124773..883568c 100644
--- a/moxy/twitter/pom.xml
+++ b/moxy/twitter/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>eclipselink.example.moxy</groupId>
 	<artifactId>twitter</artifactId>
-	<version>2.4.2-RC2</version>
+	<version>2.4.2</version>
 
 	<name>EclipseLink MOXy Twitter Example</name>
 	<url>http://wiki.eclipse.org/EclipseLink/Examples/MOXy</url>
@@ -42,7 +42,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<eclipselink.groupid>org.eclipse.persistence</eclipselink.groupid>
 		<eclipselink.artifactid>eclipselink</eclipselink.artifactid>
-		<eclipselink.version>2.4.2-RC2</eclipselink.version>
+		<eclipselink.version>2.4.2</eclipselink.version>
 	</properties>
 
 	<repositories>
diff --git a/nosql/mongo/pom.xml b/nosql/mongo/pom.xml
index 99dd7c9..75125c7 100644
--- a/nosql/mongo/pom.xml
+++ b/nosql/mongo/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>eclipselink.example</groupId>
 	<artifactId>nosql.mongo</artifactId>
-	<version>2.4.2-SNAPSHOT</version>
+	<version>2.4.2</version>
 
 	<repositories>
 		<repository>
@@ -13,6 +13,7 @@
 	</repositories>
 
 	<build>
+        <defaultGoal>test</defaultGoal>
 
 		<plugins>
 			<plugin>
@@ -29,12 +30,12 @@
 		<dependency>
 			<groupId>org.eclipse.persistence</groupId>
 			<artifactId>eclipselink</artifactId>
-			<version>2.4.2-SNAPSHOT</version>
+			<version>2.4.2</version>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.persistence</groupId>
 			<artifactId>org.eclipse.persistence.nosql</artifactId>
-			<version>2.4.2-SNAPSHOT</version>
+			<version>2.4.2</version>
 		</dependency>
 		<dependency>
 			<groupId>org.mongodb</groupId>
diff --git a/pom.xml b/pom.xml
index b4b00ef..c0a7b3a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>eclipselink.example</groupId>
 	<artifactId>parent</artifactId>
-	<version>2.4.2-SNAPSHOT</version>
+	<version>2.4.2</version>
 	<packaging>pom</packaging>
 
 	<name>Employee Example</name>
@@ -45,7 +45,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
  		<eclipselink.groupid>org.eclipse.persistence</eclipselink.groupid>
 		<eclipselink.artifactid>eclipselink</eclipselink.artifactid>
-		<eclipselink.version>2.4.2-SNAPSHOT</eclipselink.version>
+		<eclipselink.version>2.4.2</eclipselink.version>
 	</properties>
 
 	<repositories>