* 2016-02-01 Bump to gae 1.9.31 (ra)

* 2016-02-01 Bump to Ninja 5.3.1 (ra) * 2016-02-01 Fix archetype bug #14 (ra)
ninjaframework · Feb 1, 2016 · 16030ce · 16030ce
1 parent 7c72f5c
commit 16030ce
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 12 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,3 +1,11 @@
+1.9.31
+======
+
+* 2016-02-01 Bump to gae 1.9.31 (ra)
+* 2016-02-01 Bump to Ninja 5.3.1 (ra)
+* 2016-02-01 Fix archetype bug #14 (ra)
+
+
 1.9.30
 ======
 

diff --git a/...g-archetype/src/main/resources/archetype-resources/src/main/java/conf/StartupActions.java b/...g-archetype/src/main/resources/archetype-resources/src/main/java/conf/StartupActions.java
@@ -10,6 +10,11 @@
 
 import com.google.inject.Inject;
 import com.googlecode.objectify.Objectify;
+import com.googlecode.objectify.ObjectifyService;
+import java.io.Closeable;
+import java.io.IOException;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 @Singleton
 public class StartupActions {
@@ -23,13 +28,13 @@ public StartupActions(NinjaProperties ninjaProperties) {
 
     @Start(order=100)
     public void generateDummyDataWhenInTest() {
-
         if (ninjaProperties.isDev()) {
-
-            ObjectifyProvider.setup();
-
+            try (Closeable closeable = ObjectifyService.begin()) {
+                ObjectifyProvider.setup();
+            } catch (IOException ex) {
+                Logger.getLogger(StartupActions.class.getName()).log(Level.SEVERE, null, ex);
+            } 
         }
-
     }
 
 }
diff --git a/ninja-appengine-integration-test-blog/src/main/java/conf/StartupActions.java b/ninja-appengine-integration-test-blog/src/main/java/conf/StartupActions.java
@@ -7,6 +7,11 @@
 
 import com.google.inject.Inject;
 import com.googlecode.objectify.Objectify;
+import com.googlecode.objectify.ObjectifyService;
+import java.io.Closeable;
+import java.io.IOException;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 @Singleton
 public class StartupActions {
@@ -20,13 +25,13 @@ public StartupActions(NinjaProperties ninjaProperties) {
 
     @Start(order=100)
     public void generateDummyDataWhenInTest() {
-
         if (ninjaProperties.isDev()) {
-
-            ObjectifyProvider.setup();
-
+            try (Closeable closeable = ObjectifyService.begin()) {
+                ObjectifyProvider.setup();
+            } catch (IOException ex) {
+                Logger.getLogger(StartupActions.class.getName()).log(Level.SEVERE, null, ex);
+            } 
         }
-
     }
 
 }
diff --git a/pom.xml b/pom.xml
@@ -41,8 +41,8 @@
 
     <!-- pin encoding to utf-8 -->
     <properties>
-        <appengine.version>1.9.30</appengine.version>
-        <ninja.version>5.2.2</ninja.version>
+        <appengine.version>1.9.31</appengine.version>
+        <ninja.version>5.3.1</ninja.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <siteProjectVersion>${project.version}</siteProjectVersion>