Merge branch 'develop'

NASA-AMMOS · May 7, 2024 · f5c3c6c · f5c3c6c
2 parents 71dac06 + 0cbda38
commit f5c3c6c
Show file tree

Hide file tree

Showing 16 changed files with 34 additions and 34 deletions.
diff --git a/ci/ci.sh b/ci/ci.sh
@@ -36,26 +36,26 @@ function worker_conf_data() {
  INSTALL_TYPE=${1}
 
  if [[ "${INSTALL_TYPE}" == "worker1" ]]; then
- sed -i 's/__WORKER_TYPE__/run_all/' ${ROOT}/ci_worker.conf
- sed -i 's/__CWS_WEB_PORT__/37080/' ${ROOT}/ci_worker.conf
- sed -i 's/__CWS_SSL_PORT__/37443/' ${ROOT}/ci_worker.conf
- sed -i 's/__CWS_AJP_PORT__/37009/' ${ROOT}/ci_worker.conf
- sed -i 's/__CWS_SHUTDOWN_PORT__/37005/' ${ROOT}/ci_worker.conf
- sed -i 's/__CWS_JMX_PORT__/31098/' ${ROOT}/ci_worker.conf
+ sed -i '' -e 's/__WORKER_TYPE__/run_all/' ${ROOT}/ci_worker.conf
+ sed -i '' -e 's/__CWS_WEB_PORT__/37080/' ${ROOT}/ci_worker.conf
+ sed -i '' -e 's/__CWS_SSL_PORT__/37443/' ${ROOT}/ci_worker.conf
+ sed -i '' -e 's/__CWS_AJP_PORT__/37009/' ${ROOT}/ci_worker.conf
+ sed -i '' -e 's/__CWS_SHUTDOWN_PORT__/37005/' ${ROOT}/ci_worker.conf
+ sed -i '' -e 's/__CWS_JMX_PORT__/31098/' ${ROOT}/ci_worker.conf
  elif [[ "${INSTALL_TYPE}" == "worker2" ]]; then
- sed -i 's/__WORKER_TYPE__/run_models_only/' ${ROOT}/ci_worker.conf
- sed -i 's/__CWS_WEB_PORT__/36080/' ${ROOT}/ci_worker.conf
- sed -i 's/__CWS_SSL_PORT__/36443/' ${ROOT}/ci_worker.conf
- sed -i 's/__CWS_AJP_PORT__/36009/' ${ROOT}/ci_worker.conf
- sed -i 's/__CWS_SHUTDOWN_PORT__/36005/' ${ROOT}/ci_worker.conf
- sed -i 's/__CWS_JMX_PORT__/31097/' ${ROOT}/ci_worker.conf
+ sed -i '' -e 's/__WORKER_TYPE__/run_models_only/' ${ROOT}/ci_worker.conf
+ sed -i '' -e 's/__CWS_WEB_PORT__/36080/' ${ROOT}/ci_worker.conf
+ sed -i '' -e 's/__CWS_SSL_PORT__/36443/' ${ROOT}/ci_worker.conf
+ sed -i '' -e 's/__CWS_AJP_PORT__/36009/' ${ROOT}/ci_worker.conf
+ sed -i '' -e 's/__CWS_SHUTDOWN_PORT__/36005/' ${ROOT}/ci_worker.conf
+ sed -i '' -e 's/__CWS_JMX_PORT__/31097/' ${ROOT}/ci_worker.conf
  elif [[ "${INSTALL_TYPE}" == "worker3" ]]; then
- sed -i 's/__WORKER_TYPE__/run_external_tasks_only/' ${ROOT}/ci_worker.conf
- sed -i 's/__CWS_WEB_PORT__/33080/' ${ROOT}/ci_worker.conf
- sed -i 's/__CWS_SSL_PORT__/33443/' ${ROOT}/ci_worker.conf
- sed -i 's/__CWS_AJP_PORT__/33009/' ${ROOT}/ci_worker.conf
- sed -i 's/__CWS_SHUTDOWN_PORT__/33005/' ${ROOT}/ci_worker.conf
- sed -i 's/__CWS_JMX_PORT__/31096/' ${ROOT}/ci_worker.conf
+ sed -i '' -e 's/__WORKER_TYPE__/run_external_tasks_only/' ${ROOT}/ci_worker.conf
+ sed -i '' -e 's/__CWS_WEB_PORT__/33080/' ${ROOT}/ci_worker.conf
+ sed -i '' -e 's/__CWS_SSL_PORT__/33443/' ${ROOT}/ci_worker.conf
+ sed -i '' -e 's/__CWS_AJP_PORT__/33009/' ${ROOT}/ci_worker.conf
+ sed -i '' -e 's/__CWS_SHUTDOWN_PORT__/33005/' ${ROOT}/ci_worker.conf
+ sed -i '' -e 's/__CWS_JMX_PORT__/31096/' ${ROOT}/ci_worker.conf
  else
  print "ERROR: UNEXPECTED INSTALL TYPE VALUE: '${INSTALL_TYPE}'"
  exit 1;

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-pre.1</version><!-- update this each CWS release -->
+ <version>2.6.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-pre.1</version><!-- update this each CWS release -->
+ <version>2.6.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-pre.1</version><!-- update this each CWS release -->
+ <version>2.6.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-pre.1</version><!-- update this each CWS release -->
+ <version>2.6.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-pre.1</version><!-- update this each CWS release -->
+ <version>2.6.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-pre.1</version><!-- update this each CWS release -->
+ <version>2.6.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-pre.1</version><!-- update this each CWS release -->
+ <version>2.6.0</version><!-- update this each CWS release -->
  </parent>
  <artifactId>cws-service</artifactId>
 

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-pre.1</version><!-- update this each CWS release -->
+ <version>2.6.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-pre.1</version><!-- update this each CWS release -->
+ <version>2.6.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-pre.1</version><!-- update this each CWS release -->
+ <version>2.6.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
@@ -89,7 +89,7 @@ services:
  labels:
  com.example.service: "cws-server"
  com.example.description: "Common Workflow Service"
- image: nasa-ammos/common-workflow-service:2.6.0-pre.1 # update this each CWS release
+ image: nasa-ammos/common-workflow-service:2.6.0 # update this each CWS release
  depends_on:
  - db
  - es
@@ -121,7 +121,7 @@ services:
  labels:
  com.example.service: "cws-worker1"
  com.example.description: "Common Workflow Service"
- image: nasa-ammos/common-workflow-service:2.6.0-pre.1 # update this each CWS release
+ image: nasa-ammos/common-workflow-service:2.6.0 # update this each CWS release
  depends_on:
  - db
  - es

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-pre.1' # update this each CWS release
+ver='2.6.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-pre.1 # update this each CWS release
+ image: nasa-ammos/common-workflow-service:2.6.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-pre.1</version> <!-- update this each CWS release -->
+ <version>2.6.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-pre.1' # update this each CWS release
+export CWS_VER='2.6.0' # update this each CWS release
 export CAMUNDA_VER='7.20.0'
 export TOMCAT_VER='9.0.75'
 export LOGSTASH_VER='8.12.0'