Merge branch 'main' into tamirkamara/fix-yq-with-json

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

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=[],

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
 

templates/workspace_services/guacamole/guacamole-server/docker/version.txt

@@ -1 +1 @@
-__version__ = "0.6.2"
+__version__ = "0.6.3"

templates/workspace_services/guacamole/guacamole-server/guacamole-auth-azure/pom.xml

@@ -60,7 +60,7 @@
         <dependency>
             <groupId>org.json</groupId>
             <artifactId>json</artifactId>
-            <version>20220924</version>
+            <version>20230227</version>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>

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