Skip to content

Commit f5c3c6c

Browse files
James WoodJames Wood
James Wood
authored and
James Wood
committed
Merge branch 'develop'
2 parents 71dac06 + 0cbda38 commit f5c3c6c

File tree

16 files changed

+34
-34
lines changed

16 files changed

+34
-34
lines changed

‎ci/ci.sh‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -36,26 +36,26 @@ function worker_conf_data() {
3636
INSTALL_TYPE=${1}
3737

3838
if [[ "${INSTALL_TYPE}" == "worker1" ]]; then
39-
sed -i 's/__WORKER_TYPE__/run_all/' ${ROOT}/ci_worker.conf
40-
sed -i 's/__CWS_WEB_PORT__/37080/' ${ROOT}/ci_worker.conf
41-
sed -i 's/__CWS_SSL_PORT__/37443/' ${ROOT}/ci_worker.conf
42-
sed -i 's/__CWS_AJP_PORT__/37009/' ${ROOT}/ci_worker.conf
43-
sed -i 's/__CWS_SHUTDOWN_PORT__/37005/' ${ROOT}/ci_worker.conf
44-
sed -i 's/__CWS_JMX_PORT__/31098/' ${ROOT}/ci_worker.conf
39+
sed -i '' -e 's/__WORKER_TYPE__/run_all/' ${ROOT}/ci_worker.conf
40+
sed -i '' -e 's/__CWS_WEB_PORT__/37080/' ${ROOT}/ci_worker.conf
41+
sed -i '' -e 's/__CWS_SSL_PORT__/37443/' ${ROOT}/ci_worker.conf
42+
sed -i '' -e 's/__CWS_AJP_PORT__/37009/' ${ROOT}/ci_worker.conf
43+
sed -i '' -e 's/__CWS_SHUTDOWN_PORT__/37005/' ${ROOT}/ci_worker.conf
44+
sed -i '' -e 's/__CWS_JMX_PORT__/31098/' ${ROOT}/ci_worker.conf
4545
elif [[ "${INSTALL_TYPE}" == "worker2" ]]; then
46-
sed -i 's/__WORKER_TYPE__/run_models_only/' ${ROOT}/ci_worker.conf
47-
sed -i 's/__CWS_WEB_PORT__/36080/' ${ROOT}/ci_worker.conf
48-
sed -i 's/__CWS_SSL_PORT__/36443/' ${ROOT}/ci_worker.conf
49-
sed -i 's/__CWS_AJP_PORT__/36009/' ${ROOT}/ci_worker.conf
50-
sed -i 's/__CWS_SHUTDOWN_PORT__/36005/' ${ROOT}/ci_worker.conf
51-
sed -i 's/__CWS_JMX_PORT__/31097/' ${ROOT}/ci_worker.conf
46+
sed -i '' -e 's/__WORKER_TYPE__/run_models_only/' ${ROOT}/ci_worker.conf
47+
sed -i '' -e 's/__CWS_WEB_PORT__/36080/' ${ROOT}/ci_worker.conf
48+
sed -i '' -e 's/__CWS_SSL_PORT__/36443/' ${ROOT}/ci_worker.conf
49+
sed -i '' -e 's/__CWS_AJP_PORT__/36009/' ${ROOT}/ci_worker.conf
50+
sed -i '' -e 's/__CWS_SHUTDOWN_PORT__/36005/' ${ROOT}/ci_worker.conf
51+
sed -i '' -e 's/__CWS_JMX_PORT__/31097/' ${ROOT}/ci_worker.conf
5252
elif [[ "${INSTALL_TYPE}" == "worker3" ]]; then
53-
sed -i 's/__WORKER_TYPE__/run_external_tasks_only/' ${ROOT}/ci_worker.conf
54-
sed -i 's/__CWS_WEB_PORT__/33080/' ${ROOT}/ci_worker.conf
55-
sed -i 's/__CWS_SSL_PORT__/33443/' ${ROOT}/ci_worker.conf
56-
sed -i 's/__CWS_AJP_PORT__/33009/' ${ROOT}/ci_worker.conf
57-
sed -i 's/__CWS_SHUTDOWN_PORT__/33005/' ${ROOT}/ci_worker.conf
58-
sed -i 's/__CWS_JMX_PORT__/31096/' ${ROOT}/ci_worker.conf
53+
sed -i '' -e 's/__WORKER_TYPE__/run_external_tasks_only/' ${ROOT}/ci_worker.conf
54+
sed -i '' -e 's/__CWS_WEB_PORT__/33080/' ${ROOT}/ci_worker.conf
55+
sed -i '' -e 's/__CWS_SSL_PORT__/33443/' ${ROOT}/ci_worker.conf
56+
sed -i '' -e 's/__CWS_AJP_PORT__/33009/' ${ROOT}/ci_worker.conf
57+
sed -i '' -e 's/__CWS_SHUTDOWN_PORT__/33005/' ${ROOT}/ci_worker.conf
58+
sed -i '' -e 's/__CWS_JMX_PORT__/31096/' ${ROOT}/ci_worker.conf
5959
else
6060
print "ERROR: UNEXPECTED INSTALL TYPE VALUE: '${INSTALL_TYPE}'"
6161
exit 1;

‎cws-adaptation-engine/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>gov.nasa.jpl.ammos.ids.cws</groupId>
55
<artifactId>common-workflow-service</artifactId>
6-
<version>2.6.0-pre.1</version><!-- update this each CWS release -->
6+
<version>2.6.0</version><!-- update this each CWS release -->
77
</parent>
88
<artifactId>cws-adaptation-engine</artifactId>
99

‎cws-adaptation/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>gov.nasa.jpl.ammos.ids.cws</groupId>
55
<artifactId>common-workflow-service</artifactId>
6-
<version>2.6.0-pre.1</version><!-- update this each CWS release -->
6+
<version>2.6.0</version><!-- update this each CWS release -->
77
</parent>
88
<artifactId>cws-adaptation</artifactId>
99

‎cws-core/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>gov.nasa.jpl.ammos.ids.cws</groupId>
55
<artifactId>common-workflow-service</artifactId>
6-
<version>2.6.0-pre.1</version><!-- update this each CWS release -->
6+
<version>2.6.0</version><!-- update this each CWS release -->
77
</parent>
88
<artifactId>cws-core</artifactId>
99

‎cws-engine-service/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>gov.nasa.jpl.ammos.ids.cws</groupId>
55
<artifactId>common-workflow-service</artifactId>
6-
<version>2.6.0-pre.1</version><!-- update this each CWS release -->
6+
<version>2.6.0</version><!-- update this each CWS release -->
77
</parent>
88
<artifactId>cws-engine-service</artifactId>
99

‎cws-engine/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>gov.nasa.jpl.ammos.ids.cws</groupId>
66
<artifactId>common-workflow-service</artifactId>
7-
<version>2.6.0-pre.1</version><!-- update this each CWS release -->
7+
<version>2.6.0</version><!-- update this each CWS release -->
88
</parent>
99
<artifactId>cws-engine</artifactId>
1010

‎cws-installer/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>gov.nasa.jpl.ammos.ids.cws</groupId>
55
<artifactId>common-workflow-service</artifactId>
6-
<version>2.6.0-pre.1</version><!-- update this each CWS release -->
6+
<version>2.6.0</version><!-- update this each CWS release -->
77
</parent>
88
<artifactId>cws-installer</artifactId>
99

‎cws-service/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>gov.nasa.jpl.ammos.ids.cws</groupId>
66
<artifactId>common-workflow-service</artifactId>
7-
<version>2.6.0-pre.1</version><!-- update this each CWS release -->
7+
<version>2.6.0</version><!-- update this each CWS release -->
88
</parent>
99
<artifactId>cws-service</artifactId>
1010

‎cws-tasks/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>gov.nasa.jpl.ammos.ids.cws</groupId>
66
<artifactId>common-workflow-service</artifactId>
7-
<version>2.6.0-pre.1</version><!-- update this each CWS release -->
7+
<version>2.6.0</version><!-- update this each CWS release -->
88
</parent>
99
<artifactId>cws-tasks</artifactId>
1010

‎cws-test/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>gov.nasa.jpl.ammos.ids.cws</groupId>
55
<artifactId>common-workflow-service</artifactId>
6-
<version>2.6.0-pre.1</version><!-- update this each CWS release -->
6+
<version>2.6.0</version><!-- update this each CWS release -->
77
</parent>
88
<artifactId>cws-test</artifactId>
99

0 commit comments

Comments
 (0)