Merge branch 'update-dependencies'

smancill · Apr 7, 2024 · baf8c6c · baf8c6c
2 parents 94fe0b6 + 0839ca6
commit baf8c6c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/clara-std/src/main/java/org/jlab/clara/std/services/DataManager.java b/clara-std/src/main/java/org/jlab/clara/std/services/DataManager.java
@@ -212,7 +212,7 @@ private void stageInputFile(FilePaths files, EngineData output) {
             cmdLine.addArgument(files.inputFile.toString());
             cmdLine.addArgument(files.stagedInputFile.toString());
 
-            var executor = new DefaultExecutor();
+            var executor = DefaultExecutor.builder().get();
             var streamHandler = new PumpStreamHandler(outputStream);
             executor.setStreamHandler(streamHandler);
 
@@ -235,7 +235,7 @@ private void removeStagedInputFile(FilePaths files, EngineData output) {
             var cmdLine = new CommandLine("rm");
             cmdLine.addArgument(files.stagedInputFile.toString());
 
-            var executor = new DefaultExecutor();
+            var executor = DefaultExecutor.builder().get();
             var streamHandler = new PumpStreamHandler(outputStream);
             executor.setStreamHandler(streamHandler);
 
@@ -262,7 +262,7 @@ private void saveOutputFile(FilePaths files, EngineData output) {
             cmdLine.addArgument(files.stagedOutputFile.toString());
             cmdLine.addArgument(files.outputFile.toString());
 
-            var executor = new DefaultExecutor();
+            var executor = DefaultExecutor.builder().get();
             var streamHandler = new PumpStreamHandler(outputStream);
             executor.setStreamHandler(streamHandler);
 

diff --git a/settings.gradle b/settings.gradle
@@ -16,14 +16,14 @@ dependencyResolutionManagement {
     versionCatalogs {
         libs {
             version('protobuf', '3.21.12')
-            library('json', 'org.json:json:20220924')
-            library('snakeyaml', 'org.yaml:snakeyaml:1.33')
+            library('json', 'org.json:json:20240303')
+            library('snakeyaml', 'org.yaml:snakeyaml:2.2')
             library('jeromq', 'org.zeromq:jeromq:0.5.3')
             library('protobuf', 'com.google.protobuf', 'protobuf-java').versionRef('protobuf')
             library('protoc', 'com.google.protobuf', 'protoc').versionRef('protobuf')
-            library('jline', 'org.jline:jline:3.21.0')
-            library('commons-exec', 'org.apache.commons:commons-exec:1.3')
-            library('freemarker', 'org.freemarker:freemarker:2.3.31')
+            library('jline', 'org.jline:jline:3.25.1')
+            library('commons-exec', 'org.apache.commons:commons-exec:1.4.0')
+            library('freemarker', 'org.freemarker:freemarker:2.3.32')
             library('jopt', 'net.sf.jopt-simple:jopt-simple:5.0.4')
             library('jsr305', 'com.google.code.findbugs:jsr305:3.0.2')
         }