diff --git a/src/docTest/groovy/org/gradle/playframework/InDepthUserGuideSamplesIntegrationTest.groovy b/src/docTest/groovy/org/gradle/playframework/InDepthUserGuideSamplesIntegrationTest.groovy index cacda261..a6442026 100644 --- a/src/docTest/groovy/org/gradle/playframework/InDepthUserGuideSamplesIntegrationTest.groovy +++ b/src/docTest/groovy/org/gradle/playframework/InDepthUserGuideSamplesIntegrationTest.groovy @@ -14,7 +14,7 @@ import spock.lang.Specification * In-depth testing of user guide samples. */ abstract class InDepthUserGuideSamplesIntegrationTest extends Specification { - protected static final String[] VERSIONS_UNDER_TEST = ["5.1.1", "5.2.1", "5.5.1", "5.6.4", "6.0.1", "6.6.1", "7.0.1"] + protected static final String[] VERSIONS_UNDER_TEST = ["5.1.1", "5.2.1", "5.5.1", "5.6.4", "6.0.1", "6.9.3", "7.0.1", "7.6.1", "8.1.1"] @Rule Sample sample = Sample.from("src/docs/samples") diff --git a/src/docs/samples/advanced/groovy/advanced.sample.out b/src/docs/samples/advanced/groovy/advanced.sample.out index 67065b92..30dd5c20 100644 --- a/src/docs/samples/advanced/groovy/advanced.sample.out +++ b/src/docs/samples/advanced/groovy/advanced.sample.out @@ -1,115 +1,118 @@ compileClasspath - Compile classpath for source set 'main'. +--- commons-lang:commons-lang:2.6 -+--- com.typesafe.play:play-guice_2.12:2.6.15 -| +--- org.scala-lang:scala-library:2.12.4 -| +--- com.typesafe.play:play_2.12:2.6.15 -| | +--- org.scala-lang:scala-library:2.12.4 -| | +--- com.typesafe.play:build-link:2.6.15 -| | | \--- com.typesafe.play:play-exceptions:2.6.15 -| | +--- com.typesafe.play:play-netty-utils:2.6.15 -| | | +--- org.slf4j:slf4j-api:1.7.25 -| | | +--- org.slf4j:jul-to-slf4j:1.7.25 -| | | | \--- org.slf4j:slf4j-api:1.7.25 -| | | \--- org.slf4j:jcl-over-slf4j:1.7.25 -| | | \--- org.slf4j:slf4j-api:1.7.25 -| | +--- com.typesafe.play:play-streams_2.12:2.6.15 -| | | +--- org.scala-lang:scala-library:2.12.4 -| | | +--- org.reactivestreams:reactive-streams:1.0.2 -| | | +--- com.typesafe.akka:akka-stream_2.12:2.5.11 -| | | | +--- org.scala-lang:scala-library:2.12.4 -| | | | +--- com.typesafe.akka:akka-actor_2.12:2.5.11 -| | | | | +--- org.scala-lang:scala-library:2.12.4 -| | | | | +--- com.typesafe:config:1.3.2 ++--- com.typesafe.play:play-guice_2.12:2.6.25 +| +--- org.scala-lang:scala-library:2.12.8 +| +--- com.typesafe.play:play_2.12:2.6.25 +| | +--- org.scala-lang:scala-library:2.12.8 +| | +--- com.typesafe.play:build-link:2.6.25 +| | | \--- com.typesafe.play:play-exceptions:2.6.25 +| | +--- com.typesafe.play:play-netty-utils:2.6.25 +| | | +--- org.slf4j:slf4j-api:1.7.29 +| | | +--- org.slf4j:jul-to-slf4j:1.7.29 +| | | | \--- org.slf4j:slf4j-api:1.7.29 +| | | \--- org.slf4j:jcl-over-slf4j:1.7.29 +| | | \--- org.slf4j:slf4j-api:1.7.29 +| | +--- com.typesafe.play:play-streams_2.12:2.6.25 +| | | +--- org.scala-lang:scala-library:2.12.8 +| | | +--- org.reactivestreams:reactive-streams:1.0.3 +| | | +--- com.typesafe.akka:akka-stream_2.12:2.5.26 +| | | | +--- org.scala-lang:scala-library:2.12.8 +| | | | +--- com.typesafe.akka:akka-actor_2.12:2.5.26 +| | | | | +--- org.scala-lang:scala-library:2.12.8 +| | | | | +--- com.typesafe:config:1.3.3 | | | | | \--- org.scala-lang.modules:scala-java8-compat_2.12:0.8.0 -| | | | | \--- org.scala-lang:scala-library:2.12.0 -> 2.12.4 -| | | | +--- com.typesafe.akka:akka-protobuf_2.12:2.5.11 -| | | | | \--- org.scala-lang:scala-library:2.12.4 -| | | | +--- org.reactivestreams:reactive-streams:1.0.2 -| | | | \--- com.typesafe:ssl-config-core_2.12:0.2.2 -| | | | +--- org.scala-lang:scala-library:2.12.1 -> 2.12.4 -| | | | +--- com.typesafe:config:1.2.0 -> 1.3.2 -| | | | \--- org.scala-lang.modules:scala-parser-combinators_2.12:1.0.4 -> 1.0.6 -| | | | \--- org.scala-lang:scala-library:2.12.2 -> 2.12.4 +| | | | | \--- org.scala-lang:scala-library:2.12.0 -> 2.12.8 +| | | | +--- com.typesafe.akka:akka-protobuf_2.12:2.5.26 +| | | | | \--- org.scala-lang:scala-library:2.12.8 +| | | | +--- org.reactivestreams:reactive-streams:1.0.2 -> 1.0.3 +| | | | \--- com.typesafe:ssl-config-core_2.12:0.3.8 +| | | | +--- org.scala-lang:scala-library:2.12.8 +| | | | +--- org.scala-lang.modules:scala-parser-combinators_2.12:1.1.2 +| | | | | \--- org.scala-lang:scala-library:2.12.8 +| | | | \--- com.typesafe:config:1.3.3 | | | \--- org.scala-lang.modules:scala-java8-compat_2.12:0.8.0 (*) -| | +--- com.typesafe.play:twirl-api_2.12:1.3.14 -| | | +--- org.scala-lang:scala-library:2.12.4 +| | +--- com.typesafe.play:twirl-api_2.12:1.3.16 +| | | +--- org.scala-lang:scala-library:2.12.8 | | | \--- org.scala-lang.modules:scala-xml_2.12:1.0.6 -| | | \--- org.scala-lang:scala-library:2.12.0 -> 2.12.4 -| | +--- org.slf4j:slf4j-api:1.7.25 -| | +--- org.slf4j:jul-to-slf4j:1.7.25 (*) -| | +--- org.slf4j:jcl-over-slf4j:1.7.25 (*) -| | +--- com.typesafe.akka:akka-actor_2.12:2.5.11 (*) -| | +--- com.typesafe.akka:akka-slf4j_2.12:2.5.11 -| | | +--- org.scala-lang:scala-library:2.12.4 -| | | +--- com.typesafe.akka:akka-actor_2.12:2.5.11 (*) -| | | \--- org.slf4j:slf4j-api:1.7.25 +| | | \--- org.scala-lang:scala-library:2.12.0 -> 2.12.8 +| | +--- org.slf4j:slf4j-api:1.7.29 +| | +--- org.slf4j:jul-to-slf4j:1.7.29 (*) +| | +--- org.slf4j:jcl-over-slf4j:1.7.29 (*) +| | +--- com.typesafe.akka:akka-actor_2.12:2.5.26 (*) +| | +--- com.typesafe.akka:akka-slf4j_2.12:2.5.26 +| | | +--- org.scala-lang:scala-library:2.12.8 +| | | +--- com.typesafe.akka:akka-actor_2.12:2.5.26 (*) +| | | \--- org.slf4j:slf4j-api:1.7.25 -> 1.7.29 | | +--- com.fasterxml.jackson.core:jackson-core:2.8.11 | | +--- com.fasterxml.jackson.core:jackson-annotations:2.8.11 | | +--- com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.8.11 | | | +--- com.fasterxml.jackson.core:jackson-core:2.8.11 -| | | \--- com.fasterxml.jackson.core:jackson-databind:2.8.11 -> 2.8.11.1 +| | | \--- com.fasterxml.jackson.core:jackson-databind:2.8.11 -> 2.8.11.4 | | | +--- com.fasterxml.jackson.core:jackson-annotations:2.8.0 -> 2.8.11 | | | \--- com.fasterxml.jackson.core:jackson-core:2.8.10 -> 2.8.11 | | +--- com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.8.11 | | | +--- com.fasterxml.jackson.core:jackson-annotations:2.8.0 -> 2.8.11 | | | +--- com.fasterxml.jackson.core:jackson-core:2.8.11 -| | | \--- com.fasterxml.jackson.core:jackson-databind:2.8.11 -> 2.8.11.1 (*) -| | +--- com.fasterxml.jackson.core:jackson-databind:2.8.11.1 (*) -| | +--- commons-codec:commons-codec:1.10 -| | +--- com.typesafe.play:play-json_2.12:2.6.9 -| | | +--- org.scala-lang:scala-library:2.12.2 -> 2.12.4 -| | | +--- com.typesafe.play:play-functional_2.12:2.6.9 -| | | | \--- org.scala-lang:scala-library:2.12.2 -> 2.12.4 -| | | +--- org.scala-lang:scala-reflect:2.12.2 -> 2.12.4 -| | | | \--- org.scala-lang:scala-library:2.12.4 +| | | \--- com.fasterxml.jackson.core:jackson-databind:2.8.11 -> 2.8.11.4 (*) +| | +--- com.fasterxml.jackson.core:jackson-databind:2.8.11.4 (*) +| | +--- commons-codec:commons-codec:1.11 +| | +--- com.typesafe.play:play-json_2.12:2.6.14 +| | | +--- org.scala-lang:scala-library:2.12.8 +| | | +--- com.typesafe.play:play-functional_2.12:2.6.14 +| | | | \--- org.scala-lang:scala-library:2.12.8 +| | | +--- org.scala-lang:scala-reflect:2.12.8 +| | | | \--- org.scala-lang:scala-library:2.12.8 | | | +--- org.typelevel:macro-compat_2.12:1.1.1 -| | | | \--- org.scala-lang:scala-library:2.12.0 -> 2.12.4 +| | | | \--- org.scala-lang:scala-library:2.12.0 -> 2.12.8 | | | +--- joda-time:joda-time:2.9.9 -| | | +--- com.fasterxml.jackson.core:jackson-core:2.8.9 -> 2.8.11 -| | | +--- com.fasterxml.jackson.core:jackson-annotations:2.8.9 -> 2.8.11 -| | | +--- com.fasterxml.jackson.core:jackson-databind:2.8.9 -> 2.8.11.1 (*) -| | | +--- com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.8.9 -> 2.8.11 (*) -| | | \--- com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.8.9 -> 2.8.11 (*) -| | +--- com.google.guava:guava:22.0 +| | | +--- com.fasterxml.jackson.core:jackson-core:2.8.11 +| | | +--- com.fasterxml.jackson.core:jackson-annotations:2.8.11 +| | | +--- com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.8.11 (*) +| | | +--- com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.8.11 (*) +| | | \--- com.fasterxml.jackson.core:jackson-databind:2.8.11.4 (*) +| | +--- com.google.guava:guava:23.6.1-jre | | | +--- com.google.code.findbugs:jsr305:1.3.9 -| | | +--- com.google.errorprone:error_prone_annotations:2.0.18 +| | | +--- org.checkerframework:checker-compat-qual:2.0.0 +| | | +--- com.google.errorprone:error_prone_annotations:2.1.3 | | | +--- com.google.j2objc:j2objc-annotations:1.1 | | | \--- org.codehaus.mojo:animal-sniffer-annotations:1.14 | | +--- io.jsonwebtoken:jjwt:0.7.0 -| | | \--- com.fasterxml.jackson.core:jackson-databind:2.8.2 -> 2.8.11.1 (*) +| | | \--- com.fasterxml.jackson.core:jackson-databind:2.8.2 -> 2.8.11.4 (*) +| | +--- javax.xml.bind:jaxb-api:2.3.1 +| | | \--- javax.activation:javax.activation-api:1.2.0 | | +--- org.apache.commons:commons-lang3:3.6 | | +--- javax.transaction:jta:1.1 | | +--- javax.inject:javax.inject:1 -| | +--- org.scala-lang:scala-reflect:2.12.4 (*) +| | +--- org.scala-lang:scala-reflect:2.12.8 (*) | | +--- org.scala-lang.modules:scala-java8-compat_2.12:0.8.0 (*) -| | \--- org.scala-lang.modules:scala-parser-combinators_2.12:1.0.6 (*) +| | \--- org.scala-lang.modules:scala-parser-combinators_2.12:1.0.7 -> 1.1.2 (*) | +--- com.google.inject:guice:4.1.0 | | +--- javax.inject:javax.inject:1 | | +--- aopalliance:aopalliance:1.0 -| | \--- com.google.guava:guava:19.0 -> 22.0 (*) +| | \--- com.google.guava:guava:19.0 -> 23.6.1-jre (*) | \--- com.google.inject.extensions:guice-assistedinject:4.1.0 | \--- com.google.inject:guice:4.1.0 (*) +--- ch.qos.logback:logback-classic:1.2.3 | +--- ch.qos.logback:logback-core:1.2.3 -| \--- org.slf4j:slf4j-api:1.7.25 -+--- com.typesafe.play:play_2.12:2.6.15 (*) -\--- com.typesafe.play:play-java-forms_2.12:2.6.15 - +--- org.scala-lang:scala-library:2.12.4 - +--- com.typesafe.play:play-java_2.12:2.6.15 - | +--- org.scala-lang:scala-library:2.12.4 - | +--- com.typesafe.play:play_2.12:2.6.15 (*) +| \--- org.slf4j:slf4j-api:1.7.25 -> 1.7.29 ++--- com.typesafe.play:play_2.12:2.6.25 (*) +\--- com.typesafe.play:play-java-forms_2.12:2.6.25 + +--- org.scala-lang:scala-library:2.12.8 + +--- com.typesafe.play:play-java_2.12:2.6.25 + | +--- org.scala-lang:scala-library:2.12.8 + | +--- com.typesafe.play:play_2.12:2.6.25 (*) | +--- org.scala-lang.modules:scala-java8-compat_2.12:0.8.0 (*) | +--- org.reflections:reflections:0.9.11 - | | +--- com.google.guava:guava:20.0 -> 22.0 (*) + | | +--- com.google.guava:guava:20.0 -> 23.6.1-jre (*) | | \--- org.javassist:javassist:3.21.0-GA | \--- net.jodah:typetools:0.5.0 +--- org.scala-lang.modules:scala-java8-compat_2.12:0.8.0 (*) +--- org.reflections:reflections:0.9.11 (*) +--- net.jodah:typetools:0.5.0 - +--- org.hibernate:hibernate-validator:5.4.1.Final + +--- org.hibernate:hibernate-validator:5.4.3.Final | +--- javax.validation:validation-api:1.1.0.Final | +--- org.jboss.logging:jboss-logging:3.3.0.Final | \--- com.fasterxml:classmate:1.3.1 - +--- org.springframework:spring-context:4.3.11.RELEASE - +--- org.springframework:spring-core:4.3.11.RELEASE - \--- org.springframework:spring-beans:4.3.11.RELEASE \ No newline at end of file + +--- org.springframework:spring-context:4.3.25.RELEASE + +--- org.springframework:spring-core:4.3.25.RELEASE + \--- org.springframework:spring-beans:4.3.25.RELEASE diff --git a/src/docs/samples/advanced/groovy/build.gradle b/src/docs/samples/advanced/groovy/build.gradle index 3b475728..7560d990 100644 --- a/src/docs/samples/advanced/groovy/build.gradle +++ b/src/docs/samples/advanced/groovy/build.gradle @@ -4,7 +4,7 @@ plugins { play { platform { - playVersion = '2.6.15' + playVersion = '2.6.25' scalaVersion = '2.12' javaVersion = JavaVersion.VERSION_1_8 } @@ -15,7 +15,7 @@ play { // tag::play-dependencies[] dependencies { implementation "commons-lang:commons-lang:2.6" - implementation "com.typesafe.play:play-guice_2.12:2.6.15" + implementation "com.typesafe.play:play-guice_2.12:2.6.25" implementation "ch.qos.logback:logback-classic:1.2.3" testImplementation "org.scalatestplus.play:scalatestplus-play_2.12:3.1.2" }