From 728edb976c6d60ed111aa31c0240be737ab1ddfe Mon Sep 17 00:00:00 2001
From: TotoGaz <49004943+TotoGaz@users.noreply.github.com>
Date: Tue, 14 May 2024 16:18:54 -0700
Subject: [PATCH] Upgrade the version of `plantuml` (#3124)

- directly use the official binaries instead of the ubuntu package
- upgrade the readthedocs ubuntu image to 22.04
---
 .readthedocs.yml | 8 ++++++--
 src/conf.py      | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.readthedocs.yml b/.readthedocs.yml
index 55160e32db1..16bd2dc1fc5 100644
--- a/.readthedocs.yml
+++ b/.readthedocs.yml
@@ -4,10 +4,12 @@
 version: 2
 
 build:
-  os: "ubuntu-20.04"
+  os: "ubuntu-22.04"
   apt_packages:
+  - curl
+  - graphviz
   - npm
-  - plantuml
+  - openjdk-21-jre-headless
   - texlive
   tools:
     nodejs: "16"
@@ -16,6 +18,8 @@ build:
     post_install:
     - npm install -g npm@9.8.1
     - npm install -g @mermaid-js/mermaid-cli@10.3.1
+    # If you change the `/tmp/plantuml.jar` path, be sure to also update where this path is used as well (e.g. in `conf.py`).
+    - curl -fsSL https://github.com/plantuml/plantuml/releases/download/v1.2024.3/plantuml-gplv2-1.2024.3.jar -o /tmp/plantuml.jar
 
 # Set requirements to build the docs
 python:
diff --git a/src/conf.py b/src/conf.py
index 99989855bd3..f27f7843963 100644
--- a/src/conf.py
+++ b/src/conf.py
@@ -112,7 +112,7 @@
     'sphinxcontrib.programoutput'
 ]
 
-plantuml = "/usr/bin/plantuml"
+plantuml = "/usr/bin/java -Djava.awt.headless=true -jar /tmp/plantuml.jar"
 plantuml_output_format = "svg_img"
 
 plot_html_show_source_link = True