Skip to content

Commit

Permalink
Merge branch 'hotfix/4.2.2'
Browse files Browse the repository at this point in the history
* hotfix/4.2.2:
  Add path length details to DOTX010E message info
  Add details on issues resolved in 4.2.2
  Sort resolved issues in ascending order
  Bump Docker image version to ”4.2.2“
  Replace maintenance-version keyref in 4.2.1 notes
  Draft 4.2.2 Release Notes (#551)
  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
  • Loading branch information
infotexture committed Mar 22, 2024
2 parents e6f5598 + 0f9db57 commit 3cfb005
Show file tree
Hide file tree
Showing 15 changed files with 459 additions and 42 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'
default: '4.2.1'
runs:
using: 'composite'
steps:
Expand Down
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'
DITA_OT_VERSION: '4.2.1'
steps:
- name: Parse arguments
run: |
Expand Down
56 changes: 28 additions & 28 deletions package-lock.json

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

8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
57 changes: 53 additions & 4 deletions release-notes/index.dita
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,63 @@
</refbody>
</reference>

<reference id="v4.2.1" outputclass="mark">
<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 mmmm D, yyyy</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.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
folder when branch filtering topic references that include fragments. Duplicate branches are now handled
correctly and links are resolved as expected.
<xref href="https://github.com/dita-ot/dita-ot/issues/4380" format="html" scope="external">#4380</xref>
<xref href="https://github.com/dita-ot/dita-ot/pull/4427" format="html" scope="external">#4427</xref>
</li>
<li id="4383">Earlier versions of map-first pre-processing would sometimes attempt to access topics that were
excluded in DITAVAL files, which resulted in spurious errors. XLST transformations and SAX filter pipes are
now skipped for any source files that don’t exist.
<xref href="https://github.com/dita-ot/dita-ot/issues/4383" format="html" scope="external">#4383</xref>
<xref href="https://github.com/dita-ot/dita-ot/pull/4435" format="html" scope="external">#4435</xref>
</li>
<li id="4419">In earlier versions, passing a URL as an input file on the Windows command line resulted in an
<msgph>InvalidPathException</msgph> error. URI input is now handled correctly on Windows.
<xref href="https://github.com/dita-ot/dita-ot/issues/4419" format="html" scope="external">#4419</xref>
<xref href="https://github.com/dita-ot/dita-ot/pull/4425" format="html" scope="external">#4425</xref>
</li>
<li id="4430">In debug logging mode, DITA-OT 4.2 no longer passed exceptions to the CLI output. Logging has
been corrected to ensure that errors from Ant tasks once again include the stack trace as expected.
<xref href="https://github.com/dita-ot/dita-ot/issues/4430" format="html" scope="external">#4430</xref>
<xref href="https://github.com/dita-ot/dita-ot/pull/4436" format="html" scope="external">#4436</xref>
</li>
<li id="4431">When missing translations for the PDF <cite>“on page”</cite> variable were added in DITA-OT 4.2,
the Montenegrin translation <cite>“na stranici”</cite> was accidentally copied to the Swedish language file.
The Swedish translation has been updated to use <cite>“på sidan”</cite> as expected.
<xref href="https://github.com/dita-ot/dita-ot/issues/4431" format="html" scope="external">#4431</xref>
<xref href="https://github.com/dita-ot/dita-ot/pull/4433" format="html" scope="external">#4433</xref>
</li>
<li id="4412">When project files contained input map names with URI-escaped characters like spaces, earlier
versions of DITA-OT used the escape character sequences like <codeph>%20</codeph> in the output file name.
The map-first pre-processing routine has been updated to construct the output base file name using the
unescaped equivalents.
<xref href="https://github.com/dita-ot/dita-ot/issues/4412" format="html" scope="external">#4412</xref>
<xref href="https://github.com/dita-ot/dita-ot/pull/4440" format="html" scope="external">#4440</xref>
</li>
</ul>
</section>
</refbody>
</reference>

<reference id="v4.2.1">
<title>DITA-OT 4.2.1
<ph outputclass="small text-muted"> released March 1, 2024</ph>
</title>
<refbody>
<section id="bugs">
<p>DITA Open Toolkit 4.2.1 is a maintenance release that includes the following bug fixes.</p>
<!-- https://github.com/dita-ot/dita-ot/issues?q=milestone%3A4.2.1+is%3Aclosed+label%3Abug+sort%3Acreated-asc -->
<ul>
<li id="4401">When using the in-memory store, earlier versions of the map-first pre-processing pipeline failed
Expand Down Expand Up @@ -285,7 +334,7 @@
<p>(For details on recent changes, see the
<xref keyref="fop-29-rn"/>.)</p>
</li>
<li id="4346">The logback libraries have been updated to <ph keyref="tool.logback.version"/> to
<li id="4346">The logback libraries have been updated to <ph keyref="tool.logback.version"/> to
resolve a serialization vulnerability in the logback receiver component reported as <xref
href="https://nvd.nist.gov/vuln/detail/CVE-2023-6378"
format="html"
Expand Down Expand Up @@ -344,7 +393,7 @@
<codeph>usr.input.file.list</codeph> with temporary file names. The list is now generated correctly.
<xref href="https://github.com/dita-ot/dita-ot/issues/4311" format="html" scope="external">#4311</xref>
</li>
<li id="4315">Missing translations for the <cite>“on page”</cite> variable have been added to the Bosnian,
<li id="4315">Missing translations for the PDF <cite>“on page”</cite> variable have been added to the Bosnian,
Finnish, Montenegrin, Romanian, Russian, Swedish, and Simplified Chinese PDF localizations.
<xref href="https://github.com/dita-ot/dita-ot/issues/4315" format="html" scope="external">#4315</xref>,
<xref href="https://github.com/dita-ot/dita-ot/issues/4320" format="html" scope="external">#4320</xref>
Expand Down
2 changes: 1 addition & 1 deletion release-notes/rel4.0.dita
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@

<refbody>
<section>
<p>DITA Open Toolkit 4.0.2 is a maintenance release that includes the
<p>DITA Open Toolkit 4.0.1 is a maintenance release that includes the
following bug fixes.</p>
<ul>
<!-- https://github.com/dita-ot/dita-ot/issues?q=milestone%3A4.0.1+is%3Aclosed+sort%3Acreated-asc -->
Expand Down
1 change: 1 addition & 0 deletions resources/dita-ot-day-video-keys.ditamap
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Loading

0 comments on commit 3cfb005

Please sign in to comment.