Skip to content

Commit 7875d0b

Browse files
smolasmola
authored
Merge branch 'master' into landerson/replace-maven-central
2 parents 525031a + 32ca4c6 commit 7875d0b

711 files changed

Lines changed: 12439 additions & 3697 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.circleci/config.continue.yml.j2‎

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ instrumentation_modules: &instrumentation_modules "dd-java-agent/instrumentation
3636
debugger_modules: &debugger_modules "dd-java-agent/agent-debugger|dd-java-agent/agent-bootstrap|dd-java-agent/agent-builder|internal-api|communication|dd-trace-core"
3737
profiling_modules: &profiling_modules "dd-java-agent/agent-profiling"
3838

39-
default_system_tests_commit: &default_system_tests_commit c208feb5b40cca543670870b9601509d6a69c65e
39+
default_system_tests_commit: &default_system_tests_commit 1de04c42cbd9783432258004e46eb5982bbc9fe5
4040

4141
parameters:
4242
nightly:
@@ -852,6 +852,9 @@ jobs:
852852
DEFAULT
853853
APM_TRACING_E2E
854854
APM_TRACING_E2E_SINGLE_SPAN
855+
TRACING_CONFIG_NONDEFAULT
856+
TRACING_CONFIG_NONDEFAULT_2
857+
TRACING_CONFIG_NONDEFAULT_3
855858
"
856859
if ! [[ << parameters.weblog-variant >> =~ .*native ]]; then
857860
echo "
@@ -1102,7 +1105,7 @@ build_test_jobs: &build_test_jobs
11021105
requires:
11031106
- ok_to_test
11041107
name: check_inst
1105-
parallelism: 4
1108+
parallelism: 5
11061109
gradleTarget: ":instrumentationCheck"
11071110
cacheType: inst
11081111
triggeredBy: *instrumentation_modules
@@ -1330,6 +1333,7 @@ build_test_jobs: &build_test_jobs
13301333
matrix:
13311334
<<: *test_matrix
13321335
1336+
{% if ssi_smoke %}
13331337
- tests:
13341338
requires:
13351339
- ok_to_test
@@ -1343,6 +1347,7 @@ build_test_jobs: &build_test_jobs
13431347
maxWorkers: 3
13441348
matrix:
13451349
<<: *test_matrix
1350+
{% endif %}
13461351
13471352
- tests:
13481353
requires:
@@ -1386,6 +1391,7 @@ build_test_jobs: &build_test_jobs
13861391
maxWorkers: 3
13871392
testJvm: "8"
13881393
1394+
{% if ssi_smoke %}
13891395
- tests:
13901396
requires:
13911397
- ok_to_test
@@ -1398,13 +1404,16 @@ build_test_jobs: &build_test_jobs
13981404
parallelism: 4
13991405
maxWorkers: 3
14001406
testJvm: "8"
1407+
{% endif %}
14011408
14021409
- fan_in:
14031410
requires:
14041411
- z_test_<< matrix.testJvm >>_base
14051412
- z_test_<< matrix.testJvm >>_inst
14061413
- z_test_<< matrix.testJvm >>_smoke
1414+
{% if ssi_smoke %}
14071415
- z_test_<< matrix.testJvm >>_ssi_smoke
1416+
{% endif %}
14081417
name: test_<< matrix.testJvm >>
14091418
stage: tracing
14101419
matrix:
@@ -1415,7 +1424,9 @@ build_test_jobs: &build_test_jobs
14151424
- z_test_8_base
14161425
- z_test_8_inst
14171426
- z_test_8_smoke
1427+
{% if ssi_smoke %}
14181428
- z_test_8_ssi_smoke
1429+
{% endif %}
14191430
name: test_8
14201431
stage: tracing
14211432
testJvm: "8"
@@ -1509,6 +1520,14 @@ build_test_jobs: &build_test_jobs
15091520
stage: required
15101521
15111522
workflows:
1523+
{% if skip_circleci %}
1524+
build_test:
1525+
jobs:
1526+
# Just a "required" job to make GitHub PR checks happy, and run nothing else.
1527+
- fan_in:
1528+
name: required
1529+
stage: required
1530+
{% else %}
15121531
{% if is_regular %}
15131532
build_test:
15141533
jobs:
@@ -1549,3 +1568,4 @@ workflows:
15491568
gradleTarget: :profilingTest
15501569
cacheType: profiling
15511570
{% endif %}
1571+
{% endif %}

