Bump version to 2.7.0

James Wood · James Wood · commit c7da037ab36e · 2025-06-17T16:30:37.000-07:00
diff --git a/cws-adaptation-engine/pom.xml b/cws-adaptation-engine/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>gov.nasa.jpl.ammos.ids.cws</groupId>
 		<artifactId>common-workflow-service</artifactId>
-		<version>2.6.0</version><!-- update this each CWS release -->
+		<version>2.7.0</version><!-- update this each CWS release -->
 	</parent>
 	<artifactId>cws-adaptation-engine</artifactId>
 	
diff --git a/cws-adaptation/pom.xml b/cws-adaptation/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>gov.nasa.jpl.ammos.ids.cws</groupId>
 		<artifactId>common-workflow-service</artifactId>
-		<version>2.6.0</version><!-- update this each CWS release -->
+		<version>2.7.0</version><!-- update this each CWS release -->
 	</parent>
 	<artifactId>cws-adaptation</artifactId>
 	
diff --git a/cws-core/pom.xml b/cws-core/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>gov.nasa.jpl.ammos.ids.cws</groupId>
 		<artifactId>common-workflow-service</artifactId>
-		<version>2.6.0</version><!-- update this each CWS release -->
+		<version>2.7.0</version><!-- update this each CWS release -->
 	</parent>
 	<artifactId>cws-core</artifactId>
 	
diff --git a/cws-engine-service/pom.xml b/cws-engine-service/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>gov.nasa.jpl.ammos.ids.cws</groupId>
 		<artifactId>common-workflow-service</artifactId>
-		<version>2.6.0</version><!-- update this each CWS release -->
+		<version>2.7.0</version><!-- update this each CWS release -->
 	</parent>
 	<artifactId>cws-engine-service</artifactId>
 	
diff --git a/cws-engine/pom.xml b/cws-engine/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>gov.nasa.jpl.ammos.ids.cws</groupId>
 		<artifactId>common-workflow-service</artifactId>
-		<version>2.6.0</version><!-- update this each CWS release -->
+		<version>2.7.0</version><!-- update this each CWS release -->
 	</parent>
 	<artifactId>cws-engine</artifactId>
 
diff --git a/cws-installer/pom.xml b/cws-installer/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>gov.nasa.jpl.ammos.ids.cws</groupId>
 		<artifactId>common-workflow-service</artifactId>
-		<version>2.6.0</version><!-- update this each CWS release -->
+		<version>2.7.0</version><!-- update this each CWS release -->
 	</parent>
 	<artifactId>cws-installer</artifactId>
 	
diff --git a/cws-service/pom.xml b/cws-service/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>gov.nasa.jpl.ammos.ids.cws</groupId>
 		<artifactId>common-workflow-service</artifactId>
-		<version>2.6.0</version><!-- update this each CWS release -->
+		<version>2.7.0</version><!-- update this each CWS release -->
 	</parent>
 	<artifactId>cws-service</artifactId>
 
