Merge pull request #104 from ignasi35/bump-play-282

playframework · May 21, 2020 · e230763 · e230763
2 parents 75fcbff + a252226
commit e230763
Show file tree

Hide file tree

Showing 36 changed files with 48 additions and 38 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -43,7 +43,6 @@ env:
     - SCRIPT="cd play-java-ebean-example           && scripts/test-sbt" TRAVIS_JDK=11
     - SCRIPT="cd play-java-fileupload-example      && scripts/test-sbt" TRAVIS_JDK=11
     - SCRIPT="cd play-java-forms-example           && scripts/test-sbt" TRAVIS_JDK=11
-    - SCRIPT="cd play-java-grpc-example            && scripts/test-sbt" TRAVIS_JDK=11
     - SCRIPT="cd play-java-hello-world-tutorial    && scripts/test-sbt" TRAVIS_JDK=11
     - SCRIPT="cd play-java-jpa-example             && scripts/test-sbt" TRAVIS_JDK=11
     - SCRIPT="cd play-java-rest-api-example        && scripts/test-sbt" TRAVIS_JDK=11
@@ -55,7 +54,6 @@ env:
     - SCRIPT="cd play-scala-compile-di-example     && scripts/test-sbt" TRAVIS_JDK=11
     - SCRIPT="cd play-scala-fileupload-example     && scripts/test-sbt" TRAVIS_JDK=11
     - SCRIPT="cd play-scala-forms-example          && scripts/test-sbt" TRAVIS_JDK=11
-    - SCRIPT="cd play-scala-grpc-example           && scripts/test-sbt" TRAVIS_JDK=11
     - SCRIPT="cd play-scala-hello-world-tutorial   && scripts/test-sbt" TRAVIS_JDK=11
     - SCRIPT="cd play-scala-isolated-slick-example && scripts/test-sbt" TRAVIS_JDK=11
     - SCRIPT="cd play-scala-log4j2-example         && scripts/test-sbt" TRAVIS_JDK=11
@@ -68,6 +66,18 @@ env:
     - SCRIPT="cd play-scala-tls-example            && scripts/test-sbt" TRAVIS_JDK=11
     - SCRIPT="cd play-scala-websocket-example      && scripts/test-sbt" TRAVIS_JDK=11
 
+
+matrix:
+  fast_finish: true
+  allow_failures:
+    # The gRPC samples fail on 2.8.x because of a non-evicted dependency of akka-http causing 
+    # cross-version checks in Akka HTTP to fail.
+    - env: SCRIPT="cd play-java-grpc-example            && scripts/test-sbt"
+    - env: SCRIPT="cd play-scala-grpc-example           && scripts/test-sbt"
+    - env: SCRIPT="cd play-java-grpc-example            && scripts/test-sbt" TRAVIS_JDK=11
+    - env: SCRIPT="cd play-scala-grpc-example           && scripts/test-sbt" TRAVIS_JDK=11
+
+
 before_install:
   - sudo add-apt-repository -y ppa:ondrej/php && sudo apt-get -qq update && sudo apt-get install -y libsodium-dev # for secure session examples
   - curl -Ls https://git.io/jabba | bash && . ~/.jabba/jabba.sh

diff --git a/play-java-chatroom-example/project/plugins.sbt b/play-java-chatroom-example/project/plugins.sbt
@@ -1,3 +1,3 @@
 // The Play plugin
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.1")
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.2")
 
diff --git a/play-java-compile-di-example/project/plugins.sbt b/play-java-compile-di-example/project/plugins.sbt
@@ -1 +1 @@
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.1")
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.2")
diff --git a/play-java-dagger2-example/project/plugins.sbt b/play-java-dagger2-example/project/plugins.sbt
@@ -1,2 +1,2 @@
 // The Play plugin
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.1")
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.2")
diff --git a/play-java-ebean-example/project/plugins.sbt b/play-java-ebean-example/project/plugins.sbt
@@ -1,4 +1,4 @@
 // The Play plugin
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.1")
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.2")
 
 addSbtPlugin("com.typesafe.sbt" % "sbt-play-ebean" % "5.0.2")
diff --git a/play-java-ebean-example/test/BrowserTest.java b/play-java-ebean-example/test/BrowserTest.java
@@ -1,6 +1,6 @@
 import static org.fluentlenium.core.filter.FilterConstructor.withText;
 import static org.hamcrest.CoreMatchers.equalTo;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import org.junit.Test;
 import play.api.test.Helpers;

