Skip to content

Commit

Permalink
Merge branch 'hotfix/4.2.3'
Browse files Browse the repository at this point in the history
* hotfix/4.2.3:
  Implement review feedback
  Draft 4.2.3 Release Notes stub
  Bump Docker image version to ”4.2.3“
  Bump 'maintenance-version' key to “4.2.3”
  Bump gradle/wrapper-validation-action from 2 to 3 (#557)
  Bump @prettier/plugin-xml from 3.3.1 to 3.4.1 (#555)
  Update GitHub Actions for 4.2.2 (#553)
  Add 4.2.2 release date
  • Loading branch information
infotexture committed May 5, 2024
2 parents 3cfb005 + 9d2b606 commit ea2a795
Show file tree
Hide file tree
Showing 8 changed files with 35 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .github/actions/render/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ inputs:
default: 'master'
DITA_OT_VERSION:
description: 'DITA-OT version used for rendering'
default: '4.2.1'
default: '4.2.2'
runs:
using: 'composite'
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gradle-wrapper-validation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: gradle/wrapper-validation-action@v2
- uses: gradle/wrapper-validation-action@v3
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
runs-on: ubuntu-latest
env:
WEBSITE_PLUGIN_BRANCH: 'master'
DITA_OT_VERSION: '4.2.1'
DITA_OT_VERSION: '4.2.2'
steps:
- name: Parse arguments
run: |
Expand Down
14 changes: 7 additions & 7 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
}
},
"devDependencies": {
"@prettier/plugin-xml": "3.3.1",
"@prettier/plugin-xml": "3.4.1",
"husky": "^9.0.11",
"lint-staged": "15.2.2",
"prettier": "3.2.5",
Expand Down
24 changes: 22 additions & 2 deletions release-notes/index.dita
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,34 @@
</refbody>
</reference>

<reference id="v4.2.2" outputclass="mark">
<reference id="v4.2.3" outputclass="mark">
<title>DITA-OT <keyword keyref="maintenance-version"/>
<!--<ph outputclass="small text-muted">released mmmm D, yyyy</ph>-->
<ph outputclass="small text-muted">released May 5, 2024</ph>
</title>
<refbody>
<section id="bugs">
<p>DITA Open Toolkit <keyword keyref="maintenance-version"/> is a maintenance release that includes the
following bug fixes.</p>
<!-- https://github.com/dita-ot/dita-ot/issues?q=milestone%3A4.2.3+is%3Aclosed+label%3Abug+sort%3Acreated-asc -->
<ul>
<li id="4449">DITA-OT 4.2.2 included a regression bug that caused the map-first pre-processing routine to fail
with a NullPointerException when maps referred to topics that didn’t exist and other topics contained key
references. Processing now proceeds and warns of missing files as in previous versions.
<xref href="https://github.com/dita-ot/dita-ot/issues/4449" format="html" scope="external">#4449</xref>,
<xref href="https://github.com/dita-ot/dita-ot/issues/4454" format="html" scope="external">#4454</xref>
</li>
</ul>
</section>
</refbody>
</reference>

<reference id="v4.2.2">
<title>DITA-OT 4.2.2
<ph outputclass="small text-muted">released March 24, 2024</ph>
</title>
<refbody>
<section id="bugs">
<p>DITA Open Toolkit 4.2.2 is a maintenance release that includes the following bug fixes.</p>
<!-- https://github.com/dita-ot/dita-ot/issues?q=milestone%3A4.2.2+is%3Aclosed+label%3Abug+sort%3Acreated-asc -->
<ul>
<li id="4380">In earlier versions, the map-first pre-processing routine created extra HTML files in the output
Expand Down
2 changes: 1 addition & 1 deletion resources/key-definitions.ditamap
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<keydef keys="maintenance-version">
<topicmeta>
<keywords>
<keyword>4.2.2</keyword>
<keyword>4.2.3</keyword>
</keywords>
</topicmeta>
</keydef>
Expand Down
2 changes: 1 addition & 1 deletion samples/docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Use the latest DITA-OT image ↓ as parent:
FROM ghcr.io/dita-ot/dita-ot:4.2.2
FROM ghcr.io/dita-ot/dita-ot:4.2.3

# Install a custom plug-in from a remote location:
RUN dita --install https://github.com/infotexture/dita-bootstrap/archive/master.zip
Expand Down

0 comments on commit ea2a795

Please sign in to comment.