Merge pull request #69 from zowe/user/jstruga/merge-staging-intorc

Merge staging into rc

.github/workflows/build_test.yml

@@ -54,7 +54,7 @@ jobs:
       - name: '[Prep 3] Setup Node'
         uses: actions/setup-node@v2
         with:
-          node-version: 10.24.1
+          node-version: 16.15.0
 
       - name: '[Prep 4] Setup jFrog CLI'
         uses: jfrog/setup-jfrog-cli@v2
@@ -69,6 +69,7 @@ jobs:
           github-email: ${{ secrets.ZOWE_ROBOT_EMAIL }}
           github-branch: ${{ github.event.inputs.BRANCH_NAME }}
           release: ${{ github.event.inputs.PERFORM_RELEASE }}
+          plugin-version: ${{ github.event.inputs.BUILD_VERSION }}
 
       - name: '[Prep 6] build'
         uses: zowe-actions/zlux-builds/plugins/[email protected]/main
@@ -84,3 +85,9 @@ jobs:
 
       - name: '[Prep 8] deploy '
         uses: zowe-actions/zlux-builds/plugins/[email protected]/main
+
+      - name: '[Prep 9] Bump Staging Version '
+        if: ${{ github.event.inputs.PERFORM_RELEASE == 'true' && env.RELEASE == 'true' }}
+        uses: zowe-actions/zlux-builds/plugins/[email protected]/main
+        env: 
+         GITHUB_TOKEN: ${{ secrets.ZOWE_ROBOT_TOKEN }}

manifest.yaml

@@ -2,7 +2,7 @@
 name: tn3270-ng2
 id: org.zowe.terminal.tn3270
 # Without the v
-version: 1.0.0
+version: 2.7.0
 # Human readable component name
 title: TN3270
 # Human readable component description

pluginDefinition.json

@@ -1,7 +1,7 @@
 {
   "identifier": "org.zowe.terminal.tn3270",
   "apiVersion": "2.0.0",
-  "pluginVersion": "1.0.0",
+  "pluginVersion": "2.7.0",
   "pluginType": "application",
   "license": "EPL-2.0",
   "author": "Zowe",

webClient/package.json

@@ -1,6 +1,6 @@
 {
   "name": "org.zowe.terminal.tn3270",
-  "version": "1.0.0",
+  "version": "2.7.0",
   "description": "A Zowe App for TN3270 Terminal Emulation",
   "author": {
     "name": "Sean Grady",
@@ -9,7 +9,8 @@
   "scripts": {
     "start": "webpack --progress --watch",
     "build": "webpack --progress",
-    "lint": "tslint -c tslint.json \"./**/*.ts\""
+    "lint": "tslint -c tslint.json \"./**/*.ts\"",
+	"test": "exit 0"
   },
   "license": "EPL-2.0",
   "dependencies": {

webClient/src/app/terminal.ts

@@ -24,7 +24,7 @@ export class TerminalStateHelper {
   constructor(public http: HttpClient, 
               public log: ZLUX.ComponentLogger,
              pluginDefinition: any){
-    this.url = ZoweZLUX.uriBroker.pluginRESTUri(pluginDefinition.getBasePlugin(), 'stateDiscovery', '/zosDiscovery/system/tn3270');
+    this.url = ZoweZLUX.uriBroker.pluginRESTUri(pluginDefinition.getBasePlugin(), 'stateDiscovery', 'zosDiscovery/system/tn3270');
   }
 
   getAll(luname?:string): Observable<any> {