Skip to content

Commit

Permalink
License updates for 2.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
phaumer committed Sep 19, 2022
1 parent 97661a0 commit 2453089
Show file tree
Hide file tree
Showing 6 changed files with 1,325 additions and 25 deletions.
2 changes: 1 addition & 1 deletion che/ibm-z-devfile.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
zopeneditor.zcodeformat.useDefaultOnlineZCodeFormatSchema: true
- type: dockerimage
alias: wazi-terminal
image: icr.io/wazi-code/ibm-wazi-for-devspaces-codeready@sha256:3f10050adbd00eb2fa8cb9ba58503b698079190cd56c5b2d735e409fa1ce8285
image: icr.io/wazi-code/ibm-wazi-for-devspaces-codeready@sha256:05209b4edf88f98d25c294b9c957326ff004323671271f29b1ea8ed07f30bd98
memoryLimit: 512Mi
volumes:
- name: zowe
Expand Down
12 changes: 5 additions & 7 deletions che/plugins/z-open-editor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,18 @@
apiVersion: v2
publisher: ibm
name: wazi-developer
version: 2.1.0
version: 2.2.0
type: VS Code extension
displayName: IBM Z Open Editor
title: COBOL, PL/I, HLASM, REXX stack for IBM Z Open Editor 2.1.0, Zowe Explorer 2.0.2, Zowe CLI 7.1.1, Ansible 5.3.0
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
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
category: Language
firstPublicationDate: "2021-06-18"
spec:
containers:
- image: icr.io/wazi-code/ibm-wazi-for-devspaces-codeready@sha256:3f10050adbd00eb2fa8cb9ba58503b698079190cd56c5b2d735e409fa1ce8285
- image: icr.io/wazi-code/ibm-wazi-for-devspaces-codeready@sha256:05209b4edf88f98d25c294b9c957326ff004323671271f29b1ea8ed07f30bd98
name: wazi-plugins
memoryLimit: 2048Mi
memoryRequest: 256Mi
Expand All @@ -32,8 +32,6 @@ spec:
- mountPath: "/home/wazi/.m2"
name: m2
extensions:
- https://github.com/IBM/zopeneditor-about/releases/download/2.1.1/zopeneditor-2.1.1.vsix
- https://github.com/IBM/zopeneditor-about/releases/download/2.1.1/Zowe.vscode-extension-for-zowe-2.2.0.vsix
- 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://open-vsx.org/api/redhat/vscode-yaml/1.4.0/file/redhat.vscode-yaml-1.4.0.vsix
- https://open-vsx.org/api/ms-python/python/2021.11.1422169775/file/ms-python.python-2021.11.1422169775.vsix
- https://open-vsx.org/api/redhat/ansible/0.7.1/file/redhat.ansible-0.7.1.vsix
12 changes: 6 additions & 6 deletions product-licenses/LICENSE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.1 (Plug-in)
IBM Z Open Editor V2.2 (Plug-in)

The following standard terms apply to Licensee's use of the Program.

Expand All @@ -15,9 +15,9 @@ 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-CEJS6X
D/N: L-DMIR-CEJS6X
P/N: L-DMIR-CEJS6X
L/N: L-DMIR-CJ8583
D/N: L-DMIR-CJ8583
P/N: L-DMIR-CJ8583


International License Agreement for Non-Warranted Programs
Expand Down Expand Up @@ -152,7 +152,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:

Expand Down Expand Up @@ -362,7 +362,7 @@ Section 4. Liability and Intellectual Property Protection

In paragraph a, in the first sentence insert the following before the words "the amounts paid":

In Belgium, France, Germany, Italy, Luxembourg, Malta, Portugal, and Spain: the greater of 500,000 (five hundred thousand euro) or
In Belgium, France, Germany, Italy, Luxembourg, Malta, Portugal, and Spain: the greater of 500,000 (five hundred thousand euro) or

In Ireland and United Kingdom: 125% of

