From 8a965aae5a3aad5d1832097490f878b9d11e70d7 Mon Sep 17 00:00:00 2001 From: Saranya Date: Fri, 26 Jul 2024 13:00:53 -0700 Subject: [PATCH] chore: update device sdk and process killer lib versions (#1643) --- pom.xml | 4 ++-- .../lifecyclemanager/PluginComponentTest.java | 10 +++++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 6e44e52a07..fcfeaa2eae 100644 --- a/pom.xml +++ b/pom.xml @@ -201,7 +201,7 @@ org.zeroturnaround zt-process-killer - 1.10 + 1.11 com.github.oshi @@ -238,7 +238,7 @@ When updating the version here, ensure you match the correct aws-crt version below. Get the correct version from: https://github.com/aws/aws-iot-device-sdk-java-v2/blob/main/sdk/pom.xml#L45 !--> - 1.20.6-SECRET-SNAPSHOT + 1.21.0 org.bouncycastle diff --git a/src/integrationtests/java/com/aws/greengrass/integrationtests/lifecyclemanager/PluginComponentTest.java b/src/integrationtests/java/com/aws/greengrass/integrationtests/lifecyclemanager/PluginComponentTest.java index 18525155f6..08be839df1 100644 --- a/src/integrationtests/java/com/aws/greengrass/integrationtests/lifecyclemanager/PluginComponentTest.java +++ b/src/integrationtests/java/com/aws/greengrass/integrationtests/lifecyclemanager/PluginComponentTest.java @@ -389,9 +389,13 @@ static void setupPackageStore(Kernel kernel, ComponentIdentifier componentId, Co artifactPath1_0_0.getParent().getParent(), FileSystemPermission.Option.Recurse); - FileUtils.copyFile(jarFilePath.toFile(), artifact1_1_0.toFile()); - FileUtils.copyFile(jarFilePath.toFile(), artifactPath1_0_0.toFile()); - + if (!artifact1_1_0.toFile().exists()) { + FileUtils.copyFile(jarFilePath.toFile(), artifact1_1_0.toFile()); + } + if (!artifactPath1_0_0.toFile().exists()){ + FileUtils.copyFile(jarFilePath.toFile(), artifactPath1_0_0.toFile()); + } + for (ComponentIdentifier pluginId : pluginIds) { Path artifactPath = e2ETestComponentStore.resolveArtifactDirectoryPath(pluginId) .resolve(pluginId.getName() + JAR_FILE_EXTENSION);