diff --git a/pom.xml b/pom.xml
index e61f506..9e36256 100644
--- a/pom.xml
+++ b/pom.xml
@@ -163,13 +163,13 @@
         <dependency>
             <groupId>org.datanucleus</groupId>
             <artifactId>datanucleus-guava</artifactId>
-            <version>5.0.1</version>
+            <version>5.2.1</version>
         </dependency>
 
         <dependency>
             <groupId>org.datanucleus</groupId>
             <artifactId>datanucleus-jodatime</artifactId>
-            <version>5.0.0-release</version>
+            <version>5.2.1</version>
         </dependency>
 
         <dependency>
@@ -465,16 +465,17 @@
             <plugin>
                 <groupId>org.datanucleus</groupId>
                 <artifactId>datanucleus-maven-plugin</artifactId>
-                <version>5.0.0-release</version>
+                <version>5.2.1</version>
                 <configuration>
                     <api>JPA</api>
                     <persistenceUnitName>crud</persistenceUnitName>
                     <persistenceUnitName>mongo</persistenceUnitName>
+                    <log4jConfiguration>${basedir}/log4j.properties</log4jConfiguration>
                     <verbose>true</verbose>
                 </configuration>
                 <executions>
                     <execution>
-                        <phase>compile</phase>
+                        <phase>process-classes</phase>
                         <goals>
                             <goal>enhance</goal>
                         </goals>
diff --git a/src/main/java/com/example/crud/entities/Inventory.java b/src/main/java/com/example/crud/entities/Inventory.java
index 07f04d4..a8e6de7 100644
--- a/src/main/java/com/example/crud/entities/Inventory.java
+++ b/src/main/java/com/example/crud/entities/Inventory.java
@@ -19,7 +19,7 @@ import java.util.Set;
 @NamedEntityGraph(name = "allProps",
         attributeNodes = { @NamedAttributeNode("name"), @NamedAttributeNode("products") })
 @ToString
-@EqualsAndHashCode
+@EqualsAndHashCode(callSuper=false)
 @Getter @Setter
 @IdClass(Inventory.ID.class)
 public class Inventory extends AbstractAuditableEntity<String> {
diff --git a/src/main/java/com/example/crud/entities/Product.java b/src/main/java/com/example/crud/entities/Product.java
index 1de6713..983bc20 100644
--- a/src/main/java/com/example/crud/entities/Product.java
+++ b/src/main/java/com/example/crud/entities/Product.java
@@ -2,6 +2,7 @@ package com.example.crud.entities;
 
 import lombok.Data;
 import lombok.ToString;
+import lombok.EqualsAndHashCode;
 
 import javax.persistence.*;
 
@@ -11,6 +12,7 @@ import javax.persistence.*;
  **/
 @Data @Entity
 @ToString
+@EqualsAndHashCode(callSuper=false)
 @Inheritance(strategy = InheritanceType.TABLE_PER_CLASS)
 public class Product extends AbstractAuditableEntity {