From d41159bfe368a6b9afe847a968dee21a5e36817b Mon Sep 17 00:00:00 2001
From: Robin Bygrave <robin.bygrave@gmail.com>
Date: Sat, 15 Sep 2012 00:39:47 +1200
Subject: [PATCH 1/4] Tidy up pom with specific dependencies etc

---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index bb01ea3ed..1af0b6fb0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,13 +61,13 @@
     <dependency>
       <groupId>org.avaje.ebeanorm</groupId>
       <artifactId>avaje-ebeanorm-api</artifactId>
-      <version>[3.1,4)</version>
+      <version>[3.1.1]</version>
     </dependency>
 
     <dependency>
       <groupId>org.avaje.ebeanorm</groupId>
       <artifactId>avaje-ebeanorm-agent</artifactId>
-      <version>[3.1,4)</version>
+      <version>[3.1.1]</version>
     </dependency>
 
     <dependency>
@@ -128,7 +128,7 @@
       <plugin>
         <groupId>org.avaje.ebeanorm</groupId>
         <artifactId>avaje-ebeanorm-mavenenhancer</artifactId>
-        <version>3.1.1-SNAPSHOT</version>
+        <version>3.1.1</version>
         <executions>
           <execution>
             <id>main</id>

From 83aced84a25ed3af602b1bb14d140d1349587a18 Mon Sep 17 00:00:00 2001
From: Robin Bygrave <robin.bygrave@gmail.com>
Date: Sat, 15 Sep 2012 00:41:31 +1200
Subject: [PATCH 2/4] [maven-release-plugin] prepare release
 avaje-ebeanorm-server-3.1.1

---
 pom.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1af0b6fb0..677d171c3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
@@ -10,7 +9,7 @@
 
   <groupId>org.avaje.ebeanorm</groupId>
   <artifactId>avaje-ebeanorm-server</artifactId>
-  <version>3.1.1-SNAPSHOT</version>
+  <version>3.1.1</version>
   <packaging>jar</packaging>
 
   <name>avaje-ebeanorm-server</name>

From fb8b435d7eb3c5403982990f45ff6afb66b927a2 Mon Sep 17 00:00:00 2001
From: Robin Bygrave <robin.bygrave@gmail.com>
Date: Sat, 15 Sep 2012 00:41:42 +1200
Subject: [PATCH 3/4] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 677d171c3..bbf194a52 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>org.avaje.ebeanorm</groupId>
   <artifactId>avaje-ebeanorm-server</artifactId>
-  <version>3.1.1</version>
+  <version>3.1.2-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>avaje-ebeanorm-server</name>

From 0014961769771ff7510f9184559f91cfa6e79a21 Mon Sep 17 00:00:00 2001
From: James Roper <james@jazzy.id.au>
Date: Fri, 28 Sep 2012 19:37:33 +1000
Subject: [PATCH 4/4] [#428] Fixing ManyToMany association saving bug

---
 .../ebeaninternal/server/persist/DefaultPersister.java     | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/DefaultPersister.java b/src/main/java/com/avaje/ebeaninternal/server/persist/DefaultPersister.java
index a8c29748c..c82b03d64 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/persist/DefaultPersister.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/persist/DefaultPersister.java
@@ -777,11 +777,10 @@ public final class DefaultPersister implements Persister {
 			if (saveMany.isCascade()) {
 				// Need explicit Cascade to save the beans on other side
 				saveAssocManyDetails(saveMany, false, saveMany.isUpdateNullProperties());
-				// for ManyToMany save the 'relationship' via inserts/deletes
-				// into/from the intersection table
-				saveAssocManyIntersection(saveMany, saveMany.isDeleteMissingChildren());
 			}
-
+			// for ManyToMany save the 'relationship' via inserts/deletes
+			// into/from the intersection table
+			saveAssocManyIntersection(saveMany, saveMany.isDeleteMissingChildren());
 		} else {
 			if (saveMany.isCascade()) {
 				saveAssocManyDetails(saveMany, saveMany.isDeleteMissingChildren(), saveMany.isUpdateNullProperties());