diff --git a/pom.xml b/pom.xml
index 057c51bb2..b1b896bd2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,7 +35,7 @@
     <dependency>
       <groupId>org.avaje.ebean</groupId>
       <artifactId>persistence-api</artifactId>
-      <version>2.1.1</version>
+      <version>2.1.2</version>
     </dependency>
 
     <dependency>
diff --git a/src/test/java/com/avaje/tests/compositekeys/db/CaoBean.java b/src/test/java/com/avaje/tests/compositekeys/db/CaoBean.java
index 2d46b86a4..8978b3972 100644
--- a/src/test/java/com/avaje/tests/compositekeys/db/CaoBean.java
+++ b/src/test/java/com/avaje/tests/compositekeys/db/CaoBean.java
@@ -1,7 +1,6 @@
 package com.avaje.tests.compositekeys.db;
 
 import javax.persistence.AttributeOverride;
-import javax.persistence.AttributeOverrides;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
@@ -11,10 +10,8 @@ import javax.persistence.Version;
 public class CaoBean {
 
   @Id
-  @AttributeOverrides({
-    @AttributeOverride(name = "customer", column = @Column(name = "x_cust_id")),
-    @AttributeOverride(name = "type", column = @Column(name = "x_type_id"))
-  })
+  @AttributeOverride(name = "customer", column = @Column(name = "x_cust_id"))
+  @AttributeOverride(name = "type", column = @Column(name = "x_type_id"))
   private CaoKey key;
 
   private String description;
diff --git a/src/test/java/com/avaje/tests/compositekeys/db/Item.java b/src/test/java/com/avaje/tests/compositekeys/db/Item.java
index 972485d0d..4d72380df 100644
--- a/src/test/java/com/avaje/tests/compositekeys/db/Item.java
+++ b/src/test/java/com/avaje/tests/compositekeys/db/Item.java
@@ -25,29 +25,23 @@ public class Item {
   private int region;
 
   @Embedded
-  @AttributeOverrides({
-    @AttributeOverride(name = "lastUpdated", column = @Column(name = "DATE_MODIFIED")),
-    @AttributeOverride(name = "created", column = @Column(name = "DATE_CREATED")),
-    @AttributeOverride(name = "updatedBy", column = @Column(name = "MODIFIED_BY")),
-    @AttributeOverride(name = "createdBy", column = @Column(name = "CREATED_BY"))
-  })
+  @AttributeOverride(name = "lastUpdated", column = @Column(name = "DATE_MODIFIED"))
+  @AttributeOverride(name = "created", column = @Column(name = "DATE_CREATED"))
+  @AttributeOverride(name = "updatedBy", column = @Column(name = "MODIFIED_BY"))
+  @AttributeOverride(name = "createdBy", column = @Column(name = "CREATED_BY"))
   private AuditInfo auditInfo = new AuditInfo();
 
   @Version
   private Long version;
 
   @ManyToOne
-  @JoinColumns({
-    @JoinColumn(name = "customer", referencedColumnName = "customer", insertable = false, updatable = false),
-    @JoinColumn(name = "type", referencedColumnName = "type", insertable = false, updatable = false)
-  })
+  @JoinColumn(name = "customer", referencedColumnName = "customer", insertable = false, updatable = false)
+  @JoinColumn(name = "type", referencedColumnName = "type", insertable = false, updatable = false)
   private Type eType;
 
   @ManyToOne
-  @JoinColumns({
-    @JoinColumn(name = "customer", referencedColumnName = "customer", insertable = false, updatable = false),
-    @JoinColumn(name = "region", referencedColumnName = "type", insertable = false, updatable = false)
-  })
+  @JoinColumn(name = "customer", referencedColumnName = "customer", insertable = false, updatable = false)
+  @JoinColumn(name = "region", referencedColumnName = "type", insertable = false, updatable = false)
   private Region eRegion;
 
   public ItemKey getKey() {
diff --git a/src/test/java/com/avaje/tests/model/embedded/PrimaryRevision.java b/src/test/java/com/avaje/tests/model/embedded/PrimaryRevision.java
index 06f8f770c..5aef927a2 100644
--- a/src/test/java/com/avaje/tests/model/embedded/PrimaryRevision.java
+++ b/src/test/java/com/avaje/tests/model/embedded/PrimaryRevision.java
@@ -10,9 +10,6 @@ import javax.persistence.Version;
 public class PrimaryRevision {
 
   @EmbeddedId
-//  @AttributeOverrides({
-//    @AttributeOverride(name="primaryId", column = @Column(name="id"))
-//  })
   @AttributeOverride(name = "primaryId", column = @Column(name = "id"))
   private RevisionId revisionId;