Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge 2.11 rc changes back to staging #3576

Merged
merged 113 commits into from
Sep 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
113 commits
Select commit Hold shift + click to select a range
5666ae9
Update org.zowe.license to latest version
ojcelis Apr 25, 2023
b4373f9
Merge pull request #3387 from zowe/users/oscar/updatezowelicensesto2.8
ojcelis Apr 26, 2023
c9655cf
Update Explorer versions
AdarshdeepCheema May 30, 2023
bfab487
bump explorer api versions 2.9
AmandaDErrico May 31, 2023
37ee642
Update CLI component versions for Zowe 2.9.0
t1m0thyj May 31, 2023
50ba106
WebUI RC1 for 2.9.0
May 31, 2023
c9fc050
fix build
May 31, 2023
a7d5d7c
apiml versions for 2.9.0-rc1
Jun 1, 2023
049ea9b
Merge pull request #3435 from zowe/users/amanda/bump-explorer-apis-2.…
ojcelis Jun 1, 2023
cf8eda9
Merge branch 'v2.x/rc' into update-explorers
ojcelis Jun 1, 2023
c99fe94
Merge branch 'v2.x/rc' into v2.x/rc-cli
ojcelis Jun 1, 2023
08bd4fb
Merge branch 'v2.x/rc' into apiml/2.9.1
ojcelis Jun 1, 2023
085f307
Update version for launch-scripts, vscode-extension and utility-tools
ojcelis Jun 1, 2023
0d1f34d
Merge branch 'v2.x/rc' into users/jstruga/rc-2.9.0
ojcelis Jun 1, 2023
1d02244
Merge pull request #3436 from zowe/v2.x/rc-cli
ojcelis Jun 1, 2023
18a7d6f
Merge pull request #3437 from zowe/users/jstruga/rc-2.9.0
ojcelis Jun 1, 2023
7b18da2
Merge pull request #3433 from zowe/update-explorers
ojcelis Jun 1, 2023
1c9c247
Merge branch 'v2.x/rc' into users/oscar/mergev2.9statingtoRC
ojcelis Jun 1, 2023
b7ccc2e
Merge pull request #3442 from zowe/users/oscar/mergev2.9statingtoRC
ojcelis Jun 1, 2023
0b317c6
Merge pull request #3439 from zowe/apiml/2.9.1
ojcelis Jun 1, 2023
c0df33a
WebUI RC2 for 2.9.0
Jun 8, 2023
fc1ab94
Merge pull request #3447 from zowe/users/jstruga/rc2-2.9
ojcelis Jun 8, 2023
f92477d
Update licenses to 2.9
ojcelis Jun 13, 2023
859b489
Merge pull request #3450 from zowe/users/oscar/updateorgzowelicenses
ojcelis Jun 13, 2023
77fe6c5
Merge pull request #3451 from zowe/users/oscar/zowe2.9RCmergetoMaster
ojcelis Jun 13, 2023
3407d1b
apiml rc1
achmelo Jul 10, 2023
7f90e4b
2.10.0 WebUI RC1
Jul 11, 2023
01ba8ba
update missing paxs
Jul 12, 2023
f74aa13
underscore.js update
achmelo Jul 12, 2023
e732835
bump explorer apis 2.10 RC1
AmandaDErrico Jul 12, 2023
98e3e74
Merge pull request #3501 from zowe/apiml/2_10_rc1
ojcelis Jul 12, 2023
c1a2605
Merge branch 'v2.x/rc' into users/jstruga/webui-rc1
ojcelis Jul 12, 2023
b55cb55
Merge branch 'v2.x/rc' into users/amanda/bump-explorer-apis-2.10-RC1
ojcelis Jul 12, 2023
ba4497d
Merge pull request #3504 from zowe/users/amanda/bump-explorer-apis-2.…
ojcelis Jul 12, 2023
a78c194
Merge branch 'v2.x/rc' into users/jstruga/webui-rc1
ojcelis Jul 12, 2023
307b168
Merge pull request #3503 from zowe/users/jstruga/webui-rc1
ojcelis Jul 12, 2023
49e94c2
Update zowe-launch-script and vscode version
ojcelis Jul 12, 2023
171bd1a
Merge branch 'v2.x/rc' into users/oscar/mergev2.10stagingtoRC
ojcelis Jul 12, 2023
6614e90
Merge pull request #3505 from zowe/users/oscar/mergev2.10stagingtoRC
ojcelis Jul 12, 2023
7c753c9
build: make APIML_OIDC vars default for all builds
MarkAckert Jul 13, 2023
b54717b
Update CLI component versions for Zowe 2.10.0
t1m0thyj Jul 14, 2023
03a068c
update zlux, jes, mvs and uss sanity tests
ojcelis Jul 18, 2023
b1a97ae
Merge pull request #3512 from zowe/users/oscar/updatezluxjesmvsanduss…
ojcelis Jul 18, 2023
9f40e19
Merge branch 'v2.x/rc' into user/markackert/rc-oidc-playbook-updates
ojcelis Jul 18, 2023
ff7755f
Merge branch 'v2.x/rc' into v2.x/rc-cli
ojcelis Jul 18, 2023
ead644a
Merge pull request #3506 from zowe/user/markackert/rc-oidc-playbook-u…
ojcelis Jul 18, 2023
75be6c8
Merge pull request #3508 from zowe/v2.x/rc-cli
ojcelis Jul 18, 2023
87b67ea
test: add external root ca to keyring in test automation
MarkAckert Jul 19, 2023
6e374b0
build: update defaults un-setting variable in specific playbook roles
MarkAckert Jul 19, 2023
deafa02
build: workaround keyring jcl RC=4
MarkAckert Jul 19, 2023
faba813
Merge pull request #3514 from zowe/user/markackert/add-root-cer-keyri…
ojcelis Jul 19, 2023
c8b4c77
Container bug fix for rc3
Jul 24, 2023
725eddb
Update org.zowe.licenses to the latest version
ojcelis Jul 24, 2023
d990841
Merge pull request #3522 from zowe/users/oscar/updateorg.zowe.licenses
ojcelis Jul 24, 2023
e452a3d
Merge pull request #3521 from zowe/users/jstruga/fix-containerbug-for-rc
ojcelis Jul 24, 2023
9fa0bfe
update zlux-cote
Jul 24, 2023
5bdce60
add missing pax
Jul 25, 2023
f5b5d00
Merge branch 'v2.x/rc' into users/jstruga/fix-containerbug-for-rc
ojcelis Jul 25, 2023
78bc064
Merge pull request #3524 from zowe/users/jstruga/fix-containerbug-for-rc
ojcelis Jul 25, 2023
243596b
add new container fixes
Jul 25, 2023
1863401
Merge branch 'v2.x/rc' into users/jstruga/fix-containerbug-for-rc
ojcelis Jul 25, 2023
0b5fae0
Merge pull request #3525 from zowe/users/jstruga/fix-containerbug-for-rc
ojcelis Jul 25, 2023
00fab2f
Add container fix
Jul 26, 2023
b207bb2
Merge pull request #3527 from zowe/users/jstruga/fix-containerbug-for-rc
ojcelis Jul 26, 2023
1183d54
New zlux-build
Jul 27, 2023
2e9a578
Merge branch 'v2.x/rc' into users/jstruga/fix-containerbug-for-rc
ojcelis Jul 27, 2023
0323c17
Merge pull request #3528 from zowe/users/jstruga/fix-containerbug-for-rc
ojcelis Jul 27, 2023
7b939b2
build: revert manifest to earlier point for v2.10.0
MarkAckert Jul 27, 2023
06d8c3e
Merge pull request #3529 from zowe/user/markackert/revert-210rc-builds
MarkAckert Jul 27, 2023
33e58f4
revert back zlux changes
ojcelis Jul 27, 2023
b8328ea
Merge pull request #3531 from zowe/users/oscar/revertzluxchangesdated…
ojcelis Jul 27, 2023
aeacec6
Merge branch 'v2.x/master' into users/oscar/merge2.10-rctomaster
ojcelis Jul 27, 2023
16ae9ee
Merge pull request #3533 from zowe/users/oscar/merge2.10-rctomaster
ojcelis Jul 27, 2023
04d025a
Container fix for app-server
Aug 4, 2023
72b516a
Merge pull request #3546 from zowe/users/jstruga/fix-container
ojcelis Aug 4, 2023
0474a1e
Merge branch 'v2.x/master' into users/oscar/merge2.10containerstoMaster
ojcelis Aug 11, 2023
a49cd32
Merge pull request #3547 from zowe/users/oscar/merge2.10containerstoM…
ojcelis Aug 11, 2023
788ae85
bump explorer apis 2.11 RC1
AmandaDErrico Aug 29, 2023
15f2d1a
apiml rc1
achmelo Aug 29, 2023
d6f274d
webUI PR for 2.11
Aug 30, 2023
b3235dd
Merge pull request #3556 from zowe/users/amanda/bump-explorer-apis-2.…
ojcelis Aug 30, 2023
45c4e78
Merge branch 'v2.x/rc' into apiml/2_11_rc1
ojcelis Aug 30, 2023
1b5e4be
Update CLI component versions for Zowe 2.11.0
traeok Aug 30, 2023
01705aa
Overwrite manifest file with manifest from rc branch
ojcelis Aug 30, 2023
e675381
Merge branch 'v2.x/rc' into users/oscar/mergestaging2.11toRC
ojcelis Aug 31, 2023
69fcc38
Merge pull request #3557 from zowe/apiml/2_11_rc1
ojcelis Aug 31, 2023
e691c08
Merge branch 'v2.x/rc' into traeok-patch-1
ojcelis Aug 31, 2023
1548431
update config manager with better error
Aug 31, 2023
71f573b
update vscode and launch-script
ojcelis Aug 31, 2023
6184e0e
Merge branch 'users/oscar/mergestaging2.11toRC' of https://github.com…
ojcelis Aug 31, 2023
742c766
Merge pull request #3560 from zowe/traeok-patch-1
ojcelis Aug 31, 2023
2657915
Merge branch 'v2.x/rc' into users/jstruga/rc-v2.11
ojcelis Aug 31, 2023
66f85a5
Merge pull request #3559 from zowe/users/jstruga/rc-v2.11
ojcelis Aug 31, 2023
f3b26bc
Merge branch 'v2.x/rc' into users/oscar/mergestaging2.11toRC
ojcelis Aug 31, 2023
894696c
Merge pull request #3561 from zowe/users/oscar/mergestaging2.11toRC
ojcelis Aug 31, 2023
3de9f2c
Update Zowe CLI for 2.11
traeok Aug 31, 2023
08965ac
Merge branch 'v2.x/rc' into traeok-patch-2
ojcelis Aug 31, 2023
f9f8525
Merge pull request #3563 from zowe/traeok-patch-2
ojcelis Aug 31, 2023
292a93f
Allow pem to be present but empty when keyring
1000TurquoisePogs Sep 5, 2023
a45d99c
Revert pem section back to type=string
1000TurquoisePogs Sep 5, 2023
2f7df01
RC2 fix
Sep 5, 2023
5b5a7d7
Merge pull request #3567 from zowe/bugfix/v2/pem-when-keyring
ojcelis Sep 5, 2023
328c5eb
Merge branch 'v2.x/rc' into users/jstruga/rc-v2.11
ojcelis Sep 6, 2023
dc437ef
add zowe-common-c change
Sep 6, 2023
7516928
Merge branch 'v2.x/rc' of https://github.com/zowe/zowe-install-packag…
Sep 6, 2023
eaa0ad7
Merge branch 'users/jstruga/rc-v2.11' of https://github.com/zowe/zowe…
Sep 6, 2023
a42d695
Merge pull request #3568 from zowe/users/jstruga/rc-v2.11
ojcelis Sep 6, 2023
c47ec06
update licenses to 2.11
ojcelis Sep 11, 2023
581cd09
Merge pull request #3572 from zowe/users/oscar/updatezowelicensesto2.11
ojcelis Sep 11, 2023
6b8f2e1
Merge branch 'v2.x/master' into users/oscar/mergeZowe2.11rctoMaster
ojcelis Sep 12, 2023
c3ea9c9
Merge pull request #3574 from zowe/users/oscar/mergeZowe2.11rctoMaster
ojcelis Sep 12, 2023
7bb64b0
update manifest back to staging version
ojcelis Sep 12, 2023
d39d40c
Merge branch 'v2.x/staging' into users/oscar/merge2.11RCchangesbackto…
ojcelis Sep 12, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion manifest.json.template
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Zowe",
"version": "2.11.0",
"version": "2.12.0",
"description": "Zowe is an open source project created to host technologies that benefit the Z platform from all members of the Z community (Integrated Software Vendors, System Integrators and z/OS consumers). Zowe, like Mac or Windows, comes with a set of APIs and OS capabilities that applications build on and also includes some applications out of the box. Zowe offers modern interfaces to interact with z/OS and allows you to work with z/OS in a way that is similar to what you experience on cloud platforms today. You can use these interfaces as delivered or through plug-ins and extensions that are created by clients or third-party vendors.",
"license": "EPL-2.0",
"homepage": "https://zowe.org",
Expand Down
9 changes: 4 additions & 5 deletions schemas/zowe-yaml-schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -789,27 +789,26 @@
"type": "object",
"additionalProperties": false,
"description": "Certificate in PEM format.",
"required": ["key", "certificate"],
"properties": {
"key": {
"$ref": "/schemas/v2/server-common#zowePath",
"type": "string",
"description": "Path to the certificate private key stored in PEM format."
},
"certificate": {
"$ref": "/schemas/v2/server-common#zowePath",
"type": "string",
"description": "Path to the certificate stored in PEM format."
},
"certificateAuthorities": {
"description": "List of paths to the certificate authorities stored in PEM format.",
"oneOf": [{
"$ref": "/schemas/v2/server-common#zowePath",
"type": "string",
"description": "Paths to the certificate authorities stored in PEM format. You can separate multiple certificate authorities by comma."
},
{
"type": "array",
"description": "Path to the certificate authority stored in PEM format.",
"items": {
"$ref": "/schemas/v2/server-common#zowePath"
"type": "string"
}
}
]
Expand Down
Loading