diff --git a/.teamcity/Buildship/Promotion30/Project.kt b/.teamcity/Buildship/Promotion30/Project.kt
index 9ad68041e6..3583f35169 100644
--- a/.teamcity/Buildship/Promotion30/Project.kt
+++ b/.teamcity/Buildship/Promotion30/Project.kt
@@ -3,7 +3,7 @@ package Buildship.Promotion30
 import Buildship.Promotion30.buildTypes.Milestone
 import Buildship.Promotion30.buildTypes.Release
 import Buildship.Promotion30.buildTypes.Snapshot
-import jetbrains.buildServer.configs.kotlin.v2019_2.ParameterDisplay
+import Buildship.Promotion30.buildTypes.SnapshotAdHoc
 import jetbrains.buildServer.configs.kotlin.v2019_2.Project
 
 object Project : Project({
@@ -11,11 +11,13 @@ object Project : Project({
     name = "Promotion"
     description = "Promotes Buildship releases"
 
+    template(PromotionDependencyTemplate)
     template(Promotion30Template)
 
+    buildType(SnapshotAdHoc)
     buildType(Snapshot)
     buildType(Release)
     buildType(Milestone)
 
-    buildTypesOrder = arrayListOf(Release, Milestone, Snapshot)
+    buildTypesOrder = arrayListOf(Release, Milestone, Snapshot, SnapshotAdHoc)
 })
diff --git a/.teamcity/Buildship/Promotion30/Promotion30Template.kt b/.teamcity/Buildship/Promotion30/Promotion30Template.kt
index 17faa37324..94d484d483 100644
--- a/.teamcity/Buildship/Promotion30/Promotion30Template.kt
+++ b/.teamcity/Buildship/Promotion30/Promotion30Template.kt
@@ -1,10 +1,8 @@
 package Buildship.Promotion30
 
-import Buildship.Check30.Checkpoints.buildTypes.Final
 import Buildship.GitHubVcsRoot
 import Buildship.addCredentialsLeakFailureCondition
 import jetbrains.buildServer.configs.kotlin.v2019_2.CheckoutMode
-import jetbrains.buildServer.configs.kotlin.v2019_2.FailureAction
 import jetbrains.buildServer.configs.kotlin.v2019_2.Template
 
 object Promotion30Template : Template({
@@ -33,12 +31,4 @@ object Promotion30Template : Template({
     failureConditions {
         errorMessage = true
     }
-
-    dependencies {
-        snapshot(Final) {
-            onDependencyFailure = FailureAction.FAIL_TO_START
-            onDependencyCancel = FailureAction.CANCEL
-        }
-        snapshot(Buildship.Check30.CrossVersionCoverage.buildTypes.Eclipse47Java9, Buildship.Check30.Checkpoints.buildTypes.CheckpointUtils.DefaultFailureCondition)
-    }
 })
diff --git a/.teamcity/Buildship/Promotion30/PromotionDependencyTemplate.kt b/.teamcity/Buildship/Promotion30/PromotionDependencyTemplate.kt
new file mode 100644
index 0000000000..64665525f6
--- /dev/null
+++ b/.teamcity/Buildship/Promotion30/PromotionDependencyTemplate.kt
@@ -0,0 +1,17 @@
+package Buildship.Promotion30
+
+import Buildship.Check30.Checkpoints.buildTypes.Final
+import jetbrains.buildServer.configs.kotlin.v2019_2.FailureAction
+import jetbrains.buildServer.configs.kotlin.v2019_2.Template
+
+object PromotionDependencyTemplate : Template({
+    name = "Promotion Dependency Template"
+
+    dependencies {
+        snapshot(Final) {
+            onDependencyFailure = FailureAction.FAIL_TO_START
+            onDependencyCancel = FailureAction.CANCEL
+        }
+        snapshot(Buildship.Check30.CrossVersionCoverage.buildTypes.Eclipse47Java9, Buildship.Check30.Checkpoints.buildTypes.CheckpointUtils.DefaultFailureCondition)
+    }
+})
diff --git a/.teamcity/Buildship/Promotion30/buildTypes/Milestone.kt b/.teamcity/Buildship/Promotion30/buildTypes/Milestone.kt
index 1a47320a65..cabd198190 100644
--- a/.teamcity/Buildship/Promotion30/buildTypes/Milestone.kt
+++ b/.teamcity/Buildship/Promotion30/buildTypes/Milestone.kt
@@ -1,6 +1,7 @@
 package Buildship.Promotion30.buildTypes
 
 import Buildship.Promotion30.Promotion30Template
+import Buildship.Promotion30.PromotionDependencyTemplate
 import jetbrains.buildServer.configs.kotlin.v2019_2.BuildType
 import jetbrains.buildServer.configs.kotlin.v2019_2.ParameterDisplay
 import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.gradle
@@ -9,7 +10,7 @@ object Milestone : BuildType({
     id("Promote30_Milestone")
     name = "Promote Milestone"
 
-    templates(Promotion30Template)
+    templates(Promotion30Template, PromotionDependencyTemplate)
 
     params {
         text("Confirm", "NO", label = "Do you want to proceed with the milestone?", description = "Confirm to publish a new milestone.", display = ParameterDisplay.PROMPT,
diff --git a/.teamcity/Buildship/Promotion30/buildTypes/Release.kt b/.teamcity/Buildship/Promotion30/buildTypes/Release.kt
index e33487271d..ec49d1f20b 100644
--- a/.teamcity/Buildship/Promotion30/buildTypes/Release.kt
+++ b/.teamcity/Buildship/Promotion30/buildTypes/Release.kt
@@ -1,6 +1,7 @@
 package Buildship.Promotion30.buildTypes
 
 import Buildship.Promotion30.Promotion30Template
+import Buildship.Promotion30.PromotionDependencyTemplate
 import jetbrains.buildServer.configs.kotlin.v2019_2.BuildType
 import jetbrains.buildServer.configs.kotlin.v2019_2.ParameterDisplay
 import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.gradle
@@ -9,7 +10,7 @@ object Release : BuildType({
     id("Promote30_Release")
     name = "Promote Release"
 
-    templates(Promotion30Template)
+    templates(Promotion30Template, PromotionDependencyTemplate)
 
     params {
         password("github.token", "", label = "GitHub token", description = "Please specify your GitHub auth token to proceed with the release", display = ParameterDisplay.PROMPT)
diff --git a/.teamcity/Buildship/Promotion30/buildTypes/Snapshot.kt b/.teamcity/Buildship/Promotion30/buildTypes/Snapshot.kt
index 3f1c2f4526..137765a3ca 100644
--- a/.teamcity/Buildship/Promotion30/buildTypes/Snapshot.kt
+++ b/.teamcity/Buildship/Promotion30/buildTypes/Snapshot.kt
@@ -1,7 +1,10 @@
 package Buildship.Promotion30.buildTypes
 
+import Buildship.Check30.Checkpoints.buildTypes.Final
 import Buildship.Promotion30.Promotion30Template
+import Buildship.Promotion30.PromotionDependencyTemplate
 import jetbrains.buildServer.configs.kotlin.v2019_2.BuildType
+import jetbrains.buildServer.configs.kotlin.v2019_2.FailureAction
 import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.gradle
 import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.schedule
 
@@ -9,7 +12,7 @@ object Snapshot : BuildType({
     id("Promote30_Snapshot")
     name = "Promote Snapshot"
 
-    templates(Promotion30Template)
+    templates(Promotion30Template, PromotionDependencyTemplate)
 
     params {
         param("env.JAVA_HOME", "%linux.java8.oracle.64bit%")
@@ -17,6 +20,14 @@ object Snapshot : BuildType({
         param("build.invoker", "ci")
     }
 
+    dependencies {
+        snapshot(Final) {
+            onDependencyFailure = FailureAction.FAIL_TO_START
+            onDependencyCancel = FailureAction.CANCEL
+        }
+        snapshot(Buildship.Check30.CrossVersionCoverage.buildTypes.Eclipse47Java9, Buildship.Check30.Checkpoints.buildTypes.CheckpointUtils.DefaultFailureCondition)
+    }
+
     steps {
         gradle {
             name = "Build and upload update site for Eclipse 4.3 (Kepler)"
diff --git a/.teamcity/Buildship/Promotion30/buildTypes/SnapshotAdHoc.kt b/.teamcity/Buildship/Promotion30/buildTypes/SnapshotAdHoc.kt
new file mode 100644
index 0000000000..aafe38078f
--- /dev/null
+++ b/.teamcity/Buildship/Promotion30/buildTypes/SnapshotAdHoc.kt
@@ -0,0 +1,234 @@
+package Buildship.Promotion30.buildTypes
+
+import Buildship.Promotion30.Promotion30Template
+import jetbrains.buildServer.configs.kotlin.v2019_2.BuildType
+import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.gradle
+import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.schedule
+
+object SnapshotAdHoc : BuildType({
+    id("Promote30_Snapshot_Adhoc")
+    name = "Promote Snapshot (adhoc)"
+
+    templates(Promotion30Template)
+
+    params {
+        param("env.JAVA_HOME", "%linux.java8.oracle.64bit%")
+        param("eclipse.release.type", "snapshot")
+        param("build.invoker", "ci")
+    }
+
+    steps {
+        gradle {
+            name = "Build and upload update site for Eclipse 4.3 (Kepler)"
+            tasks = "clean build uploadUpdateSite"
+            buildFile = ""
+            gradleParams = """
+                --exclude-task eclipseTest
+                -Peclipse.version=43 -Pcompiler.location='%linux.java8.oracle.64bit%/bin/javac' -Pbuild.invoker=%build.invoker% -Prelease.type=%eclipse.release.type% -PECLIPSE_ORG_FTP_HOST=build.eclipse.org -PECLIPSE_ORG_FTP_USER=%eclipse.downloadServer.username% -PECLIPSE_ORG_FTP_PASSWORD=%eclipse.downloadServer.password% -PECLIPSE_ORG_FTP_UPDATE_SITES_PATH=/home/data/httpd/download.eclipse.org/buildship/updates -PECLIPSE_ORG_TEMP_PATH=/home/data/httpd/download.eclipse.org/buildship/temp -PECLIPSE_ORG_MIRROR_PATH=/buildship/updates
+                --stacktrace -Declipse.p2.mirror=false
+                -Penable.oomph.plugin=false
+                "-Dgradle.cache.remote.url=%gradle.cache.remote.url%"
+                "-Dgradle.cache.remote.username=%gradle.cache.remote.username%"
+                "-Dgradle.cache.remote.password=%gradle.cache.remote.password%"
+            """.trimIndent()
+            param("org.jfrog.artifactory.selectedDeployableServer.defaultModuleVersionConfiguration", "GLOBAL")
+        }
+        gradle {
+            name = "Build and upload update site for Eclipse 4.4 (Luna)"
+            tasks = "clean build uploadUpdateSite"
+            buildFile = ""
+            gradleParams = """
+                --exclude-task eclipseTest
+                -Peclipse.version=44 -Pcompiler.location='%linux.java8.oracle.64bit%/bin/javac' -Pbuild.invoker=%build.invoker% -Prelease.type=%eclipse.release.type% -PECLIPSE_ORG_FTP_HOST=build.eclipse.org -PECLIPSE_ORG_FTP_USER=%eclipse.downloadServer.username% -PECLIPSE_ORG_FTP_PASSWORD=%eclipse.downloadServer.password% -PECLIPSE_ORG_FTP_UPDATE_SITES_PATH=/home/data/httpd/download.eclipse.org/buildship/updates -PECLIPSE_ORG_TEMP_PATH=/home/data/httpd/download.eclipse.org/buildship/temp -PECLIPSE_ORG_MIRROR_PATH=/buildship/updates
+                --stacktrace -Declipse.p2.mirror=false
+                -Penable.oomph.plugin=false
+                "-Dgradle.cache.remote.url=%gradle.cache.remote.url%"
+                "-Dgradle.cache.remote.username=%gradle.cache.remote.username%"
+                "-Dgradle.cache.remote.password=%gradle.cache.remote.password%"
+            """.trimIndent()
+            param("org.jfrog.artifactory.selectedDeployableServer.defaultModuleVersionConfiguration", "GLOBAL")
+        }
+        gradle {
+            name = "Build and upload update site for Eclipse 4.5 (Mars)"
+            tasks = "clean build uploadUpdateSite"
+            buildFile = ""
+            gradleParams = """
+                --exclude-task eclipseTest
+                -Peclipse.version=45 -Pcompiler.location='%linux.java8.oracle.64bit%/bin/javac' -Pbuild.invoker=%build.invoker% -Prelease.type=%eclipse.release.type% -PECLIPSE_ORG_FTP_HOST=build.eclipse.org -PECLIPSE_ORG_FTP_USER=%eclipse.downloadServer.username% -PECLIPSE_ORG_FTP_PASSWORD=%eclipse.downloadServer.password% -PECLIPSE_ORG_FTP_UPDATE_SITES_PATH=/home/data/httpd/download.eclipse.org/buildship/updates -PECLIPSE_ORG_TEMP_PATH=/home/data/httpd/download.eclipse.org/buildship/temp -PECLIPSE_ORG_MIRROR_PATH=/buildship/updates
+                --stacktrace -Declipse.p2.mirror=false
+                "-Dgradle.cache.remote.url=%gradle.cache.remote.url%"
+                "-Dgradle.cache.remote.username=%gradle.cache.remote.username%"
+                "-Dgradle.cache.remote.password=%gradle.cache.remote.password%"
+            """.trimIndent()
+            param("org.jfrog.artifactory.selectedDeployableServer.defaultModuleVersionConfiguration", "GLOBAL")
+        }
+        gradle {
+            name = "Build and upload update site for Eclipse 4.6 (Neon)"
+            tasks = "clean build uploadUpdateSite"
+            buildFile = ""
+            gradleParams = """
+                --exclude-task eclipseTest
+                -Peclipse.version=46 -Pcompiler.location='%linux.java8.oracle.64bit%/bin/javac' -Pbuild.invoker=%build.invoker% -Prelease.type=%eclipse.release.type% -PECLIPSE_ORG_FTP_HOST=build.eclipse.org -PECLIPSE_ORG_FTP_USER=%eclipse.downloadServer.username% -PECLIPSE_ORG_FTP_PASSWORD=%eclipse.downloadServer.password% -PECLIPSE_ORG_FTP_UPDATE_SITES_PATH=/home/data/httpd/download.eclipse.org/buildship/updates -PECLIPSE_ORG_TEMP_PATH=/home/data/httpd/download.eclipse.org/buildship/temp -PECLIPSE_ORG_MIRROR_PATH=/buildship/updates
+                --stacktrace -Declipse.p2.mirror=false
+                "-Dgradle.cache.remote.url=%gradle.cache.remote.url%"
+                "-Dgradle.cache.remote.username=%gradle.cache.remote.username%"
+                "-Dgradle.cache.remote.password=%gradle.cache.remote.password%"
+            """.trimIndent()
+            param("org.jfrog.artifactory.selectedDeployableServer.defaultModuleVersionConfiguration", "GLOBAL")
+        }
+        gradle {
+            name = "Build and upload update site for Eclipse 4.7 (Oxygen)"
+            tasks = "clean build uploadUpdateSite"
+            buildFile = ""
+            gradleParams = """
+                --exclude-task eclipseTest
+                -Peclipse.version=47 -Pcompiler.location='%linux.java8.oracle.64bit%/bin/javac' -Pbuild.invoker=%build.invoker% -Prelease.type=%eclipse.release.type% -PECLIPSE_ORG_FTP_HOST=build.eclipse.org -PECLIPSE_ORG_FTP_USER=%eclipse.downloadServer.username% -PECLIPSE_ORG_FTP_PASSWORD=%eclipse.downloadServer.password% -PECLIPSE_ORG_FTP_UPDATE_SITES_PATH=/home/data/httpd/download.eclipse.org/buildship/updates -PECLIPSE_ORG_TEMP_PATH=/home/data/httpd/download.eclipse.org/buildship/temp -PECLIPSE_ORG_MIRROR_PATH=/buildship/updates
+                --stacktrace -Declipse.p2.mirror=false
+                "-Dgradle.cache.remote.url=%gradle.cache.remote.url%"
+                "-Dgradle.cache.remote.username=%gradle.cache.remote.username%"
+                "-Dgradle.cache.remote.password=%gradle.cache.remote.password%"
+            """.trimIndent()
+            param("org.jfrog.artifactory.selectedDeployableServer.defaultModuleVersionConfiguration", "GLOBAL")
+        }
+        gradle {
+            name = "Build and upload update site for Eclipse 4.8 (Photon)"
+            tasks = "clean build uploadUpdateSite"
+            buildFile = ""
+            gradleParams = """
+                --exclude-task eclipseTest
+                -Peclipse.version=48 -Pcompiler.location='%linux.java8.oracle.64bit%/bin/javac' -Pbuild.invoker=%build.invoker% -Prelease.type=%eclipse.release.type% -PECLIPSE_ORG_FTP_HOST=build.eclipse.org -PECLIPSE_ORG_FTP_USER=%eclipse.downloadServer.username% -PECLIPSE_ORG_FTP_PASSWORD=%eclipse.downloadServer.password% -PECLIPSE_ORG_FTP_UPDATE_SITES_PATH=/home/data/httpd/download.eclipse.org/buildship/updates -PECLIPSE_ORG_TEMP_PATH=/home/data/httpd/download.eclipse.org/buildship/temp -PECLIPSE_ORG_MIRROR_PATH=/buildship/updates
+                --stacktrace -Declipse.p2.mirror=false
+                "-Dgradle.cache.remote.url=%gradle.cache.remote.url%"
+                "-Dgradle.cache.remote.username=%gradle.cache.remote.username%"
+                "-Dgradle.cache.remote.password=%gradle.cache.remote.password%"
+            """.trimIndent()
+        }
+        gradle {
+            name = "Build and upload update site for Eclipse 2018-09"
+            tasks = "clean build uploadUpdateSite"
+            buildFile = ""
+            gradleParams = """
+                --exclude-task eclipseTest
+                -Peclipse.version=49 -Pcompiler.location='%linux.java8.oracle.64bit%/bin/javac' -Pbuild.invoker=%build.invoker% -Prelease.type=%eclipse.release.type% -PECLIPSE_ORG_FTP_HOST=build.eclipse.org -PECLIPSE_ORG_FTP_USER=%eclipse.downloadServer.username% -PECLIPSE_ORG_FTP_PASSWORD=%eclipse.downloadServer.password% -PECLIPSE_ORG_FTP_UPDATE_SITES_PATH=/home/data/httpd/download.eclipse.org/buildship/updates -PECLIPSE_ORG_TEMP_PATH=/home/data/httpd/download.eclipse.org/buildship/temp -PECLIPSE_ORG_MIRROR_PATH=/buildship/updates
+                --stacktrace -Declipse.p2.mirror=false
+                "-Dgradle.cache.remote.url=%gradle.cache.remote.url%"
+                "-Dgradle.cache.remote.username=%gradle.cache.remote.username%"
+                "-Dgradle.cache.remote.password=%gradle.cache.remote.password%"
+            """.trimIndent()
+        }
+        gradle {
+            name = "Build and upload update site for Eclipse 2018-12"
+            tasks = "clean build uploadUpdateSite"
+            buildFile = ""
+            gradleParams = """
+                --exclude-task eclipseTest
+                -Peclipse.version=410 -Pcompiler.location='%linux.java8.oracle.64bit%/bin/javac' -Pbuild.invoker=%build.invoker% -Prelease.type=%eclipse.release.type% -PECLIPSE_ORG_FTP_HOST=build.eclipse.org -PECLIPSE_ORG_FTP_USER=%eclipse.downloadServer.username% -PECLIPSE_ORG_FTP_PASSWORD=%eclipse.downloadServer.password% -PECLIPSE_ORG_FTP_UPDATE_SITES_PATH=/home/data/httpd/download.eclipse.org/buildship/updates -PECLIPSE_ORG_TEMP_PATH=/home/data/httpd/download.eclipse.org/buildship/temp -PECLIPSE_ORG_MIRROR_PATH=/buildship/updates
+                --stacktrace -Declipse.p2.mirror=false
+                "-Dgradle.cache.remote.url=%gradle.cache.remote.url%"
+                "-Dgradle.cache.remote.username=%gradle.cache.remote.username%"
+                "-Dgradle.cache.remote.password=%gradle.cache.remote.password%"
+            """.trimIndent()
+        }
+        gradle {
+            name = "Build and upload update site for Eclipse 2019-03"
+            tasks = "clean build uploadUpdateSite"
+            buildFile = ""
+            gradleParams = """
+                --exclude-task eclipseTest
+                -Peclipse.version=411 -Pcompiler.location='%linux.java8.oracle.64bit%/bin/javac' -Pbuild.invoker=%build.invoker% -Prelease.type=%eclipse.release.type% -PECLIPSE_ORG_FTP_HOST=build.eclipse.org -PECLIPSE_ORG_FTP_USER=%eclipse.downloadServer.username% -PECLIPSE_ORG_FTP_PASSWORD=%eclipse.downloadServer.password% -PECLIPSE_ORG_FTP_UPDATE_SITES_PATH=/home/data/httpd/download.eclipse.org/buildship/updates -PECLIPSE_ORG_TEMP_PATH=/home/data/httpd/download.eclipse.org/buildship/temp -PECLIPSE_ORG_MIRROR_PATH=/buildship/updates
+                --stacktrace -Declipse.p2.mirror=false
+                "-Dgradle.cache.remote.url=%gradle.cache.remote.url%"
+                "-Dgradle.cache.remote.username=%gradle.cache.remote.username%"
+                "-Dgradle.cache.remote.password=%gradle.cache.remote.password%"
+            """.trimIndent()
+        }
+
+        gradle {
+            name = "Build and upload update site for Eclipse 2019-06"
+            tasks = "clean build uploadUpdateSite"
+            buildFile = ""
+            gradleParams = """
+                --exclude-task eclipseTest
+                -Peclipse.version=412 -Pcompiler.location='%linux.java8.oracle.64bit%/bin/javac' -Pbuild.invoker=%build.invoker% -Prelease.type=%eclipse.release.type% -PECLIPSE_ORG_FTP_HOST=build.eclipse.org -PECLIPSE_ORG_FTP_USER=%eclipse.downloadServer.username% -PECLIPSE_ORG_FTP_PASSWORD=%eclipse.downloadServer.password% -PECLIPSE_ORG_FTP_UPDATE_SITES_PATH=/home/data/httpd/download.eclipse.org/buildship/updates -PECLIPSE_ORG_TEMP_PATH=/home/data/httpd/download.eclipse.org/buildship/temp -PECLIPSE_ORG_MIRROR_PATH=/buildship/updates
+                --stacktrace -Declipse.p2.mirror=false
+                "-Dgradle.cache.remote.url=%gradle.cache.remote.url%"
+                "-Dgradle.cache.remote.username=%gradle.cache.remote.username%"
+                "-Dgradle.cache.remote.password=%gradle.cache.remote.password%"
+            """.trimIndent()
+        }
+        gradle {
+            name = "Build and upload update site for Eclipse 2019-09"
+            tasks = "clean build uploadUpdateSite"
+            buildFile = ""
+            gradleParams = """
+                --exclude-task eclipseTest
+                -Peclipse.version=413 -Pcompiler.location='%linux.java8.oracle.64bit%/bin/javac' -Pbuild.invoker=%build.invoker% -Prelease.type=%eclipse.release.type% -PECLIPSE_ORG_FTP_HOST=build.eclipse.org -PECLIPSE_ORG_FTP_USER=%eclipse.downloadServer.username% -PECLIPSE_ORG_FTP_PASSWORD=%eclipse.downloadServer.password% -PECLIPSE_ORG_FTP_UPDATE_SITES_PATH=/home/data/httpd/download.eclipse.org/buildship/updates -PECLIPSE_ORG_TEMP_PATH=/home/data/httpd/download.eclipse.org/buildship/temp -PECLIPSE_ORG_MIRROR_PATH=/buildship/updates
+                --stacktrace -Declipse.p2.mirror=false
+                "-Dgradle.cache.remote.url=%gradle.cache.remote.url%"
+                "-Dgradle.cache.remote.username=%gradle.cache.remote.username%"
+                "-Dgradle.cache.remote.password=%gradle.cache.remote.password%"
+            """.trimIndent()
+        }
+        gradle {
+            name = "Build and upload update site for Eclipse 2019-12"
+            tasks = "clean build uploadUpdateSite"
+            buildFile = ""
+            gradleParams = """
+                --exclude-task eclipseTest
+                -Peclipse.version=414 -Pcompiler.location='%linux.java8.oracle.64bit%/bin/javac' -Pbuild.invoker=%build.invoker% -Prelease.type=%eclipse.release.type% -PECLIPSE_ORG_FTP_HOST=build.eclipse.org -PECLIPSE_ORG_FTP_USER=%eclipse.downloadServer.username% -PECLIPSE_ORG_FTP_PASSWORD=%eclipse.downloadServer.password% -PECLIPSE_ORG_FTP_UPDATE_SITES_PATH=/home/data/httpd/download.eclipse.org/buildship/updates -PECLIPSE_ORG_TEMP_PATH=/home/data/httpd/download.eclipse.org/buildship/temp -PECLIPSE_ORG_MIRROR_PATH=/buildship/updates
+                --stacktrace -Declipse.p2.mirror=false
+                "-Dgradle.cache.remote.url=%gradle.cache.remote.url%"
+                "-Dgradle.cache.remote.username=%gradle.cache.remote.username%"
+                "-Dgradle.cache.remote.password=%gradle.cache.remote.password%"
+            """.trimIndent()
+        }
+
+        gradle {
+            name = "Build and upload update site for Eclipse 2020-03"
+            tasks = "clean build uploadUpdateSite"
+            buildFile = ""
+            gradleParams = """
+                --exclude-task eclipseTest
+                -Peclipse.version=415 -Pcompiler.location='%linux.java8.oracle.64bit%/bin/javac' -Pbuild.invoker=%build.invoker% -Prelease.type=%eclipse.release.type% -PECLIPSE_ORG_FTP_HOST=build.eclipse.org -PECLIPSE_ORG_FTP_USER=%eclipse.downloadServer.username% -PECLIPSE_ORG_FTP_PASSWORD=%eclipse.downloadServer.password% -PECLIPSE_ORG_FTP_UPDATE_SITES_PATH=/home/data/httpd/download.eclipse.org/buildship/updates -PECLIPSE_ORG_TEMP_PATH=/home/data/httpd/download.eclipse.org/buildship/temp -PECLIPSE_ORG_MIRROR_PATH=/buildship/updates
+                --stacktrace -Declipse.p2.mirror=false
+                "-Dgradle.cache.remote.url=%gradle.cache.remote.url%"
+                "-Dgradle.cache.remote.username=%gradle.cache.remote.username%"
+                "-Dgradle.cache.remote.password=%gradle.cache.remote.password%"
+            """.trimIndent()
+        }
+
+        gradle {
+            name = "Build and upload update site for Eclipse 2020-06"
+            tasks = "clean build uploadUpdateSite"
+            buildFile = ""
+            gradleParams = """
+                --exclude-task eclipseTest
+                -Peclipse.version=416 -Pcompiler.location='%linux.java8.oracle.64bit%/bin/javac' -Pbuild.invoker=%build.invoker% -Prelease.type=%eclipse.release.type% -PECLIPSE_ORG_FTP_HOST=build.eclipse.org -PECLIPSE_ORG_FTP_USER=%eclipse.downloadServer.username% -PECLIPSE_ORG_FTP_PASSWORD=%eclipse.downloadServer.password% -PECLIPSE_ORG_FTP_UPDATE_SITES_PATH=/home/data/httpd/download.eclipse.org/buildship/updates -PECLIPSE_ORG_TEMP_PATH=/home/data/httpd/download.eclipse.org/buildship/temp -PECLIPSE_ORG_MIRROR_PATH=/buildship/updates
+                --stacktrace -Declipse.p2.mirror=false
+                "-Dgradle.cache.remote.url=%gradle.cache.remote.url%"
+                "-Dgradle.cache.remote.username=%gradle.cache.remote.username%"
+                "-Dgradle.cache.remote.password=%gradle.cache.remote.password%"
+            """.trimIndent()
+        }
+    }
+
+    triggers {
+        schedule {
+            schedulingPolicy = daily {
+                hour = 23
+            }
+            branchFilter = """
+                +:*
+                -:teamcity-versioned-settings
+            """.trimIndent()
+            triggerRules = """
+                -:docs/**
+                -:README.MD
+            """.trimIndent()
+            triggerBuild = always()
+            enforceCleanCheckout = true
+            param("revisionRule", "lastFinished")
+            param("dayOfWeek", "Sunday")
+        }
+    }
+})
diff --git a/.teamcity/pom.xml b/.teamcity/pom.xml
index a2324153a6..53bdb5abc8 100644
--- a/.teamcity/pom.xml
+++ b/.teamcity/pom.xml
@@ -2,6 +2,12 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <name>Tooling_Buildship Config DSL Script</name>
+
+  <properties>
+    <kotlin.version>1.4.21</kotlin.version>
+  </properties>
+
+
   <groupId>Tooling_Buildship</groupId>
   <artifactId>Tooling_Buildship_dsl</artifactId>
   <version>1.0-SNAPSHOT</version>
@@ -37,25 +43,27 @@
   </pluginRepositories>
 
   <build>
-    <sourceDirectory>.</sourceDirectory>
+    <sourceDirectory></sourceDirectory>
     <plugins>
       <plugin>
         <artifactId>kotlin-maven-plugin</artifactId>
         <groupId>org.jetbrains.kotlin</groupId>
         <version>${kotlin.version}</version>
 
-        <configuration/>
+        <configuration>
+          <jvmTarget>1.8</jvmTarget>
+        </configuration>
         <executions>
           <execution>
             <id>compile</id>
-            <phase>process-sources</phase>
+            <phase>compile</phase>
             <goals>
               <goal>compile</goal>
             </goals>
           </execution>
           <execution>
             <id>test-compile</id>
-            <phase>process-test-sources</phase>
+            <phase>test-compile</phase>
             <goals>
               <goal>test-compile</goal>
             </goals>
@@ -71,6 +79,26 @@
           <dstDir>target/generated-configs</dstDir>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>compile</id>
+            <phase>compile</phase>
+            <goals>
+              <goal>compile</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>testCompile</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>testCompile</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 
@@ -100,5 +128,21 @@
       <version>${kotlin.version}</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>org.jetbrains.kotlin</groupId>
+      <artifactId>kotlin-stdlib-jdk8</artifactId>
+      <version>${kotlin.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.jetbrains.kotlin</groupId>
+      <artifactId>kotlin-test</artifactId>
+      <version>${kotlin.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jetbrains.kotlin</groupId>
+      <artifactId>kotlin-stdlib-jdk8</artifactId>
+      <version>${kotlin.version}</version>
+    </dependency>
   </dependencies>
 </project>
\ No newline at end of file