diff --git a/.github/actions/setup-environment/action.yml b/.github/actions/setup-environment/action.yml
deleted file mode 100644
index ab9cb646..00000000
--- a/.github/actions/setup-environment/action.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-name: Prepare Build Environment
-description: Installs required JDKs for building and testing
-runs:
-  using: "composite"
-  steps:
-
-  - name: 'Set up JDK 8'
-    uses: actions/setup-java@v4
-    with:
-      distribution: 'temurin'
-      java-version: 8
-
-  - name: Prepare JDK8 env var
-    shell: bash
-    run: echo "JDK8=$JAVA_HOME" >> $GITHUB_ENV
-
-  - name: Setup Git user
-    shell: bash
-    run: |
-      git config --global user.name "$(git --no-pager log --format=format:'%an' -n 1)"
-      git config --global user.email "$(git --no-pager log --format=format:'%ae' -n 1)"
diff --git a/.github/renovate.json5 b/.github/renovate.json5
deleted file mode 100644
index 582b757b..00000000
--- a/.github/renovate.json5
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-    extends: [
-        "github>gradle/renovate-agent//presets/dv-automerge-minor.json5"
-    ],
-    packageRules: [
-        // We need to use Spock 2.x with Groovy 3.0 as Gradle uses Groovy 3.0 at the moment
-        // This rule prevents renovate from upgrading Spock to groovy-4.0
-        {
-            matchPackagePrefixes: [
-                "org.spockframework:"
-            ],
-            matchCurrentValue: "/^2\\./",
-            allowedVersions: "/^[0-9]+\\.[0-9]+(\\.[0-9]+)?-groovy-3\\.0$/"
-        }
-    ]
-}
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
deleted file mode 100644
index 0d888349..00000000
--- a/.github/workflows/codeql-analysis.yml
+++ /dev/null
@@ -1,76 +0,0 @@
-# For most projects, this workflow file will not need changing; you simply need
-# to commit it to your repository.
-#
-# You may wish to alter this file to override the set of languages analyzed,
-# or to provide custom queries or build logic.
-#
-# ******** NOTE ********
-# We have attempted to detect the languages in your repository. Please check
-# the `language` matrix defined below to confirm you have the correct set of
-# supported CodeQL languages.
-#
-name: "CodeQL"
-
-on:
-  push:
-    branches: [ main ]
-  pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [ main ]
-  schedule:
-    - cron: '44 15 * * 4'
-
-jobs:
-  analyze:
-    name: Analyze
-    runs-on: ubuntu-latest
-    permissions:
-      actions: read
-      contents: read
-      security-events: write
-
-    strategy:
-      fail-fast: false
-      matrix:
-        language: [ 'java' ]
-        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
-        # Learn more about CodeQL language support at https://git.io/codeql-language-support
-
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v4
-
-    - name: Setup Git user
-      shell: bash
-      run: |
-        git config --global user.name "$(git --no-pager log --format=format:'%an' -n 1)"
-        git config --global user.email "$(git --no-pager log --format=format:'%ae' -n 1)"
-
-    # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3
-      with:
-        languages: ${{ matrix.language }}
-        # If you wish to specify custom queries, you can do so here or in a config file.
-        # By default, queries listed here will override any specified in a config file.
-        # Prefix the list here with "+" to use these queries and those in the config file.
-        # queries: ./path/to/local/query, your-org/your-repo/queries@main
-
-    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-    # If this step fails, then you should remove it and run the build manually (see below)
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v3
-
-    # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 https://git.io/JvXDl
-
-    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
-    #    and modify them (or add more) to build your code if your project
-    #    uses a compiled language
-
-    #- run: |
-    #   make bootstrap
-    #   make release
-
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3
diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
deleted file mode 100644
index 19c7c20e..00000000
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-name: "Validate Gradle Wrapper"
-on: [push, pull_request]
-
-jobs:
-  validation:
-    name: "Validation"
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: gradle/actions/wrapper-validation@v4
diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml
deleted file mode 100644
index ef738e75..00000000
--- a/.github/workflows/verify.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-name: 'Verify'
-
-on:
-  push:
-    branches:
-    - main
-  pull_request:
-  workflow_dispatch:
-
-# https://stackoverflow.com/a/72408109/16358266
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  build-and-verify:
-    runs-on: 'ubuntu-latest'
-    steps:
-    - uses: actions/checkout@v4
-
-    - name: "Setup Build Environment"
-      uses: ./.github/actions/setup-environment
-
-    - name: 'Setup Gradle'
-      uses: gradle/actions/setup-gradle@v4
-      with:
-        develocity-access-key: ${{ secrets.DEVELOCITY_GRADLE_ORG_ACCESS_KEY }}
-
-    - name: "Verify"
-      env:
-        DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_GRADLE_ORG_ACCESS_KEY }}
-      run: "./gradlew build -s"
-
-    - name: "Store reports"
-      if: failure()
-      uses: actions/upload-artifact@v4
-      with:
-        name: check-reports
-        path: |
-          **/build/reports/
-          **/build/test-results/
diff --git a/.github/workflows/wrapper-upgrade.yml b/.github/workflows/wrapper-upgrade.yml
deleted file mode 100644
index a7baeb7d..00000000
--- a/.github/workflows/wrapper-upgrade.yml
+++ /dev/null
@@ -1,45 +0,0 @@
-name: Upgrade Gradle wrapper
-
-on:
-  schedule:
-    - cron: '0 0 * * *' # Every day at 00:00 UTC
-  workflow_dispatch:
-
-jobs:
-  Gradle:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out repository
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 1
-
-      - name: Set up Git config
-        env:
-          TOKEN: ${{ secrets.GH_BOT_GITHUB_TOKEN }}
-        run: |
-          git config --global url."https://bot-githubaction:${TOKEN}@github.com/".insteadOf "https://github.com/"
-
-      - name: Import GPG key
-        uses: crazy-max/ghaction-import-gpg@ea88154188003ca5aeb616063b2d0dd6a9cf86e2
-        with:
-          gpg_private_key: ${{ secrets.GH_BOT_PGP_PRIVATE_KEY }}
-          passphrase: ${{ secrets.GH_BOT_PGP_PASSPHRASE }}
-          git_user_signingkey: true
-          git_commit_gpgsign: true
-          git_config_global: true
-
-      - uses: actions/setup-java@v4
-        with:
-          distribution: temurin
-          java-version: 17
-
-      - name: 'Setup Gradle'
-        uses: gradle/actions/setup-gradle@v4
-        with:
-          develocity-access-key: ${{ secrets.DEVELOCITY_GRADLE_ORG_ACCESS_KEY }}
-
-      - name: 'Upgrade Gradle wrapper'
-        env:
-          WRAPPER_UPGRADE_GIT_TOKEN: ${{ secrets.GH_BOT_GITHUB_TOKEN }}
-        run: ./gradlew clean upgradeGradleWrapperAll --no-build-cache
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 60dc1274..2ad516aa 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,10 +4,19 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="delegatedBuild" value="true" />
-        <option name="testRunner" value="GRADLE" />
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
+        <compositeConfiguration>
+          <compositeBuild compositeDefinitionSource="SCRIPT">
+            <builds>
+              <build path="$PROJECT_DIR$/buildSrc" name="buildSrc">
+                <projects>
+                  <project path="$PROJECT_DIR$/buildSrc" />
+                </projects>
+              </build>
+            </builds>
+          </compositeBuild>
+        </compositeConfiguration>
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="corretto-21" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.teamcity/.mvn/wrapper/MavenWrapperDownloader.java b/.teamcity/.mvn/wrapper/MavenWrapperDownloader.java
deleted file mode 100644
index 066726d6..00000000
--- a/.teamcity/.mvn/wrapper/MavenWrapperDownloader.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Copyright 2007-present the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import java.net.*;
-import java.io.*;
-import java.nio.channels.*;
-import java.util.Properties;
-
-public class MavenWrapperDownloader {
-
-    private static final String WRAPPER_VERSION = "0.5.5";
-    /**
-     * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
-     */
-    private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/"
-        + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar";
-
-    /**
-     * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
-     * use instead of the default one.
-     */
-    private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
-            ".mvn/wrapper/maven-wrapper.properties";
-
-    /**
-     * Path where the maven-wrapper.jar will be saved to.
-     */
-    private static final String MAVEN_WRAPPER_JAR_PATH =
-            ".mvn/wrapper/maven-wrapper.jar";
-
-    /**
-     * Name of the property which should be used to override the default download url for the wrapper.
-     */
-    private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
-
-    public static void main(String args[]) {
-        System.out.println("- Downloader started");
-        File baseDirectory = new File(args[0]);
-        System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath());
-
-        // If the maven-wrapper.properties exists, read it and check if it contains a custom
-        // wrapperUrl parameter.
-        File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
-        String url = DEFAULT_DOWNLOAD_URL;
-        if(mavenWrapperPropertyFile.exists()) {
-            FileInputStream mavenWrapperPropertyFileInputStream = null;
-            try {
-                mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
-                Properties mavenWrapperProperties = new Properties();
-                mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
-                url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
-            } catch (IOException e) {
-                System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
-            } finally {
-                try {
-                    if(mavenWrapperPropertyFileInputStream != null) {
-                        mavenWrapperPropertyFileInputStream.close();
-                    }
-                } catch (IOException e) {
-                    // Ignore ...
-                }
-            }
-        }
-        System.out.println("- Downloading from: " + url);
-
-        File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
-        if(!outputFile.getParentFile().exists()) {
-            if(!outputFile.getParentFile().mkdirs()) {
-                System.out.println(
-                        "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'");
-            }
-        }
-        System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
-        try {
-            downloadFileFromURL(url, outputFile);
-            System.out.println("Done");
-            System.exit(0);
-        } catch (Throwable e) {
-            System.out.println("- Error downloading");
-            e.printStackTrace();
-            System.exit(1);
-        }
-    }
-
-    private static void downloadFileFromURL(String urlString, File destination) throws Exception {
-        if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) {
-            final String username = System.getenv("MVNW_USERNAME");
-            final char[] password = System.getenv("MVNW_PASSWORD").toCharArray();
-            Authenticator.setDefault(new Authenticator() {
-                @Override
-                protected PasswordAuthentication getPasswordAuthentication() {
-                    return new PasswordAuthentication(username, password);
-                }
-            });
-        }
-        URL website = new URL(urlString);
-        ReadableByteChannel rbc;
-        rbc = Channels.newChannel(website.openStream());
-        FileOutputStream fos = new FileOutputStream(destination);
-        fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
-        fos.close();
-        rbc.close();
-    }
-
-}
diff --git a/.teamcity/.mvn/wrapper/maven-wrapper.jar b/.teamcity/.mvn/wrapper/maven-wrapper.jar
deleted file mode 100644
index 0d5e6498..00000000
Binary files a/.teamcity/.mvn/wrapper/maven-wrapper.jar and /dev/null differ
diff --git a/.teamcity/.mvn/wrapper/maven-wrapper.properties b/.teamcity/.mvn/wrapper/maven-wrapper.properties
deleted file mode 100644
index d58dfb70..00000000
--- a/.teamcity/.mvn/wrapper/maven-wrapper.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-wrapperVersion=3.3.2
-distributionType=only-script
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip
diff --git a/.teamcity/GradleTestRetryPlugin_dsl.iml b/.teamcity/GradleTestRetryPlugin_dsl.iml
deleted file mode 100644
index d70ee8da..00000000
--- a/.teamcity/GradleTestRetryPlugin_dsl.iml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" version="4">
-  <component name="FacetManager">
-    <facet type="kotlin-language" name="Kotlin">
-      <configuration version="3" platform="JVM 1.6" useProjectSettings="false">
-        <compilerSettings />
-        <compilerArguments>
-          <option name="languageVersion" value="1.2" />
-          <option name="apiVersion" value="1.2" />
-          <option name="pluginOptions">
-            <array />
-          </option>
-          <option name="pluginClasspaths">
-            <array />
-          </option>
-          <option name="coroutinesState" value="warn" />
-          <option name="errors">
-            <ArgumentParseErrors />
-          </option>
-        </compilerArguments>
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$" isTestSource="false" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: org.jetbrains.teamcity:configs-dsl-kotlin:2019.1" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.2.50" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib-common:1.2.50" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains:annotations:13.0" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-reflect:1.2.50" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.teamcity:configs-dsl-converters:2019.1" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.teamcity:configs-dsl-kotlin-dotNetRunners:1.0-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.teamcity:configs-dsl-kotlin-commit-status-publisher:1.0-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.teamcity:configs-dsl-kotlin-perfmon:1.0-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.teamcity:configs-dsl-kotlin-mercurial:1.0-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.teamcity:configs-dsl-kotlin-pull-requests:1.0-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.teamcity:configs-dsl-kotlin-swabra:1.0-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.teamcity:configs-dsl-kotlin-commandLineRunner:1.0-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.teamcity:configs-dsl-kotlin-visualstudiotest:1.0-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.teamcity:configs-dsl-kotlin-dotNetPackagesSupport:1.0-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.teamcity:configs-dsl-kotlin-ant:1.0-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.teamcity:configs-dsl-kotlin-file-content-replacer:1.0-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.teamcity:configs-dsl-kotlin-jetbrains.git:1.0-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.teamcity:configs-dsl-kotlin-Maven2:1.0-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.teamcity:configs-dsl-kotlin-golang:1.0-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.teamcity:configs-dsl-kotlin-perforce:1.0-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.teamcity:configs-dsl-kotlin-gradle:1.0-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.teamcity:configs-dsl-kotlin-powershell:1.0-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.teamcity:configs-dsl-kotlin-jira:1.0-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.teamcity:configs-dsl-kotlin-docker-support:1.0-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.teamcity:configs-dsl-kotlin-investigations-auto-assigner:1.0-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.teamcity:configs-dsl-kotlin-bundled:1.0-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.teamcity:configs-dsl-kotlin-tfs:1.0-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.teamcity:configs-dsl-kotlin-svn:1.0-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.teamcity:configs-dsl-kotlin-charisma:1.0-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.teamcity:configs-dsl-kotlin-ssh-manager:1.0-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.teamcity:configs-dsl-kotlin-dotnet.cli:1.0-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.teamcity:configs-dsl-kotlin-bugzilla:1.0-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.2.50" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.50" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-script-runtime:1.2.50" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/.teamcity/mvnw b/.teamcity/mvnw
deleted file mode 100755
index 19529ddf..00000000
--- a/.teamcity/mvnw
+++ /dev/null
@@ -1,259 +0,0 @@
-#!/bin/sh
-# ----------------------------------------------------------------------------
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-# ----------------------------------------------------------------------------
-
-# ----------------------------------------------------------------------------
-# Apache Maven Wrapper startup batch script, version 3.3.2
-#
-# Optional ENV vars
-# -----------------
-#   JAVA_HOME - location of a JDK home dir, required when download maven via java source
-#   MVNW_REPOURL - repo url base for downloading maven distribution
-#   MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven
-#   MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output
-# ----------------------------------------------------------------------------
-
-set -euf
-[ "${MVNW_VERBOSE-}" != debug ] || set -x
-
-# OS specific support.
-native_path() { printf %s\\n "$1"; }
-case "$(uname)" in
-CYGWIN* | MINGW*)
-  [ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")"
-  native_path() { cygpath --path --windows "$1"; }
-  ;;
-esac
-
-# set JAVACMD and JAVACCMD
-set_java_home() {
-  # For Cygwin and MinGW, ensure paths are in Unix format before anything is touched
-  if [ -n "${JAVA_HOME-}" ]; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ]; then
-      # IBM's JDK on AIX uses strange locations for the executables
-      JAVACMD="$JAVA_HOME/jre/sh/java"
-      JAVACCMD="$JAVA_HOME/jre/sh/javac"
-    else
-      JAVACMD="$JAVA_HOME/bin/java"
-      JAVACCMD="$JAVA_HOME/bin/javac"
-
-      if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ]; then
-        echo "The JAVA_HOME environment variable is not defined correctly, so mvnw cannot run." >&2
-        echo "JAVA_HOME is set to \"$JAVA_HOME\", but \"\$JAVA_HOME/bin/java\" or \"\$JAVA_HOME/bin/javac\" does not exist." >&2
-        return 1
-      fi
-    fi
-  else
-    JAVACMD="$(
-      'set' +e
-      'unset' -f command 2>/dev/null
-      'command' -v java
-    )" || :
-    JAVACCMD="$(
-      'set' +e
-      'unset' -f command 2>/dev/null
-      'command' -v javac
-    )" || :
-
-    if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ]; then
-      echo "The java/javac command does not exist in PATH nor is JAVA_HOME set, so mvnw cannot run." >&2
-      return 1
-    fi
-  fi
-}
-
-# hash string like Java String::hashCode
-hash_string() {
-  str="${1:-}" h=0
-  while [ -n "$str" ]; do
-    char="${str%"${str#?}"}"
-    h=$(((h * 31 + $(LC_CTYPE=C printf %d "'$char")) % 4294967296))
-    str="${str#?}"
-  done
-  printf %x\\n $h
-}
-
-verbose() { :; }
-[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; }
-
-die() {
-  printf %s\\n "$1" >&2
-  exit 1
-}
-
-trim() {
-  # MWRAPPER-139:
-  #   Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds.
-  #   Needed for removing poorly interpreted newline sequences when running in more
-  #   exotic environments such as mingw bash on Windows.
-  printf "%s" "${1}" | tr -d '[:space:]'
-}
-
-# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties
-while IFS="=" read -r key value; do
-  case "${key-}" in
-  distributionUrl) distributionUrl=$(trim "${value-}") ;;
-  distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;;
-  esac
-done <"${0%/*}/.mvn/wrapper/maven-wrapper.properties"
-[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in ${0%/*}/.mvn/wrapper/maven-wrapper.properties"
-
-case "${distributionUrl##*/}" in
-maven-mvnd-*bin.*)
-  MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/
-  case "${PROCESSOR_ARCHITECTURE-}${PROCESSOR_ARCHITEW6432-}:$(uname -a)" in
-  *AMD64:CYGWIN* | *AMD64:MINGW*) distributionPlatform=windows-amd64 ;;
-  :Darwin*x86_64) distributionPlatform=darwin-amd64 ;;
-  :Darwin*arm64) distributionPlatform=darwin-aarch64 ;;
-  :Linux*x86_64*) distributionPlatform=linux-amd64 ;;
-  *)
-    echo "Cannot detect native platform for mvnd on $(uname)-$(uname -m), use pure java version" >&2
-    distributionPlatform=linux-amd64
-    ;;
-  esac
-  distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip"
-  ;;
-maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;;
-*) MVN_CMD="mvn${0##*/mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;;
-esac
-
-# apply MVNW_REPOURL and calculate MAVEN_HOME
-# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-<version>,maven-mvnd-<version>-<platform>}/<hash>
-[ -z "${MVNW_REPOURL-}" ] || distributionUrl="$MVNW_REPOURL$_MVNW_REPO_PATTERN${distributionUrl#*"$_MVNW_REPO_PATTERN"}"
-distributionUrlName="${distributionUrl##*/}"
-distributionUrlNameMain="${distributionUrlName%.*}"
-distributionUrlNameMain="${distributionUrlNameMain%-bin}"
-MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}"
-MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")"
-
-exec_maven() {
-  unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || :
-  exec "$MAVEN_HOME/bin/$MVN_CMD" "$@" || die "cannot exec $MAVEN_HOME/bin/$MVN_CMD"
-}
-
-if [ -d "$MAVEN_HOME" ]; then
-  verbose "found existing MAVEN_HOME at $MAVEN_HOME"
-  exec_maven "$@"
-fi
-
-case "${distributionUrl-}" in
-*?-bin.zip | *?maven-mvnd-?*-?*.zip) ;;
-*) die "distributionUrl is not valid, must match *-bin.zip or maven-mvnd-*.zip, but found '${distributionUrl-}'" ;;
-esac
-
-# prepare tmp dir
-if TMP_DOWNLOAD_DIR="$(mktemp -d)" && [ -d "$TMP_DOWNLOAD_DIR" ]; then
-  clean() { rm -rf -- "$TMP_DOWNLOAD_DIR"; }
-  trap clean HUP INT TERM EXIT
-else
-  die "cannot create temp dir"
-fi
-
-mkdir -p -- "${MAVEN_HOME%/*}"
-
-# Download and Install Apache Maven
-verbose "Couldn't find MAVEN_HOME, downloading and installing it ..."
-verbose "Downloading from: $distributionUrl"
-verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName"
-
-# select .zip or .tar.gz
-if ! command -v unzip >/dev/null; then
-  distributionUrl="${distributionUrl%.zip}.tar.gz"
-  distributionUrlName="${distributionUrl##*/}"
-fi
-
-# verbose opt
-__MVNW_QUIET_WGET=--quiet __MVNW_QUIET_CURL=--silent __MVNW_QUIET_UNZIP=-q __MVNW_QUIET_TAR=''
-[ "${MVNW_VERBOSE-}" != true ] || __MVNW_QUIET_WGET='' __MVNW_QUIET_CURL='' __MVNW_QUIET_UNZIP='' __MVNW_QUIET_TAR=v
-
-# normalize http auth
-case "${MVNW_PASSWORD:+has-password}" in
-'') MVNW_USERNAME='' MVNW_PASSWORD='' ;;
-has-password) [ -n "${MVNW_USERNAME-}" ] || MVNW_USERNAME='' MVNW_PASSWORD='' ;;
-esac
-
-if [ -z "${MVNW_USERNAME-}" ] && command -v wget >/dev/null; then
-  verbose "Found wget ... using wget"
-  wget ${__MVNW_QUIET_WGET:+"$__MVNW_QUIET_WGET"} "$distributionUrl" -O "$TMP_DOWNLOAD_DIR/$distributionUrlName" || die "wget: Failed to fetch $distributionUrl"
-elif [ -z "${MVNW_USERNAME-}" ] && command -v curl >/dev/null; then
-  verbose "Found curl ... using curl"
-  curl ${__MVNW_QUIET_CURL:+"$__MVNW_QUIET_CURL"} -f -L -o "$TMP_DOWNLOAD_DIR/$distributionUrlName" "$distributionUrl" || die "curl: Failed to fetch $distributionUrl"
-elif set_java_home; then
-  verbose "Falling back to use Java to download"
-  javaSource="$TMP_DOWNLOAD_DIR/Downloader.java"
-  targetZip="$TMP_DOWNLOAD_DIR/$distributionUrlName"
-  cat >"$javaSource" <<-END
-	public class Downloader extends java.net.Authenticator
-	{
-	  protected java.net.PasswordAuthentication getPasswordAuthentication()
-	  {
-	    return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() );
-	  }
-	  public static void main( String[] args ) throws Exception
-	  {
-	    setDefault( new Downloader() );
-	    java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() );
-	  }
-	}
-	END
-  # For Cygwin/MinGW, switch paths to Windows format before running javac and java
-  verbose " - Compiling Downloader.java ..."
-  "$(native_path "$JAVACCMD")" "$(native_path "$javaSource")" || die "Failed to compile Downloader.java"
-  verbose " - Running Downloader.java ..."
-  "$(native_path "$JAVACMD")" -cp "$(native_path "$TMP_DOWNLOAD_DIR")" Downloader "$distributionUrl" "$(native_path "$targetZip")"
-fi
-
-# If specified, validate the SHA-256 sum of the Maven distribution zip file
-if [ -n "${distributionSha256Sum-}" ]; then
-  distributionSha256Result=false
-  if [ "$MVN_CMD" = mvnd.sh ]; then
-    echo "Checksum validation is not supported for maven-mvnd." >&2
-    echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2
-    exit 1
-  elif command -v sha256sum >/dev/null; then
-    if echo "$distributionSha256Sum  $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c >/dev/null 2>&1; then
-      distributionSha256Result=true
-    fi
-  elif command -v shasum >/dev/null; then
-    if echo "$distributionSha256Sum  $TMP_DOWNLOAD_DIR/$distributionUrlName" | shasum -a 256 -c >/dev/null 2>&1; then
-      distributionSha256Result=true
-    fi
-  else
-    echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2
-    echo "Please install either command, or disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2
-    exit 1
-  fi
-  if [ $distributionSha256Result = false ]; then
-    echo "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised." >&2
-    echo "If you updated your Maven version, you need to update the specified distributionSha256Sum property." >&2
-    exit 1
-  fi
-fi
-
-# unzip and move
-if command -v unzip >/dev/null; then
-  unzip ${__MVNW_QUIET_UNZIP:+"$__MVNW_QUIET_UNZIP"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -d "$TMP_DOWNLOAD_DIR" || die "failed to unzip"
-else
-  tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar"
-fi
-printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/mvnw.url"
-mv -- "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME"
-
-clean || :
-exec_maven "$@"
diff --git a/.teamcity/mvnw.cmd b/.teamcity/mvnw.cmd
deleted file mode 100644
index b150b91e..00000000
--- a/.teamcity/mvnw.cmd
+++ /dev/null
@@ -1,149 +0,0 @@
-<# : batch portion
-@REM ----------------------------------------------------------------------------
-@REM Licensed to the Apache Software Foundation (ASF) under one
-@REM or more contributor license agreements.  See the NOTICE file
-@REM distributed with this work for additional information
-@REM regarding copyright ownership.  The ASF licenses this file
-@REM to you under the Apache License, Version 2.0 (the
-@REM "License"); you may not use this file except in compliance
-@REM with the License.  You may obtain a copy of the License at
-@REM
-@REM    http://www.apache.org/licenses/LICENSE-2.0
-@REM
-@REM Unless required by applicable law or agreed to in writing,
-@REM software distributed under the License is distributed on an
-@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-@REM KIND, either express or implied.  See the License for the
-@REM specific language governing permissions and limitations
-@REM under the License.
-@REM ----------------------------------------------------------------------------
-
-@REM ----------------------------------------------------------------------------
-@REM Apache Maven Wrapper startup batch script, version 3.3.2
-@REM
-@REM Optional ENV vars
-@REM   MVNW_REPOURL - repo url base for downloading maven distribution
-@REM   MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven
-@REM   MVNW_VERBOSE - true: enable verbose log; others: silence the output
-@REM ----------------------------------------------------------------------------
-
-@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0)
-@SET __MVNW_CMD__=
-@SET __MVNW_ERROR__=
-@SET __MVNW_PSMODULEP_SAVE=%PSModulePath%
-@SET PSModulePath=
-@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "& {$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock ([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @(
-  IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B)
-)
-@SET PSModulePath=%__MVNW_PSMODULEP_SAVE%
-@SET __MVNW_PSMODULEP_SAVE=
-@SET __MVNW_ARG0_NAME__=
-@SET MVNW_USERNAME=
-@SET MVNW_PASSWORD=
-@IF NOT "%__MVNW_CMD__%"=="" (%__MVNW_CMD__% %*)
-@echo Cannot start maven from wrapper >&2 && exit /b 1
-@GOTO :EOF
-: end batch / begin powershell #>
-
-$ErrorActionPreference = "Stop"
-if ($env:MVNW_VERBOSE -eq "true") {
-  $VerbosePreference = "Continue"
-}
-
-# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties
-$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl
-if (!$distributionUrl) {
-  Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties"
-}
-
-switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) {
-  "maven-mvnd-*" {
-    $USE_MVND = $true
-    $distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip"
-    $MVN_CMD = "mvnd.cmd"
-    break
-  }
-  default {
-    $USE_MVND = $false
-    $MVN_CMD = $script -replace '^mvnw','mvn'
-    break
-  }
-}
-
-# apply MVNW_REPOURL and calculate MAVEN_HOME
-# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-<version>,maven-mvnd-<version>-<platform>}/<hash>
-if ($env:MVNW_REPOURL) {
-  $MVNW_REPO_PATTERN = if ($USE_MVND) { "/org/apache/maven/" } else { "/maven/mvnd/" }
-  $distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace '^.*'+$MVNW_REPO_PATTERN,'')"
-}
-$distributionUrlName = $distributionUrl -replace '^.*/',''
-$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$',''
-$MAVEN_HOME_PARENT = "$HOME/.m2/wrapper/dists/$distributionUrlNameMain"
-if ($env:MAVEN_USER_HOME) {
-  $MAVEN_HOME_PARENT = "$env:MAVEN_USER_HOME/wrapper/dists/$distributionUrlNameMain"
-}
-$MAVEN_HOME_NAME = ([System.Security.Cryptography.MD5]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join ''
-$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME"
-
-if (Test-Path -Path "$MAVEN_HOME" -PathType Container) {
-  Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME"
-  Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD"
-  exit $?
-}
-
-if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) {
-  Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl"
-}
-
-# prepare tmp dir
-$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile
-$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir"
-$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null
-trap {
-  if ($TMP_DOWNLOAD_DIR.Exists) {
-    try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null }
-    catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" }
-  }
-}
-
-New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null
-
-# Download and Install Apache Maven
-Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..."
-Write-Verbose "Downloading from: $distributionUrl"
-Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName"
-
-$webclient = New-Object System.Net.WebClient
-if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) {
-  $webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD)
-}
-[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
-$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null
-
-# If specified, validate the SHA-256 sum of the Maven distribution zip file
-$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum
-if ($distributionSha256Sum) {
-  if ($USE_MVND) {
-    Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties."
-  }
-  Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash
-  if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) {
-    Write-Error "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised. If you updated your Maven version, you need to update the specified distributionSha256Sum property."
-  }
-}
-
-# unzip and move
-Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null
-Rename-Item -Path "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" -NewName $MAVEN_HOME_NAME | Out-Null
-try {
-  Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null
-} catch {
-  if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) {
-    Write-Error "fail to move MAVEN_HOME"
-  }
-} finally {
-  try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null }
-  catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" }
-}
-
-Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD"
diff --git a/.teamcity/pom.xml b/.teamcity/pom.xml
deleted file mode 100644
index ae8d0f05..00000000
--- a/.teamcity/pom.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0"?>
-<project>
-  <modelVersion>4.0.0</modelVersion>
-  <name>GradleTestRetryPlugin Config DSL Script</name>
-  <groupId>GradleTestRetryPlugin</groupId>
-  <artifactId>GradleTestRetryPlugin_dsl</artifactId>
-  <version>1.0-SNAPSHOT</version>
-
-  <parent>
-    <groupId>org.jetbrains.teamcity</groupId>
-    <artifactId>configs-dsl-kotlin-parent</artifactId>
-    <version>1.0-SNAPSHOT</version>
-  </parent>
-
-  <repositories>
-    <repository>
-      <id>jetbrains-all</id>
-      <url>https://download.jetbrains.com/teamcity-repository</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </repository>
-    <repository>
-      <id>teamcity-server</id>
-      <url>https://builds.gradle.org/app/dsl-plugins-repository</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </repository>
-  </repositories>
-
-  <pluginRepositories>
-    <pluginRepository>
-      <id>JetBrains</id>
-      <url>https://download.jetbrains.com/teamcity-repository</url>
-    </pluginRepository>
-  </pluginRepositories>
-
-  <build>
-    <sourceDirectory>.</sourceDirectory>
-    <plugins>
-      <plugin>
-        <artifactId>kotlin-maven-plugin</artifactId>
-        <groupId>org.jetbrains.kotlin</groupId>
-        <version>${kotlin.version}</version>
-
-        <configuration/>
-        <executions>
-          <execution>
-            <id>compile</id>
-            <phase>process-sources</phase>
-            <goals>
-              <goal>compile</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>test-compile</id>
-            <phase>process-test-sources</phase>
-            <goals>
-              <goal>test-compile</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.jetbrains.teamcity</groupId>
-        <artifactId>teamcity-configs-maven-plugin</artifactId>
-        <version>${teamcity.dsl.version}</version>
-        <configuration>
-          <format>kotlin</format>
-          <dstDir>target/generated-configs</dstDir>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.jetbrains.teamcity</groupId>
-      <artifactId>configs-dsl-kotlin</artifactId>
-      <version>${teamcity.dsl.version}</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.jetbrains.teamcity</groupId>
-      <artifactId>configs-dsl-kotlin-plugins</artifactId>
-      <version>1.0-SNAPSHOT</version>
-      <type>pom</type>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.jetbrains.kotlin</groupId>
-      <artifactId>kotlin-stdlib-jdk8</artifactId>
-      <version>${kotlin.version}</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.jetbrains.kotlin</groupId>
-      <artifactId>kotlin-script-runtime</artifactId>
-      <version>${kotlin.version}</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-</project>
\ No newline at end of file
diff --git a/.teamcity/settings.kts b/.teamcity/settings.kts
deleted file mode 100644
index f492ffd6..00000000
--- a/.teamcity/settings.kts
+++ /dev/null
@@ -1,246 +0,0 @@
-import jetbrains.buildServer.configs.kotlin.v2019_2.*
-import jetbrains.buildServer.configs.kotlin.v2019_2.BuildTypeSettings.Type.COMPOSITE
-import jetbrains.buildServer.configs.kotlin.v2019_2.FailureAction
-import jetbrains.buildServer.configs.kotlin.v2019_2.ParameterDisplay.NORMAL
-import jetbrains.buildServer.configs.kotlin.v2019_2.ParameterDisplay.PROMPT
-import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.gradle
-import jetbrains.buildServer.configs.kotlin.v2019_2.project
-import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.schedule
-import jetbrains.buildServer.configs.kotlin.v2019_2.version
-
-/*
-The settings script is an entry point for defining a TeamCity
-project hierarchy. The script should contain a single call to the
-project() function with a Project instance or an init function as
-an argument.
-
-VcsRoots, BuildTypes, Templates, and subprojects can be
-registered inside the project using the vcsRoot(), buildType(),
-template(), and subProject() methods respectively.
-
-To debug settings scripts in command-line, run the
-
-    mvnDebug org.jetbrains.teamcity:teamcity-configs-maven-plugin:generate
-
-command and attach your debugger to the port 8000.
-
-To debug in IntelliJ Idea, open the 'Maven Projects' tool window (View
--> Tool Windows -> Maven Projects), find the generate task node
-(Plugins -> teamcity-configs -> teamcity-configs:generate), the
-'Debug' option is available in the context menu for the task.
-*/
-
-version = "2021.1"
-
-project {
-    params {
-        java8Home(Os.linux)
-        text("systemProp.org.gradle.internal.publish.checksums.insecure", "true")
-    }
-
-    val quickFeedbackBuildType = buildType("Quick Feedback") {
-        steps {
-            gradle {
-                tasks = "clean build"
-                buildFile = ""
-                gradleParams = "-s $useGradleInternalScansServer $buildCacheSetup"
-            }
-        }
-    }
-
-    val crossVersionTestLinuxGroup = listOf(5, 6, 7, 8).map { gradleMajorVersion ->
-        buildType("CrossVersionTest Gradle $gradleMajorVersion.x Releases Linux - Java 1.8") {
-            steps {
-                gradle {
-                    tasks = "clean testGradle${gradleMajorVersion}Releases"
-                    buildFile = ""
-                    gradleParams = "-s $useGradleInternalScansServer $buildCacheSetup"
-                    param("org.jfrog.artifactory.selectedDeployableServer.defaultModuleVersionConfiguration", "GLOBAL")
-                }
-            }
-
-            dependencies {
-                snapshot(quickFeedbackBuildType) {
-                    onDependencyFailure = FailureAction.CANCEL
-                    onDependencyCancel = FailureAction.CANCEL
-                }
-            }
-        }
-    }
-
-    val nightliesTestLinux = buildType("CrossVersionTest Gradle Nightlies Linux - Java 1.8") {
-        steps {
-            gradle {
-                tasks = "clean testGradleNightlies"
-                buildFile = ""
-                gradleParams = "-s $useGradleInternalScansServer $buildCacheSetup"
-            }
-        }
-
-        dependencies {
-            snapshot(quickFeedbackBuildType) {
-                onDependencyFailure = FailureAction.CANCEL
-                onDependencyCancel = FailureAction.CANCEL
-            }
-        }
-    }
-    val verifyAllBuildType = buildType("Verify all") {
-        triggers.schedule {
-            schedulingPolicy = daily {
-                hour = 2
-            }
-            branchFilter = "+:<default>"
-            triggerBuild = always()
-            withPendingChangesOnly = false
-        }
-
-        type = COMPOSITE
-
-        dependencies {
-            snapshot(quickFeedbackBuildType) {
-                onDependencyFailure = FailureAction.CANCEL
-                onDependencyCancel = FailureAction.CANCEL
-            }
-            crossVersionTestLinuxGroup.map {
-                snapshot(it) {
-                    onDependencyFailure = FailureAction.CANCEL
-                    onDependencyCancel = FailureAction.CANCEL
-                }
-            }
-            snapshot(nightliesTestLinux) {
-                onDependencyFailure = FailureAction.CANCEL
-                onDependencyCancel = FailureAction.CANCEL
-            }
-        }
-    }
-    val gradleNightlyDogfoodingBuildType = buildType("Gradle Nightly dogfooding (nightly)") {
-        steps {
-            gradle {
-                tasks = "clean nightlyWrapper assemble"
-                buildFile = ""
-                gradleParams = "-s $useGradleInternalScansServer $buildCacheSetup"
-            }
-        }
-        triggers.schedule {
-            schedulingPolicy = daily {
-                hour = 2
-            }
-            branchFilter = "+:<default>"
-            withPendingChangesOnly = false
-            triggerBuild = always()
-        }
-    }
-
-    subProject("Release") {
-        buildType("Publish") {
-            description = "Publish Gradle Test Retry Plugin snapshot to Gradle's Artifactory repository"
-
-            params {
-                param("env.ORG_GRADLE_PROJECT_artifactoryUsername", "%artifactoryUsername%")
-                param("env.ORG_GRADLE_PROJECT_artifactoryPassword", "%artifactoryPassword%")
-                password("env.PGP_SIGNING_KEY", "%pgpSigningKey%")
-                password("env.PGP_SIGNING_KEY_PASSPHRASE", "%pgpSigningPassphrase%")
-            }
-
-            steps {
-                gradle {
-                    tasks =
-                        "clean snapshot publishPluginMavenPublicationToGradleBuildInternalSnapshotsRepository -x test"
-                    gradleParams =
-                        "-s $useGradleInternalScansServer $buildCacheSetup $useGradleInternalScansServer"
-                    param("org.jfrog.artifactory.selectedDeployableServer.defaultModuleVersionConfiguration", "GLOBAL")
-                    buildFile = ""
-                }
-            }
-            dependencies {
-                snapshot(verifyAllBuildType) {
-                    onDependencyFailure = FailureAction.CANCEL
-                    onDependencyCancel = FailureAction.CANCEL
-                }
-            }
-
-            // publish a nightly snapshot
-            triggers.schedule {
-                schedulingPolicy = daily {
-                    hour = 2
-                }
-                branchFilter = "+:<default>"
-                triggerBuild = always()
-                withPendingChangesOnly = false
-            }
-
-            notEc2Requirement()
-        }
-
-        buildType("Development") {
-            description =
-                "Publishes Gradle test retry plugin to development plugin portal (plugins.grdev.net)"
-            params {
-                param("env.GRADLE_PUBLISH_KEY", "%development.plugin.portal.publish.key%")
-                password("env.GRADLE_PUBLISH_SECRET", "%development.plugin.portal.publish.secret%", display = NORMAL)
-                password("env.PGP_SIGNING_KEY", "%pgpSigningKey%")
-                password("env.PGP_SIGNING_KEY_PASSPHRASE", "%pgpSigningPassphrase%")
-            }
-            steps {
-                gradle {
-                    tasks = "clean devSnapshot :plugin:publishPlugins -x test"
-                    buildFile = ""
-                    gradleParams =
-                        "-s $useGradleInternalScansServer -Dgradle.portal.url=https://plugins.grdev.net %pluginPortalPublishingFlags%"
-                }
-            }
-            dependencies {
-                snapshot(verifyAllBuildType) {
-                    onDependencyFailure = FailureAction.CANCEL
-                    onDependencyCancel = FailureAction.CANCEL
-                }
-            }
-        }
-
-        buildType("Production") {
-            description =
-                "Publishes Gradle test retry plugin to production plugin portal (plugins.gradle.org)"
-            params {
-                select(
-                    "releaseScope", "", label = "releaseScope", description = "The scope of the release",
-                    display = PROMPT, options = listOf("major", "minor", "patch")
-                )
-                text(
-                    "env.GIT_USERNAME",
-                    "",
-                    label = "GitHub username",
-                    description = "Your GitHub username",
-                    display = PROMPT,
-                    allowEmpty = false
-                )
-                password(
-                    "env.GIT_PASSWORD",
-                    "",
-                    label = "GitHub Access Token",
-                    description = "Your personal access token with repo permission",
-                    display = PROMPT
-                )
-                param("env.GRADLE_PUBLISH_KEY", "%plugin.portal.publish.key%")
-                password("env.GRADLE_PUBLISH_SECRET", "%plugin.portal.publish.secret%", display = NORMAL)
-                password("env.PGP_SIGNING_KEY", "%pgpSigningKey%")
-                password("env.PGP_SIGNING_KEY_PASSPHRASE", "%pgpSigningPassphrase%")
-            }
-            steps {
-                gradle {
-                    tasks = "clean final -x test"
-                    buildFile = ""
-                    gradleParams =
-                        "-s $useGradleInternalScansServer -Prelease.scope=%releaseScope% %pluginPortalPublishingFlags%"
-                }
-            }
-            dependencies {
-                snapshot(verifyAllBuildType) {
-                    onDependencyFailure = FailureAction.CANCEL
-                    onDependencyCancel = FailureAction.CANCEL
-                }
-            }
-        }
-
-    }
-
-}
diff --git a/.teamcity/settings/Os.kt b/.teamcity/settings/Os.kt
deleted file mode 100644
index b4feccc6..00000000
--- a/.teamcity/settings/Os.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-enum class Os(val requirementName: String) {
-    linux("Linux"),
-    macos("Mac OS X"),
-    windows("Windows")
-}
diff --git a/.teamcity/settings/extensions.kt b/.teamcity/settings/extensions.kt
deleted file mode 100644
index 55bd012a..00000000
--- a/.teamcity/settings/extensions.kt
+++ /dev/null
@@ -1,73 +0,0 @@
-import jetbrains.buildServer.configs.kotlin.v2019_2.BuildType
-import jetbrains.buildServer.configs.kotlin.v2019_2.CheckoutMode
-import jetbrains.buildServer.configs.kotlin.v2019_2.DslContext
-import jetbrains.buildServer.configs.kotlin.v2019_2.ParametrizedWithType
-import jetbrains.buildServer.configs.kotlin.v2019_2.Project
-import jetbrains.buildServer.configs.kotlin.v2019_2.RelativeId
-import jetbrains.buildServer.configs.kotlin.v2019_2.toId
-
-fun BuildType.agentRequirement(os: Os) {
-    requirements {
-        contains("teamcity.agent.jvm.os.name", os.requirementName)
-    }
-}
-
-fun BuildType.notEc2Requirement() {
-    requirements {
-        doesNotContain("teamcity.agent.name", "ec2")
-    }
-}
-
-fun ParametrizedWithType.java8Home(os: Os) {
-    param("env.JAVA_HOME", "%${os.name}.java8.oracle.64bit%")
-}
-
-const val useGradleInternalScansServer = "-I gradle/init-scripts/build-scan.init.gradle.kts"
-
-const val buildCacheSetup = "--build-cache -Dgradle.cache.remote.push=true"
-/**
- * Creates a new subproject with the given name, automatically deriving the [Project.id] from the name.
- *
- * Using this method also implicitly ensures that subprojects are ordered by creation order.
- */
-fun Project.subProject(projectName: String, init: Project.() -> Unit): Project {
-    val parent = this
-    val subProject = subProject {
-        name = projectName
-        id = RelativeId(name.toId(stripRootProject(parent.id.toString())))
-    }.apply(init)
-
-    this.subProjectsOrder += subProject.id!!
-
-    return subProject
-}
-
-fun Project.buildType(buildTypeName: String, init: BuildType.() -> Unit): BuildType {
-    val buildType = buildType {
-        name = buildTypeName
-        id = RelativeId(name.toId(stripRootProject(this@buildType.id.toString())))
-
-        artifactRules = "build/reports/** => reports"
-        agentRequirement(Os.linux) // default
-
-        params {
-            java8Home(Os.linux)
-
-            param("env.GRADLE_CACHE_REMOTE_URL", "%gradle.cache.remote.url%")
-            param("env.GRADLE_CACHE_REMOTE_USERNAME", "%gradle.cache.remote.username%")
-            param("env.GRADLE_CACHE_REMOTE_PASSWORD", "%gradle.cache.remote.password%")
-        }
-
-        vcs {
-            root(DslContext.settingsRoot)
-            checkoutMode = CheckoutMode.ON_AGENT
-        }
-    }.apply(init)
-
-    this.buildTypesOrderIds += buildType.id!!
-    return buildType
-}
-
-fun stripRootProject(id: String): String {
-    return id.replace("${DslContext.projectId.value}_", "")
-}
diff --git a/plugin/build.gradle.kts b/plugin/build.gradle.kts
index 3b1e922d..a002ca4f 100644
--- a/plugin/build.gradle.kts
+++ b/plugin/build.gradle.kts
@@ -22,7 +22,7 @@ group = "org.gradle"
 description = "Mitigate flaky tests by retrying tests when they fail"
 
 val javaToolchainVersion: String? by project