diff --git a/play-java-fileupload-example/project/plugins.sbt b/play-java-fileupload-example/project/plugins.sbt
@@ -1,2 +1,2 @@
 // The Play plugin
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.1")
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.2")
diff --git a/play-java-forms-example/project/plugins.sbt b/play-java-forms-example/project/plugins.sbt
@@ -1,2 +1,2 @@
 // The Play plugin
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.1")
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.2")
diff --git a/play-java-grpc-example/project/plugins.sbt b/play-java-grpc-example/project/plugins.sbt
@@ -3,7 +3,7 @@ val playGrpcV = "0.8.1"
 buildInfoKeys := Seq[BuildInfoKey]("playGrpcVersion" -> playGrpcV)
 buildInfoPackage := "play.java.grpc.sample"
 
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.1")
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.2")
 
 // #grpc_sbt_plugin
 // project/plugins.sbt

diff --git a/play-java-hello-world-tutorial/project/plugins.sbt b/play-java-hello-world-tutorial/project/plugins.sbt
@@ -1 +1 @@
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.1")
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.2")
diff --git a/play-java-jpa-example/project/plugins.sbt b/play-java-jpa-example/project/plugins.sbt
@@ -1,5 +1,5 @@
 // The Play plugin
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.1")
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.2")
 
 // Web plugins
 addSbtPlugin("com.typesafe.sbt" % "sbt-coffeescript" % "1.0.2")

