diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml index 1c24f9a8d..1727d4929 100644 --- a/.idea/kotlinc.xml +++ b/.idea/kotlinc.xml @@ -1,7 +1,10 @@ + + - \ No newline at end of file diff --git a/.idea/libraries/KotlinJavaRuntime.xml b/.idea/libraries/KotlinJavaRuntime.xml index 1165e2982..9fbfb0da4 100644 --- a/.idea/libraries/KotlinJavaRuntime.xml +++ b/.idea/libraries/KotlinJavaRuntime.xml @@ -1,19 +1,15 @@ - - - - - + + + - - - - - + + + \ No newline at end of file diff --git a/.idea/libraries/org_docx4j_docx4j.xml b/.idea/libraries/org_docx4j_docx4j.xml new file mode 100644 index 000000000..cf6fc4a62 --- /dev/null +++ b/.idea/libraries/org_docx4j_docx4j.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/VERSION.md b/VERSION.md index 4b73120fb..acd50a27c 100644 --- a/VERSION.md +++ b/VERSION.md @@ -7,7 +7,11 @@ flexmark-java - [To Do](#to-do) - [Docx Converter](#docx-converter) +- [0.34.53](#03453) +- [0.34.52](#03452) +- [0.34.51](#03451) - [0.34.50](#03450) +- [0.34.49](#03449) - [0.34.48](#03448) - [0.34.46](#03446) - [0.34.44](#03444) @@ -254,6 +258,21 @@ flexmark-java   +0.34.53 +------- + +* Change: revert docx4j to 3.3.4 in docx4j-3 branch + +0.34.52 +------- + +Fix: intermittent NPE when including macro with table in table + +0.34.51 +------- + +Fix: intermittent NPE when including macro with table in table in docx4j-3 branch + 0.34.50 ------- @@ -262,6 +281,11 @@ flexmark-java * Fix: extension auto links would not be processed if paragraph had inline parser processed auto links before. +0.34.49 +------- + +* Change: revert docx4j to 3.3.6 in docx4j-3 branch + 0.34.48 ------- diff --git a/flexmark-all/pom.xml b/flexmark-all/pom.xml index d0ff5e58d..7b93ffc83 100644 --- a/flexmark-all/pom.xml +++ b/flexmark-all/pom.xml @@ -7,7 +7,7 @@ com.vladsch.flexmark flexmark-java - 0.34.50 + 0.34.53 flexmark-all @@ -21,192 +21,192 @@ com.vladsch.flexmark flexmark - 0.34.50 + 0.34.53 com.vladsch.flexmark flexmark-ext-abbreviation - 0.34.50 + 0.34.53 com.vladsch.flexmark flexmark-ext-admonition - 0.34.50 + 0.34.53 com.vladsch.flexmark flexmark-ext-anchorlink - 0.34.50 + 0.34.53 com.vladsch.flexmark flexmark-ext-aside - 0.34.50 + 0.34.53 com.vladsch.flexmark flexmark-ext-attributes - 0.34.50 + 0.34.53 com.vladsch.flexmark flexmark-ext-autolink - 0.34.50 + 0.34.53 com.vladsch.flexmark flexmark-ext-definition - 0.34.50 + 0.34.53 com.vladsch.flexmark flexmark-ext-emoji - 0.34.50 + 0.34.53 com.vladsch.flexmark flexmark-ext-enumerated-reference - 0.34.50 + 0.34.53 com.vladsch.flexmark flexmark-ext-escaped-character - 0.34.50 + 0.34.53 com.vladsch.flexmark flexmark-ext-footnotes - 0.34.50 + 0.34.53 com.vladsch.flexmark flexmark-ext-gfm-issues - 0.34.50 + 0.34.53 com.vladsch.flexmark flexmark-ext-gfm-strikethrough - 0.34.50 + 0.34.53 com.vladsch.flexmark flexmark-ext-gfm-tables - 0.34.50 + 0.34.53 com.vladsch.flexmark flexmark-ext-gfm-tasklist - 0.34.50 + 0.34.53 com.vladsch.flexmark flexmark-ext-gfm-users - 0.34.50 + 0.34.53 com.vladsch.flexmark flexmark-ext-gitlab - 0.34.50 + 0.34.53 com.vladsch.flexmark flexmark-ext-jekyll-front-matter - 0.34.50 + 0.34.53 com.vladsch.flexmark flexmark-ext-jekyll-tag - 0.34.50 + 0.34.53 com.vladsch.flexmark flexmark-ext-media-tags - 0.34.50 + 0.34.53 com.vladsch.flexmark flexmark-ext-macros - 0.34.50 + 0.34.53 com.vladsch.flexmark flexmark-ext-ins - 0.34.50 + 0.34.53 com.vladsch.flexmark flexmark-ext-xwiki-macros - 0.34.50 + 0.34.53 com.vladsch.flexmark flexmark-ext-superscript - 0.34.50 + 0.34.53 com.vladsch.flexmark flexmark-ext-tables - 0.34.50 + 0.34.53 com.vladsch.flexmark flexmark-ext-toc - 0.34.50 + 0.34.53 com.vladsch.flexmark flexmark-ext-typographic - 0.34.50 + 0.34.53 com.vladsch.flexmark flexmark-ext-wikilink - 0.34.50 + 0.34.53 com.vladsch.flexmark flexmark-ext-yaml-front-matter - 0.34.50 + 0.34.53 com.vladsch.flexmark flexmark-ext-youtube-embedded - 0.34.50 + 0.34.53 com.vladsch.flexmark flexmark-formatter - 0.34.50 + 0.34.53 com.vladsch.flexmark flexmark-html-parser - 0.34.50 + 0.34.53 com.vladsch.flexmark flexmark-jira-converter - 0.34.50 + 0.34.53 com.vladsch.flexmark flexmark-pdf-converter - 0.34.50 + 0.34.53 com.vladsch.flexmark flexmark-profile-pegdown - 0.34.50 + 0.34.53 com.vladsch.flexmark flexmark-util - 0.34.50 + 0.34.53 com.vladsch.flexmark flexmark-youtrack-converter - 0.34.50 + 0.34.53 diff --git a/flexmark-docx-converter/pom.xml b/flexmark-docx-converter/pom.xml index 663426ad7..afcd84420 100644 --- a/flexmark-docx-converter/pom.xml +++ b/flexmark-docx-converter/pom.xml @@ -5,7 +5,7 @@ com.vladsch.flexmark flexmark-java - 0.34.50 + 0.34.53 flexmark-docx-converter @@ -94,7 +94,7 @@ org.docx4j docx4j - 6.0.1 + 3.3.4 diff --git a/flexmark-docx-converter/src/main/java/com/vladsch/flexmark/docx/converter/internal/CoreNodeDocxRenderer.java b/flexmark-docx-converter/src/main/java/com/vladsch/flexmark/docx/converter/internal/CoreNodeDocxRenderer.java index 8959c58f2..f42edc2bc 100644 --- a/flexmark-docx-converter/src/main/java/com/vladsch/flexmark/docx/converter/internal/CoreNodeDocxRenderer.java +++ b/flexmark-docx-converter/src/main/java/com/vladsch/flexmark/docx/converter/internal/CoreNodeDocxRenderer.java @@ -1571,6 +1571,7 @@ private void render(final TableBody node, final DocxRendererContext docx) { } private void render(final TableRow node, final DocxRendererContext docx) { + Tr savedTr = myTr; myTr = docx.getFactory().createTr(); myTbl.getContent().add(myTr); @@ -1586,7 +1587,7 @@ private void render(final TableRow node, final DocxRendererContext docx) { } docx.renderChildren(node); - myTr = null; + myTr = savedTr; } private void render(final TableCaption node, final DocxRendererContext docx) { diff --git a/flexmark-docx-converter/src/test/resources/docx_converter_ast_spec.md b/flexmark-docx-converter/src/test/resources/docx_converter_ast_spec.md index ac3f5638d..5cbaa7cc8 100644 --- a/flexmark-docx-converter/src/test/resources/docx_converter_ast_spec.md +++ b/flexmark-docx-converter/src/test/resources/docx_converter_ast_spec.md @@ -917,7 +917,7 @@ with some text - + @@ -1269,7 +1269,7 @@ with hyperlink - + @@ -1326,7 +1326,7 @@ with hard break with a link - + @@ -1386,7 +1386,7 @@ with child paragraphs with a link - + @@ -1500,7 +1500,7 @@ with child paragraphs with a link - + @@ -6304,7 +6304,7 @@ With embedded links text - + @@ -8874,7 +8874,7 @@ Paragraph text, repeated footnote[^1] to the level of the text after the footnote anchor at the left margin. - + @@ -8907,7 +8907,7 @@ Paragraph text, repeated footnote[^1] to the level of the text after the footnote anchor at the left margin. - + @@ -9026,7 +9026,7 @@ Paragraph text, repeated footnote[^1] Beispiele - + @@ -9155,7 +9155,7 @@ Der Hersteller[^C1-04] Beispiele - + @@ -9305,7 +9305,7 @@ Text [^id] with link [link](http://example.com) with link - + @@ -9343,7 +9343,7 @@ Text [^id] with link [link](http://example.com) - + @@ -9382,7 +9382,7 @@ Text [^id] with link [link](http://example.com) with link - + @@ -9420,7 +9420,7 @@ Text [^id] with link [link](http://example.com) - + @@ -13533,7 +13533,7 @@ with hyperlink - + @@ -13590,7 +13590,7 @@ with hard break with a link - + @@ -13650,7 +13650,7 @@ with child paragraphs with a link - + @@ -13873,7 +13873,7 @@ with child paragraphs with a link - + @@ -14560,4 +14560,189 @@ Plain text <<>> ```````````````````````````````` -** +```````````````````````````````` example Macros: 8 +>>>macro +- item 1 +- item 2 + + +| Column | +|--------| +| Data | +<<< + + +| Complex | Simple | +|-------------|-------------| +| <<>> | Simple Data | + +. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Complex + + + + + + + + + + + + + Simple + + + + + + + + + + + + + + + + + + item 1 + + + + + + + + + + + + item 2 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Column + + + + + + + + + + + + + + Data + + + + + + + + + + + + + + + + + + + + + + Simple Data + + + + + + +```````````````````````````````` + + diff --git a/flexmark-docx-converter/src/test/resources/docx_converter_issues_ast_spec.md b/flexmark-docx-converter/src/test/resources/docx_converter_issues_ast_spec.md index f46677531..83847acbe 100644 --- a/flexmark-docx-converter/src/test/resources/docx_converter_issues_ast_spec.md +++ b/flexmark-docx-converter/src/test/resources/docx_converter_issues_ast_spec.md @@ -176,7 +176,7 @@ Footnote [^1] Link - + @@ -1223,7 +1223,7 @@ Aside Block Numbered List HYPERLINK_STYLE - docx style named "Hyperlink" plain - + @@ -2368,7 +2368,7 @@ www.example.com - + @@ -2400,22 +2400,22 @@ TEXT :+1: TEXT - + - + - + - + - + @@ -2478,22 +2478,22 @@ TEXT :+1: TEXT - + - + - + - + - + @@ -2532,22 +2532,22 @@ TEXT :+1: TEXT - + - + - + - + - + @@ -2586,22 +2586,22 @@ TEXT :+1: TEXT - + - + - + - + - + @@ -2640,22 +2640,22 @@ TEXT :+1: TEXT - + - + - + - + - + @@ -2694,22 +2694,22 @@ TEXT :+1: TEXT - + - + - + - + - + @@ -2748,22 +2748,22 @@ TEXT :+1: TEXT - + - + - + - + - + @@ -2796,22 +2796,22 @@ TEXT :+1: TEXT - + - + - + - + - + @@ -2874,22 +2874,22 @@ TEXT :+1: TEXT - + - + - + - + - + @@ -2928,22 +2928,22 @@ TEXT :+1: TEXT - + - + - + - + - + @@ -2982,22 +2982,22 @@ TEXT :+1: TEXT - + - + - + - + - + @@ -3036,22 +3036,22 @@ TEXT :+1: TEXT - + - + - + - + - + @@ -3090,22 +3090,22 @@ TEXT :+1: TEXT - + - + - + - + - + @@ -3144,22 +3144,22 @@ TEXT :+1: TEXT - + - + - + - + - + @@ -3192,22 +3192,22 @@ TEXT :+1: TEXT - + - + - + - + - + @@ -3270,22 +3270,22 @@ TEXT :basecamp: TEXT - + - + - + - + - + @@ -3324,22 +3324,22 @@ TEXT :basecamp: TEXT - + - + - + - + - + @@ -3378,22 +3378,22 @@ TEXT :basecamp: TEXT - + - + - + - + - + @@ -3432,22 +3432,22 @@ TEXT :basecamp: TEXT - + - + - + - + - + @@ -3486,22 +3486,22 @@ TEXT :basecamp: TEXT - + - + - + - + - + @@ -3540,22 +3540,22 @@ TEXT :basecamp: TEXT - + - + - + - + - + @@ -3588,22 +3588,22 @@ TEXT :basecamp: TEXT - + - + - + - + - + @@ -3832,7 +3832,7 @@ unprefixed - + @@ -3855,7 +3855,7 @@ prefixed - + @@ -4016,7 +4016,7 @@ invalid docx für - + @@ -4063,7 +4063,7 @@ invalid docx Die - + @@ -4225,7 +4225,7 @@ invalid docx für - + @@ -4459,7 +4459,7 @@ invalid docx Die - + @@ -4611,7 +4611,7 @@ invalid docx für - + diff --git a/flexmark-ext-abbreviation/pom.xml b/flexmark-ext-abbreviation/pom.xml index 5c01aa530..9d0d960cc 100644 --- a/flexmark-ext-abbreviation/pom.xml +++ b/flexmark-ext-abbreviation/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.34.50 + 0.34.53 flexmark-ext-abbreviation diff --git a/flexmark-ext-admonition/pom.xml b/flexmark-ext-admonition/pom.xml index 8fdbd40b2..4eef95f95 100644 --- a/flexmark-ext-admonition/pom.xml +++ b/flexmark-ext-admonition/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.34.50 + 0.34.53 flexmark-ext-admonition diff --git a/flexmark-ext-anchorlink/pom.xml b/flexmark-ext-anchorlink/pom.xml index c6b34f677..b38f2acee 100644 --- a/flexmark-ext-anchorlink/pom.xml +++ b/flexmark-ext-anchorlink/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.34.50 + 0.34.53 flexmark-ext-anchorlink @@ -28,7 +28,7 @@ com.vladsch.flexmark flexmark-jira-converter - 0.34.50 + 0.34.53 test diff --git a/flexmark-ext-aside/pom.xml b/flexmark-ext-aside/pom.xml index b4a661857..49a9326fd 100644 --- a/flexmark-ext-aside/pom.xml +++ b/flexmark-ext-aside/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.34.50 + 0.34.53 flexmark-ext-aside diff --git a/flexmark-ext-attributes/pom.xml b/flexmark-ext-attributes/pom.xml index d9bfef42a..0bbe71b84 100644 --- a/flexmark-ext-attributes/pom.xml +++ b/flexmark-ext-attributes/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.34.50 + 0.34.53 flexmark-ext-attributes diff --git a/flexmark-ext-autolink/pom.xml b/flexmark-ext-autolink/pom.xml index bbf7b84b2..a4fdc9486 100644 --- a/flexmark-ext-autolink/pom.xml +++ b/flexmark-ext-autolink/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.34.50 + 0.34.53 flexmark-ext-autolink diff --git a/flexmark-ext-definition/pom.xml b/flexmark-ext-definition/pom.xml index 14bb46f80..ad4696582 100644 --- a/flexmark-ext-definition/pom.xml +++ b/flexmark-ext-definition/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.34.50 + 0.34.53 flexmark-ext-definition diff --git a/flexmark-ext-emoji/pom.xml b/flexmark-ext-emoji/pom.xml index b29b4f67f..68016b49b 100644 --- a/flexmark-ext-emoji/pom.xml +++ b/flexmark-ext-emoji/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.34.50 + 0.34.53 flexmark-ext-emoji diff --git a/flexmark-ext-enumerated-reference/pom.xml b/flexmark-ext-enumerated-reference/pom.xml index 5f5890900..9848446a9 100644 --- a/flexmark-ext-enumerated-reference/pom.xml +++ b/flexmark-ext-enumerated-reference/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.34.50 + 0.34.53 flexmark-ext-enumerated-reference diff --git a/flexmark-ext-escaped-character/pom.xml b/flexmark-ext-escaped-character/pom.xml index 5963e7223..23487fbd0 100644 --- a/flexmark-ext-escaped-character/pom.xml +++ b/flexmark-ext-escaped-character/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.34.50 + 0.34.53 flexmark-ext-escaped-character diff --git a/flexmark-ext-footnotes/pom.xml b/flexmark-ext-footnotes/pom.xml index 264dd1080..7f56cc56a 100644 --- a/flexmark-ext-footnotes/pom.xml +++ b/flexmark-ext-footnotes/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.34.50 + 0.34.53 flexmark-ext-footnotes diff --git a/flexmark-ext-gfm-issues/pom.xml b/flexmark-ext-gfm-issues/pom.xml index 9c84215c3..05e378a78 100644 --- a/flexmark-ext-gfm-issues/pom.xml +++ b/flexmark-ext-gfm-issues/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.34.50 + 0.34.53 flexmark-ext-gfm-issues diff --git a/flexmark-ext-gfm-strikethrough/pom.xml b/flexmark-ext-gfm-strikethrough/pom.xml index 2d47fa1a2..c1f634a39 100644 --- a/flexmark-ext-gfm-strikethrough/pom.xml +++ b/flexmark-ext-gfm-strikethrough/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.34.50 + 0.34.53 flexmark-ext-gfm-strikethrough diff --git a/flexmark-ext-gfm-tables/pom.xml b/flexmark-ext-gfm-tables/pom.xml index 87d8c67a7..1e2d55e6c 100644 --- a/flexmark-ext-gfm-tables/pom.xml +++ b/flexmark-ext-gfm-tables/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.34.50 + 0.34.53 flexmark-ext-gfm-tables diff --git a/flexmark-ext-gfm-tasklist/pom.xml b/flexmark-ext-gfm-tasklist/pom.xml index 9c40fd355..481b8230f 100644 --- a/flexmark-ext-gfm-tasklist/pom.xml +++ b/flexmark-ext-gfm-tasklist/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.34.50 + 0.34.53 flexmark-ext-gfm-tasklist diff --git a/flexmark-ext-gfm-users/pom.xml b/flexmark-ext-gfm-users/pom.xml index 3625ae5a8..31e1a031e 100644 --- a/flexmark-ext-gfm-users/pom.xml +++ b/flexmark-ext-gfm-users/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.34.50 + 0.34.53 flexmark-ext-gfm-users diff --git a/flexmark-ext-gitlab/pom.xml b/flexmark-ext-gitlab/pom.xml index 396b5fc81..c5c286487 100644 --- a/flexmark-ext-gitlab/pom.xml +++ b/flexmark-ext-gitlab/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.34.50 + 0.34.53 flexmark-ext-gitlab diff --git a/flexmark-ext-ins/pom.xml b/flexmark-ext-ins/pom.xml index add155dbb..b83104ed3 100644 --- a/flexmark-ext-ins/pom.xml +++ b/flexmark-ext-ins/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.34.50 + 0.34.53 flexmark-ext-ins diff --git a/flexmark-ext-jekyll-front-matter/pom.xml b/flexmark-ext-jekyll-front-matter/pom.xml index 0150867c2..7be20dce0 100644 --- a/flexmark-ext-jekyll-front-matter/pom.xml +++ b/flexmark-ext-jekyll-front-matter/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.34.50 + 0.34.53 flexmark-ext-jekyll-front-matter diff --git a/flexmark-ext-jekyll-tag/pom.xml b/flexmark-ext-jekyll-tag/pom.xml index 9812c657b..4e17e634a 100644 --- a/flexmark-ext-jekyll-tag/pom.xml +++ b/flexmark-ext-jekyll-tag/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.34.50 + 0.34.53 flexmark-ext-jekyll-tag diff --git a/flexmark-ext-macros/pom.xml b/flexmark-ext-macros/pom.xml index 7ca879552..0dbe03b75 100644 --- a/flexmark-ext-macros/pom.xml +++ b/flexmark-ext-macros/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.34.50 + 0.34.53 flexmark-ext-macros diff --git a/flexmark-ext-media-tags/pom.xml b/flexmark-ext-media-tags/pom.xml index b41481007..8b2d71527 100644 --- a/flexmark-ext-media-tags/pom.xml +++ b/flexmark-ext-media-tags/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.34.50 + 0.34.53 flexmark-ext-media-tags diff --git a/flexmark-ext-spec-example/pom.xml b/flexmark-ext-spec-example/pom.xml index 18587fdc8..d209ff133 100644 --- a/flexmark-ext-spec-example/pom.xml +++ b/flexmark-ext-spec-example/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.34.50 + 0.34.53 flexmark-ext-spec-example diff --git a/flexmark-ext-superscript/pom.xml b/flexmark-ext-superscript/pom.xml index ec2c4b80c..80b2a9e44 100644 --- a/flexmark-ext-superscript/pom.xml +++ b/flexmark-ext-superscript/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.34.50 + 0.34.53 flexmark-ext-superscript diff --git a/flexmark-ext-tables/pom.xml b/flexmark-ext-tables/pom.xml index 6b7eeadae..63f092a56 100644 --- a/flexmark-ext-tables/pom.xml +++ b/flexmark-ext-tables/pom.xml @@ -5,7 +5,7 @@ com.vladsch.flexmark flexmark-java - 0.34.50 + 0.34.53 flexmark-ext-tables diff --git a/flexmark-ext-toc/pom.xml b/flexmark-ext-toc/pom.xml index 430febb07..18051b9ad 100644 --- a/flexmark-ext-toc/pom.xml +++ b/flexmark-ext-toc/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.34.50 + 0.34.53 flexmark-ext-toc diff --git a/flexmark-ext-typographic/pom.xml b/flexmark-ext-typographic/pom.xml index 96a9a96f4..04080b05e 100644 --- a/flexmark-ext-typographic/pom.xml +++ b/flexmark-ext-typographic/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.34.50 + 0.34.53 flexmark-ext-typographic diff --git a/flexmark-ext-wikilink/pom.xml b/flexmark-ext-wikilink/pom.xml index 4153f8698..c73f945e7 100644 --- a/flexmark-ext-wikilink/pom.xml +++ b/flexmark-ext-wikilink/pom.xml @@ -5,7 +5,7 @@ com.vladsch.flexmark flexmark-java - 0.34.50 + 0.34.53 flexmark-ext-wikilink diff --git a/flexmark-ext-xwiki-macros/pom.xml b/flexmark-ext-xwiki-macros/pom.xml index 3586477ff..2e8c3d3f6 100644 --- a/flexmark-ext-xwiki-macros/pom.xml +++ b/flexmark-ext-xwiki-macros/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.34.50 + 0.34.53 flexmark-ext-xwiki-macros diff --git a/flexmark-ext-yaml-front-matter/pom.xml b/flexmark-ext-yaml-front-matter/pom.xml index dee3701c4..a28e3b065 100644 --- a/flexmark-ext-yaml-front-matter/pom.xml +++ b/flexmark-ext-yaml-front-matter/pom.xml @@ -4,7 +4,7 @@ flexmark-java com.vladsch.flexmark - 0.34.50 + 0.34.53 flexmark-ext-yaml-front-matter diff --git a/flexmark-ext-youtube-embedded/pom.xml b/flexmark-ext-youtube-embedded/pom.xml index ad1ce07e8..84a571c68 100644 --- a/flexmark-ext-youtube-embedded/pom.xml +++ b/flexmark-ext-youtube-embedded/pom.xml @@ -4,7 +4,7 @@ flexmark-java com.vladsch.flexmark - 0.34.50 + 0.34.53 4.0.0 diff --git a/flexmark-ext-zzzzzz/pom.xml b/flexmark-ext-zzzzzz/pom.xml index a8252bb9b..29c230b23 100644 --- a/flexmark-ext-zzzzzz/pom.xml +++ b/flexmark-ext-zzzzzz/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.34.50 + 0.34.53 flexmark-ext-zzzzzz diff --git a/flexmark-formatter/pom.xml b/flexmark-formatter/pom.xml index cdd4c43c6..81116370b 100644 --- a/flexmark-formatter/pom.xml +++ b/flexmark-formatter/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.34.50 + 0.34.53 flexmark-formatter diff --git a/flexmark-html-parser/pom.xml b/flexmark-html-parser/pom.xml index a65a5409e..1c8a05b20 100644 --- a/flexmark-html-parser/pom.xml +++ b/flexmark-html-parser/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.34.50 + 0.34.53 flexmark-html-parser diff --git a/flexmark-integration-test/pom.xml b/flexmark-integration-test/pom.xml index 361111085..86ab58563 100644 --- a/flexmark-integration-test/pom.xml +++ b/flexmark-integration-test/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.34.50 + 0.34.53 flexmark-integration-test diff --git a/flexmark-jira-converter/pom.xml b/flexmark-jira-converter/pom.xml index a5e214137..921fc88a4 100644 --- a/flexmark-jira-converter/pom.xml +++ b/flexmark-jira-converter/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.34.50 + 0.34.53 flexmark-jira-converter diff --git a/flexmark-osgi/pom.xml b/flexmark-osgi/pom.xml index 174ce7338..af095e705 100644 --- a/flexmark-osgi/pom.xml +++ b/flexmark-osgi/pom.xml @@ -7,7 +7,7 @@ com.vladsch.flexmark flexmark-java - 0.34.50 + 0.34.53 flexmark-osgi diff --git a/flexmark-pdf-converter/pom.xml b/flexmark-pdf-converter/pom.xml index fad332b71..1b765430e 100644 --- a/flexmark-pdf-converter/pom.xml +++ b/flexmark-pdf-converter/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.34.50 + 0.34.53 flexmark-pdf-converter diff --git a/flexmark-profile-pegdown/pom.xml b/flexmark-profile-pegdown/pom.xml index 5b859f223..691a6bd5d 100644 --- a/flexmark-profile-pegdown/pom.xml +++ b/flexmark-profile-pegdown/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.34.50 + 0.34.53 flexmark-profile-pegdown diff --git a/flexmark-test-util/pom.xml b/flexmark-test-util/pom.xml index 9dc96de1b..ff1bff913 100644 --- a/flexmark-test-util/pom.xml +++ b/flexmark-test-util/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.34.50 + 0.34.53 flexmark-test-util diff --git a/flexmark-util/pom.xml b/flexmark-util/pom.xml index 54b17b909..25a51bf20 100644 --- a/flexmark-util/pom.xml +++ b/flexmark-util/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.34.50 + 0.34.53 flexmark-util diff --git a/flexmark-youtrack-converter/pom.xml b/flexmark-youtrack-converter/pom.xml index 970c59e77..207634358 100644 --- a/flexmark-youtrack-converter/pom.xml +++ b/flexmark-youtrack-converter/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.34.50 + 0.34.53 flexmark-youtrack-converter diff --git a/flexmark/pom.xml b/flexmark/pom.xml index 052df2561..676288334 100644 --- a/flexmark/pom.xml +++ b/flexmark/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.34.50 + 0.34.53 flexmark diff --git a/lib/commons-codec-1.10.jar b/lib/commons-codec-1.10.jar new file mode 100644 index 000000000..1d7417c40 Binary files /dev/null and b/lib/commons-codec-1.10.jar differ diff --git a/lib/commons-codec-1.11.jar b/lib/commons-codec-1.11.jar deleted file mode 100644 index 22451206d..000000000 Binary files a/lib/commons-codec-1.11.jar and /dev/null differ diff --git a/lib/commons-compress-1.12.jar b/lib/commons-compress-1.12.jar deleted file mode 100644 index 4867705ea..000000000 Binary files a/lib/commons-compress-1.12.jar and /dev/null differ diff --git a/lib/commons-io-2.5.jar b/lib/commons-io-2.5.jar deleted file mode 100644 index 107b061f5..000000000 Binary files a/lib/commons-io-2.5.jar and /dev/null differ diff --git a/lib/commons-lang3-3.4.jar b/lib/commons-lang3-3.4.jar new file mode 100644 index 000000000..8ec91d454 Binary files /dev/null and b/lib/commons-lang3-3.4.jar differ diff --git a/lib/commons-lang3-3.5.jar b/lib/commons-lang3-3.5.jar deleted file mode 100644 index 6328c8de4..000000000 Binary files a/lib/commons-lang3-3.5.jar and /dev/null differ diff --git a/lib/docx4j-3.3.6.jar b/lib/docx4j-3.3.6.jar new file mode 100644 index 000000000..180bb85c8 Binary files /dev/null and b/lib/docx4j-3.3.6.jar differ diff --git a/lib/docx4j-6.0.1.jar b/lib/docx4j-6.0.1.jar deleted file mode 100644 index 5e193bb97..000000000 Binary files a/lib/docx4j-6.0.1.jar and /dev/null differ diff --git a/lib/guava-19.0.jar b/lib/guava-19.0.jar new file mode 100644 index 000000000..b175ca867 Binary files /dev/null and b/lib/guava-19.0.jar differ diff --git a/lib/guava-20.0.jar b/lib/guava-20.0.jar deleted file mode 100644 index 632772f3a..000000000 Binary files a/lib/guava-20.0.jar and /dev/null differ diff --git a/lib/httpclient-4.5.2.jar b/lib/httpclient-4.5.2.jar new file mode 100644 index 000000000..701609fcc Binary files /dev/null and b/lib/httpclient-4.5.2.jar differ diff --git a/lib/httpclient-4.5.6.jar b/lib/httpclient-4.5.6.jar deleted file mode 100644 index 56231de0c..000000000 Binary files a/lib/httpclient-4.5.6.jar and /dev/null differ diff --git a/lib/httpcore-4.4.10.jar b/lib/httpcore-4.4.10.jar deleted file mode 100644 index dc510f81c..000000000 Binary files a/lib/httpcore-4.4.10.jar and /dev/null differ diff --git a/lib/httpcore-4.4.4.jar b/lib/httpcore-4.4.4.jar new file mode 100644 index 000000000..ac4a87730 Binary files /dev/null and b/lib/httpcore-4.4.4.jar differ diff --git a/lib/jackson-core-2.7.3.jar b/lib/jackson-core-2.7.3.jar new file mode 100644 index 000000000..9b20cee67 Binary files /dev/null and b/lib/jackson-core-2.7.3.jar differ diff --git a/lib/jackson-core-2.7.9.jar b/lib/jackson-core-2.7.9.jar deleted file mode 100644 index e87c08afa..000000000 Binary files a/lib/jackson-core-2.7.9.jar and /dev/null differ diff --git a/lib/jackson-databind-2.7.9.4.jar b/lib/jackson-databind-2.7.3.jar similarity index 60% rename from lib/jackson-databind-2.7.9.4.jar rename to lib/jackson-databind-2.7.3.jar index a4ec29ec9..29d90afe4 100644 Binary files a/lib/jackson-databind-2.7.9.4.jar and b/lib/jackson-databind-2.7.3.jar differ diff --git a/lib/jcl-over-slf4j-1.7.25.jar b/lib/jcl-over-slf4j-1.7.21.jar similarity index 52% rename from lib/jcl-over-slf4j-1.7.25.jar rename to lib/jcl-over-slf4j-1.7.21.jar index 8e7fec880..12ba1261a 100644 Binary files a/lib/jcl-over-slf4j-1.7.25.jar and b/lib/jcl-over-slf4j-1.7.21.jar differ diff --git a/lib/lorem-2.0.jar b/lib/lorem-2.0.jar new file mode 100644 index 000000000..fcbb35dd6 Binary files /dev/null and b/lib/lorem-2.0.jar differ diff --git a/lib/lorem-2.1.jar b/lib/lorem-2.1.jar deleted file mode 100644 index 6536b9486..000000000 Binary files a/lib/lorem-2.1.jar and /dev/null differ diff --git a/lib/slf4j-api-1.7.25.jar b/lib/slf4j-api-1.7.21.jar similarity index 52% rename from lib/slf4j-api-1.7.25.jar rename to lib/slf4j-api-1.7.21.jar index 0143c0996..2a5c33ec5 100644 Binary files a/lib/slf4j-api-1.7.25.jar and b/lib/slf4j-api-1.7.21.jar differ diff --git a/lib/slf4j-log4j12-1.7.25.jar b/lib/slf4j-log4j12-1.7.21.jar similarity index 50% rename from lib/slf4j-log4j12-1.7.25.jar rename to lib/slf4j-log4j12-1.7.21.jar index 7d88a6e75..ff4fddd69 100644 Binary files a/lib/slf4j-log4j12-1.7.25.jar and b/lib/slf4j-log4j12-1.7.21.jar differ diff --git a/lib/xmlgraphics-commons-2.1.jar b/lib/xmlgraphics-commons-2.1.jar new file mode 100644 index 000000000..f917ca1b1 Binary files /dev/null and b/lib/xmlgraphics-commons-2.1.jar differ diff --git a/lib/xmlgraphics-commons-2.3.jar b/lib/xmlgraphics-commons-2.3.jar deleted file mode 100644 index 2ae770f5b..000000000 Binary files a/lib/xmlgraphics-commons-2.3.jar and /dev/null differ diff --git a/pom.xml b/pom.xml index 98b59b205..351d3d8de 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ com.vladsch.flexmark flexmark-java - 0.34.50 + 0.34.53 flexmark-java Java re-implementation of commonmark-java based parser, with AST reflecting source elements, full source position tracking, greater parser extensibility. @@ -217,217 +217,217 @@ com.vladsch.flexmark flexmark - 0.34.50 + 0.34.53 com.vladsch.flexmark flexmark-docx-converter - 0.34.50 + 0.34.53 com.vladsch.flexmark flexmark-ext-abbreviation - 0.34.50 + 0.34.53 com.vladsch.flexmark flexmark-ext-anchorlink - 0.34.50 + 0.34.53 com.vladsch.flexmark flexmark-ext-admonition - 0.34.50 + 0.34.53 com.vladsch.flexmark flexmark-ext-aside - 0.34.50 + 0.34.53 com.vladsch.flexmark flexmark-ext-attributes - 0.34.50 + 0.34.53 com.vladsch.flexmark flexmark-ext-autolink - 0.34.50 + 0.34.53 com.vladsch.flexmark flexmark-ext-definition - 0.34.50 + 0.34.53 com.vladsch.flexmark flexmark-ext-emoji - 0.34.50 + 0.34.53 com.vladsch.flexmark flexmark-ext-enumerated-reference - 0.34.50 + 0.34.53 com.vladsch.flexmark flexmark-ext-escaped-character - 0.34.50 + 0.34.53 com.vladsch.flexmark flexmark-ext-footnotes - 0.34.50 + 0.34.53 com.vladsch.flexmark flexmark-ext-gfm-issues - 0.34.50 + 0.34.53 com.vladsch.flexmark flexmark-ext-gfm-strikethrough - 0.34.50 + 0.34.53 com.vladsch.flexmark flexmark-ext-gfm-tables - 0.34.50 + 0.34.53 com.vladsch.flexmark flexmark-ext-gfm-tasklist - 0.34.50 + 0.34.53 com.vladsch.flexmark flexmark-ext-gfm-users - 0.34.50 + 0.34.53 com.vladsch.flexmark flexmark-ext-gitlab - 0.34.50 + 0.34.53 com.vladsch.flexmark flexmark-ext-ins - 0.34.50 + 0.34.53 com.vladsch.flexmark flexmark-ext-jekyll-front-matter - 0.34.50 + 0.34.53 com.vladsch.flexmark flexmark-ext-jekyll-tag - 0.34.50 + 0.34.53 com.vladsch.flexmark flexmark-ext-macros - 0.34.50 + 0.34.53 com.vladsch.flexmark flexmark-ext-media-tags - 0.34.50 + 0.34.53 com.vladsch.flexmark flexmark-ext-xwiki-macros - 0.34.50 + 0.34.53 com.vladsch.flexmark flexmark-ext-spec-example - 0.34.50 + 0.34.53 com.vladsch.flexmark flexmark-ext-superscript - 0.34.50 + 0.34.53 com.vladsch.flexmark flexmark-ext-tables - 0.34.50 + 0.34.53 com.vladsch.flexmark flexmark-ext-toc - 0.34.50 + 0.34.53 com.vladsch.flexmark flexmark-ext-typographic - 0.34.50 + 0.34.53 com.vladsch.flexmark flexmark-ext-wikilink - 0.34.50 + 0.34.53 com.vladsch.flexmark flexmark-ext-yaml-front-matter - 0.34.50 + 0.34.53 com.vladsch.flexmark flexmark-ext-youtube-embedded - 0.34.50 + 0.34.53 com.vladsch.flexmark flexmark-ext-zzzzzz - 0.34.50 + 0.34.53 com.vladsch.flexmark flexmark-formatter - 0.34.50 + 0.34.53 com.vladsch.flexmark flexmark-html-parser - 0.34.50 + 0.34.53 com.vladsch.flexmark flexmark-jira-converter - 0.34.50 + 0.34.53 com.vladsch.flexmark flexmark-pdf-converter - 0.34.50 + 0.34.53 com.vladsch.flexmark flexmark-profile-pegdown - 0.34.50 + 0.34.53 com.vladsch.flexmark flexmark-test-util - 0.34.50 + 0.34.53 com.vladsch.flexmark flexmark-util - 0.34.50 + 0.34.53 com.vladsch.flexmark flexmark-youtrack-converter - 0.34.50 + 0.34.53 com.vladsch.flexmark flexmark-all - 0.34.50 + 0.34.53