-val javaLanguageVersion = javaToolchainVersion?.let { JavaLanguageVersion.of(it) } ?: JavaLanguageVersion.of(8)
+val javaLanguageVersion = javaToolchainVersion?.let { JavaLanguageVersion.of(it) } ?: JavaLanguageVersion.of(21)
 
 java {
     toolchain {
diff --git a/plugin/src/main/java/org/gradle/testretry/TestRetryTaskExtension.java b/plugin/src/main/java/org/gradle/testretry/TestRetryTaskExtension.java
index 40ef332a..57f005b6 100644
--- a/plugin/src/main/java/org/gradle/testretry/TestRetryTaskExtension.java
+++ b/plugin/src/main/java/org/gradle/testretry/TestRetryTaskExtension.java
@@ -19,6 +19,8 @@
 import org.gradle.api.provider.Property;
 import org.gradle.api.provider.SetProperty;
 import org.gradle.api.tasks.testing.Test;
+import org.gradle.process.JavaForkOptions;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Allows configuring test retry mechanics.
@@ -91,6 +93,14 @@ public interface TestRetryTaskExtension {
      */
     void filter(Action<? super Filter> action);
 
+    /**
+     * Invoked when test are retried.
+     */
+    void onRetry(Action<? super JavaForkOptions> action);
+
+    @Nullable Action<? super JavaForkOptions> getOnRetry();
+
+
     /**
      * A filter for specifying which tests may be retried.
      * <p>
diff --git a/plugin/src/main/java/org/gradle/testretry/internal/config/DefaultTestRetryTaskExtension.java b/plugin/src/main/java/org/gradle/testretry/internal/config/DefaultTestRetryTaskExtension.java
index 0bf185bc..d7c79cef 100644
--- a/plugin/src/main/java/org/gradle/testretry/internal/config/DefaultTestRetryTaskExtension.java
+++ b/plugin/src/main/java/org/gradle/testretry/internal/config/DefaultTestRetryTaskExtension.java
@@ -19,7 +19,9 @@
 import org.gradle.api.model.ObjectFactory;
 import org.gradle.api.provider.Property;
 import org.gradle.api.provider.SetProperty;
+import org.gradle.process.JavaForkOptions;
 import org.gradle.testretry.TestRetryTaskExtension;
+import org.jetbrains.annotations.Nullable;
 
 import javax.inject.Inject;
 
@@ -33,6 +35,8 @@ public class DefaultTestRetryTaskExtension implements TestRetryTaskExtension {
 
     private final ClassRetryCriteria classRetryCriteria;
 
+    private Action<? super JavaForkOptions> onRetry;
+
     @Inject
     public DefaultTestRetryTaskExtension(ObjectFactory objects) {
         this.failOnPassedAfterRetry = objects.property(Boolean.class);
@@ -79,6 +83,16 @@ public void classRetry(Action<? super ClassRetryCriteria> action) {
         action.execute(classRetryCriteria);
     }
 
+    @Override
+    public void onRetry(Action<? super JavaForkOptions> action) {
+        onRetry = action;
+    }
+
+    @Override
+    public @Nullable Action<? super JavaForkOptions> getOnRetry() {
+        return onRetry;
+    }
+
     private static final class FilterImpl implements Filter {
 
         private final SetProperty<String> includeClasses;
diff --git a/plugin/src/main/java/org/gradle/testretry/internal/config/TestRetryTaskExtensionAccessor.java b/plugin/src/main/java/org/gradle/testretry/internal/config/TestRetryTaskExtensionAccessor.java
index 29e79008..12eaf61c 100644
--- a/plugin/src/main/java/org/gradle/testretry/internal/config/TestRetryTaskExtensionAccessor.java
+++ b/plugin/src/main/java/org/gradle/testretry/internal/config/TestRetryTaskExtensionAccessor.java
@@ -15,6 +15,9 @@
  */
 package org.gradle.testretry.internal.config;
 
+import org.gradle.api.Action;
+import org.gradle.process.JavaForkOptions;
+
 import java.util.Set;
 
 public interface TestRetryTaskExtensionAccessor {
@@ -41,4 +44,6 @@ public interface TestRetryTaskExtensionAccessor {
 
     boolean getSimulateNotRetryableTest();
 
+    Action<? super JavaForkOptions> getOnRetry();
+
 }
diff --git a/plugin/src/main/java/org/gradle/testretry/internal/config/TestRetryTaskExtensionAdapter.java b/plugin/src/main/java/org/gradle/testretry/internal/config/TestRetryTaskExtensionAdapter.java
index 38914974..23693172 100644
--- a/plugin/src/main/java/org/gradle/testretry/internal/config/TestRetryTaskExtensionAdapter.java
+++ b/plugin/src/main/java/org/gradle/testretry/internal/config/TestRetryTaskExtensionAdapter.java
@@ -15,10 +15,12 @@
  */
 package org.gradle.testretry.internal.config;
 
+import org.gradle.api.Action;
 import org.gradle.api.provider.Property;
 import org.gradle.api.provider.Provider;
 import org.gradle.api.provider.ProviderFactory;
 import org.gradle.api.provider.SetProperty;
+import org.gradle.process.JavaForkOptions;
 import org.gradle.testretry.TestRetryTaskExtension;
 import org.gradle.util.GradleVersion;
 
@@ -168,6 +170,11 @@ private <T> T read(Property<T> property, T defaultValue) {
         return useConventions ? property.get() : property.getOrElse(defaultValue);
     }
 
+    @Override
+    public Action<? super JavaForkOptions> getOnRetry() {
+        return extension.getOnRetry();
+    }
+
     private <T> Set<T> read(SetProperty<T> property, Set<T> defaultValue) {
         return useConventions ? property.get() : property.getOrElse(defaultValue);
     }
diff --git a/plugin/src/main/java/org/gradle/testretry/internal/executer/RetryTestExecuter.java b/plugin/src/main/java/org/gradle/testretry/internal/executer/RetryTestExecuter.java
index 9e9df90f..d9a5169e 100644
--- a/plugin/src/main/java/org/gradle/testretry/internal/executer/RetryTestExecuter.java
+++ b/plugin/src/main/java/org/gradle/testretry/internal/executer/RetryTestExecuter.java
@@ -15,6 +15,7 @@
  */
 package org.gradle.testretry.internal.executer;
 
+import org.gradle.api.Action;
 import org.gradle.api.internal.tasks.testing.JvmTestExecutionSpec;
 import org.gradle.api.internal.tasks.testing.TestExecuter;
 import org.gradle.api.internal.tasks.testing.TestFramework;
@@ -22,6 +23,7 @@
 import org.gradle.api.model.ObjectFactory;
 import org.gradle.api.tasks.testing.Test;
 import org.gradle.internal.reflect.Instantiator;
+import org.gradle.process.JavaForkOptions;
 import org.gradle.testretry.internal.config.TestRetryTaskExtensionAccessor;
 import org.gradle.testretry.internal.executer.framework.TestFrameworkStrategy;
 import org.gradle.testretry.internal.filter.AnnotationInspectorImpl;
@@ -115,6 +117,12 @@ public void execute(JvmTestExecutionSpec spec, TestResultProcessor testResultPro
         JvmTestExecutionSpec testExecutionSpec = spec;
 
         while (true) {
+            if (retryCount == 1) {
+                Action<? super JavaForkOptions> onRetry = extension.getOnRetry();
+                if (onRetry != null) {
+                    onRetry.execute(testExecutionSpec.getJavaForkOptions());
+                }
+            }
             delegate.execute(testExecutionSpec, retryTestResultProcessor);
             RoundResult result = retryTestResultProcessor.getResult();
             lastResult = result;