From c06d207ed4fb77806393dc64e4a40bb9e72ba614 Mon Sep 17 00:00:00 2001 From: Peter Haumer <4391934+phaumer@users.noreply.github.com> Date: Mon, 21 Nov 2022 17:23:02 -0800 Subject: [PATCH] Updates for Z Open Editor 3.0.0 --- README.md | 27 ++++++++----------- che/ibm-z-devfile.yaml | 2 +- che/plugins/z-open-editor.yaml | 10 +++---- product-licenses/LICENSE.txt | 8 +++--- product-licenses/NOTICES.txt | 18 ++++++------- .../rse-api-for-zowe-cli/LICENSE.txt | 11 ++++---- .../rse-api-for-zowe-cli/NOTICES.txt | 12 ++++----- 7 files changed, 42 insertions(+), 46 deletions(-) diff --git a/README.md b/README.md index 6df4a5997..666cee3c5 100644 --- a/README.md +++ b/README.md @@ -7,14 +7,9 @@ **IBM Z Open Editor is an extension for Visual Studio Code that provides language support for the IBM® Enterprise COBOL, PL/I, HLASM, REXX, and JCL languages.** -> Go here for the full [Documentation](https://ibm.github.io/zopeneditor-about/Docs/introduction.html) online. +> Go here for the full [Documentation](https://ibm.github.io/zopeneditor-about/Docs/introduction.html?utm_source=vscode&utm_medium=referral&utm_campaign=vscode_marketplace) online. -## License - -- The license for the IBM Z Open Editor can be found in the [product-licenses](./product-licenses/) folder in this repository. You can use this repository to file issues for the IBM Z Open Editor as well. -- The files managed in this repository contain files for presenting the Web site as well as samples used for tutorials. The license for these files you can find in the file [LICENSE](./LICENSE). - -## Overview +**Note, Z Open Editor version 3 has some breaking changes that require manual migration steps. See this dedicated [user documentation page](https://ibm.github.io/zopeneditor-about/Docs/zopeneditor_v3.html) for details.** This extension provides language support for the IBM Enterprise programming languages for z/OS®. It supports COBOL v6.4, PL/I v6.1, and High Level Assembler for z/OS 2.5 and TSO/E REXX. This also includes capabilities for embedded statements in COBOL and PL/I for CICS 6.1, IMS 15.1.0 and SQL DB2 for z/OS 12.1. Earlier versions of any of these components will also work. @@ -85,14 +80,14 @@ Here are the prerequisites for installing this extension in Visual Studio Code: - Microsoft VS Code version 1.53.2 or later: We recommend using always the latest VS Code version available. However, the required minimal version since v2 of Z Open Editor is now 1.53.2; it was 1.44.0 in v1. If you do not have VS Code installed we recommend using the [Visual Studio Code for Java Installer](https://code.visualstudio.com/docs/languages/java#_install-visual-studio-code-for-java) provided by Microsoft as it automatically downloads and installs a Java SDK together with VS Code. (See, but skip the next bullet for the Java dependency, if you use this option.) -- Java SDK or JRE version 8 or later - 64 bit: The language servers included in this extension are implemented in Java. Therefore, you need to install and configure a 64-bit Java SDK or Runtime in order to start it successfully. We recommend installing VS Code for Java as described above, but if you already have VS Code or want to install Java yourself then you can choose from the following options: - - You can use versions 8, 11, or 17 of [IBM's Semeru Runtime](https://developer.ibm.com/languages/java/semeru-runtimes/) that can be [downloaded here](https://developer.ibm.com/languages/java/semeru-runtimes/downloads). - - You can use [Oracle Java 8](https://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html) or the LTS versions 11 or 17 of Oracle Java. - - You can also use version 8, 11, or 17 of the [OpenJDK](https://adoptium.net/index.html?variant=openjdk8&jvmVariant=hotspot). +- Java SDK or JRE version 11 or later - 64 bit: The language servers included in this extension are implemented in Java. Therefore, you need to install and configure a 64-bit Java SDK or Runtime in order to start it successfully. We recommend installing VS Code for Java as described above, but if you already have VS Code or want to install Java yourself then you can choose from the following options: + - You can use versions 11, or 17 of [IBM's Semeru Runtime](https://developer.ibm.com/languages/java/semeru-runtimes/) that can be [downloaded here](https://developer.ibm.com/languages/java/semeru-runtimes/downloads). + - You can use [Oracle Java 11](https://www.oracle.com/java/technologies/downloads/#java11) or the LTS versions 17 of Oracle Java. + - You can also use version 11, or 17 of the [OpenJDK](https://adoptium.net/index.html). - If you are using version 1.1 or newer of Z Open Editor you can also use just a Java Runtime Environments (JRE) as well. - - Newer versions of Java should also work, but are not as rigorously tested for Z Open Editor as Java 8 and 11. + - Newer versions of Java should also work, but are not as rigorously tested for Z Open Editor as Java 11. - Various settings are provided to configure how the extension uses Java. See the [Configuring Java](#configuring-java) section below for more details. -- Zowe CLI 6.33.3 and the Zowe Explorer VS Code extension v2.2.1 or later: To make use of [Zowe](https://zowe.org) to open and edit files directly from z/OS MVS or USS, you need Zowe client software and either IBM RSE API or z/OSMF configured. We strongly recommend that you use Zowe CLI version 7 or newer. For more information, see [Installing Zowe CLI](https://docs.zowe.org/stable/user-guide/cli-installcli) and [VS Code Extension for Zowe](https://marketplace.visualstudio.com/items?itemName=Zowe.vscode-extension-for-zowe#user-content-prerequisites). Once installed, you must [create a Zowe CLI user profile](https://ibm.github.io/zopeneditor-about/Docs/interact_zos_overview.html) so that data sets can be found and accessed. +- Zowe CLI 7.3.1 or newer (CLI 6.33.3 and newer also still works) and the Zowe Explorer VS Code extension v2.4.0 or newer: To make use of [Zowe](https://zowe.org) to open and edit files directly from z/OS MVS or USS, you need Zowe client software and either IBM RSE API or z/OSMF configured. We strongly recommend that you use Zowe CLI version 7 or newer. For more information, see [Installing Zowe CLI](https://docs.zowe.org/stable/user-guide/cli-installcli) and [VS Code Extension for Zowe](https://marketplace.visualstudio.com/items?itemName=Zowe.vscode-extension-for-zowe#user-content-prerequisites). Once installed, you must [create a Zowe CLI user profile](https://ibm.github.io/zopeneditor-about/Docs/interact_zos_overview.html) so that data sets can be found and accessed. - (Optional) Git: To use the features that involve Git, you must install Git and have it available in your system path so that VS Code can display it. On Macs, Git comes out of the box. On Linux, you can install Git with your distribution's package manager. On Windows, you can get Git from . @@ -110,7 +105,7 @@ The COBOL, PL/I, HLASM, and REXX language servers utilized by IBM Z Open Editor ### Selecting the Java installation to use -Before starting a language server the language server clients in the IBM Z Open Editor VS Code extension try looking in different places to find a matching Java installation. They will look in the following places in this specific order and pick the first Java installation they can find that is at least Version 8 and 64-Bit. If it finds a Java that fails the test against these criteria it will continue searching: +Before starting a language server the language server clients in the IBM Z Open Editor VS Code extension try looking in different places to find a matching Java installation. They will look in the following places in this specific order and pick the first Java installation they can find that is at least Version 11 and 64-Bit. If it finds a Java that fails the test against these criteria it will continue searching: 1. The `zopeneditor.JAVA_HOME` VS Code user setting. 1. The `java.home` VS Code user setting. @@ -127,13 +122,13 @@ To define a user setting use the Preferences > Settings menu and either locate t On Mac: ```json -"zopeneditor.JAVA_HOME": "/Library/Java/JavaVirtualMachines/jdk1.8.0_281.jdk/Contents/Home" +"zopeneditor.JAVA_HOME": "/Library/Java/JavaVirtualMachines/jdk11.0.15+10.jdk/Contents/Home" ``` On Windows: ```json -"zopeneditor.JAVA_HOME": "C:\\Program Files\\Java\\jdk1.8.0_281" +"zopeneditor.JAVA_HOME": "C:\\Program Files\\Java\\jdk11.0.15+10" ``` ### Configuring the Java memory allocation diff --git a/che/ibm-z-devfile.yaml b/che/ibm-z-devfile.yaml index 3acffbb76..7e5fe7c7b 100644 --- a/che/ibm-z-devfile.yaml +++ b/che/ibm-z-devfile.yaml @@ -24,7 +24,7 @@ zopeneditor.zcodeformat.useDefaultOnlineZCodeFormatSchema: true - type: dockerimage alias: wazi-terminal - image: icr.io/wazi-code/ibm-wazi-for-devspaces-codeready@sha256:05209b4edf88f98d25c294b9c957326ff004323671271f29b1ea8ed07f30bd98 + image: icr.io/wazi-code/ibm-wazi-for-devspaces-codeready@sha256:0bf8460efac9db509eb1d0788077caea31cbaf0e5ac2208385403a35ca4757c2 memoryLimit: 512Mi volumes: - name: zowe diff --git a/che/plugins/z-open-editor.yaml b/che/plugins/z-open-editor.yaml index 913aff6a5..7f67da229 100644 --- a/che/plugins/z-open-editor.yaml +++ b/che/plugins/z-open-editor.yaml @@ -7,10 +7,10 @@ apiVersion: v2 publisher: ibm name: wazi-developer -version: 2.2.0 +version: 2.3.0 type: VS Code extension displayName: IBM Z Open Editor -title: COBOL, PL/I, HLASM, REXX stack for IBM Z Open Editor 2.2.0, Zowe Explorer 2.2.1, Zowe CLI 7.4.2, Ansible 5.3.0 +title: COBOL, PL/I, HLASM, REXX stack for IBM Z Open Editor 2.3.0, Zowe Explorer 2.4.0, Zowe CLI 7.7.0, Ansible 5.3.0 description: Provides COBOL, PL/I, HLASM, and REXX language servers as well as tools for IBM Z development. icon: /v3/images/wazi-developer-icon.png repository: https://github.com/IBM/zopeneditor-about.git @@ -18,7 +18,7 @@ category: Language firstPublicationDate: "2021-06-18" spec: containers: - - image: icr.io/wazi-code/ibm-wazi-for-devspaces-codeready@sha256:05209b4edf88f98d25c294b9c957326ff004323671271f29b1ea8ed07f30bd98 + - image: icr.io/wazi-code/ibm-wazi-for-devspaces-codeready@sha256:0bf8460efac9db509eb1d0788077caea31cbaf0e5ac2208385403a35ca4757c2 name: wazi-plugins memoryLimit: 2048Mi memoryRequest: 256Mi @@ -32,6 +32,6 @@ spec: - mountPath: "/home/wazi/.m2" name: m2 extensions: - - https://github.com/IBM/zopeneditor-about/releases/download/2.2.0/zopeneditor-2.2.0.vsix - - https://github.com/IBM/zopeneditor-about/releases/download/2.2.0/Zowe.vscode-extension-for-zowe-2.2.1.vsix + - https://github.com/IBM/zopeneditor-about/releases/download/3.0.0/zopeneditor-3.0.0.vsix + - https://github.com/IBM/zopeneditor-about/releases/download/3.0.0/Zowe.vscode-extension-for-zowe-2.4.0.vsix - https://open-vsx.org/api/redhat/vscode-yaml/1.4.0/file/redhat.vscode-yaml-1.4.0.vsix diff --git a/product-licenses/LICENSE.txt b/product-licenses/LICENSE.txt index 1dde29acd..98dcacc42 100644 --- a/product-licenses/LICENSE.txt +++ b/product-licenses/LICENSE.txt @@ -3,7 +3,7 @@ LICENSE INFORMATION The Programs listed below are licensed under the following License Information terms and conditions in addition to the Program license terms previously agreed to by Client and IBM. If Client does not have previously agreed to license terms in effect for the Program, the International License Agreement for Non-Warranted Programs (i125-5589-06) applies. Program Name (Program Number): -IBM Z Open Editor V2.2 (Plug-in) +IBM Z Open Editor V3.0 (Plug-in) The following standard terms apply to Licensee's use of the Program. @@ -15,10 +15,10 @@ Privacy Licensee acknowledges and agrees that IBM may use cookie and tracking technologies to collect personal information in gathering product usage statistics and information designed to help improve user experience and/or to tailor interactions with users in accordance with the IBM Online Privacy Policy, available at http://www.ibm.com/privacy/. -L/N: L-DMIR-CJ8583 -D/N: L-DMIR-CJ8583 -P/N: L-DMIR-CJ8583 +L/N: L-NTRM-98EW8H +D/N: L-NTRM-98EW8H +P/N: L-NTRM-98EW8H International License Agreement for Non-Warranted Programs diff --git a/product-licenses/NOTICES.txt b/product-licenses/NOTICES.txt index 9799f32b8..3613f7146 100644 --- a/product-licenses/NOTICES.txt +++ b/product-licenses/NOTICES.txt @@ -1,6 +1,6 @@ NOTICES AND INFORMATION -IBM Z Open Editor V2.2 +IBM Z Open Editor V3.0 The IBM license agreement and any applicable information on the web download page for IBM products refers Licensee to this file for details @@ -28,7 +28,7 @@ limitation URLs or references to any third party websites. ===================================================================== -Start of Notices for IBM Z Open Editor 2.2.x +Start of Notices for IBM Z Open Editor 3.0.x ===================================================================== @@ -437,7 +437,7 @@ Copyright (c) 2015 Andreas Madsen asynckit Copyright (c) 2016 Alex Indigo aws4 Copyright 2013 Michael Hart (michael.hart.au@gmail.com) balanced-match v1.x -Copyright (c) 2013 Julian Gruber <julian@juliangruber.com> +Copyright (c) 2013 Julian Gruber brace-expansion v1.x Copyright (c) 2013 Julian Gruber (julian@juliangruber.com) builtins Copyright (c) 2015 Julian Gruber @@ -679,7 +679,7 @@ scheduler v0.x Copyright (c) Facebook, Inc. and its affiliates. smart-buffer Copyright (c) 2013-2017 Josh Glazebrook socks Copyright (c) 2013 Josh Glazebrook -socks-proxy-agent Copyright (c) 2013 Nathan Rajlich <nathan@tootallnate.net> +socks-proxy-agent Copyright (c) 2013 Nathan Rajlich spgennard/vscode_cobol v3.9.8 Copyright (c) 2015-2019 spgennard ssh2 v0.x @@ -1706,7 +1706,7 @@ domutils Copyright (c) Felix Böhm entities Copyright (c) Felix Böhm esprima 4.x Copyright JS Foundation and other contributors, https://js.foundation/ -http-cache-semantics Copyright 2016-2018 Kornel Lesiński +http-cache-semantics Copyright 2016-2018 Kornel Lesiński npm-install-checks Copyright (c) Robert Kowalski and Isaac Z. Schlueter ("Authors") shimmer 1.x Copyright (c) 2013-2019, Forrest L Norvell. All rights reserved. @@ -2312,10 +2312,10 @@ END OF UNLICENSE NOTICES AND INFORMATION ===================================================================== -End of Notices for IBM Z Open Editor 2.2.x +End of Notices for IBM Z Open Editor 3.0.x ===================================================================== -L/N: L-DMIR-CJ8583 -D/N: L-DMIR-CJ8583 -P/N: L-DMIR-CJ8583 +L/N: L-NTRM-98EW8H +D/N: L-NTRM-98EW8H +P/N: L-NTRM-98EW8H diff --git a/product-licenses/rse-api-for-zowe-cli/LICENSE.txt b/product-licenses/rse-api-for-zowe-cli/LICENSE.txt index da2750bd3..5fa0f25c8 100644 --- a/product-licenses/rse-api-for-zowe-cli/LICENSE.txt +++ b/product-licenses/rse-api-for-zowe-cli/LICENSE.txt @@ -3,7 +3,7 @@ LICENSE INFORMATION The Programs listed below are licensed under the following License Information terms and conditions in addition to the Program license terms previously agreed to by Client and IBM. If Client does not have previously agreed to license terms in effect for the Program, the International License Agreement for Non-Warranted Programs (i125-5589-06) applies. Program Name (Program Number): -IBM RSE API Plug-in for Zowe CLI V2.2 (Plug-in) +IBM RSE API Plug-in for Zowe CLI V3.0 (Plug-in) The following standard terms apply to Licensee's use of the Program. @@ -11,10 +11,10 @@ Modifiable Third Party Code To the extent, if any, in the NOTICES file IBM identifies third party code as "Modifiable Third Party Code," IBM authorizes Licensee to 1) modify the Modifiable Third Party Code and 2) reverse engineer the Program modules that directly interface with the Modifiable Third Party Code provided that it is only for the purpose of debugging Licensee's modifications to such third party code. IBM's service and support obligations, if any, apply only to the unmodified Program. -L/N: L-DMIR-CJ855Q -D/N: L-DMIR-CJ855Q -P/N: L-DMIR-CJ855Q +L/N: L-PVBE-5UF2H9 +D/N: L-PVBE-5UF2H9 +P/N: L-PVBE-5UF2H9 International License Agreement for Non-Warranted Programs @@ -148,7 +148,7 @@ In Mexico: In the third sentence, delete the words "to an account specified by I In Mexico: Add the following new sentence after the third sentence: -Payments will be made through electronic transfer of funds to an account specified by IBM or in IBM´s domicile which is located in Alfonso Napoles Gandara 3111, Santa Fe Peña Blanca, Alvaro Obregon, Mexico City, Zip Code 01210. +Payments will be made through electronic transfer of funds to an account specified by IBM or in IBM's domicile which is located in Alfonso Napoles Gandara 3111, Santa Fe Peña Blanca, Alvaro Obregon, Mexico City, Zip Code 01210. Add at the end of paragraph c the following sentence: @@ -503,3 +503,4 @@ In Czech Republic: Licensee expressly accepts the terms of this agreement which In Romania: The Licensee expressly accepts, the following standard clauses that may be deemed 'unusual clauses' as per the provisions of article 1203 Romanian Civil Code: clauses 2, 4, 5, 8j. The Licensee hereby acknowledges that it was sufficiently informed of all the provisions of this Agreement, including the clauses mentioned above, it properly analyzed and understood such provisions and had the opportunity to negotiate the terms of each clause. i125-5589-06 (10-2021) + diff --git a/product-licenses/rse-api-for-zowe-cli/NOTICES.txt b/product-licenses/rse-api-for-zowe-cli/NOTICES.txt index d8aaf65af..f65ce5e11 100644 --- a/product-licenses/rse-api-for-zowe-cli/NOTICES.txt +++ b/product-licenses/rse-api-for-zowe-cli/NOTICES.txt @@ -1,6 +1,6 @@ NOTICES AND INFORMATION -IBM RSE API Plug-in for Zowe CLI V2.2 +IBM RSE API Plug-in for Zowe CLI V3.0 The IBM license agreement and any applicable information on the web download page for IBM products refers Licensee to this file for details @@ -26,7 +26,7 @@ from the use of this NOTICES file or its contents, including without limitation URLs or references to any third party websites. ===================================================================== -Start of Notices for IBM RSE API Plug-in for Zowe CLI 2.2.x +Start of Notices for IBM RSE API Plug-in for Zowe CLI 3.0.x ===================================================================== ===================================================================== @@ -784,10 +784,10 @@ END OF UNLICENSE NOTICES AND INFORMATION ===================================================================== -End of Notices for IBM RSE API Plug-in for Zowe CLI 2.2.x +End of Notices for IBM RSE API Plug-in for Zowe CLI 3.0.x ===================================================================== -L/N: L-DMIR-CJ855Q -D/N: L-DMIR-CJ855Q -P/N: L-DMIR-CJ855Q +L/N: L-PVBE-5UF2H9 +D/N: L-PVBE-5UF2H9 +P/N: L-PVBE-5UF2H9