Skip to content
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.

Sign up for GitHub

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

Jump to bottom

[master] Upgrade dependencies to fix CI cron build #11081

Merged
merged 19 commits into from Jan 18, 2022
Merged

[master] Upgrade dependencies to fix CI cron build #11081

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
a88e5b2
Netty deprecated EpollChannelOption#TCP_FASTOPEN in favor of ChannelO…
mkurz Dec 30, 2021
9b5e296
Run scripted tests not just for cron build but also PR builds
mkurz Dec 30, 2021
5448499
Split scripted tests (like in the past) to run parallel
mkurz Dec 30, 2021
c6cc56a
Bump versions
mkurz Dec 30, 2021
650d828
Pin FluentLenium and Selenium deps to Java 8 compatible versions
mkurz Dec 30, 2021
7a8e3dc
Bump versions
mkurz Dec 30, 2021
ca316dd
Remove whitesource
mkurz Dec 30, 2021
18b7395
Bump interplay (to not cross build against Scala 2.12 anymore)
mkurz Dec 30, 2021
7e25cde
Downgrade sbt-assembly because its ASM version conflicts with pegdown…
mkurz Jan 2, 2022
c9320b3
play-ws 2.2.0-M1
mkurz Jan 4, 2022
7b15588
Upgrade akka-http and play-json
mkurz Jan 4, 2022
ed266ca
twirl 1.6.0-M1
mkurz Jan 4, 2022
2f426ff
sbt 1.6.1
mkurz Jan 4, 2022
7d8aa51
Correctly set sbt 1.6.x
mkurz Jan 4, 2022
7f251a8
Use akka snapshot for now until 2.6.19 is released
mkurz Jan 7, 2022
7faf24d
Temporary disable UriHandlingSpec, we can fix that later
mkurz Jan 17, 2022
aca90c3
Temporary use sonatype snapshots also for non-cron builds
mkurz Jan 17, 2022
efac1ce
Evolutions needed a fix after upgrading h2 to v2.0.202
mkurz Jan 18, 2022
eb6b750
Update interplay
mkurz Jan 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 11 additions & 1 deletion .scala-steward.conf
View file
Open in desktop
Expand Up @@ -24,7 +24,10 @@ updates.ignore = [
{ 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" }
{ groupId = "com.fasterxml.jackson.datatype", artifactId = "jackson-datatype-guava" },
// these will get updated along with selenium-api, so no need to update them separately
{ groupId = "org.seleniumhq.selenium", artifactId = "selenium-support" },
{ groupId = "org.seleniumhq.selenium", artifactId = "selenium-firefox-driver" }
]

updates.pin = [
Expand All @@ -36,6 +39,13 @@ updates.pin = [
{ groupId = "com.zaxxer", artifactId = "HikariCP", version = "4." },
// caffeine 3+ requires Java 11. See https://github.com/ben-manes/caffeine/releases/tag/v3.0.0
{ groupId = "com.github.ben-manes.caffeine", version = "2." },
// FluentLenium 4+ requires Java 11.
// See https://github.com/FluentLenium/FluentLenium/releases/tag/v4.0.0 and https://fluentlenium.com/quickstart/#choose-the-right-version
{ groupId = "org.fluentlenium", version = "3." },
// FluentLenium 3 only works with Selenium 3
{ groupId = "org.seleniumhq.selenium", artifactId = "selenium-api", version = "3." },
// Selenium 3 is only compatible with htmlunit-driver 2, see https://github.com/SeleniumHQ/htmlunit-driver/releases/tag/2.56.0
{ groupId = "org.seleniumhq.selenium", artifactId = "htmlunit-driver", version = "2." },
// Hibernate Validator 7.0 is jakarta.validation based, 6.2 is javax.validation based
// and the Spring libraries we use still depends on Hibernate Validator 6.x
// See https://github.com/playframework/playframework/pull/10616#issuecomment-758273638
Expand Down
18 changes: 12 additions & 6 deletions .travis.yml
View file
Open in desktop
Expand Up @@ -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.5.x
- java8

jobs:
Expand Down Expand Up @@ -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.5.x
name: "Run scripted tests (a) for sbt 1.5.x and Scala 2.13.x"
script: scripts/test-scripted $SCRIPTED_SBT_1_5 $TEST_SCALA_2_13 'play-sbt-plugin/*1of3'
workspaces:
use: published-local
- name: "Run scripted tests (b) for sbt 1.5.x and Scala 2.13.x"
script: scripts/test-scripted $SCRIPTED_SBT_1_5 $TEST_SCALA_2_13 'play-sbt-plugin/*2of3'
workspaces:
use: published-local
- name: "Run scripted tests (c) for sbt 1.5.x and Scala 2.13.x"
script: scripts/test-scripted $SCRIPTED_SBT_1_5 $TEST_SCALA_2_13 'play-sbt-plugin/*3of3'
workspaces:
use: published-local

Expand Down
2 changes: 1 addition & 1 deletion ...gin/src/sbt-test/play-sbt-plugin/http-backend-netty-channel-options/conf/application.conf
View file
Open in desktop
Expand Up @@ -9,8 +9,8 @@ play.server {
SO_KEEPALIVE = true
TCP_NODELAY = true
TCP_FASTOPEN_CONNECT = true
"io.netty.channel.ChannelOption#TCP_FASTOPEN" = 3
Copy link
Member Author

Choose a reason for hiding this comment

The 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"
}
}
Expand Down
2 changes: 1 addition & 1 deletion .../sbt-test/play-sbt-plugin/http-backend-netty-channel-options/expected-application-log.txt
View file
Open in desktop
Expand Up @@ -11,5 +11,5 @@
[DEBUG] play.core.server.NettyServer - Setting Netty channel option SO_KEEPALIVE to true
[WARN] play.core.server.NettyServer - Ignoring unknown Netty channel option: bar
[WARN] play.core.server.NettyServer - Valid values can be found at http://netty.io/4.1/api/io/netty/channel/ChannelOption.html
[DEBUG] play.core.server.NettyServer - Setting Netty channel option io.netty.channel.epoll.EpollChannelOption#TCP_FASTOPEN to 3
[DEBUG] play.core.server.NettyServer - Setting Netty channel option io.netty.channel.ChannelOption#TCP_FASTOPEN to 3
[DEBUG] play.core.server.NettyServer - Setting Netty channel option io.netty.channel.unix.UnixChannelOption#SO_REUSEPORT to false
6 changes: 3 additions & 3 deletions documentation/project/plugins.sbt
View file
Open in desktop
Expand Up @@ -8,11 +8,11 @@ lazy val plugins = (project in file(".")).dependsOn(playDocsPlugin)
lazy val playDocsPlugin = ProjectRef(Path.fileProperty("user.dir").getParentFile, "Play-Docs-Sbt-Plugin")

// Required for Production.md
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.5")
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "1.1.0")

// Add headers to example sources
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.3.1")
addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.5.1")
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.6.0")
addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.7.0")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.0.7")

