Merge pull request #1468 from atlassian/release/8.3.1

Release 8.3.1
atlassian · Jun 27, 2024 · 559bcf9 · 559bcf9
2 parents 011195b + 355cc56
commit 559bcf9
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/app/util/conf.py b/app/util/conf.py
@@ -2,7 +2,7 @@
 
 from util.project_paths import JIRA_YML, CONFLUENCE_YML, BITBUCKET_YML, JSM_YML, CROWD_YML, BAMBOO_YML
 
-TOOLKIT_VERSION = '8.3.0'
+TOOLKIT_VERSION = '8.3.1'
 UNSUPPORTED_VERSION = '8.0.0'
 
 

diff --git a/app/util/k8s/dcapt-small.tfvars b/app/util/k8s/dcapt-small.tfvars
@@ -230,7 +230,8 @@ confluence_collaborative_editing_enabled = true
 # confluence_custom_values_file = "/path/to/values.yaml"
 
 # A list of JVM arguments to be passed to the server. Defaults to an empty list.
-# confluence_additional_jvm_args = ["-Dproperty=value", "-Dproperty1=value1"]
+# Example: ["-Dproperty=value", "-Dproperty1=value1"]
+confluence_additional_jvm_args = ["-Dupm.plugin.upload.enabled=true"]
 
 ################################################################################
 # Bitbucket Settings
@@ -326,4 +327,5 @@ bitbucket_db_master_password = "Password1!"
 # bitbucket_custom_values_file = "/path/to/values.yaml"
 
 # A list of JVM arguments to be passed to the server. Defaults to an empty list.
-# bitbucket_additional_jvm_args = ["-Dproperty=value", "-Dproperty1=value1"]
+# Example: ["-Dproperty=value", "-Dproperty1=value1"]
+bitbucket_additional_jvm_args = ["-Dupm.plugin.upload.enabled=true"]
diff --git a/app/util/k8s/dcapt.tfvars b/app/util/k8s/dcapt.tfvars
@@ -239,7 +239,8 @@ confluence_collaborative_editing_enabled = true
 # confluence_custom_values_file = "/path/to/values.yaml"
 
 # A list of JVM arguments to be passed to the server. Defaults to an empty list.
-# confluence_additional_jvm_args = ["-Dproperty=value", "-Dproperty1=value1"]
+# Example: ["-Dproperty=value", "-Dproperty1=value1"]
+confluence_additional_jvm_args = ["-Dupm.plugin.upload.enabled=true"]
 
 ################################################################################
 # Bitbucket Settings