‎.circleci/no_circleci_changes.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#!/usr/bin/env bash
2+
set -eu
3+
git diff --name-only "$1" | grep --invert-match --quiet -E '^(.gitlab-ci.yml|.gitlab)'

‎.circleci/render_config.py‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import os
44
import os.path
5+
import subprocess
56
import time
67

78
import jinja2
@@ -14,9 +15,10 @@
1415
GENERATED_CONFIG_PATH = os.path.join(SCRIPT_DIR, OUT_FILENAME)
1516

1617
# JDKs that will run on every pipeline.
17-
ALWAYS_ON_JDKS = {"8", "11", "17", "21"}
18+
ALWAYS_ON_JDKS = {"8", "17", "21"}
1819
# And these will run only in master and release/ branches.
1920
MASTER_ONLY_JDKS = {
21+
"11",
2022
"ibm8",
2123
"oracle8",
2224
"semeru8",
@@ -74,6 +76,13 @@
7476
run_all = "all" in labels
7577
is_master_or_release = branch == "master" or branch.startswith("release/v")
7678

79+
skip_circleci = False
80+
if pr_base_ref:
81+
ret = subprocess.call([".circleci/no_circleci_changes.sh", f"{pr_base_ref}..HEAD"], shell=False)
82+
if ret == 1:
83+
# Only GitLab-related files have changed, just skip Circle CI jobs.
84+
skip_circleci = True
85+
7786
if is_master_or_release or run_all:
7887
all_jdks = ALWAYS_ON_JDKS | MASTER_ONLY_JDKS
7988
else:
@@ -99,10 +108,12 @@
99108
"all_jdks": all_jdks,
100109
"all_debugger_jdks": all_debugger_jdks,
101110
"nocov_jdks": nocov_jdks,
102-
"flaky": branch == "master" or "flaky" in labels or "all" in labels,
111+
"flaky": "flaky" in labels or "all" in labels,
103112
"docker_image_prefix": "" if is_nightly else f"{DOCKER_IMAGE_VERSION}-",
104113
"use_git_changes": use_git_changes,
105114
"pr_base_ref": pr_base_ref,
115+
"skip_circleci": skip_circleci,
116+
"ssi_smoke": is_regular and is_master_or_release
106117
}
107118

108119
print(f"Variables for this build: {vars}")

‎communication/gradle.lockfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,8 +157,8 @@ org.slf4j:slf4j-api:1.7.30=compileClasspath,runtimeClasspath,testCompileClasspat
157157
org.slf4j:slf4j-api:1.7.32=testRuntimeClasspath
158158
org.slf4j:slf4j-api:2.0.0=spotbugs,spotbugsSlf4j
159159
org.slf4j:slf4j-simple:2.0.0=spotbugsSlf4j
160-
org.spockframework:spock-core:2.2-groovy-3.0=testCompileClasspath,testRuntimeClasspath
161-
org.spockframework:spock-junit4:2.2-groovy-3.0=testCompileClasspath,testRuntimeClasspath
160+
org.spockframework:spock-core:2.3-groovy-3.0=testCompileClasspath,testRuntimeClasspath
161+
org.spockframework:spock-junit4:2.3-groovy-3.0=testCompileClasspath,testRuntimeClasspath
162162
org.testng:testng:7.5=testRuntimeClasspath
163163
org.webjars:jquery:3.5.1=testRuntimeClasspath
164164
org.xmlresolver:xmlresolver:4.4.3=spotbugs

‎components/cli/build.gradle.kts‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
plugins {
2+
id("me.champeau.jmh")
3+
}
4+
5+
apply(from = "$rootDir/gradle/java.gradle")
6+
7+
jmh {
8+
version = "1.28"
9+
}

‎components/cli/gradle.lockfile‎

