Enable Gradle enhanced graph ordering #12326
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| plugins { | ||
| `kotlin-dsl` | ||
| } | ||
|
|
||
| // Shadow 9's plugin API targets Java 17, so keep it isolated from Java 8 build-logic modules. | ||
| java { | ||
| sourceCompatibility = JavaVersion.VERSION_17 | ||
| targetCompatibility = JavaVersion.VERSION_17 | ||
| } | ||
|
|
||
| kotlin { | ||
| compilerOptions { | ||
| jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17) | ||
| } | ||
| } | ||
|
|
||
| dependencies { | ||
| implementation("com.gradleup.shadow:shadow-gradle-plugin:${libs.versions.shadow.get()}") | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar | ||
| import com.github.jengelman.gradle.plugins.shadow.transformers.PropertiesFileTransformer | ||
|
|
||
| plugins { | ||
| id("com.gradleup.shadow") | ||
| } | ||
|
|
||
| tasks.withType<ShadowJar>().configureEach { | ||
| if (name == "shadowJar") { | ||
| // `configurations` is left at its convention, which the Shadow plugin already sets to | ||
| // `runtimeClasspath`; adding it again is a no-op because the property is a `SetProperty`. | ||
|
|
||
| // Spring discovery metadata can occur in multiple dependency jars. With enhanced graph | ||
| // ordering, keeping only the first duplicate may omit required registrations. | ||
| duplicatesStrategy = DuplicatesStrategy.INCLUDE | ||
| mergeServiceFiles() | ||
| append("META-INF/spring.handlers") | ||
| append("META-INF/spring.schemas") | ||
| append("META-INF/spring.tooling") | ||
| transform(PropertiesFileTransformer::class.java) { | ||
| paths.set(listOf("META-INF/spring.factories")) | ||
| mergeStrategy.set(PropertiesFileTransformer.MergeStrategy.Append) | ||
| } | ||
| filesNotMatching( | ||
| listOf( | ||
| "META-INF/services/**", | ||
| "META-INF/spring.handlers", | ||
| "META-INF/spring.schemas", | ||
| "META-INF/spring.tooling", | ||
| "META-INF/spring.factories", | ||
| ) | ||
| ) { | ||
| duplicatesStrategy = DuplicatesStrategy.EXCLUDE | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| package datadog.http.client; | ||
|
|
||
| import static org.mockserver.integration.ClientAndServer.startClientAndServer; | ||
|
|
||
| import org.junit.jupiter.api.extension.AfterAllCallback; | ||
| import org.junit.jupiter.api.extension.BeforeAllCallback; | ||
| import org.junit.jupiter.api.extension.ExtensionContext; | ||
| import org.junit.jupiter.api.extension.ParameterContext; | ||
| import org.junit.jupiter.api.extension.ParameterResolutionException; | ||
| import org.junit.jupiter.api.extension.ParameterResolver; | ||
| import org.mockserver.client.MockServerClient; | ||
| import org.mockserver.integration.ClientAndServer; | ||
|
|
||
| /** Minimal JUnit lifecycle adapter for the shaded MockServer server artifact. */ | ||
| public final class MockServerExtension | ||
| implements ParameterResolver, BeforeAllCallback, AfterAllCallback { | ||
| private ClientAndServer server; | ||
|
|
||
| @Override | ||
| public void beforeAll(ExtensionContext context) { | ||
| this.server = startClientAndServer(0); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean supportsParameter( | ||
| ParameterContext parameterContext, ExtensionContext extensionContext) { | ||
| return MockServerClient.class.isAssignableFrom(parameterContext.getParameter().getType()); | ||
| } | ||
|
|
||
| @Override | ||
| public Object resolveParameter( | ||
| ParameterContext parameterContext, ExtensionContext extensionContext) { | ||
| if (this.server == null) { | ||
| throw new ParameterResolutionException("MockServer has not been started"); | ||
| } | ||
| return this.server; | ||
| } | ||
|
|
||
| @Override | ||
| public void afterAll(ExtensionContext context) { | ||
| if (this.server != null && this.server.isRunning()) { | ||
| this.server.stop(); | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| plugins { | ||
| id 'dd-trace-java.module.instrumentation' | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
suggestion: I think that
spring-boot-shadow, should be prefixed withsmoke-test, likesmoke-test-spring-boot-appAlso, maybe the existing smoke-test can be renamed to smoke-test-app (like it's custom plugin).