Merge branch 'develop' into hotfix/4.2.2

* develop: Fix authors and link IDs Remove extra quotes Add DITA-OT Day 2024 videos (#550) Bump lint-staged from 15.2.1 to 15.2.2 (#548) Bump husky from 9.0.10 to 9.0.11 (#547) Bump @prettier/plugin-xml from 3.2.2 to 3.3.1 (#546) Bump prettier from 3.2.4 to 3.2.5 (#545) Update docs GitHub Actions for 4.2.1 (#543) Add 4.2.1 release date
dita-ot · Mar 21, 2024 · dbe5464 · dbe5464
2 parents 5844a0e + 914ce66
commit dbe5464
Show file tree

Hide file tree

Showing 11 changed files with 400 additions and 35 deletions.
diff --git a/.github/actions/render/action.yml b/.github/actions/render/action.yml
@@ -6,7 +6,7 @@ inputs:
     default: 'master'
   DITA_OT_VERSION:
     description: 'DITA-OT version used for rendering'
-    default: '4.2'
+    default: '4.2.1'
 runs:
   using: 'composite'
   steps:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       WEBSITE_PLUGIN_BRANCH: 'master'
-      DITA_OT_VERSION: '4.2'
+      DITA_OT_VERSION: '4.2.1'
     steps:
       - name: Parse arguments
         run: |

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -45,10 +45,10 @@
     }
   },
   "devDependencies": {
-    "@prettier/plugin-xml": "3.2.2",
-    "husky": "^9.0.10",
-    "lint-staged": "15.2.1",
-    "prettier": "3.2.4",
+    "@prettier/plugin-xml": "3.3.1",
+    "husky": "^9.0.11",
+    "lint-staged": "15.2.2",
+    "prettier": "3.2.5",
     "stylelint": "^15.11.0",
     "stylelint-config-recommended": "^13.0.0",
     "stylelint-config-sass-guidelines": "^10.0.0"

diff --git a/release-notes/index.dita b/release-notes/index.dita
@@ -28,7 +28,7 @@
 
   <reference id="v4.2.2" outputclass="mark">
     <title>DITA-OT <keyword keyref="maintenance-version"/>
-      <!--<ph outputclass="small text-muted">released MMMM DD, YYYY</ph>-->
+      <ph outputclass="small text-muted">released March 1, 2024</ph>
     </title>
     <refbody>
       <section id="bugs">

diff --git a/resources/dita-ot-day-video-keys.ditamap b/resources/dita-ot-day-video-keys.ditamap
@@ -10,4 +10,5 @@
   <mapref href="ditaotdaykeys/dita-ot-day-2018-keys.ditamap" format="ditamap"/>
   <mapref href="ditaotdaykeys/dita-ot-day-2019-keys.ditamap" format="ditamap"/>
   <mapref href="ditaotdaykeys/dita-ot-day-2022-keys.ditamap" format="ditamap"/>
+  <mapref href="ditaotdaykeys/dita-ot-day-2024-keys.ditamap" format="ditamap"/>
 </map>