// Required for Tutorial
Expand Down
24 changes: 12 additions & 12 deletions project/Dependencies.scala
View file
Open in desktop
Expand Up @@ -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")
val akkaHttpVersion = sys.props.getOrElse("akka.http.version", "10.1.15")

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 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",
Expand Down Expand Up @@ -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,
Expand All @@ -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")
Expand Down Expand Up @@ -193,7 +193,7 @@ object Dependencies {
slf4jSimple,
playFileWatch,
sbtDep("com.typesafe.sbt" % "sbt-twirl" % BuildInfo.sbtTwirlVersion),
sbtDep("com.typesafe.sbt" % "sbt-native-packager" % BuildInfo.sbtNativePackagerVersion),
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
Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -263,7 +263,7 @@ object Dependencies {
"com.github.ben-manes.caffeine" % "jcache" % caffeineVersion
) ++ jcacheApi

val playWsStandaloneVersion = "2.1.3"
val playWsStandaloneVersion = "2.1.6"
val playWsDeps = Seq(
"com.typesafe.play" %% "play-ws-standalone" % playWsStandaloneVersion,
"com.typesafe.play" %% "play-ws-standalone-xml" % playWsStandaloneVersion,
Expand Down
4 changes: 2 additions & 2 deletions project/plugins.sbt
View file
Open in desktop
Expand Up @@ -4,9 +4,9 @@ enablePlugins(BuildInfoPlugin)

// when updating sbtNativePackager version, be sure to also update the documentation links in
// documentation/manual/working/commonGuide/production/Deploying.md
val sbtNativePackager = "1.8.1"
val sbtNativePackager = "1.9.7"
val mima = "1.0.1"
val sbtJavaFormatter = "0.5.0"
val sbtJavaFormatter = "0.7.0"
val sbtJmh = "0.4.3"
val webjarsLocatorCore = "0.48"
val sbtHeader = "5.6.0"
Expand Down
2 changes: 1 addition & 1 deletion project/project/buildinfo.sbt
View file
Open in desktop
Expand Up @@ -2,4 +2,4 @@
// Copyright (C) Lightbend Inc. <https://www.lightbend.com>
//

addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.7.0")
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.10.0")