Merge pull request docToolchain#1285 from PacoVK/prepare-release-3.1.1

Bugfix release 3.1.1
Bennykillua · Nov 7, 2023 · 3c5d490 · 3c5d490
2 parents 4c2d5cf + 11dd0f2
commit 3c5d490
Show file tree

Hide file tree

Showing 6 changed files with 59 additions and 4 deletions.
diff --git a/changelog.adoc b/changelog.adoc
@@ -9,6 +9,14 @@ and this project tries to adhere to https://semver.org/spec/v2.0.0.html[Semantic
 
 === fixes
 
+=== added
+
+=== changed
+
+== 3.1.1 - 2023-11-07
+
+=== fixes
+
 * https://github.com/docToolchain/docToolchain/issues/1281[#1281: publishToConfluence throws exception when uploading attachments in v3.1.0]
 * https://github.com/docToolchain/docToolchain/issues/1283[#1283: "tasks" target causes Exception]
 

diff --git a/dtcw b/dtcw
@@ -12,7 +12,7 @@ set -o pipefail
 
 # See https://github.com/docToolchain/docToolchain/releases for available versions.
 # Set DTC_VERSION to "latest" to get the latest, yet unreleased version.
-: "${DTC_VERSION:=3.1.0}"
+: "${DTC_VERSION:=3.1.1}"
 
 # The 'generateSite' and 'copyThemes' tasks support DTC_SITETHEME, an URL of a theme.
 # export DTC_SITETHEME=https://....zip

diff --git a/dtcw.ps1 b/dtcw.ps1
@@ -9,7 +9,7 @@ $ErrorActionPreference = "Stop"
 
 # See https://github.com/docToolchain/docToolchain/releases for available versions.
 # Set DTC_VERSION to "latest" to get the latest, yet unreleased version.
-$DTC_VERSION = "3.1.0"
+$DTC_VERSION = "3.1.1"
 if ($env:DTC_VERSION) { $DTC_VERSION = $env:DTC_VERSION }
 
 #here you can specify the URL of a theme to use with generateSite-task

diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-dtc_version=3.1.0
+dtc_version=3.1.1
 // settings for the Gradle deamon process -> PDF generation with many images requires much more memory
 org.gradle.jvmargs=-Xmx2048m
 

diff --git a/src/docs/025_development/030_create_new_release.adoc b/src/docs/025_development/030_create_new_release.adoc
@@ -29,7 +29,7 @@ to test dtcw
 
 ==== Standard Image
 
-* Update the https://github.com/docToolchain/docker-image/tree/ng-beta/alpine[Dockerfile] to reflect the new version.
+* Update the https://github.com/docToolchain/docker-image/tree/ng-beta/.github/workflows[GitHub workflows] to reflect the new version.
 * run https://github.com/docToolchain/docker-image/actions/workflows/standard-build.yml[github action] to build and deploy the image
 
 do the same for the other images

diff --git a/src/docs/030_news/2023/3.1.1-release.adoc b/src/docs/030_news/2023/3.1.1-release.adoc
@@ -0,0 +1,47 @@
+:filename: 030_news/2023/3.1.1-release.adoc
+:jbake-title: Release v3.1.1
+:jbake-date: 2023-11-07
+:jbake-type: post
+:jbake-tags: docToolchain
+:jbake-status: published
+:jbake-menu: news
+:jbake-author: Pascal Euhus
+:icons: font
+
+ifndef::imagesdir[:imagesdir: ../../../images]
+
+== docToolchain release v3.1.1 (Bugfix-Release)
+
+We just had to create Bugfix-Release v3.1.1
+
+=== About This Release
+
+The v3.1.0 Release could not handle Confluence attachments. This release fixes this blocker.
+
+IMPORTANT: please also check the xref:3.1.0-release.adoc[release notes for v3.1.0]
+
+== Notes
+
+== 3.1.1 - 2023-11-07
+
+=== fixes
+
+* https://github.com/docToolchain/docToolchain/issues/1281[#1281: publishToConfluence throws exception when uploading attachments in v3.1.0]
+* https://github.com/docToolchain/docToolchain/issues/1283[#1283: "tasks" target causes Exception]
+
+
+=== changed
+
+* Improve docs for `publishToConfluence` task
+
+NOTE: a big "THANK YOU" to all *Sponsors* and *Contributors* who helped to support docToolchain!
+
+[TIP]
+====
+You like docToolchain? +
+What about helping to make it even better? +
+docToolchain is a community project, so be part of the community which drives the project. +
+You don't have to code for doing so. +
+It would even help to brush up the docs, write tutorials or groom the backlog +
+(I guess many of the open issues are already fixed).
+====