From 9ee07faebef6385edc7eb5bf173fd7558bcc76f9 Mon Sep 17 00:00:00 2001
From: Stephane Bouchet <sbouchet@redhat.com>
Date: Mon, 7 Oct 2024 15:51:39 +0200
Subject: [PATCH] chore: migrate build to 2024.2

* bumping minimal version to 2023.1
* updated commons to 1.9.7-snapshot and use workaround provided by @AlexanderBartash
* removed @NonNls which caused errors in IC-2023.2

Signed-off-by: Andre Dietisheim <adietish@redhat.com>
Co-authored-by: @AlexanderBartash
---
 .github/workflows/IJ-latest.yml               |   4 +-
 .github/workflows/IJ.yml                      |  35 +--
 .github/workflows/accepted                    |   1 -
 .github/workflows/it.yml                      |   6 +-
 .github/workflows/prefs.xml                   |   5 -
 .github/workflows/release.yml                 |   3 +-
 .gitignore                                    |   1 +
 Jenkinsfile                                   |   2 +-
 Makefile                                      |   6 +-
 README.md                                     |   2 +-
 build.gradle                                  | 222 ------------------
 build.gradle.kts                              | 202 ++++++++++++++++
 gradle.properties                             |  40 +++-
 gradle/libs.versions.toml                     |  42 ++++
 gradle/wrapper/gradle-wrapper.jar             | Bin 61574 -> 62076 bytes
 gradle/wrapper/gradle-wrapper.properties      |   2 +-
 gradlew                                       |  11 +-
 settings.gradle                               |   4 -
 settings.gradle.kts                           |   5 +
 .../tools/intellij/kubernetes/BasicTests.java |  65 +----
 .../dialogs/IdeFatalErrorsDialogFixture.java  |   8 -
 .../dialogs/ProjectStructureDialog.java       |  48 ----
 .../ActionPanelLabelFixture.java}             |  12 +-
 .../EditorsSplittersFixture.java              |   8 +-
 .../IdeStatusBarFixture.java                  |  11 +-
 .../KubernetesToolsFixture.java               |   2 +-
 .../fixtures/menus/ActionToolbarMenu.java     |  10 +-
 .../tests/AbstractKubernetesTest.java         |  11 +-
 .../CreateAnotherTypeResourceByEditTest.java  |  14 +-
 .../tests/CreateResourceByEditTest.java       |  15 +-
 .../kubernetes/tests/EditResourceTest.java    |  21 +-
 .../tests/OpenResourceEditorTest.java         |   7 +-
 .../kubernetes/model/ResourceModel.kt         |   1 -
 .../kubernetes/settings/SettingsComponent.kt  |   2 +-
 34 files changed, 355 insertions(+), 473 deletions(-)
 delete mode 100644 .github/workflows/accepted
 delete mode 100644 .github/workflows/prefs.xml
 delete mode 100644 build.gradle
 create mode 100644 build.gradle.kts
 create mode 100644 gradle/libs.versions.toml
 delete mode 100644 settings.gradle
 create mode 100644 settings.gradle.kts
 delete mode 100644 src/it/java/org/jboss/tools/intellij/kubernetes/fixtures/dialogs/ProjectStructureDialog.java
 rename src/it/java/org/jboss/tools/intellij/kubernetes/fixtures/{mainIdeWindow/SingleHeighLabelFixture.java => mainidewindow/ActionPanelLabelFixture.java} (70%)
 rename src/it/java/org/jboss/tools/intellij/kubernetes/fixtures/{mainIdeWindow => mainidewindow}/EditorsSplittersFixture.java (82%)
 rename src/it/java/org/jboss/tools/intellij/kubernetes/fixtures/{mainIdeWindow => mainidewindow}/IdeStatusBarFixture.java (76%)
 rename src/it/java/org/jboss/tools/intellij/kubernetes/fixtures/{mainIdeWindow => mainidewindow}/KubernetesToolsFixture.java (96%)

diff --git a/.github/workflows/IJ-latest.yml b/.github/workflows/IJ-latest.yml
index 5ddb08d99..a3e45eb77 100644
--- a/.github/workflows/IJ-latest.yml
+++ b/.github/workflows/IJ-latest.yml
@@ -23,7 +23,9 @@ jobs:
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
       - name: Build with Gradle
-        run: ./gradlew build --continue -PideaVersion=LATEST-EAP-SNAPSHOT
+        run: |
+          LATEST_EAP_SNAPSHOT=$(./gradlew printProductsReleases | grep 'IC-' | head -n 1 | cut -d'-' -f2)
+          ./gradlew build --continue -PplatformVersion=$LATEST_EAP_SNAPSHOT
       - uses: actions/upload-artifact@v4
         if: always()
         with:
diff --git a/.github/workflows/IJ.yml b/.github/workflows/IJ.yml
index aac64ab4f..822d13592 100644
--- a/.github/workflows/IJ.yml
+++ b/.github/workflows/IJ.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        IJ: [IC-2022.3, IC-2023.1, IC-2023.2, IC-2023.3, IC-2024.1]
+        IJ: [2023.1, 2023.2, 2023.3, 2024.1, 2024.2]
 
     steps:
     - uses: actions/checkout@v4
@@ -27,27 +27,12 @@ jobs:
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
     - name: Build with Gradle
-      run: ./gradlew build -PideaVersion=${{ matrix.IJ }}
-
-  verify:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout Code
-        uses: actions/checkout@v4
-      - name: Set up JDK 17
-        uses: actions/setup-java@v4
-        with:
-          java-version: 17
-          distribution: 'temurin'
-          cache: 'gradle'
-      - name: Grant execute permission for gradlew
-        run: chmod +x gradlew
-      - name: Build with Gradle
-        run: ./gradlew runPluginVerifier -PideaVersion=IC-2023.2
-      - name: Upload report
-        uses: actions/upload-artifact@v4
-        if: always()
-        with:
-          name: verifier-report
-          path: build/reports/pluginVerifier
+      run: ./gradlew build -PplatformVersion=${{ matrix.IJ }}
+    - name: Validate with Gradle
+      run: ./gradlew verifyPlugin -PplatformVersion=${{ matrix.IJ }}
+    - name: Upload report
+      uses: actions/upload-artifact@v4
+      if: always()
+      with:
+        name: ${{ matrix.IJ }}-verifier-report
+        path: build/reports/pluginVerifier
diff --git a/.github/workflows/accepted b/.github/workflows/accepted
deleted file mode 100644
index 332be0339..000000000
--- a/.github/workflows/accepted
+++ /dev/null
@@ -1 +0,0 @@
-rsch.send.usage.stat:1.1:0:1607789880884
\ No newline at end of file
diff --git a/.github/workflows/it.yml b/.github/workflows/it.yml
index 11e7f9d00..42f2355e5 100644
--- a/.github/workflows/it.yml
+++ b/.github/workflows/it.yml
@@ -34,13 +34,9 @@ jobs:
         make run-local
     - name: Run integration tests
       run: |
