From f5e37869cda1517b29693f2e6921033129c2d52a Mon Sep 17 00:00:00 2001 From: Liza Shakury <42377481+LizaShak@users.noreply.github.com> Date: Sun, 16 Apr 2023 16:18:05 +0300 Subject: [PATCH 1/3] Fix cli msal version (#3439) * Upgarde azure-cli-core version * Update setup * Fix msal version in cli --- cli/requirements.txt | 4 ++-- cli/setup.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cli/requirements.txt b/cli/requirements.txt index c0d452ca1a..a86f5a1d09 100644 --- a/cli/requirements.txt +++ b/cli/requirements.txt @@ -1,9 +1,9 @@ # if you update this file, update the install_requires in setup.py as well click==8.1.3 httpx~=0.23.0 -msal >= 1.17.0 +msal == 1.20.0 jmespath==1.0.1 tabulate==0.9.0 pygments==2.14.0 PyJWT==2.6.0 -azure-cli-core==2.46.0 +azure-cli-core==2.47.0 diff --git a/cli/setup.py b/cli/setup.py index 2d90636e72..a36cbb3937 100644 --- a/cli/setup.py +++ b/cli/setup.py @@ -42,12 +42,12 @@ install_requires=[ "click==8.1.3", "httpx~=0.23.1", - "msal >= 1.17.0", + "msal == 1.20.0", "jmespath==1.0.1", "tabulate==0.9.0", "pygments==2.14.0", "PyJWT==2.6.0", - "azure-cli-core==2.46.0" + "azure-cli-core==2.47.0" ], namespace_packages=[], From 0baa8ae5f9e8f1244fad320055d533e8583a6eab Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 16 Apr 2023 16:42:18 +0300 Subject: [PATCH 2/3] Bump json from 20220924 to 20230227 in /templates/workspace_services/guacamole/guacamole-server/guacamole-auth-azure (#3436) * Bump json Bumps [json](https://github.com/douglascrockford/JSON-java) from 20220924 to 20230227. - [Release notes](https://github.com/douglascrockford/JSON-java/releases) - [Changelog](https://github.com/stleary/JSON-java/blob/master/docs/RELEASES.md) - [Commits](https://github.com/douglascrockford/JSON-java/commits) --- updated-dependencies: - dependency-name: org.json:json dependency-type: direct:production ... Signed-off-by: dependabot[bot] * update versions --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Tamir Kamara <26870601+tamirkamara@users.noreply.github.com> --- .../guacamole/guacamole-server/docker/version.txt | 2 +- .../guacamole/guacamole-server/guacamole-auth-azure/pom.xml | 2 +- templates/workspace_services/guacamole/porter.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/workspace_services/guacamole/guacamole-server/docker/version.txt b/templates/workspace_services/guacamole/guacamole-server/docker/version.txt index 22049ab2c4..63af88769b 100644 --- a/templates/workspace_services/guacamole/guacamole-server/docker/version.txt +++ b/templates/workspace_services/guacamole/guacamole-server/docker/version.txt @@ -1 +1 @@ -__version__ = "0.6.2" +__version__ = "0.6.3" diff --git a/templates/workspace_services/guacamole/guacamole-server/guacamole-auth-azure/pom.xml b/templates/workspace_services/guacamole/guacamole-server/guacamole-auth-azure/pom.xml index faa6a4c648..23590006e9 100644 --- a/templates/workspace_services/guacamole/guacamole-server/guacamole-auth-azure/pom.xml +++ b/templates/workspace_services/guacamole/guacamole-server/guacamole-auth-azure/pom.xml @@ -60,7 +60,7 @@ org.json json - 20220924 + 20230227 org.apache.httpcomponents diff --git a/templates/workspace_services/guacamole/porter.yaml b/templates/workspace_services/guacamole/porter.yaml index 40d324abdb..6dcd5f2893 100644 --- a/templates/workspace_services/guacamole/porter.yaml +++ b/templates/workspace_services/guacamole/porter.yaml @@ -1,7 +1,7 @@ --- schemaVersion: 1.0.0 name: tre-service-guacamole -version: 0.8.3 +version: 0.8.4 description: "An Azure TRE service for Guacamole" dockerfile: Dockerfile.tmpl registry: azuretre From cd5201713b654af212c0793d19e610fb75a74e24 Mon Sep 17 00:00:00 2001 From: Martin Peck Date: Sun, 16 Apr 2023 14:54:56 +0100 Subject: [PATCH 3/3] Fix site_url and canonical url (#3423) fix site_url Co-authored-by: Tamir Kamara <26870601+tamirkamara@users.noreply.github.com> --- mkdocs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkdocs.yml b/mkdocs.yml index 0e4051f960..e3fb397e1f 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -1,6 +1,6 @@ --- site_name: Azure TRE -site_url: https://github.com/microsoft/AzureTRE +site_url: https://microsoft.github.io/AzureTRE site_description: Azure TRE site_author: Microsoft