}
    }

    private void addTagsFilter(LauncherDiscoveryRequestBuilder requestBuilder) {
        List<String> includeTags = spec.getIncludeTags();
        if (!includeTags.isEmpty()) {
            requestBuilder.filters(includeTags(includeTags));
        }
        List<String> excludeTags = spec.getExcludeTags();
        if (!excludeTags.isEmpty()) {

/**
 * This annotation is a marker and guarantees all integration tests are tagged.
 *
 * When we use JUnit Platform `includeTags('SomeTag')`, all spock tests are excluded:
 * https://github.com/spockframework/spock/issues/1288 . As a workaround,
 * we tag all non-spock integration tests and use `includeTags(none() | SomeTag)` to make
 * sure spock engine tests are executed.
 */
@Retention(RetentionPolicy.RUNTIME)

 *   tests annotated by this is handled by `JUnitPlatformOptions.includeTags/excludeTags`.
 * For JUnit 4 tests, because we run them in Vintage engine, we have to annotate the tests with `@Category(Flaky.class)` so it can be transparently

                filter {
                    includeTestsMatching('*Class')
                    excludeTestsMatching('exclude-pattern')
                }
                useJUnitPlatform {
                    includeTags('included-tag')
                    excludeTags('excluded-tag')
                    includeEngines('included-engine')
                    excludeEngines('excluded-engine')
                }

            // JUnit Platform `includeTags` works before Spock engine, thus excludes all spock tests.
            // As a workaround, we tag all non-spock integration tests and use `includeTags(none() | Flaky)` here.
            (options as JUnitPlatformOptions).includeTags("none() | org.gradle.test.fixtures.Flaky")
            includeSpockAnnotation("org.gradle.test.fixtures.Flaky")

```
test {
   useJUnitPlatform {
        includeTags("foo")
   }
}
tasks.withType(Test).configureEach {
   // previously, this would overwrite the included tags to only include "bar"
   useJUnitPlatform {
        includeTags("bar")
   }
}
```

=== Removed APIs

==== Legacy ArtifactTransform API

  "editable": true,
  "fiscalYearStartMonth": 0,
  "gnetId": 15306,
  "graphTooltip": 0,
  "id": 267,
  "links": [
    {
      "icon": "external link",
      "includeVars": true,
      "keepTime": true,
      "tags": [
        "minio"
      ],
      "type": "dashboards"
    }
  ],
  "liveNow": false,
  "panels": [
    {
      "datasource": {

  "editable": true,
  "fiscalYearStartMonth": 0,
  "gnetId": 15306,
  "graphTooltip": 0,
  "id": 283,
  "links": [
    {
      "icon": "external link",
      "includeVars": true,
      "keepTime": true,
      "tags": [
        "minio"
      ],
      "type": "dashboards"
    }
  ],
  "liveNow": false,
  "panels": [
    {
      "datasource": {

  "editable": true,
  "fiscalYearStartMonth": 0,
  "gnetId": 15306,
  "graphTooltip": 0,
  "id": 285,
  "links": [
    {
      "icon": "external link",
      "includeVars": true,
      "keepTime": true,
      "tags": [
        "minio"
      ],
      "type": "dashboards"
    }
  ],
  "liveNow": false,
  "panels": [
    {
      "datasource": {

  "editable": true,
  "fiscalYearStartMonth": 0,
  "gnetId": 13502,
  "graphTooltip": 0,
  "id": 292,
  "links": [
    {
      "icon": "external link",
      "includeVars": true,
      "keepTime": true,
      "tags": [
        "minio"
      ],
      "type": "dashboards"
    }
  ],
  "liveNow": false,
  "panels": [
    {
      "datasource": {