Fix CVEs in 3.16.

build.gradle

@@ -8,7 +8,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'org.springframework.boot:spring-boot-gradle-plugin:3.1.4'
+        classpath 'org.springframework.boot:spring-boot-gradle-plugin:3.2.1'
         classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.+'
     }
 }

dependencies.gradle

@@ -18,7 +18,7 @@ ext {
     revActivation = '2.0.1'
     revApacheHttpComponentsClient5 = '5.2.1'
     revAwaitility = '3.1.6'
-    revAwsSdk = '1.11.86'
+    revAwsSdk = '1.12.635'
     revBval = '2.0.5'
     revCassandra = '3.10.2'
     revCassandraUnit = '3.11.2.0'
@@ -55,13 +55,13 @@ ext {
     revSpectator = '0.122.0'
     revSpock = '2.4-M1-groovy-4.0'
     revSpotifyCompletableFutures = '0.3.3'
-    revTestContainer = '1.15.3'
+    revTestContainer = '1.19.3'
     revFasterXml = '2.15.3'
     revAmqpClient = '5.13.0'
     revKafka = '2.6.0'
     revMicrometer = '1.8.12'
     revPrometheus = '0.9.0'
-    revElasticSearch7 = '7.12.1'
+    revElasticSearch7 = '7.17.16'
     revCodec = '1.15'
     revAzureStorageBlobSdk = '12.7.0'
     revNatsStreaming = '2.6.5'

docker/server/Dockerfile

@@ -24,7 +24,7 @@ RUN ls -ltr
 # ===========================================================================================================
 # 1. Builder stage 2
 # ===========================================================================================================
-FROM alpine:3.18 AS ui-builder
+FROM alpine:3.19 AS ui-builder
 
 LABEL maintainer="Orkes OSS <[email protected]>"
 
@@ -44,7 +44,7 @@ RUN echo "Done building UI"
 # ===========================================================================================================
 # 2. Bin stage
 # ===========================================================================================================
-FROM alpine:3.18
+FROM alpine:3.19
 
 LABEL maintainer="Orkes OSS <[email protected]>"
 

es7-persistence/src/main/java/com/netflix/conductor/es7/config/ElasticSearchV7Configuration.java

@@ -59,7 +59,7 @@ public RestClient restClient(ElasticSearchProperties properties) {
     }
 
     @Bean
-    public RestClientBuilder restClientBuilder(ElasticSearchProperties properties) {
+    public RestClientBuilder elasticRestClientBuilder(ElasticSearchProperties properties) {
         RestClientBuilder builder = RestClient.builder(convertToHttpHosts(properties.toURLs()));
 
         if (properties.getUsername() != null && properties.getPassword() != null) {

es7-persistence/src/main/java/com/netflix/conductor/es7/dao/index/ElasticSearchRestDAOV7.java

@@ -42,7 +42,6 @@
 import org.elasticsearch.client.*;
 import org.elasticsearch.client.core.CountRequest;
 import org.elasticsearch.client.core.CountResponse;
-import org.elasticsearch.common.xcontent.*;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
@@ -51,6 +50,7 @@
 import org.elasticsearch.search.builder.SearchSourceBuilder;
 import org.elasticsearch.search.sort.FieldSortBuilder;
 import org.elasticsearch.search.sort.SortOrder;
+import org.elasticsearch.xcontent.*;
 import org.joda.time.DateTime;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

es7-persistence/src/test/java/com/netflix/conductor/es7/dao/index/ElasticSearchTest.java

@@ -47,8 +47,8 @@ public ElasticSearchProperties elasticSearchProperties() {
 
     protected static final ElasticsearchContainer container =
             new ElasticsearchContainer(
-                    DockerImageName.parse("docker.elastic.co/elasticsearch/elasticsearch-oss")
-                            .withTag("7.10.2")); // this should match the client version
+                    DockerImageName.parse("elasticsearch")
+                            .withTag("7.17.16")); // this should match the client version
 
     @Autowired protected ObjectMapper objectMapper;
 

java-sdk/src/main/java/com/netflix/conductor/sdk/testing/LocalServerRunner.java

@@ -163,7 +163,7 @@ private synchronized void installAndStartServer(String repositoryURL, int localS
                         + serverFile;
         LOGGER.info("Running command {}", command);
 
-        serverProcess = Runtime.getRuntime().exec(command);
+        serverProcess = Runtime.getRuntime().exec(new String[] {"bash", "-l", "-c", command});
         BufferedReader error =
                 new BufferedReader(new InputStreamReader(serverProcess.getErrorStream()));
         BufferedReader op =

rest/src/main/java/com/netflix/conductor/rest/controllers/ApplicationExceptionMapper.java

@@ -22,6 +22,7 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
+import org.springframework.web.servlet.resource.NoResourceFoundException;
 
 import com.netflix.conductor.common.validation.ErrorResponse;
 import com.netflix.conductor.core.exception.ConflictException;
@@ -49,6 +50,7 @@ public class ApplicationExceptionMapper {
         EXCEPTION_STATUS_MAP.put(ConflictException.class, HttpStatus.CONFLICT);
         EXCEPTION_STATUS_MAP.put(IllegalArgumentException.class, HttpStatus.BAD_REQUEST);
         EXCEPTION_STATUS_MAP.put(InvalidFormatException.class, HttpStatus.INTERNAL_SERVER_ERROR);
+        EXCEPTION_STATUS_MAP.put(NoResourceFoundException.class, HttpStatus.NOT_FOUND);
     }
 
     @ExceptionHandler(Throwable.class)

test-harness/src/test/java/com/netflix/conductor/test/integration/AbstractEndToEndTest.java

@@ -65,8 +65,8 @@ public abstract class AbstractEndToEndTest {
 
     private static final ElasticsearchContainer container =
             new ElasticsearchContainer(
-                    DockerImageName.parse("docker.elastic.co/elasticsearch/elasticsearch-oss")
-                            .withTag("7.10.2")); // this should match the client version
+                    DockerImageName.parse("elasticsearch")
+                            .withTag("7.17.16")); // this should match the client version
 
     private static RestClient restClient;
 

test-util/src/test/java/com/netflix/conductor/test/integration/AbstractEndToEndTest.java

@@ -61,8 +61,8 @@ public abstract class AbstractEndToEndTest {
 
     private static final ElasticsearchContainer container =
             new ElasticsearchContainer(
-                    DockerImageName.parse("docker.elastic.co/elasticsearch/elasticsearch-oss")
-                            .withTag("7.10.2")); // this should match the client version
+                    DockerImageName.parse("elasticsearch")
+                            .withTag("7.17.16")); // this should match the client version
 
     private static RestClient restClient;