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.

Sign up for GitHub

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

Guacamole dependencies update July 2023 #3602

Merged
merged 3 commits into from
Jul 5, 2023
Merged

Guacamole dependencies update July 2023 #3602

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1605de8
Guacamole dependencies update July 2023
tamirkamara Jul 4, 2023
468a1c1
Update CHANGELOG.md
tamirkamara Jul 5, 2023
4bf52ff
Merge branch 'main' into tamirkamara/guacamole-jul23-deps
tamirkamara Jul 5, 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
3 changes: 2 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,12 @@
**BREAKING CHANGES & MIGRATIONS**:

FEATURES:
* OHDSI workspace service ([#3562](https://github.com/microsoft/AzureTRE/issues/3562))

ENHANCEMENTS:
* Workspace networking peering sync is handled natively by Terraform ([#3534](https://github.com/microsoft/AzureTRE/issues/3534))
* Use SMTP built in connector vs API connector in Airlock Notifier ([#3572](https://github.com/microsoft/AzureTRE/issues/3572))
* Added OHDSI workspace service ([#3562](https://github.com/microsoft/AzureTRE/issues/3562))
* Update Guacamole dependencies ([#3602](https://github.com/microsoft/AzureTRE/issues/3602))

BUG FIXES:
* Nexus might fail to deploy due to wrong identity used in key-vault extension ([#3492](https://github.com/microsoft/AzureTRE/issues/3492))
Expand Down
6 changes: 3 additions & 3 deletions templates/workspace_services/guacamole/guacamole-server/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ COPY --from=client_build /target/surefire-reports/* /

FROM guacamole/guacd:1.5.2

ARG GUACAMOLE_AZURE_VERSION=0.3.2
ARG GUACAMOLE_AZURE_VERSION=0.3.3

ENV DEBIAN_FRONTEND=noninteractive

Expand All @@ -26,7 +26,7 @@ RUN apk add --update --no-cache wget openssh openjdk11-jre \

ENV CATALINA_BASE=/usr/share/tomcat9/
RUN TOMCAT_ARCHIVE="tomcat.tar.gz" && \
TOMCAT_VER="9.0.75" && \
TOMCAT_VER="9.0.76" && \
wget -O "$TOMCAT_ARCHIVE" -N "https://archive.apache.org/dist/tomcat/tomcat-9/v${TOMCAT_VER}/bin/apache-tomcat-${TOMCAT_VER}.tar.gz" --progress=dot:giga && \
tar xzf "$TOMCAT_ARCHIVE" && \
rm -f "$TOMCAT_ARCHIVE" && \
Expand Down Expand Up @@ -64,7 +64,7 @@ RUN OAUTH2_PROXY_ARCHIVE=oauth2-proxy.tar.gz && \

COPY ./docker/index.jsp "$CATALINA_BASE"/webapps/ROOT/index.jsp

RUN wget -O "/tmp/applicationinsights-agent.jar" "https://github.com/microsoft/ApplicationInsights-Java/releases/download/3.4.13/applicationinsights-agent-3.4.13.jar" --progress=dot:giga
RUN wget -O "/tmp/applicationinsights-agent.jar" "https://github.com/microsoft/ApplicationInsights-Java/releases/download/3.4.14/applicationinsights-agent-3.4.14.jar" --progress=dot:giga
ENV CATALINA_OPTS="$CATALINA_OPTS -javaagent:/tmp/applicationinsights-agent.jar"

ENTRYPOINT [ "/init" ]
Expand Down
2 changes: 1 addition & 1 deletion templates/workspace_services/guacamole/guacamole-server/docker/version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "0.7.2"
__version__ = "0.7.3"
14 changes: 7 additions & 7 deletions templates/workspace_services/guacamole/guacamole-server/guacamole-auth-azure/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-tre</artifactId>
<version>0.3.2</version>
<version>0.3.3</version>
<packaging>jar</packaging>
<name>guacamole-azure-tre</name>

Expand Down Expand Up @@ -48,18 +48,18 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-security-keyvault-secrets</artifactId>
<version>4.6.2</version>
<version>4.6.3</version>
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-identity</artifactId>
<version>1.9.0</version>
<version>1.9.1</version>
</dependency>
<!-- Http and Json Components -->
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>20230227</version>
<version>20230618</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
Expand Down Expand Up @@ -153,7 +153,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.1.0</version>
<version>3.1.2</version>
</plugin>
</plugins>
<pluginManagement>
Expand All @@ -162,12 +162,12 @@
<!-- clean lifecycle, see https://maven.apache.org/ref/current/maven-core/lifecycles.html#clean_Lifecycle -->
<plugin>
<artifactId>maven-clean-plugin</artifactId>
<version>3.2.0</version>
<version>3.3.1</version>
</plugin>
<!-- default lifecycle, jar packaging: see https://maven.apache.org/ref/current/maven-core/default-bindings.html#Plugin_bindings_for_jar_packaging -->
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>3.3.0</version>
<version>3.3.1</version>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion templates/workspace_services/guacamole/porter.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
schemaVersion: 1.0.0
name: tre-service-guacamole
version: 0.9.2
version: 0.9.3
description: "An Azure TRE service for Guacamole"
dockerfile: Dockerfile.tmpl
registry: azuretre
Expand Down