chore: update device sdk and process killer lib versions (#1643)

aws-greengrass · Jul 26, 2024 · 8a965aa · 8a965aa
1 parent 9a0de5c
commit 8a965aa
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -201,7 +201,7 @@
         <dependency>
             <groupId>org.zeroturnaround</groupId>
             <artifactId>zt-process-killer</artifactId>
-            <version>1.10</version>
+            <version>1.11</version>
         </dependency>
         <dependency>
              <groupId>com.github.oshi</groupId>
@@ -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
             !-->
-            <version>1.20.6-SECRET-SNAPSHOT</version>
+            <version>1.21.0</version>
         </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>

diff --git a/...ntests/java/com/aws/greengrass/integrationtests/lifecyclemanager/PluginComponentTest.java b/...ntests/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);