Merge pull request #1 from playframework/master

Merge

.gitattributes

@@ -1 +1 @@
-core/play-integration-test/src/test/resources/testassets/* binary
+core/play-integration-test/src/it/resources/testassets/* binary

.github/ISSUE_TEMPLATE.md

@@ -1,47 +1,64 @@
+<!--
+
+If you are reporting a bug, please be informative. This template can guide you to provide basic information, but you are not limited to that.
+
 ### Are you looking for help?
 
 This is an issue tracker, used to manage and track the development of Play. It is not a support system and so it is not a place to ask questions or get help. If you're not sure if you have found a bug, or if you have a feature request, the best place to start is with either the [Discuss Play Forum](https://discuss.playframework.com) or [Stack Overflow](http://stackoverflow.com/questions/ask?tags=playframework).
 
-### Play Version (2.5.x / etc)
+-->
+
+### Play Version
+
+<!-- The Play version used in project/plugins.sbt -->
 
 
+### API
 
-### API (Scala / Java / Neither / Both)
+<!-- If the project is using Scala, Java or both -->
 
 
+### Operating System
 
-### Operating System (Ubuntu 15.10 / MacOS 10.10 / Windows 10)
+<!-- Use `uname -a` if on Linux -->
 
-Use `uname -a` if on Linux.
 
-### JDK (Oracle 1.8.0_72, OpenJDK 1.8.x, Azul Zing)
+### JDK
 
-Paste the output from `java -version` at the command line.
+<!-- Paste the output from `java -version` at the command line. -->
 
 ### Library Dependencies
 
-If this is an issue that involves integration with another system, include the exact version and OS of the other system, including any intermediate drivers or APIs i.e. if you connect to a PostgreSQL database, include both the version / OS of PostgreSQL and the JDBC driver version used to connect to the database.
+<!-- If this is an issue that involves integration with another system, include the exact version and OS of the other system, including any intermediate drivers or APIs i.e. if you connect to a PostgreSQL database, include both the version / OS of PostgreSQL and the JDBC driver version used to connect to the database. -->
 
 ### Expected Behavior
 
-Please describe the expected behavior of the issue, starting from the first action.
+<!-- Please describe the expected behavior of the issue, starting from the first action. -->
 
 1.
 2.
 3.
 
 ### Actual Behavior
 
+<!--
+
 Please provide a description of what actually happens, working from the same starting point.
 
-Be descriptive: "it doesn't work" does not describe what the behavior actually is -- instead, say "the page renders a 500 error code with no body content."  Copy and paste logs, and include any URLs.  Turn on internal Play logging with `<logger name="play" value="TRACE"/>` if there is no log output.  
+Be descriptive: "it doesn't work" does not describe what the behavior actually is -- instead, say "the page renders a 500 error code with no body content."  Copy and paste logs, and include any URLs.  Turn on internal Play logging with `<logger name="play" value="TRACE"/>` if there is no log output.
+
+-->
 
 1.
 2.
 3.
 
 ### Reproducible Test Case
 
+<!--
+
 Please provide a PR with a failing test.  
 
 If the issue is more complex or requires configuration, please provide a link to a project on Github that reproduces the issue.
+
+-->

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,73 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+<!--
+
+If you are reporting a bug, please be informative. This template can guide you to provide basic information, but you are not limited to that.
+
+### Are you looking for help?
+
+This is an issue tracker, used to manage and track the development of Play. It is not a support system and so it is not a place to ask questions or get help. If you're not sure if you have found a bug, or if you have a feature request, the best place to start is with either the [Discuss Play Forum](https://discuss.playframework.com) or [Stack Overflow](http://stackoverflow.com/questions/ask?tags=playframework).
+
+-->
+
+### Play Version
+
+<!-- The Play version used in project/plugins.sbt -->
+
+
+### API
+
+<!-- If the project is using Scala, Java or both -->
+
+
+### Operating System
+
+<!-- Use `uname -a` if on Linux -->
+
+
+### JDK
+
+<!-- Paste the output from `java -version` at the command line. -->
+
+### Library Dependencies
+
+<!-- If this is an issue that involves integration with another system, include the exact version and OS of the other system, including any intermediate drivers or APIs i.e. if you connect to a PostgreSQL database, include both the version / OS of PostgreSQL and the JDBC driver version used to connect to the database. -->
+
+### Expected Behavior
+
+<!-- Please describe the expected behavior of the issue, starting from the first action. -->
+
+1.
+2.
+3.
+
+### Actual Behavior
+
+<!--
+
+Please provide a description of what actually happens, working from the same starting point.
+
+Be descriptive: "it doesn't work" does not describe what the behavior actually is -- instead, say "the page renders a 500 error code with no body content."  Copy and paste logs, and include any URLs.  Turn on internal Play logging with `<logger name="play" value="TRACE"/>` if there is no log output.
+
+-->
+
+1.
+2.
+3.
+
+### Reproducible Test Case
+
+<!--
+
+Please provide a PR with a failing test.  
+
+If the issue is more complex or requires configuration, please provide a link to a project on Github that reproduces the issue.
+
+-->

.gitignore

@@ -8,6 +8,11 @@ RUNNING_PID
 generated.keystore
 generated.truststore
 *.log
+!.travis-jvmopts
+
+.bloop
+.metals
+metals.sbt
 
 # Scala-IDE specific
 .scala_dependencies

.mergify.yml

@@ -7,13 +7,22 @@ pull_request_rules:
       - "#review-requested=0"
       - "#changes-requested-reviews-by=0"
       - label!=status:block-merge
+      - label=status:merge-when-green
     actions:
       merge:
-        method: squash
-        strict: smart
+        method: merge
 
-  - name: Delete the PR branch after merge
+  - name: Delete the PR branch and remove label after merge
     conditions:
       - merged
     actions:
       delete_head_branch: {}
+      label:
+        remove: [ "status:merge-when-green" ]
+
+  - name: Labeling for Scala Steward PR's
+    conditions:
+      - author=scala-steward
+    actions:
+      label:
+        add: [ "type:updates" ]

.sbtopts

@@ -0,0 +1,6 @@
+-J-Xms2G
+-J-Xmx2G
+-J-Xss2M
+-J-XX:MaxInlineLevel=18
+-J-XX:MaxMetaspaceSize=1G
+-J-Dfile.encoding=UTF-8

.scala-steward.conf

@@ -0,0 +1,29 @@
+allowedUpdates: [
+  // Apache Derby above 10.14 requires Java 9+. See
+  // https://db.apache.org/derby/derby_downloads.html
+  { groupId: "org.apache.derby", artifactId: "derby", version: "10.14." }
+]
+updates.ignore = [
+  // explicit updates
+  { groupId = "com.typesafe.akka" }, // Akka & Akka HTTP
+  { groupId = "org.scalameta", artifactId = "scalafmt-core" },
+  // these will get updated along with jackson-databind, so no need to update them
+  // separately
+  { groupId = "com.fasterxml.jackson.module", artifactId = "jackson-module-parameter-names" },
+  { groupId = "com.fasterxml.jackson.module", artifactId = "jackson-module-paranamer" },
+  { groupId = "com.fasterxml.jackson.module", artifactId = "jackson-module-scala" },
+  { groupId = "com.fasterxml.jackson.core", artifactId = "jackson-annotations" },
+  { groupId = "com.fasterxml.jackson.core", artifactId = "jackson-core" },
+  { groupId = "com.fasterxml.jackson.dataformat", artifactId = "jackson-dataformat-cbor" },
+  { groupId = "com.fasterxml.jackson.datatype", artifactId = "jackson-datatype-jsr310" },
+  { groupId = "com.fasterxml.jackson.datatype", artifactId = "jackson-datatype-jdk8" },
+  { groupId = "com.fasterxml.jackson.datatype", artifactId = "jackson-datatype-pcollections" },
+  { groupId = "com.fasterxml.jackson.datatype", artifactId = "jackson-datatype-guava" }
+]
+
+updates.pin = [
+  # To be updated in tandem with upstream Akka
+  { groupId = "com.fasterxml.jackson.core", artifactId = "jackson-databind", version = "2.10." }
+]
+
+updatePullRequests = false

.scalafmt.conf

@@ -1,3 +1,5 @@
+# ATTENTION:
+# Keep this in sync with documentation/.scalafmt.conf
 align = true
 assumeStandardLibraryStripMargin = true
 danglingParentheses = true
@@ -9,4 +11,4 @@ rewrite.rules = [ AvoidInfix, ExpandImportSelectors, RedundantParens, SortModifi
 rewrite.sortModifiers.order = [ "private", "protected", "final", "sealed", "abstract", "implicit", "override", "lazy" ]
 spaces.inImportCurlyBraces = true   # more idiomatic to include whitepsace in import x.{ yyy }
 trailingCommas = preserve
-version = 2.0.0-RC5
+version = 2.3.2