Expand Down
26 changes: 15 additions & 11 deletions product-licenses/NOTICES.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
NOTICES AND INFORMATION

IBM Z Open Editor V2.1
IBM Z Open Editor V2.2

The IBM license agreement and any applicable information on the web
download page for IBM products refers Licensee to this file for details
Expand Down Expand Up @@ -28,7 +28,7 @@ limitation URLs or references to any third party websites.

=====================================================================

Start of Notices for IBM Z Open Editor 2.1.x
Start of Notices for IBM Z Open Editor 2.2.x

=====================================================================

Expand Down Expand Up @@ -73,6 +73,7 @@ request
tunnel-agent
@carbon/telemetry 0.x
detect-libc 2.x
org.eclipse.equinox.executable v3.8.0



Expand Down Expand Up @@ -425,7 +426,7 @@ Copyright (c) Sindre Sorhus (sindresorhus@gmail.com) (sindresorhus.com)
ansi-styles v4.x
Copyright (c) Sindre Sorhus (sindresorhus@gmail.com) (sindresorhus.com)
applicationinsights v1.x
Copyright © Microsoft Corporation
Copyright © Microsoft Corporation
argparse v1.x
Copyright (C) 2012 by Vitaly Puzrin
asn1 v0.x
Expand Down Expand Up @@ -612,7 +613,7 @@ number-is-nan Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhu
object-assign v4.x
Copyright (c) Sindre Sorhus (sindresorhus@gmail.com) (sindresorhus.com)
opener v1.x
Copyright © 20122018 Domenic Denicola <d@domenic.me>
Copyright © 2012-2018 Domenic Denicola <d@domenic.me>
parse-srcset Copyright (c) 2014 Alex Bell
path-exists v3.x
Copyright (c) Sindre Sorhus (sindresorhus@gmail.com) (sindresorhus.com)
Expand Down Expand Up @@ -689,7 +690,7 @@ sshpk Copyright Joyent, Inc. All rights reserved.
stack-chain v1.x
Copyright (c) 2012 Andreas Madsen
stack-trace v0.x
Copyright (c) 2011 Felix Geisendörfer (felix@debuggable.com)
Copyright (c) 2011 Felix Geisendörfer (felix@debuggable.com)
streamroller v3.x
Copyright (c) 2013 Gareth Jones
streamsearch v0.x
Expand Down Expand Up @@ -1306,7 +1307,8 @@ org.eclipse.lsp4j.jsonrpc 0.x http://www.eclipse.org
org.eclipse.swt.cocoa.macosx.x86_64 3.x http://www.eclipse.org
org.eclipse.swt.gtk.linux.x86_64 3.x http://www.eclipse.org
org.eclipse.swt.win32.win32.x86_64 3.x http://www.eclipse.org
org.eclipse.xtext.xbase.lib 2.x http://www.eclipse.org
org.eclipse.xtext.xbase.lib 2.x http://www.eclipse.org
org.eclipse.equinox.executable v3.8.0



Expand Down Expand Up @@ -1704,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.
Expand Down Expand Up @@ -1750,6 +1752,8 @@ Copyright (c) 2009 Google Inc. All rights reserved.
json-schema
Copyright (c) 2005-2015, The Dojo Foundation

antlr4-runtime 4.x.x


org.antlr.antlr4-runtime 4.x
Copyright (c) 2012-2017 The ANTLR Project. All rights reserved.
Expand Down Expand Up @@ -2308,10 +2312,10 @@ END OF UNLICENSE NOTICES AND INFORMATION

=====================================================================

End of Notices for IBM Z Open Editor 2.1.x
End of Notices for IBM Z Open Editor 2.2.x
=====================================================================


L/N: L-DMIR-CEJS6X
D/N: L-DMIR-CEJS6X
P/N: L-DMIR-CEJS6X
L/N: L-DMIR-CJ8583
D/N: L-DMIR-CJ8583
P/N: L-DMIR-CJ8583
Loading

0 comments on commit 2453089

Please sign in to comment.