New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[master] Upgrade dependencies to fix CI cron build #11081
Changes from 15 commits
a88e5b2
9b5e296
5448499
c6cc56a
650d828
7a8e3dc
ca316dd
18b7395
7e25cde
c9320b3
7b15588
ed266ca
2f426ff
7d8aa51
7f251a8
7faf24d
aca90c3
efac1ce
eb6b750
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -11,7 +11,7 @@ env: | |
global: | ||
- secure: "NS2hMbBcmi6EF4QxtcNs4A2ZuNmIdLYQRJUWWejgnD4YtcsmoVjxrHRedqrnDdui4DyvaxWhg/3Uds23jEKTSbbh3ZphLO77BVgM2nUGUvVoa4i6qGF2eZFlIhq2G1gM700GPV7X4KmyjYi2HtH8CWBTkqP3g0An63mCZw/Gnlk=" | ||
# These are the versions used for (scripted) tests. The versions Play is build with however are defined in interplay. | ||
- SCRIPTED_SBT_1_5: "1.5.8" | ||
- SCRIPTED_SBT_1_6: "1.6.1" | ||
- TEST_SCALA_2_13: "2.13.7" | ||
jobs: | ||
- TRAVIS_JDK=11 | ||
|
@@ -29,7 +29,7 @@ install: jabba install $(jabba ls-remote "adopt@~1.$TRAVIS_JDK.0-0" --latest=pat | |
stages: | ||
- validations | ||
- test | ||
- cron-test-sbt-1.5.x | ||
- test-sbt-1.6.x | ||
- java8 | ||
|
||
jobs: | ||
|
@@ -49,7 +49,7 @@ jobs: | |
name: published-local-jdk8 | ||
paths: "$HOME/.ivy2/local/com.typesafe.play" | ||
- script: scripts/validate-code | ||
name: "Code validations (format, binary compatibilty, whitesource, etc.)" | ||
name: "Code validations (format, binary compatibilty, etc.)" | ||
- script: scripts/validate-docs | ||
name: "Validate docs (links, sample code, etc.)" | ||
- script: scripts/validate-microbenchmarks | ||
|
@@ -64,11 +64,17 @@ jobs: | |
- script: scripts/test-docs $TEST_SCALA_2_13 | ||
name: "Run documentation tests 2.13" | ||
|
||
# Test against sbt 1.5.x, but only for cron builds | ||
- stage: cron-test-sbt-1.5.x | ||
name: "Run tests for 1.5.x and Scala 2.13.x" | ||
script: scripts/test-scripted $SCRIPTED_SBT_1_5 $TEST_SCALA_2_13 | ||
if: type = cron | ||
- stage: test-sbt-1.6.x | ||
name: "Run scripted tests (a) for sbt 1.6.x and Scala 2.13.x" | ||
script: scripts/test-scripted $SCRIPTED_SBT_1_6 $TEST_SCALA_2_13 'play-sbt-plugin/*1of3' | ||
workspaces: | ||
use: published-local | ||
- name: "Run scripted tests (b) for sbt 1.6.x and Scala 2.13.x" | ||
script: scripts/test-scripted $SCRIPTED_SBT_1_6 $TEST_SCALA_2_13 'play-sbt-plugin/*2of3' | ||
workspaces: | ||
use: published-local | ||
- name: "Run scripted tests (c) for sbt 1.6.x and Scala 2.13.x" | ||
script: scripts/test-scripted $SCRIPTED_SBT_1_6 $TEST_SCALA_2_13 'play-sbt-plugin/*3of3' | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Make the scripted tests run in parallel again, like we used to do: https://github.com/playframework/playframework/pull/10956/files#diff-6ac3f79fc25d95cd1e3d51da53a4b21b939437392578a35ae8cd6d5366ca5485L82 |
||
workspaces: | ||
use: published-local | ||
|
||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -9,8 +9,8 @@ play.server { | |
SO_KEEPALIVE = true | ||
TCP_NODELAY = true | ||
TCP_FASTOPEN_CONNECT = true | ||
"io.netty.channel.ChannelOption#TCP_FASTOPEN" = 3 | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Because the cron build for the master branch was broken since month, it never reported that this scripted test actually is broken, also see #11076 (comment) |
||
"io.netty.channel.unix.UnixChannelOption#SO_REUSEPORT" = false | ||
"io.netty.channel.epoll.EpollChannelOption#TCP_FASTOPEN" = 3 | ||
bar = "xyz" | ||
} | ||
} | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -7,16 +7,16 @@ import Keys._ | |
import buildinfo.BuildInfo | ||
|
||
object Dependencies { | ||
val akkaVersion: String = sys.props.getOrElse("akka.version", "2.6.14") | ||
val akkaHttpVersion = sys.props.getOrElse("akka.http.version", "10.1.14") | ||
val akkaVersion: String = sys.props.getOrElse("akka.version", "2.6.18+21-4fb7bd9b-SNAPSHOT") | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Only temporary, let's use this akka snapshot because it contains akka/akka#31046 to unblock this PR. |
||
val akkaHttpVersion = sys.props.getOrElse("akka.http.version", "10.2.7") | ||
|
||
val sslConfig = "com.typesafe" %% "ssl-config-core" % "0.4.3" | ||
val sslConfig = "com.typesafe" %% "ssl-config-core" % "0.6.0" | ||
|
||
val playJsonVersion = "2.9.2" | ||
val playJsonVersion = "2.10.0-RC5" | ||
|
||
val logback = "ch.qos.logback" % "logback-classic" % "1.2.10" | ||
|
||
val specs2Version = "4.12.12" | ||
val specs2Version = "4.13.1" | ||
val specs2Deps = Seq( | ||
"specs2-core", | ||
"specs2-junit", | ||
|
@@ -80,10 +80,10 @@ object Dependencies { | |
) | ||
|
||
def scalaReflect(scalaVersion: String) = "org.scala-lang" % "scala-reflect" % scalaVersion % "provided" | ||
val scalaJava8Compat = "org.scala-lang.modules" %% "scala-java8-compat" % "0.9.1" | ||
val scalaJava8Compat = "org.scala-lang.modules" %% "scala-java8-compat" % "1.0.2" | ||
val scalaParserCombinators = Seq("org.scala-lang.modules" %% "scala-parser-combinators" % "1.1.2") | ||
|
||
val springFrameworkVersion = "5.3.13" | ||
val springFrameworkVersion = "5.3.14" | ||
|
||
val javaDeps = Seq( | ||
scalaJava8Compat, | ||
|
@@ -93,11 +93,11 @@ object Dependencies { | |
|
||
val joda = Seq( | ||
"joda-time" % "joda-time" % "2.10.13", | ||
"org.joda" % "joda-convert" % "2.2.1" | ||
"org.joda" % "joda-convert" % "2.2.2" | ||
) | ||
|
||
val javaFormsDeps = Seq( | ||
"org.hibernate.validator" % "hibernate-validator" % "6.2.0.Final", | ||
"org.hibernate.validator" % "hibernate-validator" % "6.2.1.Final", | ||
("org.springframework" % "spring-context" % springFrameworkVersion) | ||
.exclude("org.springframework", "spring-aop") | ||
.exclude("org.springframework", "spring-beans") | ||
|
@@ -192,10 +192,10 @@ object Dependencies { | |
typesafeConfig, | ||
slf4jSimple, | ||
playFileWatch, | ||
sbtDep("com.typesafe.sbt" % "sbt-twirl" % BuildInfo.sbtTwirlVersion), | ||
sbtDep("com.typesafe.sbt" % "sbt-native-packager" % BuildInfo.sbtNativePackagerVersion), | ||
sbtDep("com.typesafe.sbt" % "sbt-web" % "1.4.4"), | ||
sbtDep("com.typesafe.sbt" % "sbt-js-engine" % "1.2.3"), | ||
sbtDep("com.typesafe.play" % "sbt-twirl" % BuildInfo.sbtTwirlVersion), | ||
sbtDep("com.github.sbt" % "sbt-native-packager" % BuildInfo.sbtNativePackagerVersion), | ||
sbtDep("com.typesafe.sbt" % "sbt-web" % "1.4.4"), | ||
sbtDep("com.typesafe.sbt" % "sbt-js-engine" % "1.2.3"), | ||
logback % Test | ||
) ++ specs2Deps.map(_ % Test) | ||
} | ||
|
@@ -225,9 +225,9 @@ object Dependencies { | |
"com.typesafe.akka" %% "akka-cluster-sharding-typed" % akkaVersion | ||
) | ||
|
||
val fluentleniumVersion = "3.7.1" | ||
val fluentleniumVersion = "3.10.1" | ||
// This is the selenium version compatible with the FluentLenium version declared above. | ||
// See http://mvnrepository.com/artifact/org.fluentlenium/fluentlenium-core/3.5.2 | ||
// See http://mvnrepository.com/artifact/org.fluentlenium/fluentlenium-core/3.10.1 | ||
val seleniumVersion = "3.141.59" | ||
|
||
val testDependencies = Seq(junit, junitInterface, guava, findBugs, logback) ++ Seq( | ||
|
@@ -263,7 +263,7 @@ object Dependencies { | |
"com.github.ben-manes.caffeine" % "jcache" % caffeineVersion | ||
) ++ jcacheApi | ||
|
||
val playWsStandaloneVersion = "2.1.3" | ||
val playWsStandaloneVersion = "2.2.0-M1" | ||
val playWsDeps = Seq( | ||
"com.typesafe.play" %% "play-ws-standalone" % playWsStandaloneVersion, | ||
"com.typesafe.play" %% "play-ws-standalone-xml" % playWsStandaloneVersion, | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -332,6 +332,11 @@ public WSRequest setFollowRedirects(boolean followRedirects) { | |
return converter.apply(request.setFollowRedirects(followRedirects)); | ||
} | ||
|
||
@Override | ||
public WSRequest setDisableUrlEncoding(boolean disableUrlEncoding) { | ||
return converter.apply(request.setDisableUrlEncoding(disableUrlEncoding)); | ||
} | ||
|
||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. These methods were added as part of playframework/play-ws#552 |
||
@Override | ||
public WSRequest setVirtualHost(String virtualHost) { | ||
return converter.apply(request.setVirtualHost(virtualHost)); | ||
|
@@ -394,6 +399,11 @@ public Optional<Boolean> getFollowRedirects() { | |
return request.getFollowRedirects(); | ||
} | ||
|
||
@Override | ||
public Optional<Boolean> getDisableUrlEncoding() { | ||
return request.getDisableUrlEncoding(); | ||
} | ||
|
||
@Override | ||
public String getUrl() { | ||
return request.getUrl(); | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
IMHO we should run the scripted test for each pr build, not just daily, to catched errors as early as possible. Actually that is what we did until we dropped Scala 2.12: https://github.com/playframework/playframework/pull/10956/files#diff-6ac3f79fc25d95cd1e3d51da53a4b21b939437392578a35ae8cd6d5366ca5485L82
So probably I just forgot to change that back then.