This is an automated email from the ASF dual-hosted git repository.
apolovtsev pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
The following commit(s) were added to refs/heads/main by this push:
new fb09fa80ad2 IGNITE-27826 change default java to JDK17 (#7619)
fb09fa80ad2 is described below
commit fb09fa80ad24aac1828668fb65bf16d5b78eb7b7
Author: Lozmanov <[email protected]>
AuthorDate: Thu Feb 19 16:09:36 2026 +0500
IGNITE-27826 change default java to JDK17 (#7619)
---
.../teamcity/ApacheIgnite3CustomBuildType.kt | 11 +-----
.teamcity/test/build_types/RunSanityCheck.kt | 1 -
.teamcity/test/sanity_check/Project.kt | 7 ----
.../sanity_check/build_types/CodeStyleJava17.kt | 42 ----------------------
4 files changed, 1 insertion(+), 60 deletions(-)
diff --git
a/.teamcity/org/apache/ignite/teamcity/ApacheIgnite3CustomBuildType.kt
b/.teamcity/org/apache/ignite/teamcity/ApacheIgnite3CustomBuildType.kt
index 856a2388170..6b9e4f49f41 100644
--- a/.teamcity/org/apache/ignite/teamcity/ApacheIgnite3CustomBuildType.kt
+++ b/.teamcity/org/apache/ignite/teamcity/ApacheIgnite3CustomBuildType.kt
@@ -17,21 +17,12 @@ class ApacheIgnite3CustomBuildType(override val buildType:
BuildType) : CustomBu
fun ignite3VCS() = apply {
buildType.params {
hiddenText("VCSROOT__IGNITE3", "ignite-3")
- hiddenText("env.JAVA_HOME", "%env.JDK_ORA_11%")
+ hiddenText("env.JAVA_HOME", "%env.JDK_ORA_17%")
}
buildType.vcs {
root(AbsoluteId("GitHubApacheIgnite3"), "+:. =>
%VCSROOT__IGNITE3%")
}
}
-
- /**
- * Set JAVA_HOME to JDK 17
- */
- fun ignite3Java17() = apply {
- buildType.params {
- hiddenText("env.JAVA_HOME", "%env.JDK_ORA_17%")
- }
- }
/**
* Send build status to Apache Ignite 3 GitHub repository
diff --git a/.teamcity/test/build_types/RunSanityCheck.kt
b/.teamcity/test/build_types/RunSanityCheck.kt
index b1ce3b39d4b..b7575cfbf46 100644
--- a/.teamcity/test/build_types/RunSanityCheck.kt
+++ b/.teamcity/test/build_types/RunSanityCheck.kt
@@ -14,7 +14,6 @@ object RunSanityCheck : BuildType({
dependencies {
snapshot(AssembleTestClasses) {}
snapshot(CodeStyle) {}
- snapshot(CodeStyleJava17) {}
snapshot(Javadoc) {}
snapshot(MentionTicket) {}
snapshot(PMD) {}
diff --git a/.teamcity/test/sanity_check/Project.kt
b/.teamcity/test/sanity_check/Project.kt
index e493a53af0c..54fba377d5e 100644
--- a/.teamcity/test/sanity_check/Project.kt
+++ b/.teamcity/test/sanity_check/Project.kt
@@ -24,11 +24,4 @@ object Project : Project({
.build().buildType
)
}
-
- buildType(
- ApacheIgnite3CustomBuildType.Builder(CodeStyleJava17)
- .ignite3VCS().ignite3Java17().ignite3BuildDependency()
- .defaultBuildTypeSettings().requireLinux()
- .build().buildType
- )
})
diff --git a/.teamcity/test/sanity_check/build_types/CodeStyleJava17.kt
b/.teamcity/test/sanity_check/build_types/CodeStyleJava17.kt
deleted file mode 100644
index 8b00e702e1d..00000000000
--- a/.teamcity/test/sanity_check/build_types/CodeStyleJava17.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-package test.sanity_check.build_types
-
-import jetbrains.buildServer.configs.kotlin.BuildType
-import
jetbrains.buildServer.configs.kotlin.failureConditions.BuildFailureOnText
-import jetbrains.buildServer.configs.kotlin.failureConditions.failOnText
-import org.apache.ignite.teamcity.CustomBuildSteps.Companion.customGradle
-import org.apache.ignite.teamcity.Teamcity.Companion.getId
-import org.apache.ignite.teamcity.Teamcity.Companion.hiddenText
-
-
-object CodeStyleJava17 : BuildType({
- id(getId(this::class))
- name = "Code Style (Java 17)"
- description = "Runs code style checks that are missed by Java 11 code
style build"
-
- artifactRules = """
- %VCSROOT__IGNITE3%/build/reports/checkstyle/*.html
- """.trimIndent()
-
- params {
- hiddenText("env.JAVA_HOME", "%env.JDK_ORA_17%")
- }
-
- steps {
- customGradle {
- name = "Check code style by Checkstyle Gradle Plugin"
- tasks = "java-records-tests:checkstyle"
- gradleParams = "--continue"
- workingDir = "%VCSROOT__IGNITE3%"
- }
- }
-
- failureConditions {
- executionTimeoutMin = 10
- failOnText {
- conditionType = BuildFailureOnText.ConditionType.REGEXP
- pattern = "There.*[0-9]+ error(s)? reported by Checkstyle"
- failureMessage = "CheckStyle errors"
- reverse = false
- }
- }
-})