diff --git a/cws-service/src/main/java/jpl/cws/controller/SwaggerConfig.java b/cws-service/src/main/java/jpl/cws/controller/SwaggerConfig.java
@@ -31,7 +31,7 @@ private ApiInfo apiInfo() {
         return new ApiInfoBuilder()
                 .title("CWS API")
                 .description("Documentation of the endpoints used by CWS. Once authenticated, requests can be made to these endpoints.\nTo authenticate, right click on this page --> Inspect --> Click the 'Application' tab --> Select the URL under the Cookies tab on the left --> Copy the value of the cwsToken cookie.")
-                .version("2.6.0")
+                .version("2.7.0")   // update this each CWS release
                 .license("Apache 2.0")
                 .licenseUrl("https://github.com/NASA-AMMOS/common-workflow-service?tab=Apache-2.0-1-ov-file")
                 .build();
diff --git a/cws-tasks/pom.xml b/cws-tasks/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>gov.nasa.jpl.ammos.ids.cws</groupId>
 		<artifactId>common-workflow-service</artifactId>
-		<version>2.6.0</version><!-- update this each CWS release -->
+		<version>2.7.0</version><!-- update this each CWS release -->
 	</parent>
 	<artifactId>cws-tasks</artifactId>
 
diff --git a/cws-test/pom.xml b/cws-test/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>gov.nasa.jpl.ammos.ids.cws</groupId>
 		<artifactId>common-workflow-service</artifactId>
-		<version>2.6.0</version><!-- update this each CWS release -->
+		<version>2.7.0</version><!-- update this each CWS release -->
 	</parent>
 	<artifactId>cws-test</artifactId>
 	
diff --git a/cws-ui/pom.xml b/cws-ui/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>gov.nasa.jpl.ammos.ids.cws</groupId>
 		<artifactId>common-workflow-service</artifactId>
-		<version>2.6.0</version><!-- update this each CWS release -->
+		<version>2.7.0</version><!-- update this each CWS release -->
 	</parent>
 
 	<artifactId>cws-ui</artifactId>
diff --git a/install/docker/console-db-es-ls-kibana/docker-compose.yml b/install/docker/console-db-es-ls-kibana/docker-compose.yml
@@ -1,5 +1,3 @@
-version: "3.2"
-
 services:
   db:
     restart: always
@@ -18,7 +16,7 @@ services:
       timeout: 1s
       retries: 5
     networks:
-      - external-network
+      - cws-network
   es:
     labels:
       com.example.service: "es"
@@ -35,7 +33,7 @@ services:
       - xpack.security.enabled=false
       - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
     networks:
-      - external-network
+      - cws-network
     healthcheck:
       test:
         [
@@ -97,7 +95,7 @@ services:
     labels:
       com.example.service: "cws-server"
       com.example.description: "Common Workflow Service"
-    image: nasa-ammos/common-workflow-service:2.6.0 # update this each CWS release
+    image: nasa-ammos/common-workflow-service:2.7.0 # update this each CWS release
     depends_on:
       - db
       - es
@@ -130,13 +128,13 @@ services:
       - ~/.cws/creds:/root/.cws/creds:ro
       - console-logs-volume:/home/cws_user/cws/server/apache-tomcat-9.0.75/logs
     networks:
-      - external-network
+      - cws-network
   cws-worker:
     container_name: cws-worker1
     labels:
       com.example.service: "cws-worker1"
       com.example.description: "Common Workflow Service"
-    image: nasa-ammos/common-workflow-service:2.6.0 # update this each CWS release
+    image: nasa-ammos/common-workflow-service:2.7.0 # update this each CWS release
     depends_on:
       - db
       - es
@@ -155,20 +153,19 @@ services:
       - ~/.cws/creds:/root/.cws/creds:ro
       - worker1-logs-volume:/home/cws_user/cws/server/apache-tomcat-9.0.75/logs
     networks:
-      - external-network
+      - cws-network
   ldapsearch:
     container_name: ldapsearch_container
     image: ghcr.io/nasa-ammos/common-workflow-service/openldap:v2.6
     ports:
       - 389:389
     networks:
-      - external-network
+      - cws-network
 
 volumes:
   console-logs-volume:
   worker1-logs-volume:
 
 networks:
-  external-network:
-    external:
-      name: cws-network
+  cws-network:
+    name: cws-network
diff --git a/install/docker/cws-image/build.sh b/install/docker/cws-image/build.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-ver='2.6.0'    # update this each CWS release
+ver='2.7.0'    # update this each CWS release
 
 # Rebuild cws tar-ball
 ROOT=$(pwd)
diff --git a/install/docker/worker-ls/docker-compose.yml b/install/docker/worker-ls/docker-compose.yml
@@ -28,7 +28,7 @@ services:
     labels:
       com.example.service: "cws-worker2"
       com.example.description: "Common Workflow Service"
-    image: nasa-ammos/common-workflow-service:2.6.0    # update this each CWS release
+    image: nasa-ammos/common-workflow-service:2.7.0    # update this each CWS release
     #depends_on:
     #  - logstash
     hostname: cws-worker2
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>gov.nasa.jpl.ammos.ids.cws</groupId>
 	<artifactId>common-workflow-service</artifactId>
-	<version>2.6.0</version>    <!-- update this each CWS release -->
+	<version>2.7.0</version>    <!-- update this each CWS release -->
 	<packaging>pom</packaging>
 	<name>cws</name>
 	<description>CWS</description>
diff --git a/utils.sh b/utils.sh
@@ -5,7 +5,7 @@
 # Shell utility functions and environment settings used throughout CWS setup scripts
 
 # Update versions as necessary
-export CWS_VER='2.6.0'    # update this each CWS release
+export CWS_VER='2.7.0'    # update this each CWS release
 export CAMUNDA_VER='7.20.0'
 export TOMCAT_VER='9.0.75'
 export LOGSTASH_VER='8.12.0'
