diff --git a/.gitignore b/.gitignore
index 84f198a..a3faa8c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,6 +18,7 @@
 *.zip
 *.tar.gz
 *.rar
+*.dat
 
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
diff --git a/ejbdemo/ejbdemo.iml b/ejbdemo/ejbdemo.iml
index 39dfcd5..eb85289 100644
--- a/ejbdemo/ejbdemo.iml
+++ b/ejbdemo/ejbdemo.iml
@@ -17,6 +17,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/target/generated-sources/annotations" isTestSource="false" generated="true" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
@@ -27,6 +28,7 @@
     <orderEntry type="library" name="Maven: org.eclipse.persistence:org.eclipse.persistence.antlr:2.5.0" level="project" />
     <orderEntry type="library" name="Maven: org.eclipse.persistence:org.eclipse.persistence.jpa.jpql:2.5.0" level="project" />
     <orderEntry type="library" name="Maven: org.eclipse.persistence:org.eclipse.persistence.core:2.5.0" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.eclipse.persistence:org.eclipse.persistence.jpa.modelgen.processor:2.5.0" level="project" />
     <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.0.16.Final" level="project" />
     <orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
     <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.2.Final" level="project" />
@@ -35,7 +37,7 @@
     <orderEntry type="library" name="Maven: org.apache.derby:derbyclient:10.9.1.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.apache.derby:derby:10.9.1.0" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.projectlombok:lombok:1.18.6" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.glassfish.main.extras:glassfish-embedded-all:4.0" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.glassfish.main.extras:glassfish-embedded-all:4.1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
   </component>
diff --git a/ejbdemo/pom.xml b/ejbdemo/pom.xml
index 9445b13..ad6d1d7 100644
--- a/ejbdemo/pom.xml
+++ b/ejbdemo/pom.xml
@@ -24,6 +24,12 @@
       <groupId>org.eclipse.persistence</groupId>
       <artifactId>org.eclipse.persistence.jpa</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.persistence</groupId>
+      <artifactId>org.eclipse.persistence.jpa.modelgen.processor</artifactId>
+      <version>2.5.0</version>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>org.hibernate</groupId>
       <artifactId>hibernate-validator</artifactId>
diff --git a/ejbdemo/src/main/java/it/plague/jeedemo/Book.java b/ejbdemo/src/main/java/it/plague/jeedemo/Book.java
index f0f7d9b..541f323 100644
--- a/ejbdemo/src/main/java/it/plague/jeedemo/Book.java
+++ b/ejbdemo/src/main/java/it/plague/jeedemo/Book.java
@@ -8,6 +8,7 @@ import javax.persistence.Id;
 import javax.persistence.NamedQuery;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -15,6 +16,7 @@ import lombok.NoArgsConstructor;
 @Entity
 @Data
 @NoArgsConstructor
+@AllArgsConstructor
 @Builder
 @NamedQuery(name = "Book.findAll", query = "select b from Book b")
 public class Book implements Serializable {
diff --git a/ejbdemo/src/main/java/it/plague/jeedemo/DatabasePopulator.java b/ejbdemo/src/main/java/it/plague/jeedemo/DatabasePopulator.java
index 8ba1f3d..7dd5b01 100644
--- a/ejbdemo/src/main/java/it/plague/jeedemo/DatabasePopulator.java
+++ b/ejbdemo/src/main/java/it/plague/jeedemo/DatabasePopulator.java
@@ -3,18 +3,18 @@ package it.plague.jeedemo;
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 import javax.annotation.sql.DataSourceDefinition;
-import javax.ejb.Singleton;
 import javax.ejb.Startup;
+import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Inject;
 
 
 @Startup
-@Singleton
+@ApplicationScoped
 @DataSourceDefinition(
     className = "org.apache.derby.jdbc.EmbeddedDataSource",
     name = "java:global/jdbc/ejbdemoDS",
-    user = "app",
-    password = "app",
+    user = "APP",
+    password = "APP",
     databaseName = "ejbdemo",
     properties = {"connectionAttributes=;create=true"})
 public class DatabasePopulator {
diff --git a/ejbdemo/src/test/java/it/plague/jeedemo/BookEJBIT.java b/ejbdemo/src/test/java/it/plague/jeedemo/BookEJBIT.java
index 5856513..4bff095 100644
--- a/ejbdemo/src/test/java/it/plague/jeedemo/BookEJBIT.java
+++ b/ejbdemo/src/test/java/it/plague/jeedemo/BookEJBIT.java
@@ -1,6 +1,7 @@
 package it.plague.jeedemo;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 
 import java.io.File;
 import java.util.HashMap;
@@ -24,7 +25,8 @@ public class BookEJBIT {
       assertNotNull(ctx.lookup("java:global/classes/BookEJB!it.plague.jeedemo.BookEJB"));
 
       // Looks up the EJB
-      BookEJB bookEJB = (BookEJB) ctx.lookup("java:global/classes/BookEJB!it.plague.jeedemo.BookEJB");
+      BookEJB bookEJB = (BookEJB) ctx
+          .lookup("java:global/classes/BookEJB!it.plague.jeedemo.BookEJB");
 
       // Find all the books and makes sure there are two (inserted by the DBPopulator)
       assertEquals(2, bookEJB.findBooks().size());
diff --git a/pom.xml b/pom.xml
index 4f79e02..b11af7c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,7 +51,7 @@
       <dependency>
         <groupId>org.glassfish.main.extras</groupId>
         <artifactId>glassfish-embedded-all</artifactId>
-        <version>4.0</version>
+        <version>4.1</version>
         <scope>provided</scope>
       </dependency>
       <dependency>