diff --git a/jpa-moxy/jpa-moxy.simple/pom.xml b/jpa-moxy/jpa-moxy.simple/pom.xml
index 59fe413..40fcd56 100644
--- a/jpa-moxy/jpa-moxy.simple/pom.xml
+++ b/jpa-moxy/jpa-moxy.simple/pom.xml
@@ -113,9 +113,10 @@
 					<plugin>
 						<groupId>org.codehaus.mojo</groupId>
 						<artifactId>exec-maven-plugin</artifactId>
-						<version>1.2.1</version>
+						<version>1.3.2</version>
 						<configuration>
-							<mainClass>eclipselink.example.jpamoxy.simple.InitDB</mainClass>
+                                                    <cleanupDaemonThreads>false</cleanupDaemonThreads>
+                                                    <mainClass>eclipselink.example.jpamoxy.simple.InitDB</mainClass>
 						</configuration>
 					</plugin>
 				</plugins>
@@ -128,7 +129,7 @@
 					<plugin>
 						<groupId>org.codehaus.mojo</groupId>
 						<artifactId>exec-maven-plugin</artifactId>
-						<version>1.2.1</version>
+						<version>1.3.2</version>
 						<configuration>
 							<mainClass>eclipselink.example.jpamoxy.simple.Marshall</mainClass>
 							<arguments>
@@ -146,7 +147,7 @@
 					<plugin>
 						<groupId>org.codehaus.mojo</groupId>
 						<artifactId>exec-maven-plugin</artifactId>
-						<version>1.2.1</version>
+						<version>1.3.2</version>
 						<configuration>
 							<mainClass>eclipselink.example.jpamoxy.simple.Marshall</mainClass>
 							<arguments>
@@ -164,7 +165,7 @@
 					<plugin>
 						<groupId>org.codehaus.mojo</groupId>
 						<artifactId>exec-maven-plugin</artifactId>
-						<version>1.2.1</version>
+						<version>1.3.2</version>
 						<configuration>
 							<mainClass>eclipselink.example.jpamoxy.simple.Unmarshall</mainClass>
 							<arguments>
@@ -182,7 +183,7 @@
 					<plugin>
 						<groupId>org.codehaus.mojo</groupId>
 						<artifactId>exec-maven-plugin</artifactId>
-						<version>1.2.1</version>
+						<version>1.3.2</version>
 						<configuration>
 							<mainClass>eclipselink.example.jpamoxy.simple.Unmarshall</mainClass>
 							<arguments>
diff --git a/jpa-moxy/jpa-moxy.simple/src/main/java/eclipselink/example/jpamoxy/simple/InitDB.java b/jpa-moxy/jpa-moxy.simple/src/main/java/eclipselink/example/jpamoxy/simple/InitDB.java
index 3c068af..8893a33 100755
--- a/jpa-moxy/jpa-moxy.simple/src/main/java/eclipselink/example/jpamoxy/simple/InitDB.java
+++ b/jpa-moxy/jpa-moxy.simple/src/main/java/eclipselink/example/jpamoxy/simple/InitDB.java
@@ -14,7 +14,7 @@
 public class InitDB {
 
 	public static void main(String[] args) {
-		Map<String, Object> properties = new HashMap<String, Object>();
+		Map<String, Object> properties = new HashMap<>();
 		properties.put("eclipselink.ddl-generation", "drop-and-create-tables");
 		properties.put("eclipselink.ddl-generation.output-mode", "database");
 		properties.put("eclipselink.logging.level", "FINE");