From 64c35b71765267b62170a4177d7d4b211f653b67 Mon Sep 17 00:00:00 2001
From: Sravan Kumar Lakkimsetti
Date: Tue, 7 Jul 2020 08:29:41 +0530
Subject: Bug 563431 - Remove the Nashorn JavaScript Engine use

Fixed updateSiteSegment property

Change-Id: I835e225004b11f76cfc8f184ec8973ad76c9ec19
Signed-off-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>
---
 production/testScripts/runTests2.xml | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/production/testScripts/runTests2.xml b/production/testScripts/runTests2.xml
index 63b49352a..5aedb065b 100644
--- a/production/testScripts/runTests2.xml
+++ b/production/testScripts/runTests2.xml
@@ -95,7 +95,6 @@
     <echo message="eclipseStream: ${eclipseStream}" />
     <echo message="eclipseStreamMajor: ${eclipseStreamMajor}" />
     <echo message="eclipseStreamMinor: ${eclipseStreamMinor}" />
-    <echo message="eclipseStreamService: ${eclipseStreamService}" />
     <echo message="buildType: ${buildType}" />
     <echo message="testSuite: ${testSuite}" />
 
@@ -762,7 +761,17 @@
       </filterchain>
     </loadresource>
     <echo message="eclipseStreamMinor: ${eclipseStreamMinor}"/>
-  	
+
+    <loadresource property="updateSiteSegment">
+      <string value="${eclipseStream}"/>
+      <filterchain>
+        <tokenfilter>
+          <replaceregex pattern="^(\d+)\.(\d+)(\.(\d+))" replace="\1\.\2"/>
+        </tokenfilter>
+      </filterchain>
+    </loadresource>
+    <echo message="updateSiteSegment: ${updateSiteSegment}"/>
+
   	<!--
   	<script language="javascript">
       <![CDATA[
@@ -788,9 +797,6 @@
     <fail
       unless="eclipseStreamMinor"
       message="eclipseStreamMinor not defined or computable" />
-    <!-- eclipseStreamService may not always be defined? And we do not currently
-      use it. <fail unless="eclipseStreamService" message="eclipseStreamService
-      not defined or computable" /> -->
     <fail
       unless="updateSiteSegment"
       message="updateSiteSegment not defined or computable" />
@@ -1207,7 +1213,7 @@
     <echo message="javaversion in setJavaMajorVersion: ${javaversionEscaped}" />
   	
   	<loadresource property="javaMajorVersion">
-      <string value="${javaversionExcaped}"/>
+      <string value="${javaversionEscaped}"/>
       <filterchain>
         <tokenfilter>
           <replaceregex pattern='^.* "(\d+)[\.-].*' replace="\1"/>
-- 
cgit v1.2.3