Merge pull request #1236 from docToolchain/rdmueller/plantuml-encodin…

…g-issues-1218 fix #1218 PlantUML encoding Issues
docToolchain · Aug 10, 2023 · 12a8d2e · 12a8d2e
2 parents e2eac19 + 94b7e39
commit 12a8d2e
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 13 deletions.
diff --git a/changelog.adoc b/changelog.adoc
@@ -14,6 +14,7 @@ and this project tries to adhere to https://semver.org/spec/v2.0.0.html[Semantic
 * https://github.com/docToolchain/docToolchain/issues/1215[#1215: dtcw.ps1 says dtc not installed after exceuting an install]
 * https://github.com/docToolchain/docToolchain/issues/1192[#1192: exportExcel: unnecessary Rowspans break rendering of table]
 * https://github.com/docToolchain/docToolchain/issues/1221[#1221: generateSite: beforeToc functionality broken]
+* https://github.com/docToolchain/docToolchain/issues/1218[#1218: plantuml encoding issues]
 
 === added
 

diff --git a/dtcw b/dtcw
@@ -34,7 +34,7 @@ export DTC_PROJECT_BRANCH
 export DTC_HEADLESS
 
 # Options passed to docToolchain
-DTC_OPTS="${DTC_OPTS:-} -PmainConfigFile=${DTC_CONFIG_FILE} --warning-mode=none --no-daemon"
+DTC_OPTS="${DTC_OPTS:-} -PmainConfigFile=${DTC_CONFIG_FILE} --warning-mode=none --no-daemon -Dfile.encoding=UTF-8 "
 
 # Here you find the project
 GITHUB_PROJECT_URL=https://github.com/docToolchain/docToolchain

diff --git a/dtcw.ps1 b/dtcw.ps1
@@ -28,7 +28,7 @@ if ($env:DTC_CONFIG_FILE) { $DTC_CONFIG_FILE = $env:DTC_CONFIG_FILE }
 if (Test-Path ".git" ) { $env:DTCW_PROJECT_BRANCH = (git branch --show-current) } else { $env:DTCW_PROJECT_BRANCH = "" }
 
 # Options passed to docToolchain
-$DTC_OPTS = "$env:DTC_OPTS -PmainConfigFile='$DTC_CONFIG_FILE' --warning-mode=none --no-daemon "
+$DTC_OPTS = "$env:DTC_OPTS -PmainConfigFile='$DTC_CONFIG_FILE' --warning-mode=none --no-daemon -Dfile.encoding=UTF-8 "
 
 $distribution_url = "https://github.com/docToolchain/docToolchain/releases/download/v$DTC_VERSION/docToolchain-$DTC_VERSION.zip"
 

diff --git a/src/docs/015_tasks/03_task_generateHTML.adoc b/src/docs/015_tasks/03_task_generateHTML.adoc
@@ -5,9 +5,6 @@ include::_config.adoc[]
 
 include::../_feedback.adoc[]
 
-image::ea/Manual/generateHTML.png[]
-
-
 == About This Task
 
 This is the standard Asciidoctor generator which is supported out of the box.