-        dir=~/.java/.userPrefs/jetbrains/_\!\(\!\!cg\"p\!\(\}\!\}@\"j\!\(k\!\|w\"w\!\'8\!b\!\"p\!\':\!e@=\=
-        mkdir -p "$dir"
-        cp .github/workflows/prefs.xml $dir
-        mkdir -p ~/.local/share/JetBrains/consentOptions
-        cp .github/workflows/accepted ~/.local/share/JetBrains/consentOptions
         export DISPLAY=:99.0
         Xvfb -ac :99 -screen 0 1920x1080x16 &
+        sleep 10
         ./gradlew integrationTest --info
     - uses: actions/upload-artifact@v4
       with:
diff --git a/.github/workflows/prefs.xml b/.github/workflows/prefs.xml
deleted file mode 100644
index 7226536af..000000000
--- a/.github/workflows/prefs.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE map SYSTEM "http://java.sun.com/dtd/preferences.dtd">
-<map MAP_XML_VERSION="1.0">
-    <entry key="accepted_version" value="2.0"/>
-</map> 
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 6a147e9f3..ea43428c3 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -111,7 +111,7 @@ jobs:
           current-tag: ${{ inputs.release_version }}
           types-mapping: 'feat:Features,fix:Bug Fixes,docs:Documentation,refactor:Refactoring,build:Builds,chore:Other'
 
-      # Create a new Github release
+      # Create a new GitHub release
       - name: Create Github Release
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -128,4 +128,3 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: gh release upload ${{ inputs.release_version }} ./build/distributions/*
-
diff --git a/.gitignore b/.gitignore
index 93579f8da..d2b8de62b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ build
 .gradle
 out
 
+/.intellijPlatform/
\ No newline at end of file
diff --git a/Jenkinsfile b/Jenkinsfile
index 49601d392..91b1f8c54 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -2,7 +2,7 @@
 
 node('rhel7'){
 	def recipientList = 'jbosstools-builds@lists.jboss.org'
-	def javaHome = tool 'openjdk-11'
+	def javaHome = tool 'openjdk-17'
 	env.JAVA_HOME = "${javaHome}"
 
 	try {
diff --git a/Makefile b/Makefile
index e5c15c7a6..c55bface0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
-###########################################
-#  Intellij-kubernets run build minikube  #
-###########################################
+############################################
+#  Intellij-kubernetes run build minikube  #
+############################################
 
 MOD_FLAGS := $(shell (go version | grep -q -E "1\.1[1-9]") && echo -mod=vendor)
 CMDS  := $(shell go list $(MOD_FLAGS) ./cmd/...)
diff --git a/README.md b/README.md
index f399fd763..41908b66a 100644
--- a/README.md
+++ b/README.md
@@ -157,7 +157,7 @@ UI Testing
 ==========
 You can perform UI testing by running the following command:
 ```sh
-./gradlew clean runIdeForUiTests -PideaVersion=IC-2020.2 & ./gradlew integrationTest
+./gradlew integrationTest
 ```
 
 License
diff --git a/build.gradle b/build.gradle
deleted file mode 100644
index bac794d74..000000000
--- a/build.gradle
+++ /dev/null
@@ -1,222 +0,0 @@
-buildscript {
-    ext.ideaVersion = ideaVersion
-    ext.kotlinVersion = kotlinVersion
-    ext.java_version = "17"
-}
-
-plugins {
-    id "org.jetbrains.intellij" version "${intellijPluginVersion}"
-    id "org.jetbrains.kotlin.jvm" version "${kotlinJvmPluginVersion}"
-    id "idea"
-}
-
-sourceSets {
-    integrationTest {
-        java.srcDir file('src/it/java')
-        resources.srcDir file('src/it/resources')
-        compileClasspath += sourceSets.main.output + configurations.runtimeClasspath
-        runtimeClasspath += output + compileClasspath
-    }
-}
-
-task integrationTest(type: Test) {
-    useJUnitPlatform()
-    description = 'Runs the integration tests.'
-    group = 'verification'
-    testClassesDirs = sourceSets.integrationTest.output.classesDirs
-    classpath = sourceSets.integrationTest.runtimeClasspath
-    outputs.upToDateWhen { false }
-    mustRunAfter test
-}
-
-tasks.withType(Test) {
-    environment 'GRADLE_RELEASE_REPOSITORY','https://services.gradle.org/distributions'
-}
-
-dependencies {
-    implementation(
-            "com.redhat.devtools.intellij:intellij-common:${intellijCommonVersion}",
-            "io.fabric8:kubernetes-client:${kubernetesClientVersion}",
-            "io.fabric8:kubernetes-model:${kubernetesClientVersion}",
-            "io.fabric8:kubernetes-model-common:${kubernetesClientVersion}",
-            "io.fabric8:openshift-client:${kubernetesClientVersion}",
-            "io.fabric8:kubernetes-httpclient-okhttp:${kubernetesClientVersion}",
-            "com.fasterxml.jackson.core:jackson-core:2.17.0", /* IC-2022.3 ships 2.16.0 */
-            "org.apache.commons:commons-lang3:3.12.0"
-    )
-    testImplementation(
-            "org.assertj:assertj-core:3.22.0",
-            "org.mockito:mockito-inline:4.5.1",
-            "com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0",
-            "org.jetbrains.kotlin:kotlin-test-junit:${kotlinVersion}"
-    )
-    integrationTestImplementation(
-            "com.redhat.devtools.intellij:intellij-common:${intellijCommonVersion}",
-            "com.redhat.devtools.intellij:intellij-common-ui-test-library:0.3.0",
-            "org.junit.jupiter:junit-jupiter-engine:5.8.2",
-            "org.junit.jupiter:junit-jupiter-api:5.8.2",
-            "org.junit.jupiter:junit-jupiter:5.8.2",
-            "org.junit.platform:junit-platform-launcher:1.9.3",
-            "com.google.code.gson:gson:2.8.9"
-    )
-
-    components {
-        withModule("com.redhat.devtools.intellij:intellij-common") {
-            withVariant("intellijPlatformComposedJar") {
-                attributes {
-                    attribute(LibraryElements.LIBRARY_ELEMENTS_ATTRIBUTE, objects.named(LibraryElements, LibraryElements.JAR))
-                }
-            }
-        }
-    }
-}
-
-java {
-    toolchain {
-        languageVersion = JavaLanguageVersion.of(java_version)
-    }
-}
-
-configurations {
-    implementation {
-        exclude group: "org.slf4j", module: "slf4j-api"
-        exclude group: "org.jetbrains.kotlin", module: "kotlin-stdlib"
-    }
-
-    compileOptions {
-        sourceCompatibility = java_version
-        targetCompatibility = java_version
-    }
-
-    integrationTestImplementation.extendsFrom testImplementation
-    integrationTestRuntimeOnly.extendsFrom testRuntimeOnly
-}
-
-test {
-    systemProperties["com.redhat.devtools.intellij.telemetry.mode"] = "disabled"
-    afterSuite { desc, result ->
-        if (!desc.parent)
-            println("${result.resultType} " +
-                    "(${result.testCount} tests, " +
-                    "${result.successfulTestCount} successes, " +
-                    "${result.failedTestCount} failures, " +
-                    "${result.skippedTestCount} skipped)")
-    }
-}
-
-intellij {
-    version = ideaVersion //for a full list of Jetbrains IDEA releases please see https://www.jetbrains.com/intellij-repository/releases
-    pluginName = "Kubernetes by Red Hat"
-    plugins = ["yaml", "com.redhat.devtools.intellij.telemetry:${telemetryPluginVersion}" ]
-    updateSinceUntilBuild = false
-}
-
-runIde {
-    systemProperties["com.redhat.devtools.intellij.telemetry.mode"] = "debug"
-}
-
-patchPluginXml {
-    sinceBuild = "${sinceIdeaBuild}"
-}
-
-runPluginVerifier {
-    ideVersions = [ideaVersion]
-}
-
-publishPlugin {
-    token = jetBrainsToken
-    channels = [jetBrainsChannel]
-}
-
-runIdeForUiTests {
-    systemProperty "robot-server.port", System.getProperty("robot-server.port")
-    systemProperties["com.redhat.devtools.intellij.telemetry.mode"] = "disabled"
-}
-
-task generateSchemas {
-    final LATEST_VERSION_SCHEMA = "v1.24.2"
-    final SCHEMA_BASEURL = "https://raw.githubusercontent.com/kubernetes/kubernetes"
-    final SCHEMA_DIR = "src/main/resources/schemas/"
-    final K8S_DIR = "k8s.io"
-
-    doLast {
-        def schemaVersion = getProjectProperty("schemaVersion", LATEST_VERSION_SCHEMA)
-        def url = "${SCHEMA_BASEURL}/${schemaVersion}/api/openapi-spec/swagger.json"
-        def destination = "${SCHEMA_DIR}/${K8S_DIR}"
-        file("${projectDir}/${destination}").deleteDir()
-
-        println("Generating schemas ${schemaVersion} from openapi at ${url} \ninto ${SCHEMA_DIR}")
-        /*
-         * openapi2jsonschema -o src/main/resources/schemas/k8s.io --kubernetes --expanded --stand-alone --strict https://raw.githubusercontent.com/kubernetes/kubernetes/v1.20.5/api/openapi-spec/swagger.json
-         */
-        def process = exec {
-            executable "openapi2jsonschema"
-            args "-o", destination, "--kubernetes", "--expanded", "--stand-alone", "--strict", url
-        }
-        if (isSuccess(process.exitValue)) {
-            createIndexFile("${projectDir}/${destination}")
-        } else {
-            println(colorize("yellow",
-                    """Generating schema failed. Please make sure that you have 'openapi2jsonschema' installed.
-                    Make sure you have python installed and then run 'pip install openapi2jsonschema'.
-                    Further info is available at https://pypi.org/project/openapi2jsonschema/"""))
-        }
-    }
-
-    ext.createIndexFile = { destination ->
-        def indexFilename = "index.txt"
-        def index = file("${destination}/${indexFilename}")
-        index.createNewFile()
-        files { file("${destination}").listFiles() }
-                .filter { file ->
-                    !file.name.endsWith(indexFilename) ||
-                            !file.name.endsWith("all.json") ||
-                            !file.name.endsWith("_definitions.json") ||
-                            !file.name.contains(".v")
-                }
-                .each { file ->
-                    index.text += "${file.name}\n"
-                }
-        return index
-    }
-
-    ext.isSuccess = { exitValue ->
-        return exitValue == 0
-    }
-}
-
-private def getProjectProperty(String key, String defaultValue) {
-    def value = defaultValue
-    if (project.hasProperty(key)) {
-        schemaVersion = project.getProperty(key)
-    }
-    return value;
-}
-
-private def colorize(String color, String message) {
-    final colors = [
-            black: 30,
-            red: 31,
-            green: 32,
-            yellow: 33,
-            blue: 34,
-            magenta: 35,
-            cyan: 36,
-            white: 37
-    ]
-    return new String((char) 27) + "[${colors[color]}m${message}" + new String((char) 27) + "[0m"
-}
-
-repositories {
-    mavenLocal()
-    mavenCentral()
-    maven {
-        url "https://repository.jboss.org"
-    }
-    maven {
-        url "https://packages.jetbrains.team/maven/p/ij/intellij-dependencies"
-    }
-}
-
-group "com.redhat.devtools.intellij"
-version projectVersion
diff --git a/build.gradle.kts b/build.gradle.kts
new file mode 100644
index 000000000..14f8499e7
--- /dev/null
+++ b/build.gradle.kts
@@ -0,0 +1,202 @@
+import org.jetbrains.intellij.platform.gradle.IntelliJPlatformType
+import org.jetbrains.intellij.platform.gradle.TestFrameworkType
+import org.jetbrains.intellij.platform.gradle.models.ProductRelease
+
+plugins {
+    alias(libs.plugins.gradleIntelliJPlugin) // Gradle IntelliJ Plugin
+    alias(libs.plugins.kotlinJvm)
+    id("idea")
+}
+
+group = "com.redhat.devtools.intellij"
+version = providers.gradleProperty("projectVersion").get() // Plugin version
+val ideaVersion = providers.gradleProperty("platformVersion").get()
+val javaVersion = 17
+
+// Set the JVM language level used to build the project.
+kotlin {
+    jvmToolchain(javaVersion)
+}
+
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(javaVersion)
+    }
+    sourceCompatibility = JavaVersion.toVersion(javaVersion)
+    targetCompatibility = JavaVersion.toVersion(javaVersion)
+}
+
+
+repositories {
+    mavenLocal()
+    maven { url = uri("https://repository.jboss.org") }
+    mavenCentral()
+    intellijPlatform {
+        defaultRepositories()
+    }
+}
+
+dependencies {
+    intellijPlatform {
+        create(IntelliJPlatformType.IntellijIdeaCommunity, ideaVersion)
+
+        // Bundled Plugin Dependencies. Uses `platformBundledPlugins` property from the gradle.properties file for bundled IntelliJ Platform plugins.
+        bundledPlugins(providers.gradleProperty("platformBundledPlugins").map { it.split(',') })
+
+        // Plugin Dependencies. Uses `platformPlugins` property from the gradle.properties file for plugin from JetBrains Marketplace.
+        plugins(providers.gradleProperty("platformPlugins").map { it.split(',') })
+
+        // for local plugin -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin-faq.html#how-to-add-a-dependency-on-a-plugin-available-in-the-file-system
+        //plugins.set(listOf(file("/path/to/plugin/")))
+
+        pluginVerifier()
+
+        instrumentationTools()
+
+        testFramework(TestFrameworkType.Platform)
+    }
+
+    implementation(libs.devtools.common)
+    implementation(libs.kubernetes.client)
+    implementation(libs.kubernetes.model)
+    implementation(libs.kubernetes.model.common)
+    implementation(libs.openshift.client)
+    implementation(libs.kubernetes.httpclient.okhttp)
+    implementation(libs.jackson.core)
+    implementation(libs.commons.lang3)
+
+    // for unit tests
+    testImplementation(libs.assertj.core)
+    testImplementation(libs.mockito.inline)
+    testImplementation(libs.mockito.kotlin)
+    testImplementation(libs.kotlin.test.junit)
+
+    components {
+        withModule("com.redhat.devtools.intellij:intellij-common") {
+            withVariant("intellijPlatformComposedJar") {
+                attributes {
+                    attribute(LibraryElements.LIBRARY_ELEMENTS_ATTRIBUTE, objects.named(LibraryElements.JAR))
+                }
+            }
+        }
+    }
+
+}
+
+intellijPlatform {
+    buildSearchableOptions = false
+
+    pluginConfiguration {
+        ideaVersion {
+            sinceBuild = providers.gradleProperty("pluginSinceBuild")
+            untilBuild = provider { null }
+        }
+    }
+
+    publishing {
+        token = providers.gradleProperty("jetBrainsToken")
+        channels = providers.gradleProperty("jetBrainsChannel").map { listOf(it) }
+    }
+
+    pluginVerification {
+        ides {
+            ide(IntelliJPlatformType.IntellijIdeaUltimate, ideaVersion)
+        }
+        freeArgs = listOf(
+            "-mute",
+            "TemplateWordInPluginId,TemplateWordInPluginName"
+        )
+    }
+}
+
+tasks {
+    wrapper {
+        gradleVersion = providers.gradleProperty("gradleVersion").get()
+    }
+
+    runIde {
+        systemProperty("com.redhat.devtools.intellij.telemetry.mode", "debug")
+    }
+
+    test {
+        systemProperty("com.redhat.devtools.intellij.telemetry.mode", "disabled")
+    }
+
+    printProductsReleases {
+        channels = listOf(ProductRelease.Channel.EAP)
+        types = listOf(IntelliJPlatformType.IntellijIdeaCommunity)
+        untilBuild = provider { null }
+    }
+}
+
+configurations.all {
+    exclude(group = "org.slf4j", module = "slf4j-api")
+}
+
+sourceSets {
+    create("it") {
+        description = "integrationTest"
+        compileClasspath += sourceSets.main.get().compileClasspath + sourceSets.test.get().compileClasspath
+        runtimeClasspath += output + compileClasspath
+    }
+}
+
+configurations["itRuntimeOnly"].extendsFrom(configurations.testRuntimeOnly.get())
+configurations["itImplementation"].extendsFrom(configurations.testImplementation.get())
+
+val integrationTest by intellijPlatformTesting.testIde.registering {
+    task {
+        useJUnitPlatform()
+        systemProperty("com.redhat.devtools.intellij.telemetry.mode", "disabled")
+        description = "Runs the integration tests."
+        group = "verification"
+        testClassesDirs = sourceSets["it"].output.classesDirs
+        classpath = sourceSets["it"].runtimeClasspath
+        jvmArgs("-Djava.awt.headless=true")
+        shouldRunAfter(tasks["test"])
+    }
+
+    plugins {
+        robotServerPlugin()
+    }
+
+    dependencies {
+        testImplementation(libs.devtools.common)
+        testImplementation(libs.devtools.common.ui.test)
+        testImplementation(libs.junit.platform.launcher)
+        testImplementation(libs.junit.platform.suite)
+        testImplementation(libs.junit.jupiter)
+        testImplementation(libs.junit.jupiter.api)
+        testImplementation(libs.junit.jupiter.engine)
+        testImplementation(libs.gson)
+    }
+}
+
+
+// https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-tasks.html#runIdeForUiTests
+val runIdeForUiTests by intellijPlatformTesting.runIde.registering {
+    task {
+        jvmArgumentProviders += CommandLineArgumentProvider {
+            listOf(
+                "-Dide.mac.message.dialogs.as.sheets=false",
+                "-Djb.privacy.policy.text=<!--999.999-->",
+                "-Djb.consents.confirmation.enabled=false",
+                "-Duser.language=en -Duser.country=US"
+            )
+        }
+
+        systemProperty("robot-server.port", System.getProperty("robot-server.port"))
+        systemProperties["com.redhat.devtools.intellij.telemetry.mode"] = "disabled"
+    }
+
+    plugins {
+        robotServerPlugin()
+    }
+}
+
+// below is only to correctly configure IDEA project settings
+idea {
+    module {
+        testSources.from(sourceSets["it"].java.srcDirs)
+    }
+}
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 2cc897239..f08c08c7c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,16 +1,30 @@
-ideaVersion=IC-2024.1
-# build number ranges
-# https://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/build_number_ranges.html
-# incompatibilities: https://plugins.jetbrains.com/docs/intellij/api-changes-list.html
-sinceIdeaBuild=223
 projectVersion=1.4.1-SNAPSHOT
 jetBrainsToken=invalid
 jetBrainsChannel=stable
