Revert "Updating play support to 2.5.x"

This reverts commit da7bac0.
cloudfoundry · Aug 17, 2016 · bef3003 · bef3003
1 parent 66d35ea
commit bef3003
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/auto-reconfiguration/pom.xml b/auto-reconfiguration/pom.xml
@@ -38,7 +38,7 @@
         </dependency>
         <dependency>
             <groupId>com.typesafe.play</groupId>
-            <artifactId>play-server_2.11</artifactId>
+            <artifactId>play_2.10</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>

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
@@ -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
@@ -33,12 +33,12 @@
     <dependencies>
         <dependency>
             <groupId>com.typesafe.play</groupId>
-            <artifactId>play-server_2.11</artifactId>
+            <artifactId>play_2.10</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.typesafe.play</groupId>
-            <artifactId>play-java-jpa_2.11</artifactId>
+            <artifactId>play-java-jpa_2.10</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>

diff --git a/pom.xml b/pom.xml
@@ -38,7 +38,7 @@
         <mariadb.version>1.2.0</mariadb.version>
         <mockito.version>1.10.19</mockito.version>
         <postgresql.version>9.4-1201-jdbc4</postgresql.version>
-        <play.version>2.5.4</play.version>
+        <play.version>2.3.7</play.version>
         <spring.version>4.1.7.RELEASE</spring.version>
         <spring-amqp.version>1.4.5.RELEASE</spring-amqp.version>
         <spring-boot.version>1.2.5.RELEASE</spring-boot.version>
@@ -62,12 +62,12 @@
             </dependency>
             <dependency>
                 <groupId>com.typesafe.play</groupId>
-                <artifactId>play-server_2.11</artifactId>
+                <artifactId>play_2.10</artifactId>
                 <version>${play.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.typesafe.play</groupId>
-                <artifactId>play-java-jpa_2.11</artifactId>
+                <artifactId>play-java-jpa_2.10</artifactId>
                 <version>${play.version}</version>
             </dependency>
             <dependency>