File tree Expand file tree Collapse file tree 7 files changed +12
-14
lines changed
dd-java-agent/instrumentation Expand file tree Collapse file tree 7 files changed +12
-14
lines changed Original file line number Diff line number Diff line change @@ -37,8 +37,7 @@ dependencies {
37
37
webappCompileOnly group : ' javax.servlet' , name : ' javax.servlet-api' , version : ' 3.1.0'
38
38
// compileOnly to avoid bringing all the test dependencies to the test app
39
39
// these are to be provided by the system classloader on test time
40
- webappCompileOnly project(' :dd-java-agent:instrumentation:servlet:request-3' )
41
- .tasks[' compileTestFixturesJava' ]. classpath
40
+ webappCompileOnly testFixtures(project(' :dd-java-agent:instrumentation:servlet:request-3' ))
42
41
// only the testFixtures jar (not its dependencies) and groovy should be included in the webapp
43
42
webappImplementation files(
44
43
project(' :dd-java-agent:instrumentation:servlet:request-3' )
Original file line number Diff line number Diff line change @@ -41,8 +41,7 @@ dependencies {
41
41
webappCompileOnly group : ' jakarta.servlet' , name : ' jakarta.servlet-api' , version : ' 5.0.0'
42
42
// compileOnly to avoid bringing all the test dependencies to the test app
43
43
// these are to be provided by the system classloader on test time
44
- webappCompileOnly project(' :dd-java-agent:instrumentation:servlet:request-5' )
45
- .tasks[' compileTestFixturesJava' ]. classpath
44
+ webappCompileOnly testFixtures(project(' :dd-java-agent:instrumentation:servlet:request-5' ))
46
45
// only the testFixtures jar (not its dependencies) and groovy should be included in the webapp
47
46
webappImplementation files(
48
47
project(' :dd-java-agent:instrumentation:servlet:request-5' )
Original file line number Diff line number Diff line change @@ -38,7 +38,7 @@ dependencies {
38
38
compileOnly group : ' javax.servlet' , name : ' javax.servlet-api' , version : ' 3.1.0'
39
39
implementation project(' :dd-java-agent:instrumentation:servlet-common' )
40
40
41
- testFixturesImplementation (project(' :dd-java-agent:testing' )) {
41
+ testFixturesApi (project(' :dd-java-agent:testing' )) {
42
42
exclude group : ' org.eclipse.jetty' , module : ' jetty-server'
43
43
}
44
44
testFixturesCompileOnly group : ' javax.servlet' , name : ' javax.servlet-api' , version : ' 3.0.1'
Original file line number Diff line number Diff line change @@ -64,7 +64,7 @@ dependencies {
64
64
transitive = false
65
65
}
66
66
67
- testFixturesImplementation (project(' :dd-java-agent:testing' )) {
67
+ testFixturesApi (project(' :dd-java-agent:testing' )) {
68
68
exclude group : ' org.eclipse.jetty' , module : ' jetty-server'
69
69
}
70
70
testFixturesCompileOnly group : ' jakarta.servlet' , name : ' jakarta.servlet-api' , version : ' 5.0.0'
Original file line number Diff line number Diff line change @@ -19,9 +19,9 @@ repositories {
19
19
url ' https://archive.apache.org/dist'
20
20
patternLayout {
21
21
artifact ' /[organisation]/[module]/v[revision]/bin/apache-[organisation]-[revision].[ext]'
22
- metadataSources {
23
- artifact()
24
- }
22
+ }
23
+ metadataSources {
24
+ it . artifact()
25
25
}
26
26
}
27
27
}
Original file line number Diff line number Diff line change @@ -14,9 +14,9 @@ repositories {
14
14
// artifact '/[organisation]/[revision]/[module]/[organisation]-[module]-[revision].[ext]'
15
15
// we download the full EE profile and not the servlet minimal one
16
16
artifact ' /[organisation]/[revision]/[organisation]-[revision].[ext]'
17
- metadataSources {
18
- artifact()
19
- }
17
+ }
18
+ metadataSources {
19
+ it . artifact()
20
20
}
21
21
}
22
22
}
Original file line number Diff line number Diff line change @@ -111,8 +111,8 @@ configurations {
111
111
}
112
112
}
113
113
114
- tasks. withType(AbstractPublishToMaven ). configureEach {
114
+ tasks. withType(AbstractPublishToMaven ). configureEach { task ->
115
115
rootProject. subprojects {
116
- mustRunAfter tasks. matching { it instanceof VerificationTask }
116
+ task . mustRunAfter tasks. matching { it instanceof VerificationTask }
117
117
}
118
118
}
You can’t perform that action at this time.
0 commit comments