Lines changed: 118 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,118 @@
1+
# This is a Gradle generated file for dependency locking.
2+
# Manual edits can break the build and are not advised.
3+
# This file is expected to be part of source control.
4+
ch.qos.logback:logback-classic:1.2.3=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
5+
ch.qos.logback:logback-core:1.2.3=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
6+
com.beust:jcommander:1.78=jmhRuntimeClasspath,testRuntimeClasspath
7+
com.github.javaparser:javaparser-core:3.25.1=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
8+
com.github.spotbugs:spotbugs-annotations:4.2.0=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
9+
com.github.spotbugs:spotbugs-annotations:4.7.3=spotbugs
10+
com.github.spotbugs:spotbugs:4.7.3=spotbugs
11+
com.google.code.findbugs:jsr305:3.0.2=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
12+
com.google.code.gson:gson:2.9.1=spotbugs
13+
com.thoughtworks.qdox:qdox:1.12.1=jmhRuntimeClasspath,testRuntimeClasspath
14+
commons-codec:commons-codec:1.15=spotbugs
15+
de.thetaphi:forbiddenapis:3.8=compileClasspath,jmhCompileClasspath
16+
info.picocli:picocli:4.6.3=jmhRuntimeClasspath,testRuntimeClasspath
17+
jaxen:jaxen:1.2.0=spotbugs
18+
jline:jline:2.14.6=jmhRuntimeClasspath,testRuntimeClasspath
19+
junit:junit:4.13.2=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
20+
net.jcip:jcip-annotations:1.0=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
21+
net.sf.jopt-simple:jopt-simple:5.0.4=jmh,jmhCompileClasspath,jmhRuntimeClasspath
22+
net.sf.saxon:Saxon-HE:11.4=spotbugs
23+
org.apache.ant:ant-antlr:1.10.12=jmhRuntimeClasspath,testRuntimeClasspath
24+
org.apache.ant:ant-antlr:1.9.15=codenarc
25+
org.apache.ant:ant-junit:1.10.12=jmhRuntimeClasspath,testRuntimeClasspath
26+
org.apache.ant:ant-junit:1.9.15=codenarc
27+
org.apache.ant:ant-launcher:1.10.12=jmhRuntimeClasspath,testRuntimeClasspath
28+
org.apache.ant:ant:1.10.12=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
29+
org.apache.bcel:bcel:6.5.0=spotbugs
30+
org.apache.commons:commons-lang3:3.12.0=pitest,spotbugs
31+
org.apache.commons:commons-math3:3.2=jmh,jmhCompileClasspath,jmhRuntimeClasspath
32+
org.apache.commons:commons-text:1.10.0=pitest,spotbugs
33+
org.apache.httpcomponents.client5:httpclient5:5.1.3=spotbugs
34+
org.apache.httpcomponents.core5:httpcore5-h2:5.1.3=spotbugs
35+
org.apache.httpcomponents.core5:httpcore5:5.1.3=spotbugs
36+
org.apache.logging.log4j:log4j-api:2.19.0=spotbugs
37+
org.apache.logging.log4j:log4j-core:2.19.0=spotbugs
38+
org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
39+
org.codehaus.groovy:groovy-all:3.0.17=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
40+
org.codehaus.groovy:groovy-ant:2.5.14=codenarc
41+
org.codehaus.groovy:groovy-ant:3.0.17=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
42+
org.codehaus.groovy:groovy-astbuilder:3.0.17=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
43+
org.codehaus.groovy:groovy-cli-picocli:3.0.17=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
44+
org.codehaus.groovy:groovy-console:3.0.17=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
45+
org.codehaus.groovy:groovy-datetime:3.0.17=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
46+
org.codehaus.groovy:groovy-docgenerator:3.0.17=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
47+
org.codehaus.groovy:groovy-groovydoc:2.5.14=codenarc
48+
org.codehaus.groovy:groovy-groovydoc:3.0.17=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
49+
org.codehaus.groovy:groovy-groovysh:3.0.17=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
50+
org.codehaus.groovy:groovy-jmx:3.0.17=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
51+
org.codehaus.groovy:groovy-json:2.5.14=codenarc
52+
org.codehaus.groovy:groovy-json:3.0.17=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
53+
org.codehaus.groovy:groovy-jsr223:3.0.17=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
54+
org.codehaus.groovy:groovy-macro:3.0.17=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
55+
org.codehaus.groovy:groovy-nio:3.0.17=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
56+
org.codehaus.groovy:groovy-servlet:3.0.17=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
57+
org.codehaus.groovy:groovy-sql:3.0.17=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
58+
org.codehaus.groovy:groovy-swing:3.0.17=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
59+
org.codehaus.groovy:groovy-templates:2.5.14=codenarc
60+
org.codehaus.groovy:groovy-templates:3.0.17=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
61+
org.codehaus.groovy:groovy-test-junit5:3.0.17=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
62+
org.codehaus.groovy:groovy-test:3.0.17=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
63+
org.codehaus.groovy:groovy-testng:3.0.17=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
64+
org.codehaus.groovy:groovy-xml:2.5.14=codenarc
65+
org.codehaus.groovy:groovy-xml:3.0.17=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
66+
org.codehaus.groovy:groovy:2.5.14=codenarc
67+
org.codehaus.groovy:groovy:3.0.17=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
68+
org.codenarc:CodeNarc:2.2.0=codenarc
69+
org.dom4j:dom4j:2.1.3=spotbugs
70+
org.gmetrics:GMetrics:1.1=codenarc
71+
org.hamcrest:hamcrest-core:1.3=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
72+
org.hamcrest:hamcrest:2.2=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
73+
org.jacoco:org.jacoco.agent:0.8.5=jacocoAgent,jacocoAnt
74+
org.jacoco:org.jacoco.ant:0.8.5=jacocoAnt
75+
org.jacoco:org.jacoco.core:0.8.5=jacocoAnt
76+
org.jacoco:org.jacoco.report:0.8.5=jacocoAnt
77+
org.junit.jupiter:junit-jupiter-api:5.9.2=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
78+
org.junit.jupiter:junit-jupiter-engine:5.9.2=jmhRuntimeClasspath,testRuntimeClasspath
79+
org.junit.jupiter:junit-jupiter-params:5.9.2=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
80+
org.junit.jupiter:junit-jupiter:5.9.2=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
81+
org.junit.platform:junit-platform-commons:1.9.2=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
82+
org.junit.platform:junit-platform-engine:1.9.2=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
83+
org.junit.platform:junit-platform-launcher:1.9.2=jmhRuntimeClasspath,testRuntimeClasspath
84+
org.junit:junit-bom:5.9.1=spotbugs
85+
org.junit:junit-bom:5.9.2=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
86+
org.objenesis:objenesis:3.3=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
87+
org.openjdk.jmh:jmh-core:1.36=jmh,jmhCompileClasspath,jmhRuntimeClasspath
88+
org.openjdk.jmh:jmh-generator-asm:1.36=jmh,jmhCompileClasspath,jmhRuntimeClasspath
89+
org.openjdk.jmh:jmh-generator-bytecode:1.36=jmh,jmhCompileClasspath,jmhRuntimeClasspath
90+
org.openjdk.jmh:jmh-generator-reflection:1.36=jmh,jmhCompileClasspath,jmhRuntimeClasspath
91+
org.opentest4j:opentest4j:1.2.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
92+
org.ow2.asm:asm-analysis:7.2=jacocoAnt
93+
org.ow2.asm:asm-analysis:9.4=spotbugs
94+
org.ow2.asm:asm-commons:7.2=jacocoAnt
95+
org.ow2.asm:asm-commons:9.4=spotbugs
96+
org.ow2.asm:asm-tree:7.2=jacocoAnt
97+
org.ow2.asm:asm-tree:9.4=spotbugs
98+
org.ow2.asm:asm-util:9.4=spotbugs
99+
org.ow2.asm:asm:7.2=jacocoAnt
100+
org.ow2.asm:asm:9.0=jmh,jmhCompileClasspath,jmhRuntimeClasspath
101+
org.ow2.asm:asm:9.4=spotbugs
102+
org.pitest:pitest-command-line:1.9.11=pitest
103+
org.pitest:pitest-entry:1.9.11=pitest
104+
org.pitest:pitest:1.9.11=pitest
105+
org.slf4j:jcl-over-slf4j:1.7.30=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
106+
org.slf4j:jul-to-slf4j:1.7.30=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
107+
org.slf4j:log4j-over-slf4j:1.7.30=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
108+
org.slf4j:slf4j-api:1.7.30=testCompileClasspath
109+
org.slf4j:slf4j-api:1.7.32=jmhRuntimeClasspath,testRuntimeClasspath
110+
org.slf4j:slf4j-api:2.0.0=spotbugs,spotbugsSlf4j
111+
org.slf4j:slf4j-simple:2.0.0=spotbugsSlf4j
112+
org.spockframework:spock-core:2.3-groovy-3.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
113+
org.spockframework:spock-junit4:2.3-groovy-3.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
114+
org.testng:testng:7.5=jmhRuntimeClasspath,testRuntimeClasspath
115+
org.webjars:jquery:3.5.1=jmhRuntimeClasspath,testRuntimeClasspath
116+
org.xmlresolver:xmlresolver:4.4.3=spotbugs
117+
xml-apis:xml-apis:1.4.01=spotbugs
118+
empty=annotationProcessor,jmhAnnotationProcessor,runtimeClasspath,spotbugsPlugins,testAnnotationProcessor

