From bef3003e688f0a568660a7d072fe010cdcceaa34 Mon Sep 17 00:00:00 2001 From: Ben Hale Date: Wed, 17 Aug 2016 11:34:36 -0700 Subject: [PATCH] Revert "Updating play support to 2.5.x" This reverts commit da7bac02e30a06b194d55fd7cfbb9d87f5a7cfc0. --- auto-reconfiguration/pom.xml | 2 +- .../org/cloudfoundry/reconfiguration/play/Bootstrap.java | 5 ++--- play-jpa-plugin/pom.xml | 4 ++-- pom.xml | 6 +++--- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/auto-reconfiguration/pom.xml b/auto-reconfiguration/pom.xml index b214eef..9578e58 100644 --- a/auto-reconfiguration/pom.xml +++ b/auto-reconfiguration/pom.xml @@ -38,7 +38,7 @@ com.typesafe.play - play-server_2.11 + play_2.10 provided diff --git a/auto-reconfiguration/src/main/java/org/cloudfoundry/reconfiguration/play/Bootstrap.java b/auto-reconfiguration/src/main/java/org/cloudfoundry/reconfiguration/play/Bootstrap.java index 37b7754..e242d8d 100644 --- a/auto-reconfiguration/src/main/java/org/cloudfoundry/reconfiguration/play/Bootstrap.java +++ b/auto-reconfiguration/src/main/java/org/cloudfoundry/reconfiguration/play/Bootstrap.java @@ -19,7 +19,7 @@ import org.cloudfoundry.reconfiguration.util.CloudUtils; import org.cloudfoundry.reconfiguration.util.StandardCloudUtils; import org.springframework.cloud.Cloud; -import play.core.server.ProdServerStart; +import play.core.server.NettyServer; /** * Wrapper that takes care of environment initialization and auto-reconfiguration before starting the main Play @@ -43,8 +43,7 @@ public static void main(String[] args) { Configurer.configure(new StandardApplicationConfiguration(), cloud, new StandardPropertySetter(cloud)); } - //In play 2.5.x, you have to start it with ProdServerStart - ProdServerStart.main(args); + NettyServer.main(args); } } diff --git a/play-jpa-plugin/pom.xml b/play-jpa-plugin/pom.xml index 77c3143..ff0f622 100644 --- a/play-jpa-plugin/pom.xml +++ b/play-jpa-plugin/pom.xml @@ -33,12 +33,12 @@ com.typesafe.play - play-server_2.11 + play_2.10 provided com.typesafe.play - play-java-jpa_2.11 + play-java-jpa_2.10 provided diff --git a/pom.xml b/pom.xml index 8d443c2..55b4db5 100644 --- a/pom.xml +++ b/pom.xml @@ -38,7 +38,7 @@ 1.2.0 1.10.19 9.4-1201-jdbc4 - 2.5.4 + 2.3.7 4.1.7.RELEASE 1.4.5.RELEASE 1.2.5.RELEASE @@ -62,12 +62,12 @@ com.typesafe.play - play-server_2.11 + play_2.10 ${play.version} com.typesafe.play - play-java-jpa_2.11 + play-java-jpa_2.10 ${play.version}