diff --git a/play-java-jpa-example/test/AcceptanceTest.java b/play-java-jpa-example/test/AcceptanceTest.java
@@ -1,7 +1,7 @@
 import org.junit.Test;
 
 import static org.hamcrest.CoreMatchers.containsString;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static play.test.Helpers.*;
 
 public class AcceptanceTest {

diff --git a/play-java-rest-api-example/project/plugins.sbt b/play-java-rest-api-example/project/plugins.sbt
@@ -1,5 +1,5 @@
 // The Play plugin
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.1")
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.2")
 
 // Load testing tool:
 // http://gatling.io/docs/2.2.2/extensions/sbt_plugin.html

diff --git a/play-java-rest-api-example/test/it/IntegrationTest.java b/play-java-rest-api-example/test/it/IntegrationTest.java
@@ -93,7 +93,7 @@ public void testTimeoutOnUpdate() {
                 .uri("/v1/posts/1");
 
         Result result = route(app, request);
-        assertThat(result.status(), equalTo(GATEWAY_TIMEOUT));
+        org.hamcrest.MatcherAssert.assertThat(result.status(), equalTo(GATEWAY_TIMEOUT));
     }
 
     @Test
@@ -106,7 +106,7 @@ public void testCircuitBreakerOnShow() {
                 .uri("/v1/posts/1");
 
         Result result = route(app, request);
-        assertThat(result.status(), equalTo(SERVICE_UNAVAILABLE));
+        org.hamcrest.MatcherAssert.assertThat(result.status(), equalTo(SERVICE_UNAVAILABLE));
     }
 
 

diff --git a/play-java-starter-example/project/plugins.sbt b/play-java-starter-example/project/plugins.sbt
@@ -1,2 +1,2 @@
 // The Play plugin
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.1")
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.2")
diff --git a/play-java-streaming-example/project/plugins.sbt b/play-java-streaming-example/project/plugins.sbt
@@ -1,2 +1,2 @@
 // Use the Play sbt plugin for Play projects
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.1")
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.2")
diff --git a/play-java-telemetry-example/project/plugins.sbt b/play-java-telemetry-example/project/plugins.sbt
@@ -1,5 +1,5 @@
 // The Play plugin
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.1")
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.2")
 
 addSbtPlugin("com.lightbend.cinnamon" % "sbt-cinnamon" % "2.12.4")
 

diff --git a/play-java-websocket-example/project/plugins.sbt b/play-java-websocket-example/project/plugins.sbt
@@ -1,4 +1,4 @@
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.1")
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.2")
 
 addSbtPlugin("com.typesafe.sbt" % "sbt-less" % "1.1.2")
 

diff --git a/play-scala-anorm-example/project/plugins.sbt b/play-scala-anorm-example/project/plugins.sbt
@@ -1,3 +1,3 @@
 // The Play plugin
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.1")
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.2")
 
diff --git a/play-scala-chatroom-example/project/plugins.sbt b/play-scala-chatroom-example/project/plugins.sbt
@@ -1 +1 @@
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.1")
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.2")
diff --git a/play-scala-compile-di-example/project/plugins.sbt b/play-scala-compile-di-example/project/plugins.sbt
@@ -1 +1 @@
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.1")
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.2")
diff --git a/play-scala-fileupload-example/project/plugins.sbt b/play-scala-fileupload-example/project/plugins.sbt
@@ -3,4 +3,4 @@ resolvers += Resolver.typesafeRepo("snapshots")
 resolvers += Resolver.jcenterRepo
 
 // The Play plugin
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.1")
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.2")
diff --git a/play-scala-forms-example/project/plugins.sbt b/play-scala-forms-example/project/plugins.sbt
@@ -1 +1 @@
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.1")
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.2")
diff --git a/play-scala-grpc-example/project/plugins.sbt b/play-scala-grpc-example/project/plugins.sbt
@@ -4,7 +4,7 @@ buildInfoKeys := Seq[BuildInfoKey]("playGrpcVersion" -> playGrpcV)
 buildInfoPackage := "play.scala.grpc.sample"
 
 
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.1")
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.2")
 
 // #grpc_sbt_plugin
 // project/plugins.sbt

diff --git a/play-scala-hello-world-tutorial/project/plugins.sbt b/play-scala-hello-world-tutorial/project/plugins.sbt
@@ -1 +1 @@
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.1")
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.2")
diff --git a/play-scala-isolated-slick-example/project/plugins.sbt b/play-scala-isolated-slick-example/project/plugins.sbt
@@ -11,4 +11,4 @@ addSbtPlugin("io.github.davidmweber" % "flyway-sbt" % "6.2.2")
 addSbtPlugin("com.github.tototoshi" % "sbt-slick-codegen" % "1.4.0")
 
 // The Play plugin
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.1")
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.2")
diff --git a/play-scala-log4j2-example/project/plugins.sbt b/play-scala-log4j2-example/project/plugins.sbt
@@ -1,2 +1,2 @@
 // The Play plugin
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.1")
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.2")
diff --git a/play-scala-macwire-di-example/project/plugins.sbt b/play-scala-macwire-di-example/project/plugins.sbt
@@ -1 +1 @@
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.1")
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.2")
diff --git a/play-scala-rest-api-example/project/plugins.sbt b/play-scala-rest-api-example/project/plugins.sbt
@@ -1,5 +1,5 @@
 // The Play plugin
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.1")
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.2")
 
 // sbt-paradox, used for documentation
 addSbtPlugin("com.lightbend.paradox" % "sbt-paradox" % "0.4.4")

diff --git a/play-scala-secure-session-example/project/plugins.sbt b/play-scala-secure-session-example/project/plugins.sbt
@@ -1,2 +1,2 @@
 // The Play plugin
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.1")
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.2")
diff --git a/play-scala-slick-example/project/plugins.sbt b/play-scala-slick-example/project/plugins.sbt
@@ -1,2 +1,2 @@
 // The Play plugin
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.1")
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.2")
diff --git a/play-scala-starter-example/project/plugins.sbt b/play-scala-starter-example/project/plugins.sbt
@@ -1,2 +1,2 @@
 // The Play plugin
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.1")
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.2")
diff --git a/play-scala-streaming-example/project/plugins.sbt b/play-scala-streaming-example/project/plugins.sbt
@@ -1,2 +1,2 @@
 // Use the Play sbt plugin for Play projects
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.1")
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.2")
diff --git a/play-scala-telemetry-example/project/plugins.sbt b/play-scala-telemetry-example/project/plugins.sbt
@@ -1,5 +1,5 @@
 // The Play plugin
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.1")
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.2")
 
 addSbtPlugin("com.lightbend.cinnamon" % "sbt-cinnamon" % "2.12.4")
 

diff --git a/play-scala-tls-example/project/plugins.sbt b/play-scala-tls-example/project/plugins.sbt
@@ -1,2 +1,2 @@
 // The Play plugin
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.1")
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.2")
diff --git a/play-scala-websocket-example/project/plugins.sbt b/play-scala-websocket-example/project/plugins.sbt
@@ -1,5 +1,5 @@
 // Use the Play sbt plugin for Play projects
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.1")
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.2")
 
 addSbtPlugin("com.typesafe.sbt" % "sbt-less" % "1.1.2")