From a946105704377e1c8b45165ce759fc6c69497722 Mon Sep 17 00:00:00 2001
From: Clive Stokes <clive.stokes@refinitiv.com>
Date: Thu, 14 Nov 2019 11:13:36 +0000
Subject: [PATCH 01/14] Support JDK 11, updated the Beam version to 12.16

---
 Dataflow-Pipeline/config/spring.xml           | 42 ++++++++++++-------
 Dataflow-Pipeline/pom.xml                     |  2 +-
 .../beamio/trepws/dataflow/PipelineBean.java  |  8 +++-
 3 files changed, 35 insertions(+), 17 deletions(-)

diff --git a/Dataflow-Pipeline/config/spring.xml b/Dataflow-Pipeline/config/spring.xml
index 7aa7bd1..1a06679 100755
--- a/Dataflow-Pipeline/config/spring.xml
+++ b/Dataflow-Pipeline/config/spring.xml
@@ -14,14 +14,15 @@
     <context:component-scan base-package="com.refinitiv.beamio.trepws.dataflow" />
 
     <bean name="streaming-options" factory-method="initStreaming" class="com.refinitiv.beamio.trepws.dataflow.Options">
-        <property name="project"             value="YOUR GCP PROJECT NAME" />
+        <property name="project"             value="tr-solutions-playground" />
         <property name="AppName"             value="StreamingPipeline"/>
-        <property name="zone"                value="YOUR PREFFERED GCP ZONE" />
-        <property name="region"              value="YOUR PREFFERED GCP REGION" />
-        <property name="location"            value="YOUR PREFFERED GCP LOCATION" />
+        <property name="zone"                value="europe-west1-b" />
+        <property name="region"              value="europe-west1"/>
+        <property name="location"            value="EU" />
         <property name="numWorkers"          value="1" />
         <property name="maxNumWorkers"       value="1" />
-        <property name="tempLocation"        value="YOUR GOOGLE STORAGE (gs://bucket/path)" />
+        <property name="stagingLocation"     value="gs://tr-solutions-playground-tickhistory/staging/" />
+        <property name="tempLocation"        value="gs://tr-solutions-playground-tickhistory/temp/" />
         <!-- single CPU, 3.75 GB mem -->
         <property name="workerMachineType"   value="n1-standard-1" />
         <property name="diskSizeGb"          value="20" />
@@ -35,21 +36,23 @@
         <!-- You'll probably have to set a unique position too -->
         <property name="jobName"     value="trep-websocket-io" />
 
-        <property name="hostname"    value="YOUR TREP/ADS/ERT hostname or IP address" />
-        <property name="port"        value="15000" />
+        <property name="hostname"    value="amer-3.pricing.streaming.edp.thomsonreuters.com" />  <!-- 10.132.0.66 -->
+        <property name="port"        value="443" /> <!-- 5900 -->
 
        <!-- For ERT -->
-        <property name="tokenAuth"           value="false" />
-        <property name="password"            value="YOUR ERT-GW-Password" />
+        <property name="tokenAuth"           value="true" />
+        <property name="password"            value="FEfEMWT{$DvM6MUavwgBwATxhfgQhA" /><!-- YOUR ERT-GW-Password -->
         <property name="serviceDiscovery"    value="true" />
         <property name="region"              value="eu" /> <!-- eu or us -->
 
         <!-- The maximum number of ADS mounts (overridden if the number of  -->
         <!-- desired splits is smaller). If unset then 1 is used -->
         <!-- NOTE: for ERT maxMounts is forced to 1 to avoid clashes then performing token authentication. -->
-        <property name="maxMounts"   value="1" />
+        <property name="maxMounts"         value="5" />
 
-        <property name="username"    value="YOUR TREP/DACS id/ERT username" />
+        <!-- <property name="trepIoInstances"   value="3" /> -->
+
+        <property name="username"    value="GE-A-01103867-3-532" />
         <property name="timeout"     value="60000" />
 
         <!-- can default to 256 if property removed -->
@@ -65,7 +68,7 @@
 
         <!-- Table is create if needed and append. Removing this property will not add a BigQuery write step to the pipeline -->
         <!-- DATASET must exit! -->
-        <property name="bigQuery" value="YOUR GCP PROJECT NAME:DATASET.TABLE" />
+        <property name="bigQuery" value="tr-solutions-playground:TEST.tickdb" />
 
          <!-- Time partitioning field -->
         <property name="partition"      value="Time" />
@@ -122,13 +125,22 @@
         <property name="ricList">
             <list>
                 <value>GBP=</value>
-                <value>.TRXVUSGOV10U</value>
-                <value>GB50YT=RR</value>
+                <value>EUR=</value>
+                <value>JPY=</value>
+                <value>NOK=</value>
+                <value>.FTSE</value>
+                <value>LCOc1</value>
+                <value>LCOc2</value>
+                <value>LCOc3</value>
+                <value>LCOc4</value>
+                <value>LCOc5</value>
+                <value>LCOc6</value>
+                <value>LCOc7</value>
             </list>
         </property>
 
         <!--  note if the above ricList is empty, use the following query to retrieve a list of RICs -->
-        <property name="ricListQuery" value="YOUR GCP PROJECT VIEW to return a list of RICs"/>
+        <!-- <property name="ricListQuery" value="YOUR GCP PROJECT VIEW to return a list of RICs"/> -->
 
     </bean>
 
diff --git a/Dataflow-Pipeline/pom.xml b/Dataflow-Pipeline/pom.xml
index f5f9527..c0f290a 100644
--- a/Dataflow-Pipeline/pom.xml
+++ b/Dataflow-Pipeline/pom.xml
@@ -13,7 +13,7 @@
     <artifactId>trepws-pipeline</artifactId>
 
     <properties>
-        <beam.version>2.12.0</beam.version>
+        <beam.version>2.16.0</beam.version>
         <trepio.version>1.2.0</trepio.version>
         <spring.version>5.1.6.RELEASE</spring.version>
         <spring.boot.version>2.1.4.RELEASE</spring.boot.version>
diff --git a/Dataflow-Pipeline/src/main/java/com/refinitiv/beamio/trepws/dataflow/PipelineBean.java b/Dataflow-Pipeline/src/main/java/com/refinitiv/beamio/trepws/dataflow/PipelineBean.java
index 65616e4..06067a0 100755
--- a/Dataflow-Pipeline/src/main/java/com/refinitiv/beamio/trepws/dataflow/PipelineBean.java
+++ b/Dataflow-Pipeline/src/main/java/com/refinitiv/beamio/trepws/dataflow/PipelineBean.java
@@ -17,11 +17,14 @@
 
 import static com.refinitiv.beamio.trepwebsockets.TrepWsIO.InstrumentTuple;
 
+import java.io.File;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 import org.apache.beam.sdk.Pipeline;
 import org.apache.beam.sdk.io.gcp.bigquery.BigQueryIO;
@@ -95,6 +98,9 @@ public void runPipeline(String[] args) throws JobException, InterruptedException
 		logger.info(String.format("runPipeline %s %s...", options.getAppName(), options.getJobName()));
 		logger.info(this.toString());
 