‎components/cli/src/main/java/datadog/cli/CLIHelper.java‎

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
package datadog.cli;
2+
3+
import de.thetaphi.forbiddenapis.SuppressForbidden;
4+
import java.io.BufferedReader;
5+
import java.lang.management.ManagementFactory;
6+
import java.lang.reflect.Field;
7+
import java.nio.file.Files;
8+
import java.nio.file.Path;
9+
import java.nio.file.Paths;
10+
import java.util.Arrays;
11+
import java.util.Collections;
12+
import java.util.List;
13+
import java.util.Locale;
14+
15+
public final class CLIHelper {
16+
private static final List<String> VM_ARGS = findVmArgs();
17+
18+
public static List<String> getVmArgs() {
19+
return VM_ARGS;
20+
}
21+
22+
@SuppressForbidden
23+
private static List<String> findVmArgs() {
24+
// Try ProcFS on Linux
25+
try {
26+
if (isLinux()) {
27+
Path cmdlinePath = Paths.get("/proc/self/cmdline");
28+
if (Files.exists(cmdlinePath)) {
29+
try (BufferedReader in = Files.newBufferedReader(cmdlinePath)) {
30+
return Arrays.asList(in.readLine().split("\0"));
31+
}
32+
}
33+
}
34+
} catch (Throwable ignored) {
35+
// Ignored exception
36+
}
37+
38+
// Try Oracle-based
39+
// IBM Semeru Runtime 1.8.0_345-b01 will throw UnsatisfiedLinkError here.
40+
try {
41+
final Class<?> managementFactoryHelperClass =
42+
Class.forName("sun.management.ManagementFactoryHelper");
43+
44+
final Class<?> vmManagementClass = Class.forName("sun.management.VMManagement");
45+
46+
Object vmManagement;
47+
48+
try {
49+
vmManagement =
50+
managementFactoryHelperClass.getDeclaredMethod("getVMManagement").invoke(null);
51+
} catch (final NoSuchMethodException e) {
52+
// Older vm before getVMManagement() existed
53+
final Field field = managementFactoryHelperClass.getDeclaredField("jvm");
54+
field.setAccessible(true);
55+
vmManagement = field.get(null);
56+
field.setAccessible(false);
57+
}
58+
59+
//noinspection unchecked
60+
return (List<String>) vmManagementClass.getMethod("getVmArguments").invoke(vmManagement);
61+
} catch (final ReflectiveOperationException | UnsatisfiedLinkError ignored) {
62+
// Ignored exception
63+
}
64+
65+
// Try IBM-based.
66+
try {
67+
final Class<?> VMClass = Class.forName("com.ibm.oti.vm.VM");
68+
final String[] argArray = (String[]) VMClass.getMethod("getVMArgs").invoke(null);
69+
return Arrays.asList(argArray);
70+
} catch (final ReflectiveOperationException ignored) {
71+
// Ignored exception
72+
}
73+
74+
// Fallback to default
75+
try {
76+
return ManagementFactory.getRuntimeMXBean().getInputArguments();
77+
} catch (final Throwable t) {
78+
// Throws InvocationTargetException on modularized applications
79+
// with non-opened java.management module
80+
System.err.println("WARNING: Unable to get VM args using managed beans");
81+
}
82+
return Collections.emptyList();
83+
}
84+
85+
private static boolean isLinux() {
86+
return System.getProperty("os.name").toLowerCase(Locale.ROOT).contains("linux");
87+
}
88+
}

‎components/context/gradle.lockfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,8 @@ org.slf4j:slf4j-api:1.7.30=testCompileClasspath
109109
org.slf4j:slf4j-api:1.7.32=jmhRuntimeClasspath,testRuntimeClasspath
110110
org.slf4j:slf4j-api:2.0.0=spotbugs,spotbugsSlf4j
111111
org.slf4j:slf4j-simple:2.0.0=spotbugsSlf4j
112-
org.spockframework:spock-core:2.2-groovy-3.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
113-
org.spockframework:spock-junit4:2.2-groovy-3.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
112+
org.spockframework:spock-core:2.3-groovy-3.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
113+
org.spockframework:spock-junit4:2.3-groovy-3.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
114114
org.testng:testng:7.5=jmhRuntimeClasspath,testRuntimeClasspath
115115
org.webjars:jquery:3.5.1=jmhRuntimeClasspath,testRuntimeClasspath
116116
org.xmlresolver:xmlresolver:4.4.3=spotbugs

0 commit comments

Comments
 (0)