8000 Minor cleanup and typo fixes. (#8917) · DataDog/dd-trace-java@7787af7 · GitHub
[go: up one dir, main page]
Skip to content

Commit 7787af7

Browse files
AlexeyKuznetsov-DDAlexeyKuznetsov-DD
authored
Minor cleanup and typo fixes. (#8917)
1 parent 1280fcc commit 7787af7

File tree

5 files changed

+22
-8
lines changed

5 files changed

+22
-8
lines changed

‎BUILDING.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ Requirements to build the full project:
6060

6161
### Install the required JDKs
6262

63-
Download and install Eclipse Temurin JDK versions 8, 11, 17 and 21, and GraalVM 17.
63+
Download and install JDK versions 8, 11, 17 and 21, and GraalVM 17 for your OS.
6464

6565
#### macOS
6666

@@ -179,17 +179,17 @@ scoop install git
179179
180180
#### macOS
181181

182-
Download and install Docker Desktop from the offical website:<br/>
182+
Download and install Docker Desktop from the official website:<br/>
183183
https://docs.docker.com/desktop/setup/install/mac-install/
184184

185185
#### Linux
186186

187-
Download and install Docker Desktop from the offical website:<br/>
187+
Download and install Docker Desktop from the official website:<br/>
188188
https://docs.docker.com/desktop/setup/install/linux/
189189

190190
#### Windows
191191

192-
Download and install Docker Desktop from the offical website:<br/>
192+
Download and install Docker Desktop from the official website:<br/>
193193
https://docs.docker.com/desktop/setup/install/windows-install/
194194

195195
<details>

‎dd-java-agent/agent-iast/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ java {
1515
toolchain {
1616
languageVersion.set(JavaLanguageVersion.of(11))
1717
}
18-
sourceCompatibility = 1.8
19-
targetCompatibility = 1.8
18+
sourceCompatibility = JavaVersion.VERSION_1_8
19+
targetCompatibility = JavaVersion.VERSION_1_8
2020
}
2121

2222
tasks.withType(AbstractCompile).configureEach {

‎dd-java-agent/benchmark-integration/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ apply from: "$rootDir/gradle/java.gradle"
2525

2626
description = 'Integration Level Agent benchmarks.'
2727

28-
sourceCompatibility = 1.8
29-
targetCompatibility = 1.8
28+
sourceCompatibility = JavaVersion.VERSION_1_8
29+
targetCompatibility = JavaVersion.VERSION_1_8
3030

3131
subprojects { sub ->
3232
sub.apply plugin: 'com.gradleup.shadow'

‎dd-java-agent/instrumentation/javax-xml/build.gradle

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,13 @@ repositories {
1414
}
1515
}
1616

17+
configurations.all {
18+
// shut up about broken xml-api pom relocation
19+
resolutionStrategy {
20+
force 'xml-apis:xml-apis:1.4.01'
21+
}
22+
}
23+
1724
dependencies {
1825
testRuntimeOnly project(':dd-java-agent:instrumentation:iast-instrumenter')
1926
testImplementation group: 'xalan', name: 'xalan', version: '2.7.0'

‎dd-java-agent/instrumentation/owasp-esapi-2/build.gradle

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,13 @@ muzzle {
77
}
88
}
99

10+
configurations.all {
11+
// shut up about broken xml-api pom relocation
12+
resolutionStrategy {
13+
force 'xml-apis:xml-apis:1.4.01'
14+
}
15+
}
16+
1017
apply from: "$rootDir/gradle/java.gradle"
1118
apply plugin: 'call-site-instrumentation'
1219

0 commit comments

Comments
 (0)
0