-intellijPluginVersion=1.16.1
-kotlinJvmPluginVersion=1.8.0
-intellijCommonVersion=1.9.6
-telemetryPluginVersion=1.1.0.52
-kotlin.stdlib.default.dependency = false
-kotlinVersion=1.6.21
-kubernetesClientVersion=6.12.0
-fixturesVersion=1.1.18
+
+# IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension
+# if plugin uses intellij-common-ui-test library, 'platformType' and 'platformVersion' variables names MUST be used
+# platformType = IC (not needed as hard-coded in gradle build directly)
+platformVersion=2024.2
+
+# Gradle Releases -> https://github.com/gradle/gradle/releases
+gradleVersion=8.5
+
+# Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
+platformBundledPlugins=org.jetbrains.plugins.yaml
+platformPlugins=com.redhat.devtools.intellij.telemetry:1.2.0.59
+
+# Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
+pluginSinceBuild=231
+
+# Opt-out flag for bundling Kotlin standard library -> https://jb.gg/intellij-platform-kotlin-stdlib
+kotlin.stdlib.default.dependency=false
+
+# Enable Gradle Configuration Cache -> https://docs.gradle.org/current/userguide/configuration_cache.html
+org.gradle.configuration-cache=true
+
+# Enable Gradle Build Cache -> https://docs.gradle.org/current/userguide/build_cache.html
+org.gradle.caching=true
+
+kotlin.daemon.jvm.options=-Xmx2g
+org.gradle.jvmargs=-Xmx2g
\ No newline at end of file
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
new file mode 100644
index 000000000..bf5c1acc7
--- /dev/null
+++ b/gradle/libs.versions.toml
@@ -0,0 +1,42 @@
+[versions]
+# libraries
+kubernetes-client = "6.12.0"
+devtools-common = "1.9.7-SNAPSHOT"
+jackson-core = "2.17.0"
+commons-lang3 = "3.12.0"
+assertj-core = "3.22.0"
+mockito-inline = "4.5.1"
+mockito-kotlin = "2.2.0"
+devtools-common-ui-test = "0.4.2"
+junit-platform = "1.10.3"
+junit-jupiter = "5.10.3"
+gson = "2.8.9"
+
+# plugins
+gradleIntelliJPlugin = "2.1.0"
+kotlinJvm = "2.0.20"
+
+[libraries]
+openshift-client = { group = "io.fabric8", name = "openshift-client", version.ref = "kubernetes-client" }
+kubernetes-client = { group = "io.fabric8", name = "kubernetes-client", version.ref = "kubernetes-client" }
+kubernetes-model = { group = "io.fabric8", name = "kubernetes-model", version.ref = "kubernetes-client" }
+kubernetes-model-common = { group = "io.fabric8", name = "kubernetes-model-common", version.ref = "kubernetes-client" }
+kubernetes-httpclient-okhttp = { group = "io.fabric8", name = "kubernetes-httpclient-okhttp", version.ref = "kubernetes-client" }
+devtools-common = { group = "com.redhat.devtools.intellij", name = "intellij-common", version.ref = "devtools-common" }
+jackson-core = { group = "com.fasterxml.jackson.core", name = "jackson-core", version.ref = "jackson-core" }
+commons-lang3 = { group = "org.apache.commons", name = "commons-lang3", version.ref = "commons-lang3" }
+kotlin-test-junit = { group = "org.jetbrains.kotlin", name = "kotlin-test-junit", version.ref = "kotlinJvm" }
+assertj-core = { group = "org.assertj", name = "assertj-core", version.ref = "assertj-core" }
+mockito-inline = { group = "org.mockito", name = "mockito-inline", version.ref = "mockito-inline" }
+mockito-kotlin = { group = "com.nhaarman.mockitokotlin2", name = "mockito-kotlin", version.ref = "mockito-kotlin" }
+devtools-common-ui-test = { group = "com.redhat.devtools.intellij", name = "intellij-common-ui-test-library", version.ref = "devtools-common-ui-test" }
+junit-platform-launcher = { group = "org.junit.platform", name = "junit-platform-launcher", version.ref = "junit-platform" }
+junit-platform-suite = { group = "org.junit.platform", name = "junit-platform-suite", version.ref = "junit-platform" }
+junit-jupiter = { group = "org.junit.jupiter", name = "junit-jupiter", version.ref = "junit-jupiter" }
+junit-jupiter-api = { group = "org.junit.jupiter", name = "junit-jupiter-api", version.ref = "junit-jupiter" }
+junit-jupiter-engine = { group = "org.junit.jupiter", name = "junit-jupiter-engine", version.ref = "junit-jupiter" }
+gson = { group = "com.google.code.gson", name = "gson", version.ref = "gson" }
+
+[plugins]
+gradleIntelliJPlugin = { id = "org.jetbrains.intellij.platform", version.ref = "gradleIntelliJPlugin" }
+kotlinJvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlinJvm" }
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 943f0cbfa754578e88a3dae77fce6e3dea56edbf..c1962a79e29d3e0ab67b14947c167a862655af9b 100644
GIT binary patch
delta 13895
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
J*WbtZ{{Z#P!zlm&

delta 13442
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

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 829e1a5a9..3499ded5c 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 65dcd68d6..aeb74cbb4 100755
--- a/gradlew
+++ b/gradlew
@@ -85,9 +85,6 @@ done
 APP_BASE_NAME=${0##*/}
 APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
 
@@ -144,7 +141,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -152,7 +149,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -197,6 +194,10 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
 # Collect all arguments for the java command;
 #   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in
diff --git a/settings.gradle b/settings.gradle
deleted file mode 100644
index a68923942..000000000
--- a/settings.gradle
+++ /dev/null
@@ -1,4 +0,0 @@
-plugins {
-    id "org.gradle.toolchains.foojay-resolver-convention" version "0.7.0"
-}
-
diff --git a/settings.gradle.kts b/settings.gradle.kts
new file mode 100644
index 000000000..f5c4e7274
--- /dev/null
+++ b/settings.gradle.kts
@@ -0,0 +1,5 @@
+rootProject.name = "intellij-kubernetes"
+plugins {
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
+}
+
diff --git a/src/it/java/org/jboss/tools/intellij/kubernetes/BasicTests.java b/src/it/java/org/jboss/tools/intellij/kubernetes/BasicTests.java
index e7aa54aa1..95217ef72 100644
--- a/src/it/java/org/jboss/tools/intellij/kubernetes/BasicTests.java
+++ b/src/it/java/org/jboss/tools/intellij/kubernetes/BasicTests.java
@@ -13,19 +13,12 @@
 import com.intellij.remoterobot.RemoteRobot;
 import com.intellij.remoterobot.fixtures.ComponentFixture;
 import com.intellij.remoterobot.fixtures.dataExtractor.RemoteText;
-import com.intellij.remoterobot.utils.WaitForConditionTimeoutException;
 import com.redhat.devtools.intellij.commonuitest.UITestRunner;
-import com.redhat.devtools.intellij.commonuitest.fixtures.dialogs.FlatWelcomeFrame;
-import com.redhat.devtools.intellij.commonuitest.fixtures.dialogs.information.TipDialog;
+import com.redhat.devtools.intellij.commonuitest.utils.project.CreateCloseUtils;
 import com.redhat.devtools.intellij.commonuitest.utils.runner.IntelliJVersion;
-import com.redhat.devtools.intellij.commonuitest.fixtures.dialogs.project.NewProjectDialogWizard;
-import com.redhat.devtools.intellij.commonuitest.fixtures.mainidewindow.idestatusbar.IdeStatusBar;
 import com.redhat.devtools.intellij.commonuitest.fixtures.mainidewindow.toolwindowspane.ToolWindowPane;
-import org.jboss.tools.intellij.kubernetes.fixtures.dialogs.ProjectStructureDialog;
-import org.jboss.tools.intellij.kubernetes.fixtures.mainIdeWindow.KubernetesToolsFixture;
-import static com.intellij.remoterobot.search.locators.Locators.byXpath;
+import org.jboss.tools.intellij.kubernetes.fixtures.mainidewindow.KubernetesToolsFixture;
 
-import org.jboss.tools.intellij.kubernetes.fixtures.mainIdeWindow.SingleHeighLabelFixture;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
@@ -41,8 +34,6 @@
 
 import java.time.Duration;
 import java.util.List;
-import java.util.logging.Logger;
-import java.util.logging.Level;
 
 /**
  * JUnit UI tests for intellij-kubernetes
@@ -53,12 +44,11 @@ public class BasicTests {
 
     private static RemoteRobot robot;
     private static ComponentFixture kubernetesViewTree;
-    private static final Logger LOGGER = Logger.getLogger(BasicTests.class.getName());
 
     @BeforeAll
     public static void connect() {
-        robot = UITestRunner.runIde(IntelliJVersion.COMMUNITY_V_2022_3, 8580);
-        createEmptyProject();
+        robot = UITestRunner.runIde(IntelliJVersion.COMMUNITY_V_2024_1, 8580);
+        CreateCloseUtils.createEmptyProject(robot, "test-project");
         openKubernetesTab();
 
         KubernetesToolsFixture kubernetesToolsFixture = robot.find(KubernetesToolsFixture.class, Duration.ofSeconds(5));
@@ -98,23 +88,6 @@ public void createAnotherResourceTypeByEdit() {
         step("create another type of Resource", () -> CreateAnotherTypeResourceByEditTest.createAnotherTypeResourceByEdit(robot, kubernetesViewTree));
     }
 
-
-    private static void createEmptyProject(){
-        final FlatWelcomeFrame flatWelcomeFrame = robot.find(FlatWelcomeFrame.class);
-        flatWelcomeFrame.createNewProject();
-        final NewProjectDialogWizard newProjectDialogWizard = flatWelcomeFrame.find(NewProjectDialogWizard.class, Duration.ofSeconds(20));
-        selectNewProjectType("Empty Project");
-        newProjectDialogWizard.finish();
-
-        final IdeStatusBar ideStatusBar = robot.find(IdeStatusBar.class, Duration.ofSeconds(10));
-        ideStatusBar.waitUntilProjectImportIsComplete();
-        ProjectStructureDialog.cancelProjectStructureDialogIfItAppears(robot);
-        closeTipDialogIfItAppears();
-        closeGotItPopup();
-        closeOpenedEditors();
-        ideStatusBar.waitUntilAllBgTasksFinish();
-    }
-
     private static void openKubernetesTab(){
         final ToolWindowPane toolWindowPane = robot.find(ToolWindowPane.class, Duration.ofSeconds(5));
         toolWindowPane.stripeButton("Kubernetes", false).click();
@@ -126,34 +99,4 @@ private static boolean isKubernetesViewTreeAvailable(){
         return !"Nothing to show".equals(firstText);
     }
 
-    private static void closeTipDialogIfItAppears() {
-        try {
-            TipDialog tipDialog = robot.find(TipDialog.class, Duration.ofSeconds(10));
-            tipDialog.close();
-        } catch (WaitForConditionTimeoutException e) {
-            e.printStackTrace();
-        }
-    }
-
-    private static void closeGotItPopup() {
-        try {
-            robot.find(ComponentFixture.class, byXpath("JBList", "//div[@accessiblename='Got It' and @class='JButton' and @text='Got It']"), Duration.ofSeconds(10)).click();
-        } catch (WaitForConditionTimeoutException e) {
-            e.printStackTrace();
-        }
-    }
-
-    private static void closeOpenedEditors() {
-        List<SingleHeighLabelFixture> singleHeighLabelsList = robot.findAll(SingleHeighLabelFixture.class, byXpath("//div[@class='SingleHeightLabel']"));
-        LOGGER.log(Level.INFO, "Next opened editors will be closed: " + singleHeighLabelsList);
-        for (SingleHeighLabelFixture singleHeighLabel : singleHeighLabelsList) {
-            singleHeighLabel.find(ComponentFixture.class, byXpath("//div[@accessiblename='Close. Alt-Click to Close Others (Ctrl+F4)' and @class='InplaceButton']")).click();
-        }
-    }
-
-    private static void selectNewProjectType(String projectType) {
-        ComponentFixture newProjectTypeList = robot.findAll(ComponentFixture.class, byXpath("JBList", "//div[@class='JBList']")).get(0);
-        newProjectTypeList.findText(projectType).click();
-    }
-
 }
\ No newline at end of file
diff --git a/src/it/java/org/jboss/tools/intellij/kubernetes/fixtures/dialogs/IdeFatalErrorsDialogFixture.java b/src/it/java/org/jboss/tools/intellij/kubernetes/fixtures/dialogs/IdeFatalErrorsDialogFixture.java
index 505da20ce..82664fd07 100644
--- a/src/it/java/org/jboss/tools/intellij/kubernetes/fixtures/dialogs/IdeFatalErrorsDialogFixture.java
+++ b/src/it/java/org/jboss/tools/intellij/kubernetes/fixtures/dialogs/IdeFatalErrorsDialogFixture.java
@@ -19,7 +19,6 @@
 import org.jetbrains.annotations.NotNull;
 
 import static com.intellij.remoterobot.search.locators.Locators.byXpath;
-import static com.redhat.devtools.intellij.commonuitest.utils.constants.ButtonLabels.CLEAR_ALL_LABEL;
 
 /**
  * IDE Fatal Errors dialog fixture
@@ -33,13 +32,6 @@ public IdeFatalErrorsDialogFixture(@NotNull RemoteRobot remoteRobot, @NotNull Re
         super(remoteRobot, remoteComponent);
     }
 
-    /**
-     * Click on the 'Clear all' button
-     */
-    public void clearAll() {
-        button(CLEAR_ALL_LABEL).click();
-    }
-
     public ComponentFixture exceptionDescriptionJTextArea() {
         return find(ComponentFixture.class, byXpath("//div[@class='JTextArea']"));
     }
diff --git a/src/it/java/org/jboss/tools/intellij/kubernetes/fixtures/dialogs/ProjectStructureDialog.java b/src/it/java/org/jboss/tools/intellij/kubernetes/fixtures/dialogs/ProjectStructureDialog.java
deleted file mode 100644
index ae7e16d96..000000000
--- a/src/it/java/org/jboss/tools/intellij/kubernetes/fixtures/dialogs/ProjectStructureDialog.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2020 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v2.0 which accompanies this distribution,
- * and is available at https://www.eclipse.org/legal/epl-v20.html
- *
- * Contributors:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.intellij.kubernetes.fixtures.dialogs;
-
-import com.intellij.remoterobot.RemoteRobot;
-import com.intellij.remoterobot.data.RemoteComponent;
-import com.intellij.remoterobot.fixtures.CommonContainerFixture;
-import com.intellij.remoterobot.fixtures.DefaultXpath;
-import com.intellij.remoterobot.fixtures.FixtureName;
-import com.intellij.remoterobot.utils.WaitForConditionTimeoutException;
-import org.jetbrains.annotations.NotNull;
-
-import java.time.Duration;
-
-/**
- * Project Structure dialog fixture
- *
- * @author olkornii@redhat.com
- */
-@DefaultXpath(by = "MyDialog type", xpath = "//div[@accessiblename='Project Structure' and @class='MyDialog']")
-@FixtureName(name = "Project Structure Dialog")
-public class ProjectStructureDialog extends CommonContainerFixture {
-    public ProjectStructureDialog(@NotNull RemoteRobot remoteRobot, @NotNull RemoteComponent remoteComponent) {
-        super(remoteRobot, remoteComponent);
-    }
-
-    /**
-     * Cancel the 'Project Structure' dialog if it appears
-     *
-     * @param remoteRobot reference to the RemoteRobot instance
-     */
-    public static void cancelProjectStructureDialogIfItAppears(RemoteRobot remoteRobot) {
-        try {
-            ProjectStructureDialog projectStructureDialog = remoteRobot.find(ProjectStructureDialog.class, Duration.ofSeconds(20));
-            projectStructureDialog.button("Cancel").click();
-        } catch (WaitForConditionTimeoutException e) {
-            e.printStackTrace();
-        }
-    }
-}
diff --git a/src/it/java/org/jboss/tools/intellij/kubernetes/fixtures/mainIdeWindow/SingleHeighLabelFixture.java b/src/it/java/org/jboss/tools/intellij/kubernetes/fixtures/mainidewindow/ActionPanelLabelFixture.java
similarity index 70%
rename from src/it/java/org/jboss/tools/intellij/kubernetes/fixtures/mainIdeWindow/SingleHeighLabelFixture.java
rename to src/it/java/org/jboss/tools/intellij/kubernetes/fixtures/mainidewindow/ActionPanelLabelFixture.java
index 8cf6e3ab8..895324351 100644
--- a/src/it/java/org/jboss/tools/intellij/kubernetes/fixtures/mainIdeWindow/SingleHeighLabelFixture.java
+++ b/src/it/java/org/jboss/tools/intellij/kubernetes/fixtures/mainidewindow/ActionPanelLabelFixture.java
@@ -8,7 +8,7 @@
  * Contributors:
  * Red Hat, Inc. - initial API and implementation
  ******************************************************************************/
-package org.jboss.tools.intellij.kubernetes.fixtures.mainIdeWindow;
+package org.jboss.tools.intellij.kubernetes.fixtures.mainidewindow;
 
 import com.intellij.remoterobot.RemoteRobot;
 import com.intellij.remoterobot.data.RemoteComponent;
@@ -24,14 +24,14 @@
 /**
  * @author olkornii@redhat.com
  */
-@DefaultXpath(by = "SingleHeightLabel type", xpath = "//div[@class='SingleHeightLabel']")
-@FixtureName(name = "Single Height Label")
-public class SingleHeighLabelFixture extends CommonContainerFixture {
-    public SingleHeighLabelFixture(@NotNull RemoteRobot remoteRobot, @NotNull RemoteComponent remoteComponent) {
+@DefaultXpath(by = "ActionPanel type", xpath = "//div[@class='ActionPanel']")
+@FixtureName(name = "Action Panel Label")
+public class ActionPanelLabelFixture extends CommonContainerFixture {
+    public ActionPanelLabelFixture(@NotNull RemoteRobot remoteRobot, @NotNull RemoteComponent remoteComponent) {
         super(remoteRobot, remoteComponent);
     }
 
     public void close(){
-        find(ComponentFixture.class, byXpath("//div[@accessiblename='Close. Alt-Click to Close Others (Ctrl+F4)' and @class='InplaceButton']")).click();
+        find(ComponentFixture.class, byXpath("//div[@class='InplaceButton']")).click();
     }
 }
diff --git a/src/it/java/org/jboss/tools/intellij/kubernetes/fixtures/mainIdeWindow/EditorsSplittersFixture.java b/src/it/java/org/jboss/tools/intellij/kubernetes/fixtures/mainidewindow/EditorsSplittersFixture.java
similarity index 82%
rename from src/it/java/org/jboss/tools/intellij/kubernetes/fixtures/mainIdeWindow/EditorsSplittersFixture.java
rename to src/it/java/org/jboss/tools/intellij/kubernetes/fixtures/mainidewindow/EditorsSplittersFixture.java
index 630ab7a59..f8a202fed 100644
--- a/src/it/java/org/jboss/tools/intellij/kubernetes/fixtures/mainIdeWindow/EditorsSplittersFixture.java
+++ b/src/it/java/org/jboss/tools/intellij/kubernetes/fixtures/mainidewindow/EditorsSplittersFixture.java
@@ -8,7 +8,7 @@
  * Contributors:
  * Red Hat, Inc. - initial API and implementation
  ******************************************************************************/
-package org.jboss.tools.intellij.kubernetes.fixtures.mainIdeWindow;
+package org.jboss.tools.intellij.kubernetes.fixtures.mainidewindow;
 
 import com.intellij.remoterobot.RemoteRobot;
 import com.intellij.remoterobot.data.RemoteComponent;
@@ -19,7 +19,6 @@
 import org.jetbrains.annotations.NotNull;
 
 import java.time.Duration;
-import java.util.List;
 
 import static com.intellij.remoterobot.search.locators.Locators.byXpath;
 
@@ -37,8 +36,7 @@ public ComponentFixture getEditorTextFixture(){
         return find(ComponentFixture.class, byXpath("//div[@class='EditorComponentImpl']"), Duration.ofSeconds(5));
     }
 
-    public void closeEditor(String fileName){
-        SingleHeighLabelFixture myLabel = find(SingleHeighLabelFixture.class, byXpath("//div[@accessiblename='" + fileName + "' and @class='SingleHeightLabel']"), Duration.ofSeconds(5));
-        myLabel.close();
+    public void closeEditor(){
+        find(ActionPanelLabelFixture.class, Duration.ofSeconds(5)).close();
     }
 }
diff --git a/src/it/java/org/jboss/tools/intellij/kubernetes/fixtures/mainIdeWindow/IdeStatusBarFixture.java b/src/it/java/org/jboss/tools/intellij/kubernetes/fixtures/mainidewindow/IdeStatusBarFixture.java
similarity index 76%
rename from src/it/java/org/jboss/tools/intellij/kubernetes/fixtures/mainIdeWindow/IdeStatusBarFixture.java
rename to src/it/java/org/jboss/tools/intellij/kubernetes/fixtures/mainidewindow/IdeStatusBarFixture.java
index f13665852..faa7e6ab8 100644
--- a/src/it/java/org/jboss/tools/intellij/kubernetes/fixtures/mainIdeWindow/IdeStatusBarFixture.java
+++ b/src/it/java/org/jboss/tools/intellij/kubernetes/fixtures/mainidewindow/IdeStatusBarFixture.java
@@ -8,13 +8,12 @@
  * Contributors:
  * Red Hat, Inc. - initial API and implementation
  ******************************************************************************/
-package org.jboss.tools.intellij.kubernetes.fixtures.mainIdeWindow;
+package org.jboss.tools.intellij.kubernetes.fixtures.mainidewindow;
 
 import com.intellij.remoterobot.RemoteRobot;
 import com.intellij.remoterobot.data.RemoteComponent;
 import com.intellij.remoterobot.fixtures.CommonContainerFixture;
 import com.intellij.remoterobot.fixtures.ComponentFixture;
-import com.intellij.remoterobot.fixtures.ContainerFixture;
 import com.intellij.remoterobot.fixtures.DefaultXpath;
 import com.intellij.remoterobot.fixtures.FixtureName;
 import org.jetbrains.annotations.NotNull;
@@ -33,15 +32,11 @@ public IdeStatusBarFixture(@NotNull RemoteRobot remoteRobot, @NotNull RemoteComp
         super(remoteRobot, remoteComponent);
     }
 
-    public ComponentFixture inlineProgressPanel() {
-        return find(ContainerFixture.class, byXpath("//div[@class='InlineProgressPanel']"));
-    }
-
     public ComponentFixture ideErrorsIcon() {
         return find(ComponentFixture.class, byXpath("//div[@class='IdeErrorsIcon']"));
     }
 
-    public ComponentFixture withIconAndArrows(String accessiblename){
-        return find(ComponentFixture.class, byXpath("//div[@accessiblename='" + accessiblename + "' and @class='WithIconAndArrows']"));
+    public void withIconAndArrows(String accessibleName){
+        find(ComponentFixture.class, byXpath("//div[@accessiblename='" + accessibleName + "' and @class='WithIconAndArrows']"));
     }
 }
\ No newline at end of file
diff --git a/src/it/java/org/jboss/tools/intellij/kubernetes/fixtures/mainIdeWindow/KubernetesToolsFixture.java b/src/it/java/org/jboss/tools/intellij/kubernetes/fixtures/mainidewindow/KubernetesToolsFixture.java
similarity index 96%
rename from src/it/java/org/jboss/tools/intellij/kubernetes/fixtures/mainIdeWindow/KubernetesToolsFixture.java
rename to src/it/java/org/jboss/tools/intellij/kubernetes/fixtures/mainidewindow/KubernetesToolsFixture.java
index 026aff30d..564673b4a 100644
--- a/src/it/java/org/jboss/tools/intellij/kubernetes/fixtures/mainIdeWindow/KubernetesToolsFixture.java
+++ b/src/it/java/org/jboss/tools/intellij/kubernetes/fixtures/mainidewindow/KubernetesToolsFixture.java
@@ -8,7 +8,7 @@
  * Contributors:
  * Red Hat, Inc. - initial API and implementation
  ******************************************************************************/
-package org.jboss.tools.intellij.kubernetes.fixtures.mainIdeWindow;
+package org.jboss.tools.intellij.kubernetes.fixtures.mainidewindow;
 
 import com.intellij.remoterobot.RemoteRobot;
 import com.intellij.remoterobot.data.RemoteComponent;
diff --git a/src/it/java/org/jboss/tools/intellij/kubernetes/fixtures/menus/ActionToolbarMenu.java b/src/it/java/org/jboss/tools/intellij/kubernetes/fixtures/menus/ActionToolbarMenu.java
index 1cf0591c5..9e05ad20c 100644
--- a/src/it/java/org/jboss/tools/intellij/kubernetes/fixtures/menus/ActionToolbarMenu.java
+++ b/src/it/java/org/jboss/tools/intellij/kubernetes/fixtures/menus/ActionToolbarMenu.java
@@ -23,24 +23,20 @@
 /**
  * @author olkornii@redhat.com
  */
-@DefaultXpath(by = "ActionToolbar type", xpath = "//div[@myactiongroup=' (null)']")
+@DefaultXpath(by = "ActionToolbar type", xpath = "//div[contains(@myvisibleactions, 'Push')]")
 @FixtureName(name = "Action Toolbar Impl")
 public class ActionToolbarMenu extends CommonContainerFixture {
     public ActionToolbarMenu(@NotNull RemoteRobot remoteRobot, @NotNull RemoteComponent remoteComponent) {
         super(remoteRobot, remoteComponent);
     }
 
-    public void PushToCluster(){
+    public void pushToCluster(){
         find(ComponentFixture.class, byXpath("//div[@myicon='upload.svg']")).click();
         try {
-            Thread.sleep(5000); // sleep for 3 seconds, cluster need some time to create pods
+            Thread.sleep(5000); // sleep for 5 seconds, cluster need some time to create pods
         } catch (InterruptedException e) {
             e.printStackTrace();
         }
     }
-
-    public void LoadFromCluster(){
-        find(ComponentFixture.class, byXpath("//div[@myicon='download.svg']")).click();
-    }
 }
 
diff --git a/src/it/java/org/jboss/tools/intellij/kubernetes/tests/AbstractKubernetesTest.java b/src/it/java/org/jboss/tools/intellij/kubernetes/tests/AbstractKubernetesTest.java
index 2e3d572ba..8575d6b49 100644
--- a/src/it/java/org/jboss/tools/intellij/kubernetes/tests/AbstractKubernetesTest.java
+++ b/src/it/java/org/jboss/tools/intellij/kubernetes/tests/AbstractKubernetesTest.java
@@ -17,7 +17,7 @@
 import com.intellij.remoterobot.utils.WaitForConditionTimeoutException;
 import com.redhat.devtools.intellij.commonuitest.fixtures.dialogs.errors.IdeFatalErrorsDialog;
 import org.assertj.swing.core.MouseButton;
-import org.jboss.tools.intellij.kubernetes.fixtures.mainIdeWindow.IdeStatusBarFixture;
+import org.jboss.tools.intellij.kubernetes.fixtures.mainidewindow.IdeStatusBarFixture;
 
 import java.awt.*;
 import java.awt.datatransfer.Clipboard;
@@ -138,24 +138,21 @@ public static boolean isError(RemoteRobot robot){
         return true;
     }
 
-    public static boolean clearErrors(RemoteRobot robot){
+    public static void clearErrors(RemoteRobot robot){
         IdeStatusBarFixture statusBar = robot.find(IdeStatusBarFixture.class);
         try {
             statusBar.ideErrorsIcon().click();
         } catch (WaitForConditionTimeoutException e) {
-            return true;
+            e.printStackTrace();
         }
         IdeFatalErrorsDialog ideErrorsDialog = robot.find(IdeFatalErrorsDialog.class);
         ideErrorsDialog.clearAll();
-        return true;
     }
 
     public static Clipboard getSystemClipboard()
     {
         Toolkit defaultToolkit = Toolkit.getDefaultToolkit();
-        Clipboard systemClipboard = defaultToolkit.getSystemClipboard();
-
-        return systemClipboard;
+        return defaultToolkit.getSystemClipboard();
     }
 
     public static void scrollToVisible(String text, RemoteRobot robot) {
diff --git a/src/it/java/org/jboss/tools/intellij/kubernetes/tests/CreateAnotherTypeResourceByEditTest.java b/src/it/java/org/jboss/tools/intellij/kubernetes/tests/CreateAnotherTypeResourceByEditTest.java
index fc7d43348..28a78cf56 100644
--- a/src/it/java/org/jboss/tools/intellij/kubernetes/tests/CreateAnotherTypeResourceByEditTest.java
+++ b/src/it/java/org/jboss/tools/intellij/kubernetes/tests/CreateAnotherTypeResourceByEditTest.java
@@ -16,8 +16,8 @@
 import com.intellij.remoterobot.utils.Keyboard;
 import org.assertj.swing.core.MouseButton;
 import org.jboss.tools.intellij.kubernetes.fixtures.dialogs.IdeFatalErrorsDialogFixture;
-import org.jboss.tools.intellij.kubernetes.fixtures.mainIdeWindow.EditorsSplittersFixture;
-import org.jboss.tools.intellij.kubernetes.fixtures.mainIdeWindow.IdeStatusBarFixture;
+import org.jboss.tools.intellij.kubernetes.fixtures.mainidewindow.EditorsSplittersFixture;
+import org.jboss.tools.intellij.kubernetes.fixtures.mainidewindow.IdeStatusBarFixture;
 import org.jboss.tools.intellij.kubernetes.fixtures.menus.ActionToolbarMenu;
 import org.jboss.tools.intellij.kubernetes.fixtures.menus.RightClickMenu;
 
@@ -51,11 +51,11 @@ public static void createAnotherTypeResourceByEdit(RemoteRobot robot, ComponentF
         clearErrors(robot);
 
         ActionToolbarMenu toolbarMenu = robot.find(ActionToolbarMenu.class);
-        toolbarMenu.PushToCluster();
+        toolbarMenu.pushToCluster();
 
         checkErrors(robot);
 
-        editorSplitter.closeEditor(newResourceName); // close editor
+        editorSplitter.closeEditor(); // close editor
         hideClusterContent(kubernetesViewTree);
         openResourceContentList(new String[] {"Workloads", "Pods"}, kubernetesViewTree);
         waitFor(Duration.ofSeconds(15), Duration.ofSeconds(1), "New resource was not been created.", () -> isResourceCreated(kubernetesViewTree, newResourceName, false));
@@ -107,15 +107,15 @@ private static void setupNewPod(RemoteRobot robot, Keyboard myKeyboard){
     }
 
     private static void checkErrors(RemoteRobot robot){
-        String errorMessage = "";
+        StringBuilder errorMessage = new StringBuilder();
         boolean isErrorAfterPush = isError(robot);
         if (isErrorAfterPush){
             robot.find(IdeStatusBarFixture.class).ideErrorsIcon().click();
             IdeFatalErrorsDialogFixture ideErrorsDialog = robot.find(IdeFatalErrorsDialogFixture.class);
             for (RemoteText remoteText: ideErrorsDialog.exceptionDescriptionJTextArea().findAllText()){
-                errorMessage = errorMessage + remoteText.getText();
+                errorMessage.append(remoteText.getText());
             }
         }
-        assertFalse(isErrorAfterPush, errorMessage);
+        assertFalse(isErrorAfterPush, errorMessage.toString());
     }
 }
diff --git a/src/it/java/org/jboss/tools/intellij/kubernetes/tests/CreateResourceByEditTest.java b/src/it/java/org/jboss/tools/intellij/kubernetes/tests/CreateResourceByEditTest.java
index 28042739e..ed5206f0c 100644
--- a/src/it/java/org/jboss/tools/intellij/kubernetes/tests/CreateResourceByEditTest.java
+++ b/src/it/java/org/jboss/tools/intellij/kubernetes/tests/CreateResourceByEditTest.java
@@ -16,7 +16,7 @@
 import com.intellij.remoterobot.utils.Keyboard;
 import com.intellij.remoterobot.utils.WaitForConditionTimeoutException;
 import org.assertj.swing.core.MouseButton;
-import org.jboss.tools.intellij.kubernetes.fixtures.mainIdeWindow.EditorsSplittersFixture;
+import org.jboss.tools.intellij.kubernetes.fixtures.mainidewindow.EditorsSplittersFixture;
 import org.jboss.tools.intellij.kubernetes.fixtures.menus.ActionToolbarMenu;
 import org.jboss.tools.intellij.kubernetes.fixtures.menus.RightClickMenu;
 
@@ -42,20 +42,19 @@ public static void createResourceByEdit(RemoteRobot robot, ComponentFixture kube
 
         EditorsSplittersFixture editorSplitter = robot.find(EditorsSplittersFixture.class);
         Keyboard myKeyboard = new Keyboard(robot);
-        String newEditorTitle = newResourceName;
 
         String text = "\"" + newResourceName;
 
-        RemoteText namePlace = findResourceNamePosition(robot, editorSplitter, myKeyboard);
+        RemoteText namePlace = findResourceNamePosition(robot, editorSplitter);
         namePlace.doubleClick();
         myKeyboard.enterText(text); // replace with new name
 
         ActionToolbarMenu toolbarMenu = robot.find(ActionToolbarMenu.class);
-        toolbarMenu.PushToCluster();
+        toolbarMenu.pushToCluster();
 
         waitFor(Duration.ofSeconds(15), Duration.ofSeconds(1), "New resource was not been created.", () -> isResourceCreated(kubernetesViewTree, newResourceName, true)); // wait 15 seconds for Nodes load
 
-        editorSplitter.closeEditor(newEditorTitle); // close editor
+        editorSplitter.closeEditor(); // close editor
         hideClusterContent(kubernetesViewTree);
     }
 
@@ -70,7 +69,7 @@ public static void deleteResource(RemoteRobot robot, ComponentFixture kubernetes
         hideClusterContent(kubernetesViewTree);
     }
 
-    private static RemoteText findResourceNamePosition(RemoteRobot robot, EditorsSplittersFixture editorSplitter, Keyboard myKeyboard){
+    private static RemoteText findResourceNamePosition(RemoteRobot robot, EditorsSplittersFixture editorSplitter){
         scrollToVisible(" name:", robot);
 
         ComponentFixture textFixture = editorSplitter.getEditorTextFixture();
@@ -88,9 +87,7 @@ private static RemoteText findResourceNamePosition(RemoteRobot robot, EditorsSpl
 
         assertTrue(nameFound, "Resource name not found.");
 
-        RemoteText namePlace = remoteText.get(nameId+3); // +1 because we need the next one, +1 because between every 2 real elements is space, +1 because here is the ":"
-
-        return namePlace;
+        return remoteText.get(nameId+3); // +1 because we need the next one, +1 because between every 2 real elements is space, +1 because here is the ":"
     }
 
     private static boolean acceptDeleteDialog(RemoteRobot robot){
diff --git a/src/it/java/org/jboss/tools/intellij/kubernetes/tests/EditResourceTest.java b/src/it/java/org/jboss/tools/intellij/kubernetes/tests/EditResourceTest.java
index 01af5f63e..f586cadfd 100644
--- a/src/it/java/org/jboss/tools/intellij/kubernetes/tests/EditResourceTest.java
+++ b/src/it/java/org/jboss/tools/intellij/kubernetes/tests/EditResourceTest.java
@@ -14,7 +14,7 @@
 import com.intellij.remoterobot.fixtures.ComponentFixture;
 import com.intellij.remoterobot.fixtures.dataExtractor.RemoteText;
 import com.intellij.remoterobot.utils.Keyboard;
-import org.jboss.tools.intellij.kubernetes.fixtures.mainIdeWindow.EditorsSplittersFixture;
+import org.jboss.tools.intellij.kubernetes.fixtures.mainidewindow.EditorsSplittersFixture;
 import org.jboss.tools.intellij.kubernetes.fixtures.menus.ActionToolbarMenu;
 
 import java.util.List;
@@ -34,22 +34,21 @@ public static void editResource(RemoteRobot robot, ComponentFixture kubernetesVi
         selectedResource.doubleClick();
 
         EditorsSplittersFixture editorSplitter = robot.find(EditorsSplittersFixture.class);
-        String editorTitle = selectedResource.getText();
 
         RemoteText placeForNewLabel = getPlaceForNewLabel(editorSplitter);
         placeForNewLabel.click();
 
         String text = "    " + yodaLabel +": \"" + yodaText;
-        Keyboard my_keyboard = new Keyboard(robot);
+        Keyboard myKeyboard = new Keyboard(robot);
 
-        my_keyboard.enter(); // create empty line
+        myKeyboard.enter(); // create empty line
         placeForNewLabel.click(); // focus on the empty line
-        my_keyboard.enterText(text); // enter text
+        myKeyboard.enterText(text); // enter text
 
         ActionToolbarMenu toolbarMenu = robot.find(ActionToolbarMenu.class);
-        toolbarMenu.PushToCluster();
+        toolbarMenu.pushToCluster();
 
-        editorSplitter.closeEditor(editorTitle);
+        editorSplitter.closeEditor();
         hideClusterContent(kubernetesViewTree);
 
         openResourceContentList(new String[]{"Nodes"}, kubernetesViewTree);
@@ -66,7 +65,7 @@ public static void editResource(RemoteRobot robot, ComponentFixture kubernetesVi
             }
         }
 
-        editorSplitter.closeEditor(editorTitle); // close editor
+        editorSplitter.closeEditor(); // close editor
         hideClusterContent(kubernetesViewTree);
 
         assertTrue(labelExist, "Label '" + yodaLabel + "' not found.");
@@ -74,11 +73,11 @@ public static void editResource(RemoteRobot robot, ComponentFixture kubernetesVi
 
     private static RemoteText getPlaceForNewLabel (EditorsSplittersFixture editorSplitter) {
         ComponentFixture textFixture = editorSplitter.getEditorTextFixture();
-        List<RemoteText> remote_text = textFixture.findAllText();
+        List<RemoteText> remoteText = textFixture.findAllText();
 
         int labelsId = 0;
         boolean labelsFound = false;
-        for (RemoteText actual_remote_text : remote_text){
+        for (RemoteText actual_remote_text : remoteText){
             if ("labels".equals(actual_remote_text.getText())){
                 labelsFound = true;
                 break;
@@ -88,6 +87,6 @@ private static RemoteText getPlaceForNewLabel (EditorsSplittersFixture editorSpl
 
         assertTrue(labelsFound, "Labels not found in resource.");
 
-        return remote_text.get(labelsId+2); // +1 because we need the next one, +1 because between every 2 real elements is space
+        return remoteText.get(labelsId+2); // +1 because we need the next one, +1 because between every 2 real elements is space
     }
 }
diff --git a/src/it/java/org/jboss/tools/intellij/kubernetes/tests/OpenResourceEditorTest.java b/src/it/java/org/jboss/tools/intellij/kubernetes/tests/OpenResourceEditorTest.java
index 0f4b2f925..0cf9221ad 100644
--- a/src/it/java/org/jboss/tools/intellij/kubernetes/tests/OpenResourceEditorTest.java
+++ b/src/it/java/org/jboss/tools/intellij/kubernetes/tests/OpenResourceEditorTest.java
@@ -15,8 +15,8 @@
 import com.intellij.remoterobot.fixtures.dataExtractor.RemoteText;
 import com.intellij.remoterobot.utils.WaitForConditionTimeoutException;
 import org.assertj.swing.core.MouseButton;
-import org.jboss.tools.intellij.kubernetes.fixtures.mainIdeWindow.EditorsSplittersFixture;
-import org.jboss.tools.intellij.kubernetes.fixtures.mainIdeWindow.IdeStatusBarFixture;
+import org.jboss.tools.intellij.kubernetes.fixtures.mainidewindow.EditorsSplittersFixture;
+import org.jboss.tools.intellij.kubernetes.fixtures.mainidewindow.IdeStatusBarFixture;
 import org.jboss.tools.intellij.kubernetes.fixtures.menus.RightClickMenu;
 
 import java.time.Duration;
@@ -36,11 +36,10 @@ public static void checkResourceEditor(RemoteRobot robot, ComponentFixture kuber
         rightClickMenu.select("Edit..."); // open the yml editor
 
         EditorsSplittersFixture editorSplitter = robot.find(EditorsSplittersFixture.class);
-        String editorTitle = selectedResource.getText();
         waitFor(Duration.ofSeconds(15), Duration.ofSeconds(1), "Editor is not available.", () -> isEditorOpened(robot)); // wait 15 seconds for editor
         waitFor(Duration.ofSeconds(15), Duration.ofSeconds(1), "Resource schema is wrong.", () -> isSchemaSet(robot, "v1#Node")); // wait 15 seconds for set right schema
 
-        editorSplitter.closeEditor(editorTitle); // close editor
+        editorSplitter.closeEditor(); // close editor
         hideClusterContent(kubernetesViewTree);
     }
 
diff --git a/src/main/kotlin/com/redhat/devtools/intellij/kubernetes/model/ResourceModel.kt b/src/main/kotlin/com/redhat/devtools/intellij/kubernetes/model/ResourceModel.kt
index 4b84f4773..87779eac1 100644
--- a/src/main/kotlin/com/redhat/devtools/intellij/kubernetes/model/ResourceModel.kt
+++ b/src/main/kotlin/com/redhat/devtools/intellij/kubernetes/model/ResourceModel.kt
@@ -10,7 +10,6 @@
  ******************************************************************************/
 package com.redhat.devtools.intellij.kubernetes.model
 
-import com.google.api.ResourceProto.resource
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.diagnostic.logger
 import com.redhat.devtools.intellij.kubernetes.model.client.ClientAdapter
diff --git a/src/main/kotlin/com/redhat/devtools/intellij/kubernetes/settings/SettingsComponent.kt b/src/main/kotlin/com/redhat/devtools/intellij/kubernetes/settings/SettingsComponent.kt
index 2c48e0529..1d958838b 100644
--- a/src/main/kotlin/com/redhat/devtools/intellij/kubernetes/settings/SettingsComponent.kt
+++ b/src/main/kotlin/com/redhat/devtools/intellij/kubernetes/settings/SettingsComponent.kt
@@ -40,7 +40,7 @@ class SettingsComponent(editorSyncEnabled: Boolean):  BoundConfigurable("Editor"
         return editorSyncEnabled.get()
     }
 
-    override fun getId(): @NonNls String {
+    override fun getId(): String {
         return "kubernetes.editor"
     }
 }