diff --git a/test/docker_environment.bats b/test/docker_environment.bats
@@ -35,7 +35,7 @@ teardown() {
     expected_cmd="run --rm -i --platform linux/amd64 -u $(id -u):$(id -g) \
 --name doctoolchain-${DTC_VERSION}-${timestamp} -e DTC_HEADLESS=true -e DTC_SITETHEME -e DTC_PROJECT_BRANCH=test \
 -p 8042:8042 --entrypoint /bin/bash -v ${PWD}:/project doctoolchain/doctoolchain:v${DTC_VERSION} \
--c doctoolchain . tasks --group doctoolchain  -PmainConfigFile=docToolchainConfig.groovy --warning-mode=none --no-daemon && exit"
+-c doctoolchain . tasks --group doctoolchain  -PmainConfigFile=docToolchainConfig.groovy --warning-mode=none --no-daemon -Dfile.encoding=UTF-8  && exit"
     assert_equal "$(mock_get_call_args "${mock_docker}")" "${expected_cmd}"
     # TODO: the mock doesn't handles quotes correctly
     # assert_line "$expected_cmd"

diff --git a/test/install_latest.bats b/test/install_latest.bats
@@ -73,7 +73,7 @@ teardown() {
     assert_line "Using environment: local"
 
     assert_equal "$(mock_get_call_num "${mock_doctoolchain}")" 1
-    assert_equal "$(mock_get_call_args "${mock_doctoolchain}")" ". tasks -PmainConfigFile=docToolchainConfig.groovy --warning-mode=none --no-daemon -Dorg.gradle.java.home=${DTC_ROOT}/jdk -Dgradle.user.home=${DTC_ROOT}/.gradle"
+    assert_equal "$(mock_get_call_args "${mock_doctoolchain}")" ". tasks -PmainConfigFile=docToolchainConfig.groovy --warning-mode=none --no-daemon -Dfile.encoding=UTF-8 -Dorg.gradle.java.home=${DTC_ROOT}/jdk -Dgradle.user.home=${DTC_ROOT}/.gradle"
 }
 
 @test "DTC_VERSION=latest tasks - git pull before execution" {

diff --git a/test/java_environment.bats b/test/java_environment.bats
@@ -31,7 +31,7 @@ teardown() {
     PATH="${minimal_system}" JAVA_HOME="${minimal_system}/jdk" ./dtcw tasks --group doctoolchain
 
     assert_equal "$(mock_get_call_num "${mock_java}")" 1
-    assert_equal "$(mock_get_call_args "${mock_doctoolchain}")" ". tasks --group doctoolchain -PmainConfigFile=docToolchainConfig.groovy --warning-mode=none --no-daemon -Dgradle.user.home=${DTC_ROOT}/.gradle"
+    assert_equal "$(mock_get_call_args "${mock_doctoolchain}")" ". tasks --group doctoolchain -PmainConfigFile=docToolchainConfig.groovy --warning-mode=none --no-daemon -Dfile.encoding=UTF-8 -Dgradle.user.home=${DTC_ROOT}/.gradle"
 }
 
 @test "invalid JAVA_HOME" {
@@ -47,7 +47,7 @@ teardown() {
 
     assert_line --partial "Using Java 11.0.19"
     assert_equal "$(mock_get_call_num "${mock_java}")" 1
-    assert_equal "$(mock_get_call_args "${mock_doctoolchain}")" ". tasks --group doctoolchain -PmainConfigFile=docToolchainConfig.groovy --warning-mode=none --no-daemon -Dgradle.user.home=${DTC_ROOT}/.gradle"
+    assert_equal "$(mock_get_call_args "${mock_doctoolchain}")" ". tasks --group doctoolchain -PmainConfigFile=docToolchainConfig.groovy --warning-mode=none --no-daemon -Dfile.encoding=UTF-8 -Dgradle.user.home=${DTC_ROOT}/.gradle"
 }
 
 @test "newest supported Java version is Java 17" {
@@ -57,7 +57,7 @@ teardown() {
 
     assert_line --partial "Using Java 17.0.6"
     assert_equal "$(mock_get_call_num "${mock_java}")" 1
-    assert_equal "$(mock_get_call_args "${mock_doctoolchain}")" ". tasks --group doctoolchain -PmainConfigFile=docToolchainConfig.groovy --warning-mode=none --no-daemon -Dgradle.user.home=${DTC_ROOT}/.gradle"
+    assert_equal "$(mock_get_call_args "${mock_doctoolchain}")" ". tasks --group doctoolchain -PmainConfigFile=docToolchainConfig.groovy --warning-mode=none --no-daemon -Dfile.encoding=UTF-8 -Dgradle.user.home=${DTC_ROOT}/.gradle"
 }
 
 @test "show unsupported java version - Java 8" {

diff --git a/test/local_environment.bats b/test/local_environment.bats
@@ -40,15 +40,15 @@ teardown() {
     assert_line "Using Java 11.0.18 [${HOME}/.doctoolchain/jdk/bin/java]"
 
     assert_equal "$(mock_get_call_num "${mock_doctoolchain}")" 1
-    assert_equal "$(mock_get_call_args "${mock_doctoolchain}")" ". tasks --group doctoolchain -PmainConfigFile=docToolchainConfig.groovy --warning-mode=none --no-daemon -Dorg.gradle.java.home=${DTC_ROOT}/jdk -Dgradle.user.home=${DTC_ROOT}/.gradle"
+    assert_equal "$(mock_get_call_args "${mock_doctoolchain}")" ". tasks --group doctoolchain -PmainConfigFile=docToolchainConfig.groovy --warning-mode=none --no-daemon -Dfile.encoding=UTF-8 -Dorg.gradle.java.home=${DTC_ROOT}/jdk -Dgradle.user.home=${DTC_ROOT}/.gradle"
 }
 
 @test "overrule configuration file with DTC_CONFIG_FILE" {
     # Execute
     PATH="${minimal_system}" DTC_CONFIG_FILE=my_config_file.groovy run -0 ./dtcw tasks
 
     assert_equal "$(mock_get_call_num "${mock_doctoolchain}")" 1
-    assert_equal "$(mock_get_call_args "${mock_doctoolchain}")" ". tasks -PmainConfigFile=my_config_file.groovy --warning-mode=none --no-daemon -Dorg.gradle.java.home=${DTC_ROOT}/jdk -Dgradle.user.home=${DTC_ROOT}/.gradle"
+    assert_equal "$(mock_get_call_args "${mock_doctoolchain}")" ". tasks -PmainConfigFile=my_config_file.groovy --warning-mode=none --no-daemon -Dfile.encoding=UTF-8 -Dorg.gradle.java.home=${DTC_ROOT}/jdk -Dgradle.user.home=${DTC_ROOT}/.gradle"
 }
 
 @test "using sdk with local environment fails" {

diff --git a/test/sdk_installation.bats b/test/sdk_installation.bats
@@ -129,7 +129,7 @@ EOF
     PATH="${path}" run -0 ./dtcw tasks --group doctoolchain
 
     assert_equal "$(mock_get_call_num "${mock_doctoolchain}")" 1
-    assert_equal "$(mock_get_call_args "${mock_doctoolchain}")" ". tasks --group doctoolchain -PmainConfigFile=docToolchainConfig.groovy --warning-mode=none --no-daemon -Dgradle.user.home=${DTC_ROOT}/.gradle"
+    assert_equal "$(mock_get_call_args "${mock_doctoolchain}")" ". tasks --group doctoolchain -PmainConfigFile=docToolchainConfig.groovy --warning-mode=none --no-daemon -Dfile.encoding=UTF-8 -Dgradle.user.home=${DTC_ROOT}/.gradle"
 }
 
 @test "using local with sdk environment fails" {