Skip to content

Commit c86443e

Browse files
Merge branch 'master' into alexeyk/protocol-v1-1
2 parents 0450392 + 0b10654 commit c86443e

3 files changed

Lines changed: 13 additions & 5 deletions

File tree

buildSrc/build.gradle.kts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
plugins {
2-
groovy
32
`java-gradle-plugin`
43
`kotlin-dsl`
54
`jvm-test-suite`
@@ -72,7 +71,6 @@ repositories {
7271

7372
dependencies {
7473
implementation(gradleApi())
75-
implementation(localGroovy())
7674

7775
implementation("net.bytebuddy", "byte-buddy-gradle-plugin", "1.18.3")
7876

@@ -109,7 +107,7 @@ testing {
109107
}
110108
targets.configureEach {
111109
testTask.configure {
112-
enabled = providers.systemProperty("runBuildSrcTests").isPresent or providers.systemProperty("idea.active").isPresent
110+
enabled = providers.gradleProperty("runBuildSrcTests").isPresent or providers.systemProperty("idea.active").isPresent
113111
}
114112
}
115113
}

dd-smoke-tests/rum/wildfly-15/build.gradle

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,12 @@ ext {
99
repositories {
1010
ivy {
1111
url = 'https://download.jboss.org/'
12+
// Restrict this repository to WildFly distribution artifacts only.
13+
// Without this filter, Gradle may probe this host for unrelated dependencies
14+
// (for example JUnit/Mockito), which makes the build flaky when the host is unreachable.
15+
content {
16+
includeGroup 'wildfly'
17+
}
1218
patternLayout {
1319
// artifact '/[organisation]/[revision]/[module]/[organisation]-[module]-[revision].[ext]'
1420
// we download the full EE profile and not the servlet minimal one
@@ -124,4 +130,3 @@ tasks.withType(Test).configureEach {
124130
dependsOn 'deploy'
125131
jvmArgs "-Ddatadog.smoketest.wildflyDir=${wildflyDir}"
126132
}
127-

dd-smoke-tests/wildfly/build.gradle

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,12 @@ ext {
99
repositories {
1010
ivy {
1111
url = 'https://download.jboss.org/'
12+
// Restrict this repository to WildFly distribution artifacts only.
13+
// Without this filter, Gradle may probe this host for unrelated dependencies
14+
// (for example JUnit/Mockito), which makes the build flaky when the host is unreachable.
15+
content {
16+
includeGroup 'wildfly'
17+
}
1218
patternLayout {
1319
// artifact '/[organisation]/[revision]/[module]/[organisation]-[module]-[revision].[ext]'
1420
// we download the full EE profile and not the servlet minimal one
@@ -127,4 +133,3 @@ tasks.withType(Test).configureEach {
127133
dependsOn 'deploy'
128134
jvmArgs "-Ddatadog.smoketest.wildflyDir=${wildflyDir}"
129135
}
130-

0 commit comments

Comments
 (0)