diff --git a/.github/workflows/ssm-integ.yml b/.github/workflows/ssm-integ.yml index 3d50adbb861..d18f63d2d00 100644 --- a/.github/workflows/ssm-integ.yml +++ b/.github/workflows/ssm-integ.yml @@ -9,6 +9,7 @@ on: branches: [ main, feature/* ] # PRs only need to run this if the SSM plugin logic has changed paths: + - '.github/workflows/ssm-integ.yml' - 'jetbrains-core/src/software/aws/toolkits/jetbrains/services/ssm/SsmPlugin.kt' - 'jetbrains-core/it/software/aws/toolkits/jetbrains/services/ssm/SsmPluginTest.kt' @@ -28,10 +29,10 @@ jobs: run: git config --system core.longpaths true if: ${{ matrix.os == 'windows-latest' }} - uses: actions/checkout@v2 - - name: Set up JDK 17 - uses: actions/setup-java@v1 + - uses: actions/setup-java@v4 with: - java-version: 17 + distribution: 'corretto' + java-version: '21' - name: Grant execute permission for gradlew run: chmod +x gradlew - name: Build with Gradle diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b6a0855a88d..e31aafe76a8 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] apache-commons-collections = "4.4" -apache-commons-io = "2.16.0" +apache-commons-io = "2.16.1" apache-commons-text = "1.12.0" assertJ = "3.26.3" # match with /settings.gradle.kts diff --git a/plugins/core/jetbrains-community/build.gradle.kts b/plugins/core/jetbrains-community/build.gradle.kts index f2868180063..bc21062a1ee 100644 --- a/plugins/core/jetbrains-community/build.gradle.kts +++ b/plugins/core/jetbrains-community/build.gradle.kts @@ -73,6 +73,8 @@ dependencies { testFixturesApi(libs.wiremock) { // conflicts with transitive inclusion from docker plugin exclude(group = "org.apache.httpcomponents.client5") + // provided by IDE + exclude(group = "commons-io") } testImplementation(project(":plugin-core:core"))