Skip to content

Commit 47dbd65

Browse files
bantonssonbantonsson
committed
Gradle change configurations to new names
1 parent c443bfb commit 47dbd65

14 files changed

Lines changed: 58 additions & 54 deletions

File tree

‎dd-cws-tls/dd-cws-tls.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ sourceCompatibility = JavaVersion.VERSION_1_8
1010
targetCompatibility = JavaVersion.VERSION_1_8
1111

1212
dependencies {
13-
compile group: 'net.java.dev.jna', name: 'jna', version: '5.8.0'
14-
compile group: 'net.java.dev.jna', name: 'jna-platform', version: '5.8.0'
13+
implementation group: 'net.java.dev.jna', name: 'jna', version: '5.8.0'
14+
implementation group: 'net.java.dev.jna', name: 'jna-platform', version: '5.8.0'
1515

1616
implementation project(':internal-api')
1717
implementation project(':dd-trace-api')

‎dd-java-agent/agent-profiling/profiling-auxiliary/profiling-auxiliary.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ dependencies {
1616

1717
testImplementation deps.junit5
1818
testImplementation deps.mockito
19-
testCompile deps.autoserviceAnnotation
19+
testImplementation deps.autoserviceAnnotation
2020
testAnnotationProcessor deps.autoserviceProcessor
2121
}
2222

‎dd-java-agent/agent-tooling/agent-tooling.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ compileMain_java11Java.doFirst {
4343
dependencies {
4444
main_java11CompileOnly deps.bytebuddy
4545
main_java11CompileOnly sourceSets.main.output
46-
runtime sourceSets.main_java11.output
46+
runtimeOnly sourceSets.main_java11.output
4747
}
4848
jar {
4949
from sourceSets.main_java11.output

‎dd-java-agent/appsec/weblog/weblog-spring-app/weblog-spring-app.gradle‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ buildscript {
33
mavenCentral()
44
}
55
dependencies {
6-
classpath 'org.springframework.boot:spring-boot-gradle-plugin:1.5.9.RELEASE'
6+
classpath 'org.springframework.boot:spring-boot-gradle-plugin:1.5.22.RELEASE'
77
}
88
}
99

@@ -38,12 +38,10 @@ if (project.hasProperty('testExecutable') && project.testExecutable) {
3838
}
3939
}
4040

41-
/* Last versions supporting Java 6
42-
* (this can be updated now though, because we support only 8+) */
43-
ext['jetty.version'] = '8.1.22.v20160922'
41+
ext['jetty.version'] = '9.4.44.v20210927'
4442
ext['jackson.version'] = '2.7.9'
4543

46-
def groovyVersion = '2.5.8'
44+
def groovyVersion = '2.5.13'
4745
ext['groovy.version'] = groovyVersion
4846

4947
dependencies {
@@ -55,7 +53,7 @@ dependencies {
5553
implementation group: 'io.sqreen', name: 'sqreen-sdk', version: '0.3'
5654
implementation group: 'io.sqreen', name: 'sqreen-sdk-standalone', version: '0.3.0'
5755

58-
implementation group: 'org.codehaus.groovy', name: 'groovy-all', version: '2.5.8'
56+
implementation group: 'org.codehaus.groovy', name: 'groovy-all', version: '2.5.13'
5957
implementation 'org.springframework.boot:spring-boot-starter-web'
6058
implementation 'org.springframework.boot:spring-boot-starter-data-jpa', {
6159
exclude module: 'tomcat-jdbc'
@@ -210,7 +208,7 @@ def createBundleTarget = { name, deps ->
210208
if (!(d instanceof List)) {
211209
d = [d]
212210
}
213-
delegate."${name}Compile"(*d)
211+
delegate."${name}Implementation"(*d)
214212
}
215213
}
216214

‎dd-java-agent/instrumentation/aws-java-sdk-1.11.0/aws-java-sdk-1.11.0.gradle‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,13 @@ dependencies {
4040
// Include httpclient instrumentation for testing because it is a dependency for aws-sdk.
4141
testImplementation project(':dd-java-agent:instrumentation:apache-httpclient-4')
4242

43-
testCompile group: 'com.amazonaws', name: 'aws-java-sdk-s3', version: '[1.11,1.11.106]'
44-
testCompile group: 'com.amazonaws', name: 'aws-java-sdk-rds', version: '[1.11,1.11.106]'
45-
testCompile group: 'com.amazonaws', name: 'aws-java-sdk-ec2', version: '[1.11,1.11.106]'
46-
testCompile group: 'com.amazonaws', name: 'aws-java-sdk-kinesis', version: '[1.11,1.11.106]'
47-
testCompile group: 'com.amazonaws', name: 'aws-java-sdk-sqs', version: '[1.11,1.11.106]'
48-
testCompile group: 'com.amazonaws', name: 'aws-java-sdk-sns', version: '[1.11,1.11.106]'
49-
testCompile group: 'com.amazonaws', name: 'aws-java-sdk-dynamodb', version: '[1.11,1.11.106]'
43+
testImplementation group: 'com.amazonaws', name: 'aws-java-sdk-s3', version: '[1.11,1.11.106]'
44+
testImplementation group: 'com.amazonaws', name: 'aws-java-sdk-rds', version: '[1.11,1.11.106]'
45+
testImplementation group: 'com.amazonaws', name: 'aws-java-sdk-ec2', version: '[1.11,1.11.106]'
46+
testImplementation group: 'com.amazonaws', name: 'aws-java-sdk-kinesis', version: '[1.11,1.11.106]'
47+
testImplementation group: 'com.amazonaws', name: 'aws-java-sdk-sqs', version: '[1.11,1.11.106]'
48+
testImplementation group: 'com.amazonaws', name: 'aws-java-sdk-sns', version: '[1.11,1.11.106]'
49+
testImplementation group: 'com.amazonaws', name: 'aws-java-sdk-dynamodb', version: '[1.11,1.11.106]'
5050

5151
// needed for kinesis:
5252
testImplementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-cbor', version: versions.jackson

‎dd-java-agent/instrumentation/micronaut-http-server-netty-2/micronaut-http-server-netty-2.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ dependencies {
2727
main_java8CompileOnly group: 'io.micronaut', name: 'micronaut-http-server-netty', version: '2.0.0'
2828

2929
testImplementation project(':dd-java-agent:instrumentation:netty-4.1')
30-
testCompile group: 'io.micronaut', name: 'micronaut-http-server-netty', version: '2.0.0'
30+
testImplementation group: 'io.micronaut', name: 'micronaut-http-server-netty', version: '2.0.0'
3131

3232
testAnnotationProcessor "io.micronaut:micronaut-inject-java:2.0.0"
3333

34-
latestDepTestCompile group: 'io.micronaut', name: 'micronaut-http-server-netty', version: '2.+'
34+
latestDepTestImplementation group: 'io.micronaut', name: 'micronaut-http-server-netty', version: '2.+'
3535
}

‎dd-java-agent/instrumentation/okhttp-2/okhttp-2.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ testSets {
2424
dependencies {
2525
compileOnly(group: 'com.squareup.okhttp', name: 'okhttp', version: '2.2.0')
2626

27-
compile(project(':dd-java-agent:agent-tooling')) {
27+
implementation(project(':dd-java-agent:agent-tooling')) {
2828
exclude module: 'okhttp'
2929
}
3030

‎dd-java-agent/instrumentation/spray-1.3/spray-1.3.gradle‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ dependencies {
2323
compileOnly group: 'io.spray', name: "spray-can_$scalaVersion", version: '1.3.1'
2424
compileOnly group: 'io.spray', name: "spray-routing_$scalaVersion", version: '1.3.1'
2525

26-
testCompile group: 'com.typesafe.akka', name: "akka-actor_$scalaVersion", version: '2.3.14'
27-
testCompile group: 'io.spray', name: "spray-can_$scalaVersion", version: '1.3.3'
28-
testCompile group: 'io.spray', name: "spray-routing_$scalaVersion", version: '1.3.1'
26+
testImplementation group: 'com.typesafe.akka', name: "akka-actor_$scalaVersion", version: '2.3.14'
27+
testImplementation group: 'io.spray', name: "spray-can_$scalaVersion", version: '1.3.3'
28+
testImplementation group: 'io.spray', name: "spray-routing_$scalaVersion", version: '1.3.1'
2929

30-
testCompile project(':dd-java-agent:testing')
30+
testImplementation project(':dd-java-agent:testing')
3131
}
3232

‎dd-smoke-tests/wildfly/wildfly.gradle‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,24 @@ apply from: "$rootDir/gradle/java.gradle"
2323

2424
description = 'Wildfly Smoke Tests.'
2525

26+
configurations {
27+
serverFile {
28+
extendsFrom implementation
29+
canBeResolved = true
30+
}
31+
}
32+
2633
dependencies {
2734
// uses the ivy repository url to download the wildfly servlet zip
2835
// organisation = serverName, revision = serverVersion, module = serverModule, ext = serverExtension
29-
compile "${serverName}:${serverModule}:${serverVersion}@${serverExtension}"
36+
serverFile "${serverName}:${serverModule}:${serverVersion}@${serverExtension}"
3037

3138
testImplementation project(':dd-smoke-tests')
3239
}
3340

3441
tasks.register("unzip", Copy) {
3542
def zipFileNamePrefix = "servlet"
36-
def zipPath = project.configurations.compile.find {
43+
def zipPath = project.configurations.serverFile.find {
3744
it.name.startsWith(zipFileNamePrefix)
3845
}
3946
if (zipPath != null) {

‎dd-trace-core/dd-trace-core.gradle‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,18 +30,18 @@ testSets {
3030
}
3131

3232
dependencies {
33-
compile project(':dd-trace-api')
33+
api project(':dd-trace-api')
3434
api project(':communication')
35-
compile project(':internal-api')
36-
compile project(':utils:histograms')
37-
compile project(':utils:container-utils')
38-
compile project(':utils:socket-utils')
39-
compile project(':dd-cws-tls')
35+
api project(':internal-api')
36+
implementation project(':utils:histograms')
37+
implementation project(':utils:container-utils')
38+
implementation project(':utils:socket-utils')
39+
implementation project(':dd-cws-tls')
4040

41-
compile deps.slf4j
41+
implementation deps.slf4j
4242
implementation deps.moshi
4343

44-
compile group: 'org.jctools', name: 'jctools-core', version: '3.3.0'
44+
implementation group: 'org.jctools', name: 'jctools-core', version: '3.3.0'
4545

4646
compileOnly group: 'com.github.spotbugs', name: 'spotbugs-annotations', version: '4.2.0'
4747

0 commit comments

Comments
 (0)