+        options.setFilesToStage(Arrays.asList(System.getProperty("java.class.path").split(File.pathSeparator)).stream()
+                .map(entry -> new File(entry).toString()).collect(Collectors.toList()));
+
         List<String> rics = Lists.newArrayList();
 
         try {
@@ -185,7 +191,7 @@ public void runPipeline(String[] args) throws JobException, InterruptedException
 
         // The options.setUpdate(true) seems to create two pipelines. This can cause
         // problems with multiple tokens being created and stored when using ERT.
-        // Therefore please cancel the running pipeline and start a new one.
+        // Therefore, please cancel the running pipeline and start a new one.
 		options.setUpdate(false);
 		pipeline.run(options);
 

From d22d02949964f746cf7c9875c773aeb8793b07c9 Mon Sep 17 00:00:00 2001
From: Clive Stokes <clive.stokes@refinitiv.com>
Date: Thu, 14 Nov 2019 11:13:36 +0000
Subject: [PATCH 02/14] Support JDK 11, updated the Beam version to 12.16

---
 Dataflow-Pipeline/config/spring.xml           | 42 ++++++++++++-------
 Dataflow-Pipeline/pom.xml                     |  2 +-
 .../beamio/trepws/dataflow/PipelineBean.java  |  8 +++-
 3 files changed, 35 insertions(+), 17 deletions(-)

diff --git a/Dataflow-Pipeline/config/spring.xml b/Dataflow-Pipeline/config/spring.xml
index 7aa7bd1..f0b9011 100755
--- a/Dataflow-Pipeline/config/spring.xml
+++ b/Dataflow-Pipeline/config/spring.xml
@@ -14,14 +14,15 @@
     <context:component-scan base-package="com.refinitiv.beamio.trepws.dataflow" />
 
     <bean name="streaming-options" factory-method="initStreaming" class="com.refinitiv.beamio.trepws.dataflow.Options">
-        <property name="project"             value="YOUR GCP PROJECT NAME" />
+        <property name="project"             value="tr-solutions-playground" />
         <property name="AppName"             value="StreamingPipeline"/>
-        <property name="zone"                value="YOUR PREFFERED GCP ZONE" />
-        <property name="region"              value="YOUR PREFFERED GCP REGION" />
-        <property name="location"            value="YOUR PREFFERED GCP LOCATION" />
+        <property name="zone"                value="europe-west1-b" />
+        <property name="region"              value="europe-west1"/>
+        <property name="location"            value="EU" />
         <property name="numWorkers"          value="1" />
         <property name="maxNumWorkers"       value="1" />
-        <property name="tempLocation"        value="YOUR GOOGLE STORAGE (gs://bucket/path)" />
+        <property name="stagingLocation"     value="gs://tr-solutions-playground-tickhistory/staging/" />
+        <property name="tempLocation"        value="gs://tr-solutions-playground-tickhistory/temp/" />
         <!-- single CPU, 3.75 GB mem -->
         <property name="workerMachineType"   value="n1-standard-1" />
         <property name="diskSizeGb"          value="20" />
@@ -35,21 +36,23 @@
         <!-- You'll probably have to set a unique position too -->
         <property name="jobName"     value="trep-websocket-io" />
 
-        <property name="hostname"    value="YOUR TREP/ADS/ERT hostname or IP address" />
-        <property name="port"        value="15000" />
+        <property name="hostname"    value="amer-3.pricing.streaming.edp.thomsonreuters.com" />  <!-- 10.132.0.66 -->
+        <property name="port"        value="443" /> <!-- 5900 -->
 
        <!-- For ERT -->
-        <property name="tokenAuth"           value="false" />
-        <property name="password"            value="YOUR ERT-GW-Password" />
+        <property name="tokenAuth"           value="true" />
+        <property name="password"            value="***REMOVED***" /><!-- YOUR ERT-GW-Password -->
         <property name="serviceDiscovery"    value="true" />
         <property name="region"              value="eu" /> <!-- eu or us -->
 
         <!-- The maximum number of ADS mounts (overridden if the number of  -->
         <!-- desired splits is smaller). If unset then 1 is used -->
         <!-- NOTE: for ERT maxMounts is forced to 1 to avoid clashes then performing token authentication. -->
-        <property name="maxMounts"   value="1" />
+        <property name="maxMounts"         value="5" />
 
-        <property name="username"    value="YOUR TREP/DACS id/ERT username" />
+        <!-- <property name="trepIoInstances"   value="3" /> -->
+
+        <property name="username"    value="***REMOVED***" />
         <property name="timeout"     value="60000" />
 
         <!-- can default to 256 if property removed -->
@@ -65,7 +68,7 @@
 
         <!-- Table is create if needed and append. Removing this property will not add a BigQuery write step to the pipeline -->
         <!-- DATASET must exit! -->
-        <property name="bigQuery" value="YOUR GCP PROJECT NAME:DATASET.TABLE" />
+        <property name="bigQuery" value="tr-solutions-playground:TEST.tickdb" />
 
          <!-- Time partitioning field -->
         <property name="partition"      value="Time" />
@@ -122,13 +125,22 @@
         <property name="ricList">
             <list>
                 <value>GBP=</value>
-                <value>.TRXVUSGOV10U</value>
-                <value>GB50YT=RR</value>
+                <value>EUR=</value>
+                <value>JPY=</value>
+                <value>NOK=</value>
+                <value>.FTSE</value>
+                <value>LCOc1</value>
+                <value>LCOc2</value>
+                <value>LCOc3</value>
+                <value>LCOc4</value>
+                <value>LCOc5</value>
+                <value>LCOc6</value>
+                <value>LCOc7</value>
             </list>
         </property>
 
         <!--  note if the above ricList is empty, use the following query to retrieve a list of RICs -->
-        <property name="ricListQuery" value="YOUR GCP PROJECT VIEW to return a list of RICs"/>
+        <!-- <property name="ricListQuery" value="YOUR GCP PROJECT VIEW to return a list of RICs"/> -->
 
     </bean>
 
diff --git a/Dataflow-Pipeline/pom.xml b/Dataflow-Pipeline/pom.xml
index f5f9527..c0f290a 100644
--- a/Dataflow-Pipeline/pom.xml
+++ b/Dataflow-Pipeline/pom.xml
@@ -13,7 +13,7 @@
     <artifactId>trepws-pipeline</artifactId>
 
     <properties>
-        <beam.version>2.12.0</beam.version>
+        <beam.version>2.16.0</beam.version>
         <trepio.version>1.2.0</trepio.version>
         <spring.version>5.1.6.RELEASE</spring.version>
         <spring.boot.version>2.1.4.RELEASE</spring.boot.version>
diff --git a/Dataflow-Pipeline/src/main/java/com/refinitiv/beamio/trepws/dataflow/PipelineBean.java b/Dataflow-Pipeline/src/main/java/com/refinitiv/beamio/trepws/dataflow/PipelineBean.java
index 65616e4..06067a0 100755
--- a/Dataflow-Pipeline/src/main/java/com/refinitiv/beamio/trepws/dataflow/PipelineBean.java
+++ b/Dataflow-Pipeline/src/main/java/com/refinitiv/beamio/trepws/dataflow/PipelineBean.java
@@ -17,11 +17,14 @@
 
 import static com.refinitiv.beamio.trepwebsockets.TrepWsIO.InstrumentTuple;
 
+import java.io.File;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 import org.apache.beam.sdk.Pipeline;
 import org.apache.beam.sdk.io.gcp.bigquery.BigQueryIO;
@@ -95,6 +98,9 @@ public void runPipeline(String[] args) throws JobException, InterruptedException
 		logger.info(String.format("runPipeline %s %s...", options.getAppName(), options.getJobName()));
 		logger.info(this.toString());
 
+        options.setFilesToStage(Arrays.asList(System.getProperty("java.class.path").split(File.pathSeparator)).stream()
+                .map(entry -> new File(entry).toString()).collect(Collectors.toList()));
+
         List<String> rics = Lists.newArrayList();
 
         try {
@@ -185,7 +191,7 @@ public void runPipeline(String[] args) throws JobException, InterruptedException
 
         // The options.setUpdate(true) seems to create two pipelines. This can cause
         // problems with multiple tokens being created and stored when using ERT.
-        // Therefore please cancel the running pipeline and start a new one.
+        // Therefore, please cancel the running pipeline and start a new one.
 		options.setUpdate(false);
 		pipeline.run(options);
 

From c7e98ea1fd2ae4d61519a3859fc91191bfe7b854 Mon Sep 17 00:00:00 2001
From: Clive Stokes <clive.stokes@refinitiv.com>
Date: Thu, 14 Nov 2019 11:21:03 +0000
Subject: [PATCH 03/14] updated Spring.xml

---
 Dataflow-Pipeline/config/spring.xml | 42 +++++++++++------------------
 1 file changed, 15 insertions(+), 27 deletions(-)

diff --git a/Dataflow-Pipeline/config/spring.xml b/Dataflow-Pipeline/config/spring.xml
index 1a06679..7aa7bd1 100755
--- a/Dataflow-Pipeline/config/spring.xml
+++ b/Dataflow-Pipeline/config/spring.xml
@@ -14,15 +14,14 @@
     <context:component-scan base-package="com.refinitiv.beamio.trepws.dataflow" />
 
     <bean name="streaming-options" factory-method="initStreaming" class="com.refinitiv.beamio.trepws.dataflow.Options">
-        <property name="project"             value="tr-solutions-playground" />
+        <property name="project"             value="YOUR GCP PROJECT NAME" />
         <property name="AppName"             value="StreamingPipeline"/>
-        <property name="zone"                value="europe-west1-b" />
-        <property name="region"              value="europe-west1"/>
-        <property name="location"            value="EU" />
+        <property name="zone"                value="YOUR PREFFERED GCP ZONE" />
+        <property name="region"              value="YOUR PREFFERED GCP REGION" />
+        <property name="location"            value="YOUR PREFFERED GCP LOCATION" />
         <property name="numWorkers"          value="1" />
         <property name="maxNumWorkers"       value="1" />
-        <property name="stagingLocation"     value="gs://tr-solutions-playground-tickhistory/staging/" />
-        <property name="tempLocation"        value="gs://tr-solutions-playground-tickhistory/temp/" />
+        <property name="tempLocation"        value="YOUR GOOGLE STORAGE (gs://bucket/path)" />
         <!-- single CPU, 3.75 GB mem -->
         <property name="workerMachineType"   value="n1-standard-1" />
         <property name="diskSizeGb"          value="20" />
@@ -36,23 +35,21 @@
         <!-- You'll probably have to set a unique position too -->
         <property name="jobName"     value="trep-websocket-io" />
 
-        <property name="hostname"    value="amer-3.pricing.streaming.edp.thomsonreuters.com" />  <!-- 10.132.0.66 -->
-        <property name="port"        value="443" /> <!-- 5900 -->
+        <property name="hostname"    value="YOUR TREP/ADS/ERT hostname or IP address" />
+        <property name="port"        value="15000" />
 
        <!-- For ERT -->
-        <property name="tokenAuth"           value="true" />
-        <property name="password"            value="FEfEMWT{$DvM6MUavwgBwATxhfgQhA" /><!-- YOUR ERT-GW-Password -->
+        <property name="tokenAuth"           value="false" />
+        <property name="password"            value="YOUR ERT-GW-Password" />
         <property name="serviceDiscovery"    value="true" />
         <property name="region"              value="eu" /> <!-- eu or us -->
 
         <!-- The maximum number of ADS mounts (overridden if the number of  -->
         <!-- desired splits is smaller). If unset then 1 is used -->
         <!-- NOTE: for ERT maxMounts is forced to 1 to avoid clashes then performing token authentication. -->
-        <property name="maxMounts"         value="5" />
+        <property name="maxMounts"   value="1" />
 
-        <!-- <property name="trepIoInstances"   value="3" /> -->
-
-        <property name="username"    value="GE-A-01103867-3-532" />
+        <property name="username"    value="YOUR TREP/DACS id/ERT username" />
         <property name="timeout"     value="60000" />
 
         <!-- can default to 256 if property removed -->
@@ -68,7 +65,7 @@
 
         <!-- Table is create if needed and append. Removing this property will not add a BigQuery write step to the pipeline -->
         <!-- DATASET must exit! -->
-        <property name="bigQuery" value="tr-solutions-playground:TEST.tickdb" />
+        <property name="bigQuery" value="YOUR GCP PROJECT NAME:DATASET.TABLE" />
 
          <!-- Time partitioning field -->
         <property name="partition"      value="Time" />
@@ -125,22 +122,13 @@
         <property name="ricList">
             <list>
                 <value>GBP=</value>
-                <value>EUR=</value>
-                <value>JPY=</value>
-                <value>NOK=</value>
-                <value>.FTSE</value>
-                <value>LCOc1</value>
-                <value>LCOc2</value>
-                <value>LCOc3</value>
-                <value>LCOc4</value>
-                <value>LCOc5</value>
-                <value>LCOc6</value>
-                <value>LCOc7</value>
+                <value>.TRXVUSGOV10U</value>
+                <value>GB50YT=RR</value>
             </list>
         </property>
 
         <!--  note if the above ricList is empty, use the following query to retrieve a list of RICs -->
-        <!-- <property name="ricListQuery" value="YOUR GCP PROJECT VIEW to return a list of RICs"/> -->
+        <property name="ricListQuery" value="YOUR GCP PROJECT VIEW to return a list of RICs"/>
 
     </bean>
 

From a6bf5b7ac48e7e90dc52fe29fee51121745a933f Mon Sep 17 00:00:00 2001
From: Clive Stokes <clive.stokes@refinitiv.com>
Date: Thu, 14 Nov 2019 11:21:03 +0000
Subject: [PATCH 04/14] updated Spring.xml

---
 Dataflow-Pipeline/config/spring.xml | 42 +++++++++++------------------
 1 file changed, 15 insertions(+), 27 deletions(-)

diff --git a/Dataflow-Pipeline/config/spring.xml b/Dataflow-Pipeline/config/spring.xml
index f0b9011..7aa7bd1 100755
--- a/Dataflow-Pipeline/config/spring.xml
+++ b/Dataflow-Pipeline/config/spring.xml
@@ -14,15 +14,14 @@
     <context:component-scan base-package="com.refinitiv.beamio.trepws.dataflow" />
 
     <bean name="streaming-options" factory-method="initStreaming" class="com.refinitiv.beamio.trepws.dataflow.Options">
-        <property name="project"             value="tr-solutions-playground" />
+        <property name="project"             value="YOUR GCP PROJECT NAME" />
         <property name="AppName"             value="StreamingPipeline"/>
-        <property name="zone"                value="europe-west1-b" />
-        <property name="region"              value="europe-west1"/>
-        <property name="location"            value="EU" />
+        <property name="zone"                value="YOUR PREFFERED GCP ZONE" />
+        <property name="region"              value="YOUR PREFFERED GCP REGION" />
+        <property name="location"            value="YOUR PREFFERED GCP LOCATION" />
         <property name="numWorkers"          value="1" />
         <property name="maxNumWorkers"       value="1" />
-        <property name="stagingLocation"     value="gs://tr-solutions-playground-tickhistory/staging/" />
-        <property name="tempLocation"        value="gs://tr-solutions-playground-tickhistory/temp/" />
+        <property name="tempLocation"        value="YOUR GOOGLE STORAGE (gs://bucket/path)" />
         <!-- single CPU, 3.75 GB mem -->
         <property name="workerMachineType"   value="n1-standard-1" />
         <property name="diskSizeGb"          value="20" />
@@ -36,23 +35,21 @@
         <!-- You'll probably have to set a unique position too -->
         <property name="jobName"     value="trep-websocket-io" />
 
-        <property name="hostname"    value="amer-3.pricing.streaming.edp.thomsonreuters.com" />  <!-- 10.132.0.66 -->
-        <property name="port"        value="443" /> <!-- 5900 -->
+        <property name="hostname"    value="YOUR TREP/ADS/ERT hostname or IP address" />
+        <property name="port"        value="15000" />
 
        <!-- For ERT -->
-        <property name="tokenAuth"           value="true" />
-        <property name="password"            value="***REMOVED***" /><!-- YOUR ERT-GW-Password -->
+        <property name="tokenAuth"           value="false" />
+        <property name="password"            value="YOUR ERT-GW-Password" />
         <property name="serviceDiscovery"    value="true" />
         <property name="region"              value="eu" /> <!-- eu or us -->
 
         <!-- The maximum number of ADS mounts (overridden if the number of  -->
         <!-- desired splits is smaller). If unset then 1 is used -->
         <!-- NOTE: for ERT maxMounts is forced to 1 to avoid clashes then performing token authentication. -->
-        <property name="maxMounts"         value="5" />
+        <property name="maxMounts"   value="1" />
 
-        <!-- <property name="trepIoInstances"   value="3" /> -->
-
-        <property name="username"    value="***REMOVED***" />
+        <property name="username"    value="YOUR TREP/DACS id/ERT username" />
         <property name="timeout"     value="60000" />
 
         <!-- can default to 256 if property removed -->
@@ -68,7 +65,7 @@
 
         <!-- Table is create if needed and append. Removing this property will not add a BigQuery write step to the pipeline -->
         <!-- DATASET must exit! -->
-        <property name="bigQuery" value="tr-solutions-playground:TEST.tickdb" />
+        <property name="bigQuery" value="YOUR GCP PROJECT NAME:DATASET.TABLE" />
 
          <!-- Time partitioning field -->
         <property name="partition"      value="Time" />
@@ -125,22 +122,13 @@
         <property name="ricList">
             <list>
                 <value>GBP=</value>
-                <value>EUR=</value>
-                <value>JPY=</value>
-                <value>NOK=</value>
-                <value>.FTSE</value>
-                <value>LCOc1</value>
-                <value>LCOc2</value>
-                <value>LCOc3</value>
-                <value>LCOc4</value>
-                <value>LCOc5</value>
-                <value>LCOc6</value>
-                <value>LCOc7</value>
+                <value>.TRXVUSGOV10U</value>
+                <value>GB50YT=RR</value>
             </list>
         </property>
 
         <!--  note if the above ricList is empty, use the following query to retrieve a list of RICs -->
-        <!-- <property name="ricListQuery" value="YOUR GCP PROJECT VIEW to return a list of RICs"/> -->
+        <property name="ricListQuery" value="YOUR GCP PROJECT VIEW to return a list of RICs"/>
 
     </bean>
 

From 80f9aa302fcebceaf08cb5a4971ffb64bbaaa2a2 Mon Sep 17 00:00:00 2001
From: Clive Stokes <clive.stokes@refinitiv.com>
Date: Thu, 14 Nov 2019 11:31:16 +0000
Subject: [PATCH 05/14] Revert "Support JDK 11, updated the Beam version to
 12.16"

This reverts commit a946105704377e1c8b45165ce759fc6c69497722.
---
 Dataflow-Pipeline/pom.xml                                 | 2 +-
 .../refinitiv/beamio/trepws/dataflow/PipelineBean.java    | 8 +-------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/Dataflow-Pipeline/pom.xml b/Dataflow-Pipeline/pom.xml
index c0f290a..f5f9527 100644
--- a/Dataflow-Pipeline/pom.xml
+++ b/Dataflow-Pipeline/pom.xml
@@ -13,7 +13,7 @@
     <artifactId>trepws-pipeline</artifactId>
 
     <properties>
-        <beam.version>2.16.0</beam.version>
+        <beam.version>2.12.0</beam.version>
         <trepio.version>1.2.0</trepio.version>
         <spring.version>5.1.6.RELEASE</spring.version>
         <spring.boot.version>2.1.4.RELEASE</spring.boot.version>
diff --git a/Dataflow-Pipeline/src/main/java/com/refinitiv/beamio/trepws/dataflow/PipelineBean.java b/Dataflow-Pipeline/src/main/java/com/refinitiv/beamio/trepws/dataflow/PipelineBean.java
index 06067a0..65616e4 100755
--- a/Dataflow-Pipeline/src/main/java/com/refinitiv/beamio/trepws/dataflow/PipelineBean.java
+++ b/Dataflow-Pipeline/src/main/java/com/refinitiv/beamio/trepws/dataflow/PipelineBean.java
@@ -17,14 +17,11 @@
 
 import static com.refinitiv.beamio.trepwebsockets.TrepWsIO.InstrumentTuple;
 
-import java.io.File;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
-import java.util.stream.Collectors;
 
 import org.apache.beam.sdk.Pipeline;
 import org.apache.beam.sdk.io.gcp.bigquery.BigQueryIO;
@@ -98,9 +95,6 @@ public void runPipeline(String[] args) throws JobException, InterruptedException
 		logger.info(String.format("runPipeline %s %s...", options.getAppName(), options.getJobName()));
 		logger.info(this.toString());
 
-        options.setFilesToStage(Arrays.asList(System.getProperty("java.class.path").split(File.pathSeparator)).stream()
-                .map(entry -> new File(entry).toString()).collect(Collectors.toList()));
-
         List<String> rics = Lists.newArrayList();
 
         try {
@@ -191,7 +185,7 @@ public void runPipeline(String[] args) throws JobException, InterruptedException
 
         // The options.setUpdate(true) seems to create two pipelines. This can cause
         // problems with multiple tokens being created and stored when using ERT.
-        // Therefore, please cancel the running pipeline and start a new one.
+        // Therefore please cancel the running pipeline and start a new one.
 		options.setUpdate(false);
 		pipeline.run(options);
 

From 25fc64bfba8cd02fe74a2b6f990a093f7f3b8a72 Mon Sep 17 00:00:00 2001
From: Clive Stokes <clive.stokes@refinitiv.com>
Date: Thu, 14 Nov 2019 11:31:16 +0000
Subject: [PATCH 06/14] Revert "Support JDK 11, updated the Beam version to
 12.16"

This reverts commit d22d02949964f746cf7c9875c773aeb8793b07c9.
---
 Dataflow-Pipeline/pom.xml                                 | 2 +-
 .../refinitiv/beamio/trepws/dataflow/PipelineBean.java    | 8 +-------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/Dataflow-Pipeline/pom.xml b/Dataflow-Pipeline/pom.xml
index c0f290a..f5f9527 100644
--- a/Dataflow-Pipeline/pom.xml
+++ b/Dataflow-Pipeline/pom.xml
@@ -13,7 +13,7 @@
     <artifactId>trepws-pipeline</artifactId>
 
     <properties>
-        <beam.version>2.16.0</beam.version>
+        <beam.version>2.12.0</beam.version>
         <trepio.version>1.2.0</trepio.version>
         <spring.version>5.1.6.RELEASE</spring.version>
         <spring.boot.version>2.1.4.RELEASE</spring.boot.version>
diff --git a/Dataflow-Pipeline/src/main/java/com/refinitiv/beamio/trepws/dataflow/PipelineBean.java b/Dataflow-Pipeline/src/main/java/com/refinitiv/beamio/trepws/dataflow/PipelineBean.java
index 06067a0..65616e4 100755
--- a/Dataflow-Pipeline/src/main/java/com/refinitiv/beamio/trepws/dataflow/PipelineBean.java
+++ b/Dataflow-Pipeline/src/main/java/com/refinitiv/beamio/trepws/dataflow/PipelineBean.java
@@ -17,14 +17,11 @@
 
 import static com.refinitiv.beamio.trepwebsockets.TrepWsIO.InstrumentTuple;
 
-import java.io.File;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
-import java.util.stream.Collectors;
 
 import org.apache.beam.sdk.Pipeline;
 import org.apache.beam.sdk.io.gcp.bigquery.BigQueryIO;
@@ -98,9 +95,6 @@ public void runPipeline(String[] args) throws JobException, InterruptedException
 		logger.info(String.format("runPipeline %s %s...", options.getAppName(), options.getJobName()));
 		logger.info(this.toString());
 
-        options.setFilesToStage(Arrays.asList(System.getProperty("java.class.path").split(File.pathSeparator)).stream()
-                .map(entry -> new File(entry).toString()).collect(Collectors.toList()));
-
         List<String> rics = Lists.newArrayList();
 
         try {
@@ -191,7 +185,7 @@ public void runPipeline(String[] args) throws JobException, InterruptedException
 
         // The options.setUpdate(true) seems to create two pipelines. This can cause
         // problems with multiple tokens being created and stored when using ERT.
-        // Therefore, please cancel the running pipeline and start a new one.
+        // Therefore please cancel the running pipeline and start a new one.
 		options.setUpdate(false);
 		pipeline.run(options);
 

From 83b295cc7dd3020b38e46419a8c3441256a08de5 Mon Sep 17 00:00:00 2001
From: Clive Stokes <clive.stokes@refinitiv.com>
Date: Thu, 14 Nov 2019 11:31:30 +0000
Subject: [PATCH 07/14] Revert "updated Spring.xml"

This reverts commit c7e98ea1fd2ae4d61519a3859fc91191bfe7b854.
---
 Dataflow-Pipeline/config/spring.xml | 42 ++++++++++++++++++-----------
 1 file changed, 27 insertions(+), 15 deletions(-)

diff --git a/Dataflow-Pipeline/config/spring.xml b/Dataflow-Pipeline/config/spring.xml
index 7aa7bd1..1a06679 100755
--- a/Dataflow-Pipeline/config/spring.xml
+++ b/Dataflow-Pipeline/config/spring.xml
@@ -14,14 +14,15 @@
     <context:component-scan base-package="com.refinitiv.beamio.trepws.dataflow" />
 
     <bean name="streaming-options" factory-method="initStreaming" class="com.refinitiv.beamio.trepws.dataflow.Options">
-        <property name="project"             value="YOUR GCP PROJECT NAME" />
+        <property name="project"             value="tr-solutions-playground" />
         <property name="AppName"             value="StreamingPipeline"/>
-        <property name="zone"                value="YOUR PREFFERED GCP ZONE" />
-        <property name="region"              value="YOUR PREFFERED GCP REGION" />
-        <property name="location"            value="YOUR PREFFERED GCP LOCATION" />
+        <property name="zone"                value="europe-west1-b" />
+        <property name="region"              value="europe-west1"/>
+        <property name="location"            value="EU" />
         <property name="numWorkers"          value="1" />
         <property name="maxNumWorkers"       value="1" />
-        <property name="tempLocation"        value="YOUR GOOGLE STORAGE (gs://bucket/path)" />
+        <property name="stagingLocation"     value="gs://tr-solutions-playground-tickhistory/staging/" />
+        <property name="tempLocation"        value="gs://tr-solutions-playground-tickhistory/temp/" />
         <!-- single CPU, 3.75 GB mem -->
         <property name="workerMachineType"   value="n1-standard-1" />
         <property name="diskSizeGb"          value="20" />
@@ -35,21 +36,23 @@
         <!-- You'll probably have to set a unique position too -->
         <property name="jobName"     value="trep-websocket-io" />
 
-        <property name="hostname"    value="YOUR TREP/ADS/ERT hostname or IP address" />
-        <property name="port"        value="15000" />
+        <property name="hostname"    value="amer-3.pricing.streaming.edp.thomsonreuters.com" />  <!-- 10.132.0.66 -->
+        <property name="port"        value="443" /> <!-- 5900 -->
 
        <!-- For ERT -->
-        <property name="tokenAuth"           value="false" />
-        <property name="password"            value="YOUR ERT-GW-Password" />
+        <property name="tokenAuth"           value="true" />
+        <property name="password"            value="FEfEMWT{$DvM6MUavwgBwATxhfgQhA" /><!-- YOUR ERT-GW-Password -->
         <property name="serviceDiscovery"    value="true" />
         <property name="region"              value="eu" /> <!-- eu or us -->
 
         <!-- The maximum number of ADS mounts (overridden if the number of  -->
         <!-- desired splits is smaller). If unset then 1 is used -->
         <!-- NOTE: for ERT maxMounts is forced to 1 to avoid clashes then performing token authentication. -->
-        <property name="maxMounts"   value="1" />
+        <property name="maxMounts"         value="5" />
 
-        <property name="username"    value="YOUR TREP/DACS id/ERT username" />
+        <!-- <property name="trepIoInstances"   value="3" /> -->
+
+        <property name="username"    value="GE-A-01103867-3-532" />
         <property name="timeout"     value="60000" />
 
         <!-- can default to 256 if property removed -->
@@ -65,7 +68,7 @@
 
         <!-- Table is create if needed and append. Removing this property will not add a BigQuery write step to the pipeline -->
         <!-- DATASET must exit! -->
-        <property name="bigQuery" value="YOUR GCP PROJECT NAME:DATASET.TABLE" />
+        <property name="bigQuery" value="tr-solutions-playground:TEST.tickdb" />
 
          <!-- Time partitioning field -->
         <property name="partition"      value="Time" />
@@ -122,13 +125,22 @@
         <property name="ricList">
             <list>
                 <value>GBP=</value>
-                <value>.TRXVUSGOV10U</value>
-                <value>GB50YT=RR</value>
+                <value>EUR=</value>
+                <value>JPY=</value>
+                <value>NOK=</value>
+                <value>.FTSE</value>
+                <value>LCOc1</value>
+                <value>LCOc2</value>
+                <value>LCOc3</value>
+                <value>LCOc4</value>
+                <value>LCOc5</value>
+                <value>LCOc6</value>
+                <value>LCOc7</value>
             </list>
         </property>
 
         <!--  note if the above ricList is empty, use the following query to retrieve a list of RICs -->
-        <property name="ricListQuery" value="YOUR GCP PROJECT VIEW to return a list of RICs"/>
+        <!-- <property name="ricListQuery" value="YOUR GCP PROJECT VIEW to return a list of RICs"/> -->
 
     </bean>
 

From 12fefeeb4467cb509f79e95e5bf240c5b60a17e7 Mon Sep 17 00:00:00 2001
From: Clive Stokes <clive.stokes@refinitiv.com>
Date: Thu, 14 Nov 2019 11:31:30 +0000
Subject: [PATCH 08/14] Revert "updated Spring.xml"

This reverts commit a6bf5b7ac48e7e90dc52fe29fee51121745a933f.
---
 Dataflow-Pipeline/config/spring.xml | 42 ++++++++++++++++++-----------
 1 file changed, 27 insertions(+), 15 deletions(-)

diff --git a/Dataflow-Pipeline/config/spring.xml b/Dataflow-Pipeline/config/spring.xml
index 7aa7bd1..f0b9011 100755
--- a/Dataflow-Pipeline/config/spring.xml
+++ b/Dataflow-Pipeline/config/spring.xml
@@ -14,14 +14,15 @@
     <context:component-scan base-package="com.refinitiv.beamio.trepws.dataflow" />
 
     <bean name="streaming-options" factory-method="initStreaming" class="com.refinitiv.beamio.trepws.dataflow.Options">
-        <property name="project"             value="YOUR GCP PROJECT NAME" />
+        <property name="project"             value="tr-solutions-playground" />
         <property name="AppName"             value="StreamingPipeline"/>
-        <property name="zone"                value="YOUR PREFFERED GCP ZONE" />
-        <property name="region"              value="YOUR PREFFERED GCP REGION" />
-        <property name="location"            value="YOUR PREFFERED GCP LOCATION" />
+        <property name="zone"                value="europe-west1-b" />
+        <property name="region"              value="europe-west1"/>
+        <property name="location"            value="EU" />
         <property name="numWorkers"          value="1" />
         <property name="maxNumWorkers"       value="1" />
-        <property name="tempLocation"        value="YOUR GOOGLE STORAGE (gs://bucket/path)" />
+        <property name="stagingLocation"     value="gs://tr-solutions-playground-tickhistory/staging/" />
+        <property name="tempLocation"        value="gs://tr-solutions-playground-tickhistory/temp/" />
         <!-- single CPU, 3.75 GB mem -->
         <property name="workerMachineType"   value="n1-standard-1" />
         <property name="diskSizeGb"          value="20" />
@@ -35,21 +36,23 @@
         <!-- You'll probably have to set a unique position too -->
         <property name="jobName"     value="trep-websocket-io" />
 
-        <property name="hostname"    value="YOUR TREP/ADS/ERT hostname or IP address" />
-        <property name="port"        value="15000" />
+        <property name="hostname"    value="amer-3.pricing.streaming.edp.thomsonreuters.com" />  <!-- 10.132.0.66 -->
+        <property name="port"        value="443" /> <!-- 5900 -->
 
        <!-- For ERT -->
-        <property name="tokenAuth"           value="false" />
-        <property name="password"            value="YOUR ERT-GW-Password" />
+        <property name="tokenAuth"           value="true" />
+        <property name="password"            value="***REMOVED***" /><!-- YOUR ERT-GW-Password -->
         <property name="serviceDiscovery"    value="true" />
         <property name="region"              value="eu" /> <!-- eu or us -->
 
         <!-- The maximum number of ADS mounts (overridden if the number of  -->
         <!-- desired splits is smaller). If unset then 1 is used -->
         <!-- NOTE: for ERT maxMounts is forced to 1 to avoid clashes then performing token authentication. -->
-        <property name="maxMounts"   value="1" />
+        <property name="maxMounts"         value="5" />
 
-        <property name="username"    value="YOUR TREP/DACS id/ERT username" />
+        <!-- <property name="trepIoInstances"   value="3" /> -->
+
+        <property name="username"    value="***REMOVED***" />
         <property name="timeout"     value="60000" />
 
         <!-- can default to 256 if property removed -->
@@ -65,7 +68,7 @@
 
         <!-- Table is create if needed and append. Removing this property will not add a BigQuery write step to the pipeline -->
         <!-- DATASET must exit! -->
-        <property name="bigQuery" value="YOUR GCP PROJECT NAME:DATASET.TABLE" />
+        <property name="bigQuery" value="tr-solutions-playground:TEST.tickdb" />
 
          <!-- Time partitioning field -->
         <property name="partition"      value="Time" />
@@ -122,13 +125,22 @@
         <property name="ricList">
             <list>
                 <value>GBP=</value>
-                <value>.TRXVUSGOV10U</value>
-                <value>GB50YT=RR</value>
+                <value>EUR=</value>
+                <value>JPY=</value>
+                <value>NOK=</value>
+                <value>.FTSE</value>
+                <value>LCOc1</value>
+                <value>LCOc2</value>
+                <value>LCOc3</value>
+                <value>LCOc4</value>
+                <value>LCOc5</value>
+                <value>LCOc6</value>
+                <value>LCOc7</value>
             </list>
         </property>
 
         <!--  note if the above ricList is empty, use the following query to retrieve a list of RICs -->
-        <property name="ricListQuery" value="YOUR GCP PROJECT VIEW to return a list of RICs"/>
+        <!-- <property name="ricListQuery" value="YOUR GCP PROJECT VIEW to return a list of RICs"/> -->
 
     </bean>
 

From 34fde822c9a27661f5bc439222fe1d750a6504ab Mon Sep 17 00:00:00 2001
From: Clive Stokes <clive.stokes@refinitiv.com>
Date: Thu, 14 Nov 2019 11:56:30 +0000
Subject: [PATCH 09/14] Revert "Revert "updated Spring.xml""

This reverts commit 83b295cc7dd3020b38e46419a8c3441256a08de5.
---
 Dataflow-Pipeline/config/spring.xml | 42 +++++++++++------------------
 1 file changed, 15 insertions(+), 27 deletions(-)

diff --git a/Dataflow-Pipeline/config/spring.xml b/Dataflow-Pipeline/config/spring.xml
index 1a06679..7aa7bd1 100755
--- a/Dataflow-Pipeline/config/spring.xml
+++ b/Dataflow-Pipeline/config/spring.xml
@@ -14,15 +14,14 @@
     <context:component-scan base-package="com.refinitiv.beamio.trepws.dataflow" />
 
     <bean name="streaming-options" factory-method="initStreaming" class="com.refinitiv.beamio.trepws.dataflow.Options">
-        <property name="project"             value="tr-solutions-playground" />
+        <property name="project"             value="YOUR GCP PROJECT NAME" />
         <property name="AppName"             value="StreamingPipeline"/>
-        <property name="zone"                value="europe-west1-b" />
-        <property name="region"              value="europe-west1"/>
-        <property name="location"            value="EU" />
+        <property name="zone"                value="YOUR PREFFERED GCP ZONE" />
+        <property name="region"              value="YOUR PREFFERED GCP REGION" />
+        <property name="location"            value="YOUR PREFFERED GCP LOCATION" />
         <property name="numWorkers"          value="1" />
         <property name="maxNumWorkers"       value="1" />
-        <property name="stagingLocation"     value="gs://tr-solutions-playground-tickhistory/staging/" />
-        <property name="tempLocation"        value="gs://tr-solutions-playground-tickhistory/temp/" />
+        <property name="tempLocation"        value="YOUR GOOGLE STORAGE (gs://bucket/path)" />
         <!-- single CPU, 3.75 GB mem -->
         <property name="workerMachineType"   value="n1-standard-1" />
         <property name="diskSizeGb"          value="20" />
@@ -36,23 +35,21 @@
         <!-- You'll probably have to set a unique position too -->
         <property name="jobName"     value="trep-websocket-io" />
 
-        <property name="hostname"    value="amer-3.pricing.streaming.edp.thomsonreuters.com" />  <!-- 10.132.0.66 -->
-        <property name="port"        value="443" /> <!-- 5900 -->
+        <property name="hostname"    value="YOUR TREP/ADS/ERT hostname or IP address" />
+        <property name="port"        value="15000" />
 
        <!-- For ERT -->
-        <property name="tokenAuth"           value="true" />
-        <property name="password"            value="FEfEMWT{$DvM6MUavwgBwATxhfgQhA" /><!-- YOUR ERT-GW-Password -->
+        <property name="tokenAuth"           value="false" />
+        <property name="password"            value="YOUR ERT-GW-Password" />
         <property name="serviceDiscovery"    value="true" />
         <property name="region"              value="eu" /> <!-- eu or us -->
 
         <!-- The maximum number of ADS mounts (overridden if the number of  -->
         <!-- desired splits is smaller). If unset then 1 is used -->
         <!-- NOTE: for ERT maxMounts is forced to 1 to avoid clashes then performing token authentication. -->
-        <property name="maxMounts"         value="5" />
+        <property name="maxMounts"   value="1" />
 
-        <!-- <property name="trepIoInstances"   value="3" /> -->
-
-        <property name="username"    value="GE-A-01103867-3-532" />
+        <property name="username"    value="YOUR TREP/DACS id/ERT username" />
         <property name="timeout"     value="60000" />
 
         <!-- can default to 256 if property removed -->
@@ -68,7 +65,7 @@
 
         <!-- Table is create if needed and append. Removing this property will not add a BigQuery write step to the pipeline -->
         <!-- DATASET must exit! -->
-        <property name="bigQuery" value="tr-solutions-playground:TEST.tickdb" />
+        <property name="bigQuery" value="YOUR GCP PROJECT NAME:DATASET.TABLE" />
 
          <!-- Time partitioning field -->
         <property name="partition"      value="Time" />
@@ -125,22 +122,13 @@
         <property name="ricList">
             <list>
                 <value>GBP=</value>
-                <value>EUR=</value>
-                <value>JPY=</value>
-                <value>NOK=</value>
-                <value>.FTSE</value>
-                <value>LCOc1</value>
-                <value>LCOc2</value>
-                <value>LCOc3</value>
-                <value>LCOc4</value>
-                <value>LCOc5</value>
-                <value>LCOc6</value>
-                <value>LCOc7</value>
+                <value>.TRXVUSGOV10U</value>
+                <value>GB50YT=RR</value>
             </list>
         </property>
 
         <!--  note if the above ricList is empty, use the following query to retrieve a list of RICs -->
-        <!-- <property name="ricListQuery" value="YOUR GCP PROJECT VIEW to return a list of RICs"/> -->
+        <property name="ricListQuery" value="YOUR GCP PROJECT VIEW to return a list of RICs"/>
 
     </bean>
 

From 2bd8ad819c3ed8594a4fb2766087ee4c67763a42 Mon Sep 17 00:00:00 2001
From: Clive Stokes <clive.stokes@refinitiv.com>
Date: Thu, 14 Nov 2019 11:56:30 +0000
Subject: [PATCH 10/14] Revert "Revert "updated Spring.xml""

This reverts commit 12fefeeb4467cb509f79e95e5bf240c5b60a17e7.
---
 Dataflow-Pipeline/config/spring.xml | 42 +++++++++++------------------
 1 file changed, 15 insertions(+), 27 deletions(-)

diff --git a/Dataflow-Pipeline/config/spring.xml b/Dataflow-Pipeline/config/spring.xml
index f0b9011..7aa7bd1 100755
--- a/Dataflow-Pipeline/config/spring.xml
+++ b/Dataflow-Pipeline/config/spring.xml
@@ -14,15 +14,14 @@
     <context:component-scan base-package="com.refinitiv.beamio.trepws.dataflow" />
 
     <bean name="streaming-options" factory-method="initStreaming" class="com.refinitiv.beamio.trepws.dataflow.Options">
-        <property name="project"             value="tr-solutions-playground" />
+        <property name="project"             value="YOUR GCP PROJECT NAME" />
         <property name="AppName"             value="StreamingPipeline"/>
-        <property name="zone"                value="europe-west1-b" />
-        <property name="region"              value="europe-west1"/>
-        <property name="location"            value="EU" />
+        <property name="zone"                value="YOUR PREFFERED GCP ZONE" />
+        <property name="region"              value="YOUR PREFFERED GCP REGION" />
+        <property name="location"            value="YOUR PREFFERED GCP LOCATION" />
         <property name="numWorkers"          value="1" />
         <property name="maxNumWorkers"       value="1" />
-        <property name="stagingLocation"     value="gs://tr-solutions-playground-tickhistory/staging/" />
-        <property name="tempLocation"        value="gs://tr-solutions-playground-tickhistory/temp/" />
+        <property name="tempLocation"        value="YOUR GOOGLE STORAGE (gs://bucket/path)" />
         <!-- single CPU, 3.75 GB mem -->
         <property name="workerMachineType"   value="n1-standard-1" />
         <property name="diskSizeGb"          value="20" />
@@ -36,23 +35,21 @@
         <!-- You'll probably have to set a unique position too -->
         <property name="jobName"     value="trep-websocket-io" />
 
-        <property name="hostname"    value="amer-3.pricing.streaming.edp.thomsonreuters.com" />  <!-- 10.132.0.66 -->
-        <property name="port"        value="443" /> <!-- 5900 -->
+        <property name="hostname"    value="YOUR TREP/ADS/ERT hostname or IP address" />
+        <property name="port"        value="15000" />
 
        <!-- For ERT -->
-        <property name="tokenAuth"           value="true" />
-        <property name="password"            value="***REMOVED***" /><!-- YOUR ERT-GW-Password -->
+        <property name="tokenAuth"           value="false" />
+        <property name="password"            value="YOUR ERT-GW-Password" />
         <property name="serviceDiscovery"    value="true" />
         <property name="region"              value="eu" /> <!-- eu or us -->
 
         <!-- The maximum number of ADS mounts (overridden if the number of  -->
         <!-- desired splits is smaller). If unset then 1 is used -->
         <!-- NOTE: for ERT maxMounts is forced to 1 to avoid clashes then performing token authentication. -->
-        <property name="maxMounts"         value="5" />
+        <property name="maxMounts"   value="1" />
 
-        <!-- <property name="trepIoInstances"   value="3" /> -->
-
-        <property name="username"    value="***REMOVED***" />
+        <property name="username"    value="YOUR TREP/DACS id/ERT username" />
         <property name="timeout"     value="60000" />
 
         <!-- can default to 256 if property removed -->
@@ -68,7 +65,7 @@
 
         <!-- Table is create if needed and append. Removing this property will not add a BigQuery write step to the pipeline -->
         <!-- DATASET must exit! -->
-        <property name="bigQuery" value="tr-solutions-playground:TEST.tickdb" />
+        <property name="bigQuery" value="YOUR GCP PROJECT NAME:DATASET.TABLE" />
 
          <!-- Time partitioning field -->
         <property name="partition"      value="Time" />
@@ -125,22 +122,13 @@
         <property name="ricList">
             <list>
                 <value>GBP=</value>
-                <value>EUR=</value>
-                <value>JPY=</value>
-                <value>NOK=</value>
-                <value>.FTSE</value>
-                <value>LCOc1</value>
-                <value>LCOc2</value>
-                <value>LCOc3</value>
-                <value>LCOc4</value>
-                <value>LCOc5</value>
-                <value>LCOc6</value>
-                <value>LCOc7</value>
+                <value>.TRXVUSGOV10U</value>
+                <value>GB50YT=RR</value>
             </list>
         </property>
 
         <!--  note if the above ricList is empty, use the following query to retrieve a list of RICs -->
-        <!-- <property name="ricListQuery" value="YOUR GCP PROJECT VIEW to return a list of RICs"/> -->
+        <property name="ricListQuery" value="YOUR GCP PROJECT VIEW to return a list of RICs"/>
 
     </bean>
 

From 86298de4d0ab4d431fccf72ee853713319cbdc03 Mon Sep 17 00:00:00 2001
From: Clive Stokes <clive.stokes@refinitiv.com>
Date: Thu, 14 Nov 2019 14:00:02 +0000
Subject: [PATCH 11/14] Support JDK 11, updated the Beam version to 12.16
 version 1.2.1

---
 Dataflow-Pipeline/config/spring.xml           | 42 ++++++++++++-------
 Dataflow-Pipeline/pom.xml                     |  6 +--
 .../beamio/trepws/dataflow/PipelineBean.java  | 10 +++++
 TrepWs-IO/pom.xml                             |  2 +-
 pom.xml                                       |  2 +-
 5 files changed, 42 insertions(+), 20 deletions(-)

diff --git a/Dataflow-Pipeline/config/spring.xml b/Dataflow-Pipeline/config/spring.xml
index 7aa7bd1..1a06679 100755
--- a/Dataflow-Pipeline/config/spring.xml
+++ b/Dataflow-Pipeline/config/spring.xml
@@ -14,14 +14,15 @@
     <context:component-scan base-package="com.refinitiv.beamio.trepws.dataflow" />
 
     <bean name="streaming-options" factory-method="initStreaming" class="com.refinitiv.beamio.trepws.dataflow.Options">
-        <property name="project"             value="YOUR GCP PROJECT NAME" />
+        <property name="project"             value="tr-solutions-playground" />
         <property name="AppName"             value="StreamingPipeline"/>
-        <property name="zone"                value="YOUR PREFFERED GCP ZONE" />
-        <property name="region"              value="YOUR PREFFERED GCP REGION" />
-        <property name="location"            value="YOUR PREFFERED GCP LOCATION" />
+        <property name="zone"                value="europe-west1-b" />
+        <property name="region"              value="europe-west1"/>
+        <property name="location"            value="EU" />
         <property name="numWorkers"          value="1" />
         <property name="maxNumWorkers"       value="1" />
-        <property name="tempLocation"        value="YOUR GOOGLE STORAGE (gs://bucket/path)" />
+        <property name="stagingLocation"     value="gs://tr-solutions-playground-tickhistory/staging/" />
+        <property name="tempLocation"        value="gs://tr-solutions-playground-tickhistory/temp/" />
         <!-- single CPU, 3.75 GB mem -->
         <property name="workerMachineType"   value="n1-standard-1" />
         <property name="diskSizeGb"          value="20" />
@@ -35,21 +36,23 @@
         <!-- You'll probably have to set a unique position too -->
         <property name="jobName"     value="trep-websocket-io" />
 
-        <property name="hostname"    value="YOUR TREP/ADS/ERT hostname or IP address" />
-        <property name="port"        value="15000" />
+        <property name="hostname"    value="amer-3.pricing.streaming.edp.thomsonreuters.com" />  <!-- 10.132.0.66 -->
+        <property name="port"        value="443" /> <!-- 5900 -->
 
        <!-- For ERT -->
-        <property name="tokenAuth"           value="false" />
-        <property name="password"            value="YOUR ERT-GW-Password" />
+        <property name="tokenAuth"           value="true" />
+        <property name="password"            value="FEfEMWT{$DvM6MUavwgBwATxhfgQhA" /><!-- YOUR ERT-GW-Password -->
         <property name="serviceDiscovery"    value="true" />
         <property name="region"              value="eu" /> <!-- eu or us -->
 
         <!-- The maximum number of ADS mounts (overridden if the number of  -->
         <!-- desired splits is smaller). If unset then 1 is used -->
         <!-- NOTE: for ERT maxMounts is forced to 1 to avoid clashes then performing token authentication. -->
-        <property name="maxMounts"   value="1" />
+        <property name="maxMounts"         value="5" />
 
-        <property name="username"    value="YOUR TREP/DACS id/ERT username" />
+        <!-- <property name="trepIoInstances"   value="3" /> -->
+
+        <property name="username"    value="GE-A-01103867-3-532" />
         <property name="timeout"     value="60000" />
 
         <!-- can default to 256 if property removed -->
@@ -65,7 +68,7 @@
 
         <!-- Table is create if needed and append. Removing this property will not add a BigQuery write step to the pipeline -->
         <!-- DATASET must exit! -->
-        <property name="bigQuery" value="YOUR GCP PROJECT NAME:DATASET.TABLE" />
+        <property name="bigQuery" value="tr-solutions-playground:TEST.tickdb" />
 
          <!-- Time partitioning field -->
         <property name="partition"      value="Time" />
@@ -122,13 +125,22 @@
         <property name="ricList">
             <list>
                 <value>GBP=</value>
-                <value>.TRXVUSGOV10U</value>
-                <value>GB50YT=RR</value>
+                <value>EUR=</value>
+                <value>JPY=</value>
+                <value>NOK=</value>
+                <value>.FTSE</value>
+                <value>LCOc1</value>
+                <value>LCOc2</value>
+                <value>LCOc3</value>
+                <value>LCOc4</value>
+                <value>LCOc5</value>
+                <value>LCOc6</value>
+                <value>LCOc7</value>
             </list>
         </property>
 
         <!--  note if the above ricList is empty, use the following query to retrieve a list of RICs -->
-        <property name="ricListQuery" value="YOUR GCP PROJECT VIEW to return a list of RICs"/>
+        <!-- <property name="ricListQuery" value="YOUR GCP PROJECT VIEW to return a list of RICs"/> -->
 
     </bean>
 
diff --git a/Dataflow-Pipeline/pom.xml b/Dataflow-Pipeline/pom.xml
index f5f9527..c3013d7 100644
--- a/Dataflow-Pipeline/pom.xml
+++ b/Dataflow-Pipeline/pom.xml
@@ -7,13 +7,13 @@
     <parent>
         <groupId>com.refinitiv.beamio</groupId>
         <artifactId>Trep-Websocket-IO</artifactId>
-        <version>1.2.0</version>
+        <version>1.2.1</version>
     </parent>
 
     <artifactId>trepws-pipeline</artifactId>
 
     <properties>
-        <beam.version>2.12.0</beam.version>
+        <beam.version>2.16.0</beam.version>
         <trepio.version>1.2.0</trepio.version>
         <spring.version>5.1.6.RELEASE</spring.version>
         <spring.boot.version>2.1.4.RELEASE</spring.boot.version>
@@ -230,7 +230,7 @@
 
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
-                <version>2.3</version>
+                <version>2.3</version><!--$NO-MVN-MAN-VER$-->
                 <configuration>
                     <appendAssemblyId>false</appendAssemblyId>
                     <finalName>${project.name}_${project.version}
diff --git a/Dataflow-Pipeline/src/main/java/com/refinitiv/beamio/trepws/dataflow/PipelineBean.java b/Dataflow-Pipeline/src/main/java/com/refinitiv/beamio/trepws/dataflow/PipelineBean.java
index 65616e4..fd03943 100755
--- a/Dataflow-Pipeline/src/main/java/com/refinitiv/beamio/trepws/dataflow/PipelineBean.java
+++ b/Dataflow-Pipeline/src/main/java/com/refinitiv/beamio/trepws/dataflow/PipelineBean.java
@@ -17,11 +17,14 @@
 
 import static com.refinitiv.beamio.trepwebsockets.TrepWsIO.InstrumentTuple;
 
+import java.io.File;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 import org.apache.beam.sdk.Pipeline;
 import org.apache.beam.sdk.io.gcp.bigquery.BigQueryIO;
@@ -85,6 +88,11 @@ public PipelineBean(ProjectOptions options) {
 		this.options = options;
 		options.setStreaming(true);
 		options.setStableUniqueNames(CheckEnabled.OFF);
+		options.setFilesToStage(Arrays.asList(
+		        System.getProperty("java.class.path")
+		        .split(File.pathSeparator)).stream()
+                .map(entry -> new File(entry)
+                        .toString()).collect(Collectors.toList()));
 
 		logger.info(options.getProject());
 	}
@@ -95,6 +103,8 @@ public void runPipeline(String[] args) throws JobException, InterruptedException
 		logger.info(String.format("runPipeline %s %s...", options.getAppName(), options.getJobName()));
 		logger.info(this.toString());
 
+
+
         List<String> rics = Lists.newArrayList();
 
         try {
diff --git a/TrepWs-IO/pom.xml b/TrepWs-IO/pom.xml
index b336645..51d4222 100644
--- a/TrepWs-IO/pom.xml
+++ b/TrepWs-IO/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.refinitiv.beamio</groupId>
         <artifactId>Trep-Websocket-IO</artifactId>
-        <version>1.2.0</version>
+        <version>1.2.1</version>
     </parent>
 
     <artifactId>trepws-io</artifactId>
diff --git a/pom.xml b/pom.xml
index 81a1d99..cd84e2f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
     <groupId>com.refinitiv.beamio</groupId>
     <artifactId>Trep-Websocket-IO</artifactId>
     <packaging>pom</packaging>
-    <version>1.2.0</version>
+    <version>1.2.1</version>
     <name>Dataflow TREP Websocket Parent Project</name>
 
     <modules>

From 0ecc026b679ea112336ac7011f87a6bb4d85a5ba Mon Sep 17 00:00:00 2001
From: Clive Stokes <clive.stokes@refinitiv.com>
Date: Thu, 14 Nov 2019 14:00:02 +0000
Subject: [PATCH 12/14] Support JDK 11, updated the Beam version to 12.16
 version 1.2.1

---
 Dataflow-Pipeline/config/spring.xml           | 42 ++++++++++++-------
 Dataflow-Pipeline/pom.xml                     |  6 +--
 .../beamio/trepws/dataflow/PipelineBean.java  | 10 +++++
 TrepWs-IO/pom.xml                             |  2 +-
 pom.xml                                       |  2 +-
 5 files changed, 42 insertions(+), 20 deletions(-)

diff --git a/Dataflow-Pipeline/config/spring.xml b/Dataflow-Pipeline/config/spring.xml
index 7aa7bd1..f0b9011 100755
--- a/Dataflow-Pipeline/config/spring.xml
+++ b/Dataflow-Pipeline/config/spring.xml
@@ -14,14 +14,15 @@
     <context:component-scan base-package="com.refinitiv.beamio.trepws.dataflow" />
 
     <bean name="streaming-options" factory-method="initStreaming" class="com.refinitiv.beamio.trepws.dataflow.Options">
-        <property name="project"             value="YOUR GCP PROJECT NAME" />
+        <property name="project"             value="tr-solutions-playground" />
         <property name="AppName"             value="StreamingPipeline"/>
-        <property name="zone"                value="YOUR PREFFERED GCP ZONE" />
-        <property name="region"              value="YOUR PREFFERED GCP REGION" />
-        <property name="location"            value="YOUR PREFFERED GCP LOCATION" />
+        <property name="zone"                value="europe-west1-b" />
+        <property name="region"              value="europe-west1"/>
+        <property name="location"            value="EU" />
         <property name="numWorkers"          value="1" />
         <property name="maxNumWorkers"       value="1" />
-        <property name="tempLocation"        value="YOUR GOOGLE STORAGE (gs://bucket/path)" />
+        <property name="stagingLocation"     value="gs://tr-solutions-playground-tickhistory/staging/" />
+        <property name="tempLocation"        value="gs://tr-solutions-playground-tickhistory/temp/" />
         <!-- single CPU, 3.75 GB mem -->
         <property name="workerMachineType"   value="n1-standard-1" />
         <property name="diskSizeGb"          value="20" />
@@ -35,21 +36,23 @@
         <!-- You'll probably have to set a unique position too -->
         <property name="jobName"     value="trep-websocket-io" />
 
-        <property name="hostname"    value="YOUR TREP/ADS/ERT hostname or IP address" />
-        <property name="port"        value="15000" />
+        <property name="hostname"    value="amer-3.pricing.streaming.edp.thomsonreuters.com" />  <!-- 10.132.0.66 -->
+        <property name="port"        value="443" /> <!-- 5900 -->
 
        <!-- For ERT -->
-        <property name="tokenAuth"           value="false" />
-        <property name="password"            value="YOUR ERT-GW-Password" />
+        <property name="tokenAuth"           value="true" />
+        <property name="password"            value="***REMOVED***" /><!-- YOUR ERT-GW-Password -->
         <property name="serviceDiscovery"    value="true" />
         <property name="region"              value="eu" /> <!-- eu or us -->
 
         <!-- The maximum number of ADS mounts (overridden if the number of  -->
         <!-- desired splits is smaller). If unset then 1 is used -->
         <!-- NOTE: for ERT maxMounts is forced to 1 to avoid clashes then performing token authentication. -->
-        <property name="maxMounts"   value="1" />
+        <property name="maxMounts"         value="5" />
 
-        <property name="username"    value="YOUR TREP/DACS id/ERT username" />
+        <!-- <property name="trepIoInstances"   value="3" /> -->
+
+        <property name="username"    value="***REMOVED***" />
         <property name="timeout"     value="60000" />
 
         <!-- can default to 256 if property removed -->
@@ -65,7 +68,7 @@
 
         <!-- Table is create if needed and append. Removing this property will not add a BigQuery write step to the pipeline -->
         <!-- DATASET must exit! -->
-        <property name="bigQuery" value="YOUR GCP PROJECT NAME:DATASET.TABLE" />
+        <property name="bigQuery" value="tr-solutions-playground:TEST.tickdb" />
 
          <!-- Time partitioning field -->
         <property name="partition"      value="Time" />
@@ -122,13 +125,22 @@
         <property name="ricList">
             <list>
                 <value>GBP=</value>
-                <value>.TRXVUSGOV10U</value>
-                <value>GB50YT=RR</value>
+                <value>EUR=</value>
+                <value>JPY=</value>
+                <value>NOK=</value>
+                <value>.FTSE</value>
+                <value>LCOc1</value>
+                <value>LCOc2</value>
+                <value>LCOc3</value>
+                <value>LCOc4</value>
+                <value>LCOc5</value>
+                <value>LCOc6</value>
+                <value>LCOc7</value>
             </list>
         </property>
 
         <!--  note if the above ricList is empty, use the following query to retrieve a list of RICs -->
-        <property name="ricListQuery" value="YOUR GCP PROJECT VIEW to return a list of RICs"/>
+        <!-- <property name="ricListQuery" value="YOUR GCP PROJECT VIEW to return a list of RICs"/> -->
 
     </bean>
 
diff --git a/Dataflow-Pipeline/pom.xml b/Dataflow-Pipeline/pom.xml
index f5f9527..c3013d7 100644
--- a/Dataflow-Pipeline/pom.xml
+++ b/Dataflow-Pipeline/pom.xml
@@ -7,13 +7,13 @@
     <parent>
         <groupId>com.refinitiv.beamio</groupId>
         <artifactId>Trep-Websocket-IO</artifactId>
-        <version>1.2.0</version>
+        <version>1.2.1</version>
     </parent>
 
     <artifactId>trepws-pipeline</artifactId>
 
     <properties>
-        <beam.version>2.12.0</beam.version>
+        <beam.version>2.16.0</beam.version>
         <trepio.version>1.2.0</trepio.version>
         <spring.version>5.1.6.RELEASE</spring.version>
         <spring.boot.version>2.1.4.RELEASE</spring.boot.version>
@@ -230,7 +230,7 @@
 
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
-                <version>2.3</version>
+                <version>2.3</version><!--$NO-MVN-MAN-VER$-->
                 <configuration>
                     <appendAssemblyId>false</appendAssemblyId>
                     <finalName>${project.name}_${project.version}
diff --git a/Dataflow-Pipeline/src/main/java/com/refinitiv/beamio/trepws/dataflow/PipelineBean.java b/Dataflow-Pipeline/src/main/java/com/refinitiv/beamio/trepws/dataflow/PipelineBean.java
index 65616e4..fd03943 100755
--- a/Dataflow-Pipeline/src/main/java/com/refinitiv/beamio/trepws/dataflow/PipelineBean.java
+++ b/Dataflow-Pipeline/src/main/java/com/refinitiv/beamio/trepws/dataflow/PipelineBean.java
@@ -17,11 +17,14 @@
 
 import static com.refinitiv.beamio.trepwebsockets.TrepWsIO.InstrumentTuple;
 
+import java.io.File;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 import org.apache.beam.sdk.Pipeline;
 import org.apache.beam.sdk.io.gcp.bigquery.BigQueryIO;
@@ -85,6 +88,11 @@ public PipelineBean(ProjectOptions options) {
 		this.options = options;
 		options.setStreaming(true);
 		options.setStableUniqueNames(CheckEnabled.OFF);
+		options.setFilesToStage(Arrays.asList(
+		        System.getProperty("java.class.path")
+		        .split(File.pathSeparator)).stream()
+                .map(entry -> new File(entry)
+                        .toString()).collect(Collectors.toList()));
 
 		logger.info(options.getProject());
 	}
@@ -95,6 +103,8 @@ public void runPipeline(String[] args) throws JobException, InterruptedException
 		logger.info(String.format("runPipeline %s %s...", options.getAppName(), options.getJobName()));
 		logger.info(this.toString());
 
+
+
         List<String> rics = Lists.newArrayList();
 
         try {
diff --git a/TrepWs-IO/pom.xml b/TrepWs-IO/pom.xml
index b336645..51d4222 100644
--- a/TrepWs-IO/pom.xml
+++ b/TrepWs-IO/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.refinitiv.beamio</groupId>
         <artifactId>Trep-Websocket-IO</artifactId>
-        <version>1.2.0</version>
+        <version>1.2.1</version>
     </parent>
 
     <artifactId>trepws-io</artifactId>
diff --git a/pom.xml b/pom.xml
index 81a1d99..cd84e2f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
     <groupId>com.refinitiv.beamio</groupId>
     <artifactId>Trep-Websocket-IO</artifactId>
     <packaging>pom</packaging>
-    <version>1.2.0</version>
+    <version>1.2.1</version>
     <name>Dataflow TREP Websocket Parent Project</name>
 
     <modules>

From cf07f5b7a895a50e35a49e83355f853839937553 Mon Sep 17 00:00:00 2001
From: Clive Stokes <clive.stokes@refinitiv.com>
Date: Thu, 14 Nov 2019 14:06:36 +0000
Subject: [PATCH 13/14] Revert spring.xml

---
 Dataflow-Pipeline/config/spring.xml | 42 +++++++++++------------------
 1 file changed, 15 insertions(+), 27 deletions(-)

diff --git a/Dataflow-Pipeline/config/spring.xml b/Dataflow-Pipeline/config/spring.xml
index 1a06679..7aa7bd1 100755
--- a/Dataflow-Pipeline/config/spring.xml
+++ b/Dataflow-Pipeline/config/spring.xml
@@ -14,15 +14,14 @@
     <context:component-scan base-package="com.refinitiv.beamio.trepws.dataflow" />
 
     <bean name="streaming-options" factory-method="initStreaming" class="com.refinitiv.beamio.trepws.dataflow.Options">
-        <property name="project"             value="tr-solutions-playground" />
+        <property name="project"             value="YOUR GCP PROJECT NAME" />
         <property name="AppName"             value="StreamingPipeline"/>
-        <property name="zone"                value="europe-west1-b" />
-        <property name="region"              value="europe-west1"/>
-        <property name="location"            value="EU" />
+        <property name="zone"                value="YOUR PREFFERED GCP ZONE" />
+        <property name="region"              value="YOUR PREFFERED GCP REGION" />
+        <property name="location"            value="YOUR PREFFERED GCP LOCATION" />
         <property name="numWorkers"          value="1" />
         <property name="maxNumWorkers"       value="1" />
-        <property name="stagingLocation"     value="gs://tr-solutions-playground-tickhistory/staging/" />
-        <property name="tempLocation"        value="gs://tr-solutions-playground-tickhistory/temp/" />
+        <property name="tempLocation"        value="YOUR GOOGLE STORAGE (gs://bucket/path)" />
         <!-- single CPU, 3.75 GB mem -->
         <property name="workerMachineType"   value="n1-standard-1" />
         <property name="diskSizeGb"          value="20" />
@@ -36,23 +35,21 @@
         <!-- You'll probably have to set a unique position too -->
         <property name="jobName"     value="trep-websocket-io" />
 
-        <property name="hostname"    value="amer-3.pricing.streaming.edp.thomsonreuters.com" />  <!-- 10.132.0.66 -->
-        <property name="port"        value="443" /> <!-- 5900 -->
+        <property name="hostname"    value="YOUR TREP/ADS/ERT hostname or IP address" />
+        <property name="port"        value="15000" />
 
        <!-- For ERT -->
-        <property name="tokenAuth"           value="true" />
-        <property name="password"            value="FEfEMWT{$DvM6MUavwgBwATxhfgQhA" /><!-- YOUR ERT-GW-Password -->
+        <property name="tokenAuth"           value="false" />
+        <property name="password"            value="YOUR ERT-GW-Password" />
         <property name="serviceDiscovery"    value="true" />
         <property name="region"              value="eu" /> <!-- eu or us -->
 
         <!-- The maximum number of ADS mounts (overridden if the number of  -->
         <!-- desired splits is smaller). If unset then 1 is used -->
         <!-- NOTE: for ERT maxMounts is forced to 1 to avoid clashes then performing token authentication. -->
-        <property name="maxMounts"         value="5" />
+        <property name="maxMounts"   value="1" />
 
-        <!-- <property name="trepIoInstances"   value="3" /> -->
-
-        <property name="username"    value="GE-A-01103867-3-532" />
+        <property name="username"    value="YOUR TREP/DACS id/ERT username" />
         <property name="timeout"     value="60000" />
 
         <!-- can default to 256 if property removed -->
@@ -68,7 +65,7 @@
 
         <!-- Table is create if needed and append. Removing this property will not add a BigQuery write step to the pipeline -->
         <!-- DATASET must exit! -->
-        <property name="bigQuery" value="tr-solutions-playground:TEST.tickdb" />
+        <property name="bigQuery" value="YOUR GCP PROJECT NAME:DATASET.TABLE" />
 
          <!-- Time partitioning field -->
         <property name="partition"      value="Time" />
@@ -125,22 +122,13 @@
         <property name="ricList">
             <list>
                 <value>GBP=</value>
-                <value>EUR=</value>
-                <value>JPY=</value>
-                <value>NOK=</value>
-                <value>.FTSE</value>
-                <value>LCOc1</value>
-                <value>LCOc2</value>
-                <value>LCOc3</value>
-                <value>LCOc4</value>
-                <value>LCOc5</value>
-                <value>LCOc6</value>
-                <value>LCOc7</value>
+                <value>.TRXVUSGOV10U</value>
+                <value>GB50YT=RR</value>
             </list>
         </property>
 
         <!--  note if the above ricList is empty, use the following query to retrieve a list of RICs -->
-        <!-- <property name="ricListQuery" value="YOUR GCP PROJECT VIEW to return a list of RICs"/> -->
+        <property name="ricListQuery" value="YOUR GCP PROJECT VIEW to return a list of RICs"/>
 
     </bean>
 

From 2bb673e92b9e99b39876b5158c23577f01a85191 Mon Sep 17 00:00:00 2001
From: Clive Stokes <clive.stokes@refinitiv.com>
Date: Thu, 14 Nov 2019 14:06:36 +0000
Subject: [PATCH 14/14] Revert spring.xml

---
 Dataflow-Pipeline/config/spring.xml | 42 +++++++++++------------------
 1 file changed, 15 insertions(+), 27 deletions(-)

diff --git a/Dataflow-Pipeline/config/spring.xml b/Dataflow-Pipeline/config/spring.xml
index f0b9011..7aa7bd1 100755
--- a/Dataflow-Pipeline/config/spring.xml
+++ b/Dataflow-Pipeline/config/spring.xml
@@ -14,15 +14,14 @@
     <context:component-scan base-package="com.refinitiv.beamio.trepws.dataflow" />
 
     <bean name="streaming-options" factory-method="initStreaming" class="com.refinitiv.beamio.trepws.dataflow.Options">
-        <property name="project"             value="tr-solutions-playground" />
+        <property name="project"             value="YOUR GCP PROJECT NAME" />
         <property name="AppName"             value="StreamingPipeline"/>
-        <property name="zone"                value="europe-west1-b" />
-        <property name="region"              value="europe-west1"/>
-        <property name="location"            value="EU" />
+        <property name="zone"                value="YOUR PREFFERED GCP ZONE" />
+        <property name="region"              value="YOUR PREFFERED GCP REGION" />
+        <property name="location"            value="YOUR PREFFERED GCP LOCATION" />
         <property name="numWorkers"          value="1" />
         <property name="maxNumWorkers"       value="1" />
-        <property name="stagingLocation"     value="gs://tr-solutions-playground-tickhistory/staging/" />
-        <property name="tempLocation"        value="gs://tr-solutions-playground-tickhistory/temp/" />
+        <property name="tempLocation"        value="YOUR GOOGLE STORAGE (gs://bucket/path)" />
         <!-- single CPU, 3.75 GB mem -->
         <property name="workerMachineType"   value="n1-standard-1" />
         <property name="diskSizeGb"          value="20" />
@@ -36,23 +35,21 @@
         <!-- You'll probably have to set a unique position too -->
         <property name="jobName"     value="trep-websocket-io" />
 
-        <property name="hostname"    value="amer-3.pricing.streaming.edp.thomsonreuters.com" />  <!-- 10.132.0.66 -->
-        <property name="port"        value="443" /> <!-- 5900 -->
+        <property name="hostname"    value="YOUR TREP/ADS/ERT hostname or IP address" />
+        <property name="port"        value="15000" />
 
        <!-- For ERT -->
-        <property name="tokenAuth"           value="true" />
-        <property name="password"            value="***REMOVED***" /><!-- YOUR ERT-GW-Password -->
+        <property name="tokenAuth"           value="false" />
+        <property name="password"            value="YOUR ERT-GW-Password" />
         <property name="serviceDiscovery"    value="true" />
         <property name="region"              value="eu" /> <!-- eu or us -->
 
         <!-- The maximum number of ADS mounts (overridden if the number of  -->
         <!-- desired splits is smaller). If unset then 1 is used -->
         <!-- NOTE: for ERT maxMounts is forced to 1 to avoid clashes then performing token authentication. -->
-        <property name="maxMounts"         value="5" />
+        <property name="maxMounts"   value="1" />
 
-        <!-- <property name="trepIoInstances"   value="3" /> -->
-
-        <property name="username"    value="***REMOVED***" />
+        <property name="username"    value="YOUR TREP/DACS id/ERT username" />
         <property name="timeout"     value="60000" />
 
         <!-- can default to 256 if property removed -->
@@ -68,7 +65,7 @@
 
         <!-- Table is create if needed and append. Removing this property will not add a BigQuery write step to the pipeline -->
         <!-- DATASET must exit! -->
-        <property name="bigQuery" value="tr-solutions-playground:TEST.tickdb" />
+        <property name="bigQuery" value="YOUR GCP PROJECT NAME:DATASET.TABLE" />
 
          <!-- Time partitioning field -->
         <property name="partition"      value="Time" />
@@ -125,22 +122,13 @@
         <property name="ricList">
             <list>
                 <value>GBP=</value>
-                <value>EUR=</value>
-                <value>JPY=</value>
-                <value>NOK=</value>
-                <value>.FTSE</value>
-                <value>LCOc1</value>
-                <value>LCOc2</value>
-                <value>LCOc3</value>
-                <value>LCOc4</value>
-                <value>LCOc5</value>
-                <value>LCOc6</value>
-                <value>LCOc7</value>
+                <value>.TRXVUSGOV10U</value>
+                <value>GB50YT=RR</value>
             </list>
         </property>
 
         <!--  note if the above ricList is empty, use the following query to retrieve a list of RICs -->
-        <!-- <property name="ricListQuery" value="YOUR GCP PROJECT VIEW to return a list of RICs"/> -->
+        <property name="ricListQuery" value="YOUR GCP PROJECT VIEW to return a list of RICs"/>
 
     </bean>