Skip to content

Commit ef74b6f

Browse files
big-guybig-guy
committed
Update to test with latest Gradle releases
1 parent 06e2afc commit ef74b6f

3 files changed

Lines changed: 80 additions & 77 deletions

File tree

‎src/docTest/groovy/org/gradle/playframework/InDepthUserGuideSamplesIntegrationTest.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import spock.lang.Specification
1414
* In-depth testing of user guide samples.
1515
*/
1616
abstract class InDepthUserGuideSamplesIntegrationTest extends Specification {
17-
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"]
17+
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"]
1818

1919
@Rule
2020
Sample sample = Sample.from("src/docs/samples")

‎src/docs/samples/advanced/groovy/advanced.sample.out‎

Lines changed: 77 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -1,115 +1,118 @@
11
compileClasspath - Compile classpath for source set 'main'.
22
+--- commons-lang:commons-lang:2.6
3-
+--- com.typesafe.play:play-guice_2.12:2.6.15
4-
| +--- org.scala-lang:scala-library:2.12.4
5-
| +--- com.typesafe.play:play_2.12:2.6.15
6-
| | +--- org.scala-lang:scala-library:2.12.4
7-
| | +--- com.typesafe.play:build-link:2.6.15
8-
| | | \--- com.typesafe.play:play-exceptions:2.6.15
9-
| | +--- com.typesafe.play:play-netty-utils:2.6.15
10-
| | | +--- org.slf4j:slf4j-api:1.7.25
11-
| | | +--- org.slf4j:jul-to-slf4j:1.7.25
12-
| | | | \--- org.slf4j:slf4j-api:1.7.25
13-
| | | \--- org.slf4j:jcl-over-slf4j:1.7.25
14-
| | | \--- org.slf4j:slf4j-api:1.7.25
15-
| | +--- com.typesafe.play:play-streams_2.12:2.6.15
16-
| | | +--- org.scala-lang:scala-library:2.12.4
17-
| | | +--- org.reactivestreams:reactive-streams:1.0.2
18-
| | | +--- com.typesafe.akka:akka-stream_2.12:2.5.11
19-
| | | | +--- org.scala-lang:scala-library:2.12.4
20-
| | | | +--- com.typesafe.akka:akka-actor_2.12:2.5.11
21-
| | | | | +--- org.scala-lang:scala-library:2.12.4
22-
| | | | | +--- com.typesafe:config:1.3.2
3+
+--- com.typesafe.play:play-guice_2.12:2.6.25
4+
| +--- org.scala-lang:scala-library:2.12.8
5+
| +--- com.typesafe.play:play_2.12:2.6.25
6+
| | +--- org.scala-lang:scala-library:2.12.8
7+
| | +--- com.typesafe.play:build-link:2.6.25
8+
| | | \--- com.typesafe.play:play-exceptions:2.6.25
9+
| | +--- com.typesafe.play:play-netty-utils:2.6.25
10+
| | | +--- org.slf4j:slf4j-api:1.7.29
11+
| | | +--- org.slf4j:jul-to-slf4j:1.7.29
12+
| | | | \--- org.slf4j:slf4j-api:1.7.29
13+
| | | \--- org.slf4j:jcl-over-slf4j:1.7.29
14+
| | | \--- org.slf4j:slf4j-api:1.7.29
15+
| | +--- com.typesafe.play:play-streams_2.12:2.6.25
16+
| | | +--- org.scala-lang:scala-library:2.12.8
17+
| | | +--- org.reactivestreams:reactive-streams:1.0.3
18+
| | | +--- com.typesafe.akka:akka-stream_2.12:2.5.26
19+
| | | | +--- org.scala-lang:scala-library:2.12.8
20+
| | | | +--- com.typesafe.akka:akka-actor_2.12:2.5.26
21+
| | | | | +--- org.scala-lang:scala-library:2.12.8
22+
| | | | | +--- com.typesafe:config:1.3.3
2323
| | | | | \--- org.scala-lang.modules:scala-java8-compat_2.12:0.8.0
24-
| | | | | \--- org.scala-lang:scala-library:2.12.0 -> 2.12.4
25-
| | | | +--- com.typesafe.akka:akka-protobuf_2.12:2.5.11
26-
| | | | | \--- org.scala-lang:scala-library:2.12.4
27-
| | | | +--- org.reactivestreams:reactive-streams:1.0.2
28-
| | | | \--- com.typesafe:ssl-config-core_2.12:0.2.2
29-
| | | | +--- org.scala-lang:scala-library:2.12.1 -> 2.12.4
30-
| | | | +--- com.typesafe:config:1.2.0 -> 1.3.2
31-
| | | | \--- org.scala-lang.modules:scala-parser-combinators_2.12:1.0.4 -> 1.0.6
32-
| | | | \--- org.scala-lang:scala-library:2.12.2 -> 2.12.4
24+
| | | | | \--- org.scala-lang:scala-library:2.12.0 -> 2.12.8
25+
| | | | +--- com.typesafe.akka:akka-protobuf_2.12:2.5.26
26+
| | | | | \--- org.scala-lang:scala-library:2.12.8
27+
| | | | +--- org.reactivestreams:reactive-streams:1.0.2 -> 1.0.3
28+
| | | | \--- com.typesafe:ssl-config-core_2.12:0.3.8
29+
| | | | +--- org.scala-lang:scala-library:2.12.8
30+
| | | | +--- org.scala-lang.modules:scala-parser-combinators_2.12:1.1.2
31+
| | | | | \--- org.scala-lang:scala-library:2.12.8
32+
| | | | \--- com.typesafe:config:1.3.3
3333
| | | \--- org.scala-lang.modules:scala-java8-compat_2.12:0.8.0 (*)
34-
| | +--- com.typesafe.play:twirl-api_2.12:1.3.14
35-
| | | +--- org.scala-lang:scala-library:2.12.4
34+
| | +--- com.typesafe.play:twirl-api_2.12:1.3.16
35+
| | | +--- org.scala-lang:scala-library:2.12.8
3636
| | | \--- org.scala-lang.modules:scala-xml_2.12:1.0.6
37-
| | | \--- org.scala-lang:scala-library:2.12.0 -> 2.12.4
38-
| | +--- org.slf4j:slf4j-api:1.7.25
39-
| | +--- org.slf4j:jul-to-slf4j:1.7.25 (*)
40-
| | +--- org.slf4j:jcl-over-slf4j:1.7.25 (*)
41-
| | +--- com.typesafe.akka:akka-actor_2.12:2.5.11 (*)
42-
| | +--- com.typesafe.akka:akka-slf4j_2.12:2.5.11
43-
| | | +--- org.scala-lang:scala-library:2.12.4
44-
| | | +--- com.typesafe.akka:akka-actor_2.12:2.5.11 (*)
45-
| | | \--- org.slf4j:slf4j-api:1.7.25
37+
| | | \--- org.scala-lang:scala-library:2.12.0 -> 2.12.8
38+
| | +--- org.slf4j:slf4j-api:1.7.29
39+
| | +--- org.slf4j:jul-to-slf4j:1.7.29 (*)
40+
| | +--- org.slf4j:jcl-over-slf4j:1.7.29 (*)
41+
| | +--- com.typesafe.akka:akka-actor_2.12:2.5.26 (*)
42+
| | +--- com.typesafe.akka:akka-slf4j_2.12:2.5.26
43+
| | | +--- org.scala-lang:scala-library:2.12.8
44+
| | | +--- com.typesafe.akka:akka-actor_2.12:2.5.26 (*)
45+
| | | \--- org.slf4j:slf4j-api:1.7.25 -> 1.7.29
4646
| | +--- com.fasterxml.jackson.core:jackson-core:2.8.11
4747
| | +--- com.fasterxml.jackson.core:jackson-annotations:2.8.11
4848
| | +--- com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.8.11
4949
| | | +--- com.fasterxml.jackson.core:jackson-core:2.8.11
50-
| | | \--- com.fasterxml.jackson.core:jackson-databind:2.8.11 -> 2.8.11.1
50+
| | | \--- com.fasterxml.jackson.core:jackson-databind:2.8.11 -> 2.8.11.4
5151
| | | +--- com.fasterxml.jackson.core:jackson-annotations:2.8.0 -> 2.8.11
5252
| | | \--- com.fasterxml.jackson.core:jackson-core:2.8.10 -> 2.8.11
5353
| | +--- com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.8.11
5454
| | | +--- com.fasterxml.jackson.core:jackson-annotations:2.8.0 -> 2.8.11
5555
| | | +--- com.fasterxml.jackson.core:jackson-core:2.8.11
56-
| | | \--- com.fasterxml.jackson.core:jackson-databind:2.8.11 -> 2.8.11.1 (*)
57-
| | +--- com.fasterxml.jackson.core:jackson-databind:2.8.11.1 (*)
58-
| | +--- commons-codec:commons-codec:1.10
59-
| | +--- com.typesafe.play:play-json_2.12:2.6.9
60-
| | | +--- org.scala-lang:scala-library:2.12.2 -> 2.12.4
61-
| | | +--- com.typesafe.play:play-functional_2.12:2.6.9
62-
| | | | \--- org.scala-lang:scala-library:2.12.2 -> 2.12.4
63-
| | | +--- org.scala-lang:scala-reflect:2.12.2 -> 2.12.4
64-
| | | | \--- org.scala-lang:scala-library:2.12.4
56+
| | | \--- com.fasterxml.jackson.core:jackson-databind:2.8.11 -> 2.8.11.4 (*)
57+
| | +--- com.fasterxml.jackson.core:jackson-databind:2.8.11.4 (*)
58+
| | +--- commons-codec:commons-codec:1.11
59+
| | +--- com.typesafe.play:play-json_2.12:2.6.14
60+
| | | +--- org.scala-lang:scala-library:2.12.8
61+
| | | +--- com.typesafe.play:play-functional_2.12:2.6.14
62+
| | | | \--- org.scala-lang:scala-library:2.12.8
63+
| | | +--- org.scala-lang:scala-reflect:2.12.8
64+
| | | | \--- org.scala-lang:scala-library:2.12.8
6565
| | | +--- org.typelevel:macro-compat_2.12:1.1.1
66-
| | | | \--- org.scala-lang:scala-library:2.12.0 -> 2.12.4
66+
| | | | \--- org.scala-lang:scala-library:2.12.0 -> 2.12.8
6767
| | | +--- joda-time:joda-time:2.9.9
68-
| | | +--- com.fasterxml.jackson.core:jackson-core:2.8.9 -> 2.8.11
69-
| | | +--- com.fasterxml.jackson.core:jackson-annotations:2.8.9 -> 2.8.11
70-
| | | +--- com.fasterxml.jackson.core:jackson-databind:2.8.9 -> 2.8.11.1 (*)
71-
| | | +--- com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.8.9 -> 2.8.11 (*)
72-
| | | \--- com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.8.9 -> 2.8.11 (*)
73-
| | +--- com.google.guava:guava:22.0
68+
| | | +--- com.fasterxml.jackson.core:jackson-core:2.8.11
69+
| | | +--- com.fasterxml.jackson.core:jackson-annotations:2.8.11
70+
| | | +--- com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.8.11 (*)
71+
| | | +--- com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.8.11 (*)
72+
| | | \--- com.fasterxml.jackson.core:jackson-databind:2.8.11.4 (*)
73+
| | +--- com.google.guava:guava:23.6.1-jre
7474
| | | +--- com.google.code.findbugs:jsr305:1.3.9
75-
| | | +--- com.google.errorprone:error_prone_annotations:2.0.18
75+
| | | +--- org.checkerframework:checker-compat-qual:2.0.0
76+
| | | +--- com.google.errorprone:error_prone_annotations:2.1.3
7677
| | | +--- com.google.j2objc:j2objc-annotations:1.1
7778
| | | \--- org.codehaus.mojo:animal-sniffer-annotations:1.14
7879
| | +--- io.jsonwebtoken:jjwt:0.7.0
79-
| | | \--- com.fasterxml.jackson.core:jackson-databind:2.8.2 -> 2.8.11.1 (*)
80+
| | | \--- com.fasterxml.jackson.core:jackson-databind:2.8.2 -> 2.8.11.4 (*)
81+
| | +--- javax.xml.bind:jaxb-api:2.3.1
82+
| | | \--- javax.activation:javax.activation-api:1.2.0
8083
| | +--- org.apache.commons:commons-lang3:3.6
8184
| | +--- javax.transaction:jta:1.1
8285
| | +--- javax.inject:javax.inject:1
83-
| | +--- org.scala-lang:scala-reflect:2.12.4 (*)
86+
| | +--- org.scala-lang:scala-reflect:2.12.8 (*)
8487
| | +--- org.scala-lang.modules:scala-java8-compat_2.12:0.8.0 (*)
85-
| | \--- org.scala-lang.modules:scala-parser-combinators_2.12:1.0.6 (*)
88+
| | \--- org.scala-lang.modules:scala-parser-combinators_2.12:1.0.7 -> 1.1.2 (*)
8689
| +--- com.google.inject:guice:4.1.0
8790
| | +--- javax.inject:javax.inject:1
8891
| | +--- aopalliance:aopalliance:1.0
89-
| | \--- com.google.guava:guava:19.0 -> 22.0 (*)
92+
| | \--- com.google.guava:guava:19.0 -> 23.6.1-jre (*)
9093
| \--- com.google.inject.extensions:guice-assistedinject:4.1.0
9194
| \--- com.google.inject:guice:4.1.0 (*)
9295
+--- ch.qos.logback:logback-classic:1.2.3
9396
| +--- ch.qos.logback:logback-core:1.2.3
94-
| \--- org.slf4j:slf4j-api:1.7.25
95-
+--- com.typesafe.play:play_2.12:2.6.15 (*)
96-
\--- com.typesafe.play:play-java-forms_2.12:2.6.15
97-
+--- org.scala-lang:scala-library:2.12.4
98-
+--- com.typesafe.play:play-java_2.12:2.6.15
99-
| +--- org.scala-lang:scala-library:2.12.4
100-
| +--- com.typesafe.play:play_2.12:2.6.15 (*)
97+
| \--- org.slf4j:slf4j-api:1.7.25 -> 1.7.29
98+
+--- com.typesafe.play:play_2.12:2.6.25 (*)
99+
\--- com.typesafe.play:play-java-forms_2.12:2.6.25
100+
+--- org.scala-lang:scala-library:2.12.8
101+
+--- com.typesafe.play:play-java_2.12:2.6.25
102+
| +--- org.scala-lang:scala-library:2.12.8
103+
| +--- com.typesafe.play:play_2.12:2.6.25 (*)
101104
| +--- org.scala-lang.modules:scala-java8-compat_2.12:0.8.0 (*)
102105
| +--- org.reflections:reflections:0.9.11
103-
| | +--- com.google.guava:guava:20.0 -> 22.0 (*)
106+
| | +--- com.google.guava:guava:20.0 -> 23.6.1-jre (*)
104107
| | \--- org.javassist:javassist:3.21.0-GA
105108
| \--- net.jodah:typetools:0.5.0
106109
+--- org.scala-lang.modules:scala-java8-compat_2.12:0.8.0 (*)
107110
+--- org.reflections:reflections:0.9.11 (*)
108111
+--- net.jodah:typetools:0.5.0
109-
+--- org.hibernate:hibernate-validator:5.4.1.Final
112+
+--- org.hibernate:hibernate-validator:5.4.3.Final
110113
| +--- javax.validation:validation-api:1.1.0.Final
111114
| +--- org.jboss.logging:jboss-logging:3.3.0.Final
112115
| \--- com.fasterxml:classmate:1.3.1
113-
+--- org.springframework:spring-context:4.3.11.RELEASE
114-
+--- org.springframework:spring-core:4.3.11.RELEASE
115-
\--- org.springframework:spring-beans:4.3.11.RELEASE
116+
+--- org.springframework:spring-context:4.3.25.RELEASE
117+
+--- org.springframework:spring-core:4.3.25.RELEASE
118+
\--- org.springframework:spring-beans:4.3.25.RELEASE

‎src/docs/samples/advanced/groovy/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44

55
play {
66
platform {
7-
playVersion = '2.6.15'
7+
playVersion = '2.6.25'
88
scalaVersion = '2.12'
99
javaVersion = JavaVersion.VERSION_1_8
1010
}
@@ -15,7 +15,7 @@ play {
1515
// tag::play-dependencies[]
1616
dependencies {
1717
implementation "commons-lang:commons-lang:2.6"
18-
implementation "com.typesafe.play:play-guice_2.12:2.6.15"
18+
implementation "com.typesafe.play:play-guice_2.12:2.6.25"
1919
implementation "ch.qos.logback:logback-classic:1.2.3"
2020
testImplementation "org.scalatestplus.play:scalatestplus-play_2.12:3.1.2"
2121
}

0 commit comments

Comments
 (0)