From b7a94255e0ae65f9eb07654c9b25f9fa842ac060 Mon Sep 17 00:00:00 2001 From: Vladimir Schneider Date: Mon, 24 Dec 2018 17:12:26 -0500 Subject: [PATCH 1/3] fix missing test-scope on some dependencies --- VERSION.md | 6 ++ flexmark-all/pom.xml | 78 ++++++++-------- flexmark-docx-converter/pom.xml | 2 +- flexmark-ext-abbreviation/pom.xml | 6 +- flexmark-ext-admonition/pom.xml | 2 +- flexmark-ext-anchorlink/pom.xml | 4 +- flexmark-ext-aside/pom.xml | 2 +- flexmark-ext-attributes/pom.xml | 2 +- flexmark-ext-autolink/pom.xml | 2 +- flexmark-ext-definition/pom.xml | 2 +- flexmark-ext-emoji/pom.xml | 2 +- flexmark-ext-enumerated-reference/pom.xml | 2 +- flexmark-ext-escaped-character/pom.xml | 2 +- flexmark-ext-footnotes/pom.xml | 2 +- flexmark-ext-gfm-issues/pom.xml | 2 +- flexmark-ext-gfm-strikethrough/pom.xml | 2 +- flexmark-ext-gfm-tables/pom.xml | 2 +- flexmark-ext-gfm-tasklist/pom.xml | 2 +- flexmark-ext-gfm-users/pom.xml | 2 +- flexmark-ext-gitlab/pom.xml | 2 +- flexmark-ext-ins/pom.xml | 2 +- flexmark-ext-jekyll-front-matter/pom.xml | 2 +- flexmark-ext-jekyll-tag/pom.xml | 2 +- flexmark-ext-macros/pom.xml | 2 +- flexmark-ext-media-tags/pom.xml | 3 +- flexmark-ext-spec-example/pom.xml | 2 +- flexmark-ext-superscript/pom.xml | 2 +- flexmark-ext-tables/pom.xml | 2 +- flexmark-ext-toc/pom.xml | 2 +- flexmark-ext-typographic/pom.xml | 2 +- flexmark-ext-wikilink/pom.xml | 2 +- flexmark-ext-xwiki-macros/pom.xml | 2 +- flexmark-ext-yaml-front-matter/pom.xml | 2 +- flexmark-ext-youtube-embedded/pom.xml | 2 +- flexmark-ext-zzzzzz/pom.xml | 2 +- flexmark-formatter/pom.xml | 2 +- flexmark-html-parser/pom.xml | 2 +- flexmark-integration-test/pom.xml | 2 +- flexmark-jira-converter/pom.xml | 2 +- flexmark-osgi/pom.xml | 2 +- flexmark-pdf-converter/pom.xml | 2 +- flexmark-profile-pegdown/pom.xml | 2 +- flexmark-test-util/pom.xml | 2 +- flexmark-util/pom.xml | 2 +- flexmark-youtrack-converter/pom.xml | 2 +- flexmark/pom.xml | 3 +- .../flexmark/internal/DocumentParser.java | 44 ++++------ pom.xml | 88 +++++++++---------- 48 files changed, 155 insertions(+), 157 deletions(-) diff --git a/VERSION.md b/VERSION.md index 67c44e7803..9ecf5b70ed 100644 --- a/VERSION.md +++ b/VERSION.md @@ -7,6 +7,7 @@ flexmark-java - [To Do](#to-do) - [Docx Converter](#docx-converter) +- [0.35.8](#0358) - [0.35.6](#0356) - [0.35.4](#0354) - [0.35.2](#0352) @@ -265,6 +266,11 @@ flexmark-java   +0.35.8 +------ + +* Fix: add missing test-scope to flexmark-test-util dependencies + 0.35.6 ------ diff --git a/flexmark-all/pom.xml b/flexmark-all/pom.xml index 10aca0c9f0..2bbe50390f 100644 --- a/flexmark-all/pom.xml +++ b/flexmark-all/pom.xml @@ -7,7 +7,7 @@ com.vladsch.flexmark flexmark-java - 0.35.6 + 0.36.8 flexmark-all @@ -21,192 +21,192 @@ com.vladsch.flexmark flexmark - 0.35.6 + 0.36.8 com.vladsch.flexmark flexmark-ext-abbreviation - 0.35.6 + 0.36.8 com.vladsch.flexmark flexmark-ext-admonition - 0.35.6 + 0.36.8 com.vladsch.flexmark flexmark-ext-anchorlink - 0.35.6 + 0.36.8 com.vladsch.flexmark flexmark-ext-aside - 0.35.6 + 0.36.8 com.vladsch.flexmark flexmark-ext-attributes - 0.35.6 + 0.36.8 com.vladsch.flexmark flexmark-ext-autolink - 0.35.6 + 0.36.8 com.vladsch.flexmark flexmark-ext-definition - 0.35.6 + 0.36.8 com.vladsch.flexmark flexmark-ext-emoji - 0.35.6 + 0.36.8 com.vladsch.flexmark flexmark-ext-enumerated-reference - 0.35.6 + 0.36.8 com.vladsch.flexmark flexmark-ext-escaped-character - 0.35.6 + 0.36.8 com.vladsch.flexmark flexmark-ext-footnotes - 0.35.6 + 0.36.8 com.vladsch.flexmark flexmark-ext-gfm-issues - 0.35.6 + 0.36.8 com.vladsch.flexmark flexmark-ext-gfm-strikethrough - 0.35.6 + 0.36.8 com.vladsch.flexmark flexmark-ext-gfm-tables - 0.35.6 + 0.36.8 com.vladsch.flexmark flexmark-ext-gfm-tasklist - 0.35.6 + 0.36.8 com.vladsch.flexmark flexmark-ext-gfm-users - 0.35.6 + 0.36.8 com.vladsch.flexmark flexmark-ext-gitlab - 0.35.6 + 0.36.8 com.vladsch.flexmark flexmark-ext-jekyll-front-matter - 0.35.6 + 0.36.8 com.vladsch.flexmark flexmark-ext-jekyll-tag - 0.35.6 + 0.36.8 com.vladsch.flexmark flexmark-ext-media-tags - 0.35.6 + 0.36.8 com.vladsch.flexmark flexmark-ext-macros - 0.35.6 + 0.36.8 com.vladsch.flexmark flexmark-ext-ins - 0.35.6 + 0.36.8 com.vladsch.flexmark flexmark-ext-xwiki-macros - 0.35.6 + 0.36.8 com.vladsch.flexmark flexmark-ext-superscript - 0.35.6 + 0.36.8 com.vladsch.flexmark flexmark-ext-tables - 0.35.6 + 0.36.8 com.vladsch.flexmark flexmark-ext-toc - 0.35.6 + 0.36.8 com.vladsch.flexmark flexmark-ext-typographic - 0.35.6 + 0.36.8 com.vladsch.flexmark flexmark-ext-wikilink - 0.35.6 + 0.36.8 com.vladsch.flexmark flexmark-ext-yaml-front-matter - 0.35.6 + 0.36.8 com.vladsch.flexmark flexmark-ext-youtube-embedded - 0.35.6 + 0.36.8 com.vladsch.flexmark flexmark-formatter - 0.35.6 + 0.36.8 com.vladsch.flexmark flexmark-html-parser - 0.35.6 + 0.36.8 com.vladsch.flexmark flexmark-jira-converter - 0.35.6 + 0.36.8 com.vladsch.flexmark flexmark-pdf-converter - 0.35.6 + 0.36.8 com.vladsch.flexmark flexmark-profile-pegdown - 0.35.6 + 0.36.8 com.vladsch.flexmark flexmark-util - 0.35.6 + 0.36.8 com.vladsch.flexmark flexmark-youtrack-converter - 0.35.6 + 0.36.8 diff --git a/flexmark-docx-converter/pom.xml b/flexmark-docx-converter/pom.xml index 0c74260138..5c6660f4eb 100644 --- a/flexmark-docx-converter/pom.xml +++ b/flexmark-docx-converter/pom.xml @@ -5,7 +5,7 @@ com.vladsch.flexmark flexmark-java - 0.35.6 + 0.36.8 flexmark-docx-converter diff --git a/flexmark-ext-abbreviation/pom.xml b/flexmark-ext-abbreviation/pom.xml index 3b854b78c4..290dbaffd7 100644 --- a/flexmark-ext-abbreviation/pom.xml +++ b/flexmark-ext-abbreviation/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.35.6 + 0.36.8 flexmark-ext-abbreviation @@ -36,18 +36,22 @@ com.vladsch.flexmark flexmark-ext-typographic + test com.vladsch.flexmark flexmark-ext-ins + test com.vladsch.flexmark flexmark-ext-gfm-strikethrough + test com.vladsch.flexmark flexmark-ext-superscript + test diff --git a/flexmark-ext-admonition/pom.xml b/flexmark-ext-admonition/pom.xml index e22050089b..7cd818bc4d 100644 --- a/flexmark-ext-admonition/pom.xml +++ b/flexmark-ext-admonition/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.35.6 + 0.36.8 flexmark-ext-admonition diff --git a/flexmark-ext-anchorlink/pom.xml b/flexmark-ext-anchorlink/pom.xml index 2edb4690d8..2b95c61d25 100644 --- a/flexmark-ext-anchorlink/pom.xml +++ b/flexmark-ext-anchorlink/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.35.6 + 0.36.8 flexmark-ext-anchorlink @@ -28,7 +28,7 @@ com.vladsch.flexmark flexmark-jira-converter - 0.35.6 + 0.36.8 test diff --git a/flexmark-ext-aside/pom.xml b/flexmark-ext-aside/pom.xml index 084b792379..bd55b4e467 100644 --- a/flexmark-ext-aside/pom.xml +++ b/flexmark-ext-aside/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.35.6 + 0.36.8 flexmark-ext-aside diff --git a/flexmark-ext-attributes/pom.xml b/flexmark-ext-attributes/pom.xml index 6e629cdba7..26de2915d6 100644 --- a/flexmark-ext-attributes/pom.xml +++ b/flexmark-ext-attributes/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.35.6 + 0.36.8 flexmark-ext-attributes diff --git a/flexmark-ext-autolink/pom.xml b/flexmark-ext-autolink/pom.xml index 575cdc97ec..2045390f0f 100644 --- a/flexmark-ext-autolink/pom.xml +++ b/flexmark-ext-autolink/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.35.6 + 0.36.8 flexmark-ext-autolink diff --git a/flexmark-ext-definition/pom.xml b/flexmark-ext-definition/pom.xml index 07b473de4f..1ede282709 100644 --- a/flexmark-ext-definition/pom.xml +++ b/flexmark-ext-definition/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.35.6 + 0.36.8 flexmark-ext-definition diff --git a/flexmark-ext-emoji/pom.xml b/flexmark-ext-emoji/pom.xml index 71baad9249..c3c1e5511b 100644 --- a/flexmark-ext-emoji/pom.xml +++ b/flexmark-ext-emoji/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.35.6 + 0.36.8 flexmark-ext-emoji diff --git a/flexmark-ext-enumerated-reference/pom.xml b/flexmark-ext-enumerated-reference/pom.xml index c81eb7db62..9ecdbf6021 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.35.6 + 0.36.8 flexmark-ext-enumerated-reference diff --git a/flexmark-ext-escaped-character/pom.xml b/flexmark-ext-escaped-character/pom.xml index bdce52b82b..febf382fc8 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.35.6 + 0.36.8 flexmark-ext-escaped-character diff --git a/flexmark-ext-footnotes/pom.xml b/flexmark-ext-footnotes/pom.xml index 24364b1353..d35b43acb3 100644 --- a/flexmark-ext-footnotes/pom.xml +++ b/flexmark-ext-footnotes/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.35.6 + 0.36.8 flexmark-ext-footnotes diff --git a/flexmark-ext-gfm-issues/pom.xml b/flexmark-ext-gfm-issues/pom.xml index 734b3b0e8b..09e4f2286a 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.35.6 + 0.36.8 flexmark-ext-gfm-issues diff --git a/flexmark-ext-gfm-strikethrough/pom.xml b/flexmark-ext-gfm-strikethrough/pom.xml index c786703fe0..d2c5b83382 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.35.6 + 0.36.8 flexmark-ext-gfm-strikethrough diff --git a/flexmark-ext-gfm-tables/pom.xml b/flexmark-ext-gfm-tables/pom.xml index e3b75522a3..2a8d9a4b82 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.35.6 + 0.36.8 flexmark-ext-gfm-tables diff --git a/flexmark-ext-gfm-tasklist/pom.xml b/flexmark-ext-gfm-tasklist/pom.xml index 00c66b926d..a8bee452d0 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.35.6 + 0.36.8 flexmark-ext-gfm-tasklist diff --git a/flexmark-ext-gfm-users/pom.xml b/flexmark-ext-gfm-users/pom.xml index 8d9d9fbb1f..f3d1757a68 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.35.6 + 0.36.8 flexmark-ext-gfm-users diff --git a/flexmark-ext-gitlab/pom.xml b/flexmark-ext-gitlab/pom.xml index 9036de37f8..dea1819702 100644 --- a/flexmark-ext-gitlab/pom.xml +++ b/flexmark-ext-gitlab/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.35.6 + 0.36.8 flexmark-ext-gitlab diff --git a/flexmark-ext-ins/pom.xml b/flexmark-ext-ins/pom.xml index faac494af7..bce003d33b 100644 --- a/flexmark-ext-ins/pom.xml +++ b/flexmark-ext-ins/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.35.6 + 0.36.8 flexmark-ext-ins diff --git a/flexmark-ext-jekyll-front-matter/pom.xml b/flexmark-ext-jekyll-front-matter/pom.xml index b48abf45ff..4f7b25fdc0 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.35.6 + 0.36.8 flexmark-ext-jekyll-front-matter diff --git a/flexmark-ext-jekyll-tag/pom.xml b/flexmark-ext-jekyll-tag/pom.xml index a785c2694e..b82a921d61 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.35.6 + 0.36.8 flexmark-ext-jekyll-tag diff --git a/flexmark-ext-macros/pom.xml b/flexmark-ext-macros/pom.xml index 98dc8c04ee..1dff36ffa0 100644 --- a/flexmark-ext-macros/pom.xml +++ b/flexmark-ext-macros/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.35.6 + 0.36.8 flexmark-ext-macros diff --git a/flexmark-ext-media-tags/pom.xml b/flexmark-ext-media-tags/pom.xml index 1029d08083..4f720edd4c 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.35.6 + 0.36.8 flexmark-ext-media-tags @@ -19,6 +19,7 @@ com.vladsch.flexmark flexmark-test-util + test diff --git a/flexmark-ext-spec-example/pom.xml b/flexmark-ext-spec-example/pom.xml index 4bcc61b4da..84ad382618 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.35.6 + 0.36.8 flexmark-ext-spec-example diff --git a/flexmark-ext-superscript/pom.xml b/flexmark-ext-superscript/pom.xml index 42e5017b46..58f5caf2d9 100644 --- a/flexmark-ext-superscript/pom.xml +++ b/flexmark-ext-superscript/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.35.6 + 0.36.8 flexmark-ext-superscript diff --git a/flexmark-ext-tables/pom.xml b/flexmark-ext-tables/pom.xml index 71469d3ae6..6af38d1ac0 100644 --- a/flexmark-ext-tables/pom.xml +++ b/flexmark-ext-tables/pom.xml @@ -5,7 +5,7 @@ com.vladsch.flexmark flexmark-java - 0.35.6 + 0.36.8 flexmark-ext-tables diff --git a/flexmark-ext-toc/pom.xml b/flexmark-ext-toc/pom.xml index aab25690f1..b6493cb9bc 100644 --- a/flexmark-ext-toc/pom.xml +++ b/flexmark-ext-toc/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.35.6 + 0.36.8 flexmark-ext-toc diff --git a/flexmark-ext-typographic/pom.xml b/flexmark-ext-typographic/pom.xml index 8108ee2ab6..b0976aff88 100644 --- a/flexmark-ext-typographic/pom.xml +++ b/flexmark-ext-typographic/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.35.6 + 0.36.8 flexmark-ext-typographic diff --git a/flexmark-ext-wikilink/pom.xml b/flexmark-ext-wikilink/pom.xml index 3d5d1a4e01..b590a3477e 100644 --- a/flexmark-ext-wikilink/pom.xml +++ b/flexmark-ext-wikilink/pom.xml @@ -5,7 +5,7 @@ com.vladsch.flexmark flexmark-java - 0.35.6 + 0.36.8 flexmark-ext-wikilink diff --git a/flexmark-ext-xwiki-macros/pom.xml b/flexmark-ext-xwiki-macros/pom.xml index aa6782af80..1107981fd5 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.35.6 + 0.36.8 flexmark-ext-xwiki-macros diff --git a/flexmark-ext-yaml-front-matter/pom.xml b/flexmark-ext-yaml-front-matter/pom.xml index ac67959cf0..6bdc464e5b 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.35.6 + 0.36.8 flexmark-ext-yaml-front-matter diff --git a/flexmark-ext-youtube-embedded/pom.xml b/flexmark-ext-youtube-embedded/pom.xml index 2610f4b806..7f8dc43c0b 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.35.6 + 0.36.8 4.0.0 diff --git a/flexmark-ext-zzzzzz/pom.xml b/flexmark-ext-zzzzzz/pom.xml index d0fde10f3c..c929dbcb2b 100644 --- a/flexmark-ext-zzzzzz/pom.xml +++ b/flexmark-ext-zzzzzz/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.35.6 + 0.36.8 flexmark-ext-zzzzzz diff --git a/flexmark-formatter/pom.xml b/flexmark-formatter/pom.xml index 2df9154507..91b6028554 100644 --- a/flexmark-formatter/pom.xml +++ b/flexmark-formatter/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.35.6 + 0.36.8 flexmark-formatter diff --git a/flexmark-html-parser/pom.xml b/flexmark-html-parser/pom.xml index 3805bb73e7..b5da7ef535 100644 --- a/flexmark-html-parser/pom.xml +++ b/flexmark-html-parser/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.35.6 + 0.36.8 flexmark-html-parser diff --git a/flexmark-integration-test/pom.xml b/flexmark-integration-test/pom.xml index b6f72fea16..4b22b56cad 100644 --- a/flexmark-integration-test/pom.xml +++ b/flexmark-integration-test/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.35.6 + 0.36.8 flexmark-integration-test diff --git a/flexmark-jira-converter/pom.xml b/flexmark-jira-converter/pom.xml index 97e4005f48..b5742acd0d 100644 --- a/flexmark-jira-converter/pom.xml +++ b/flexmark-jira-converter/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.35.6 + 0.36.8 flexmark-jira-converter diff --git a/flexmark-osgi/pom.xml b/flexmark-osgi/pom.xml index c0d565c08b..62ff455bf1 100644 --- a/flexmark-osgi/pom.xml +++ b/flexmark-osgi/pom.xml @@ -7,7 +7,7 @@ com.vladsch.flexmark flexmark-java - 0.35.6 + 0.36.8 flexmark-osgi diff --git a/flexmark-pdf-converter/pom.xml b/flexmark-pdf-converter/pom.xml index 217953ca6e..bbfca20335 100644 --- a/flexmark-pdf-converter/pom.xml +++ b/flexmark-pdf-converter/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.35.6 + 0.36.8 flexmark-pdf-converter diff --git a/flexmark-profile-pegdown/pom.xml b/flexmark-profile-pegdown/pom.xml index 0f2edfb776..22609dcaba 100644 --- a/flexmark-profile-pegdown/pom.xml +++ b/flexmark-profile-pegdown/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.35.6 + 0.36.8 flexmark-profile-pegdown diff --git a/flexmark-test-util/pom.xml b/flexmark-test-util/pom.xml index 04114e3944..a6aac2252e 100644 --- a/flexmark-test-util/pom.xml +++ b/flexmark-test-util/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.35.6 + 0.36.8 flexmark-test-util diff --git a/flexmark-util/pom.xml b/flexmark-util/pom.xml index af96905537..e1bd987d77 100644 --- a/flexmark-util/pom.xml +++ b/flexmark-util/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.35.6 + 0.36.8 flexmark-util diff --git a/flexmark-youtrack-converter/pom.xml b/flexmark-youtrack-converter/pom.xml index 17dbc3f509..bab074a3f4 100644 --- a/flexmark-youtrack-converter/pom.xml +++ b/flexmark-youtrack-converter/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.35.6 + 0.36.8 flexmark-youtrack-converter diff --git a/flexmark/pom.xml b/flexmark/pom.xml index a5688b473e..8df9e18ea1 100644 --- a/flexmark/pom.xml +++ b/flexmark/pom.xml @@ -4,7 +4,7 @@ com.vladsch.flexmark flexmark-java - 0.35.6 + 0.36.8 flexmark @@ -15,6 +15,7 @@ com.vladsch.flexmark flexmark-test-util + test com.vladsch.flexmark diff --git a/flexmark/src/main/java/com/vladsch/flexmark/internal/DocumentParser.java b/flexmark/src/main/java/com/vladsch/flexmark/internal/DocumentParser.java index 8e83c540aa..ad8cc9a815 100644 --- a/flexmark/src/main/java/com/vladsch/flexmark/internal/DocumentParser.java +++ b/flexmark/src/main/java/com/vladsch/flexmark/internal/DocumentParser.java @@ -1,12 +1,6 @@ package com.vladsch.flexmark.internal; -import com.vladsch.flexmark.ast.BlankLine; -import com.vladsch.flexmark.ast.BlankLineContainer; -import com.vladsch.flexmark.ast.Block; -import com.vladsch.flexmark.ast.Document; -import com.vladsch.flexmark.ast.KeepTrailingBlankLineContainer; -import com.vladsch.flexmark.ast.Node; -import com.vladsch.flexmark.ast.Paragraph; +import com.vladsch.flexmark.ast.*; import com.vladsch.flexmark.ast.util.ClassifyingBlockTracker; import com.vladsch.flexmark.ast.util.Parsing; import com.vladsch.flexmark.parser.InlineParser; @@ -15,7 +9,6 @@ import com.vladsch.flexmark.parser.Parser; import com.vladsch.flexmark.parser.block.*; import com.vladsch.flexmark.parser.delimiter.DelimiterProcessor; -import com.vladsch.flexmark.test.AstCollectingVisitor; import com.vladsch.flexmark.util.Computable; import com.vladsch.flexmark.util.collection.ItemFactoryMap; import com.vladsch.flexmark.util.collection.iteration.ReversibleIterable; @@ -28,18 +21,11 @@ import com.vladsch.flexmark.util.sequence.CharSubSequence; import com.vladsch.flexmark.util.sequence.PrefixedSubSequence; import com.vladsch.flexmark.util.sequence.SubSequence; -import org.apache.log4j.Logger; import java.io.BufferedReader; import java.io.IOException; import java.io.Reader; -import java.util.ArrayList; -import java.util.BitSet; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; import static com.vladsch.flexmark.parser.Parser.BLANK_LINES_IN_AST; import static com.vladsch.flexmark.parser.Parser.TRACK_DOCUMENT_LINES; @@ -1145,37 +1131,37 @@ private void preProcessBlocks() { } } - private static Logger LOG = Logger.getLogger(DocumentParser.class); + //private static Logger LOG = Logger.getLogger(DocumentParser.class); private Document finalizeAndProcess() { finalizeBlocks(this.activeBlockParsers); - if (LOG.isDebugEnabled()) { - LOG.debug("Parsed\n" + new AstCollectingVisitor().collectAndGetAstText(documentBlockParser.getBlock())); - } + //if (LOG.isDebugEnabled()) { + // LOG.debug("Parsed\n" + new AstCollectingVisitor().collectAndGetAstText(documentBlockParser.getBlock())); + //} // need to run block pre-processors at this point, before inline processing currentPhase = ParserPhase.PRE_PROCESS_PARAGRAPHS; this.preProcessParagraphs(); - if (LOG.isDebugEnabled()) { - LOG.debug("Paragraphs PreProcessed\n" + new AstCollectingVisitor().collectAndGetAstText(documentBlockParser.getBlock())); - } + //if (LOG.isDebugEnabled()) { + // LOG.debug("Paragraphs PreProcessed\n" + new AstCollectingVisitor().collectAndGetAstText(documentBlockParser.getBlock())); + //} currentPhase = ParserPhase.PRE_PROCESS_BLOCKS; this.preProcessBlocks(); - if (LOG.isDebugEnabled()) { - LOG.debug("Blocks PreProcessed\n" + new AstCollectingVisitor().collectAndGetAstText(documentBlockParser.getBlock())); - } + //if (LOG.isDebugEnabled()) { + // LOG.debug("Blocks PreProcessed\n" + new AstCollectingVisitor().collectAndGetAstText(documentBlockParser.getBlock())); + //} // can naw run inline processing currentPhase = ParserPhase.PARSE_INLINES; this.processInlines(); - if (LOG.isDebugEnabled()) { - LOG.debug("Inline Processed\n" + new AstCollectingVisitor().collectAndGetAstText(documentBlockParser.getBlock())); - } + //if (LOG.isDebugEnabled()) { + // LOG.debug("Inline Processed\n" + new AstCollectingVisitor().collectAndGetAstText(documentBlockParser.getBlock())); + //} currentPhase = ParserPhase.DONE; Document document = this.documentBlockParser.getBlock(); diff --git a/pom.xml b/pom.xml index 5fc3ef8bcc..3fc7c59ff8 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ com.vladsch.flexmark flexmark-java - 0.35.6 + 0.36.8 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.35.6 + 0.36.8 com.vladsch.flexmark flexmark-docx-converter - 0.35.6 + 0.36.8 com.vladsch.flexmark flexmark-ext-abbreviation - 0.35.6 + 0.36.8 com.vladsch.flexmark flexmark-ext-anchorlink - 0.35.6 + 0.36.8 com.vladsch.flexmark flexmark-ext-admonition - 0.35.6 + 0.36.8 com.vladsch.flexmark flexmark-ext-aside - 0.35.6 + 0.36.8 com.vladsch.flexmark flexmark-ext-attributes - 0.35.6 + 0.36.8 com.vladsch.flexmark flexmark-ext-autolink - 0.35.6 + 0.36.8 com.vladsch.flexmark flexmark-ext-definition - 0.35.6 + 0.36.8 com.vladsch.flexmark flexmark-ext-emoji - 0.35.6 + 0.36.8 com.vladsch.flexmark flexmark-ext-enumerated-reference - 0.35.6 + 0.36.8 com.vladsch.flexmark flexmark-ext-escaped-character - 0.35.6 + 0.36.8 com.vladsch.flexmark flexmark-ext-footnotes - 0.35.6 + 0.36.8 com.vladsch.flexmark flexmark-ext-gfm-issues - 0.35.6 + 0.36.8 com.vladsch.flexmark flexmark-ext-gfm-strikethrough - 0.35.6 + 0.36.8 com.vladsch.flexmark flexmark-ext-gfm-tables - 0.35.6 + 0.36.8 com.vladsch.flexmark flexmark-ext-gfm-tasklist - 0.35.6 + 0.36.8 com.vladsch.flexmark flexmark-ext-gfm-users - 0.35.6 + 0.36.8 com.vladsch.flexmark flexmark-ext-gitlab - 0.35.6 + 0.36.8 com.vladsch.flexmark flexmark-ext-ins - 0.35.6 + 0.36.8 com.vladsch.flexmark flexmark-ext-jekyll-front-matter - 0.35.6 + 0.36.8 com.vladsch.flexmark flexmark-ext-jekyll-tag - 0.35.6 + 0.36.8 com.vladsch.flexmark flexmark-ext-macros - 0.35.6 + 0.36.8 com.vladsch.flexmark flexmark-ext-media-tags - 0.35.6 + 0.36.8 com.vladsch.flexmark flexmark-ext-xwiki-macros - 0.35.6 + 0.36.8 com.vladsch.flexmark flexmark-ext-spec-example - 0.35.6 + 0.36.8 com.vladsch.flexmark flexmark-ext-superscript - 0.35.6 + 0.36.8 com.vladsch.flexmark flexmark-ext-tables - 0.35.6 + 0.36.8 com.vladsch.flexmark flexmark-ext-toc - 0.35.6 + 0.36.8 com.vladsch.flexmark flexmark-ext-typographic - 0.35.6 + 0.36.8 com.vladsch.flexmark flexmark-ext-wikilink - 0.35.6 + 0.36.8 com.vladsch.flexmark flexmark-ext-yaml-front-matter - 0.35.6 + 0.36.8 com.vladsch.flexmark flexmark-ext-youtube-embedded - 0.35.6 + 0.36.8 com.vladsch.flexmark flexmark-ext-zzzzzz - 0.35.6 + 0.36.8 com.vladsch.flexmark flexmark-formatter - 0.35.6 + 0.36.8 com.vladsch.flexmark flexmark-html-parser - 0.35.6 + 0.36.8 com.vladsch.flexmark flexmark-jira-converter - 0.35.6 + 0.36.8 com.vladsch.flexmark flexmark-pdf-converter - 0.35.6 + 0.36.8 com.vladsch.flexmark flexmark-profile-pegdown - 0.35.6 + 0.36.8 com.vladsch.flexmark flexmark-test-util - 0.35.6 + 0.36.8 com.vladsch.flexmark flexmark-util - 0.35.6 + 0.36.8 com.vladsch.flexmark flexmark-youtrack-converter - 0.35.6 + 0.36.8 com.vladsch.flexmark flexmark-all - 0.35.6 + 0.36.8 From fc854b9e766cb206033776fbb43c1b17fc8a0f16 Mon Sep 17 00:00:00 2001 From: Vladimir Schneider Date: Mon, 24 Dec 2018 17:17:26 -0500 Subject: [PATCH 2/3] update version --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 2ab81aa915..e73139ab9a 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ following sample: com.vladsch.flexmark flexmark-all - 0.35.6 + 0.35.8 ``` @@ -86,7 +86,7 @@ public class BasicSample { #### Building via Gradle ```shell -compile 'com.vladsch.flexmark:flexmark-all:0.35.6' +compile 'com.vladsch.flexmark:flexmark-all:0.35.8' ``` #### Building with Android Studio From a38856c1d28a08d8bb5b9a131467c04461fef3d4 Mon Sep 17 00:00:00 2001 From: Vladimir Schneider Date: Wed, 27 Mar 2019 00:35:00 -0400 Subject: [PATCH 3/3] prep release 0.35.10 --- .idea/markdown-exported-files.xml | 89 +- .idea/markdown-navigator/COPY_HTML_MIME.xml | 7 +- .idea/markdown-navigator/GitHub_Templates.xml | 7 +- .idea/markdown-navigator/OVERVIEW.xml | 7 +- .../markdown-navigator/profiles_settings.xml | 2 +- VERSION.md | 6 + flexmark-all/pom.xml | 78 +- flexmark-docx-converter/pom.xml | 2 +- .../internal/CoreNodeDocxRenderer.java | 115 +- .../ComboDeDocxConverterSpec2Test.java | 333 + .../ComboDocxConverterSpec2Test.java | 331 + .../ComboEnDocxConverterSpec2Test.java | 333 + .../converter/DocxConverterTestSuite.java | 3 + .../test/resources/docx_converter_ast_spec.md | 6280 --------------- .../resources/docx_converter_ast_spec2.md | 6877 +++++++++++++++++ .../docx_converter_issues_ast_spec.md | 2 +- flexmark-ext-abbreviation/pom.xml | 2 +- flexmark-ext-admonition/pom.xml | 2 +- flexmark-ext-anchorlink/pom.xml | 4 +- flexmark-ext-aside/pom.xml | 2 +- .../flexmark-ext-attributes.iml | 2 + flexmark-ext-attributes/pom.xml | 190 +- .../ext/attributes/AttributeNode.java | 4 +- .../ext/attributes/AttributesDelimiter.java | 27 + .../ext/attributes/AttributesExtension.java | 2 + .../ext/attributes/AttributesNode.java | 4 +- .../attributes/internal/AttributeParsing.java | 16 +- .../AttributesInlineParserExtension.java | 9 +- .../internal/AttributesNodeFormatter.java | 7 + .../internal/AttributesNodePostProcessor.java | 136 +- .../internal/AttributesOptions.java | 6 + .../src/main/javadoc/overview.md | 3 + .../ComboExtAttributesSpecTest.java | 6 + .../test/resources/ext_attributes_ast_spec.md | 686 +- flexmark-ext-autolink/pom.xml | 2 +- flexmark-ext-definition/pom.xml | 2 +- flexmark-ext-emoji/pom.xml | 2 +- flexmark-ext-enumerated-reference/pom.xml | 2 +- .../reference/EnumeratedOrdinalRenderer.java | 25 + .../reference/EnumeratedReferenceBase.java | 2 +- .../reference/EnumeratedReferenceBlock.java | 2 +- .../EnumeratedReferenceRendering.java | 13 + .../EnumRefTextCollectingVisitor.java | 82 +- .../EnumeratedReferenceBlockParser.java | 2 +- .../EnumeratedReferenceLinkRefProcessor.java | 2 +- .../EnumeratedReferenceNodePostProcessor.java | 23 +- .../EnumeratedReferenceNodeRenderer.java | 109 +- .../EnumeratedReferenceRepository.java | 2 +- .../internal/EnumeratedReferences.java | 120 +- .../src/main/javadoc/information_source.png | Bin 0 -> 5756 bytes .../src/main/javadoc/overview.html | 75 +- .../src/main/javadoc/overview.md | 92 +- .../ext_enumerated_reference_ast_spec.md | 306 + flexmark-ext-escaped-character/pom.xml | 2 +- flexmark-ext-footnotes/pom.xml | 2 +- flexmark-ext-gfm-issues/pom.xml | 2 +- flexmark-ext-gfm-strikethrough/pom.xml | 2 +- flexmark-ext-gfm-tables/pom.xml | 2 +- flexmark-ext-gfm-tasklist/pom.xml | 2 +- flexmark-ext-gfm-users/pom.xml | 2 +- flexmark-ext-gitlab/pom.xml | 2 +- flexmark-ext-ins/pom.xml | 2 +- flexmark-ext-jekyll-front-matter/pom.xml | 2 +- flexmark-ext-jekyll-tag/pom.xml | 2 +- flexmark-ext-macros/pom.xml | 2 +- flexmark-ext-media-tags/pom.xml | 2 +- flexmark-ext-spec-example/pom.xml | 2 +- flexmark-ext-superscript/pom.xml | 2 +- flexmark-ext-tables/pom.xml | 2 +- .../src/main/javadoc/overview.html | 2 +- flexmark-ext-toc/pom.xml | 2 +- flexmark-ext-typographic/pom.xml | 2 +- flexmark-ext-wikilink/pom.xml | 2 +- flexmark-ext-xwiki-macros/pom.xml | 2 +- .../src/main/javadoc/overview.html | 2 +- flexmark-ext-yaml-front-matter/pom.xml | 2 +- flexmark-ext-youtube-embedded/pom.xml | 2 +- flexmark-ext-zzzzzz/pom.xml | 2 +- flexmark-formatter/pom.xml | 2 +- flexmark-html-parser/pom.xml | 2 +- flexmark-integration-test/pom.xml | 2 +- flexmark-jira-converter/pom.xml | 2 +- flexmark-osgi/pom.xml | 2 +- flexmark-pdf-converter/pom.xml | 2 +- flexmark-profile-pegdown/pom.xml | 2 +- flexmark-test-util/pom.xml | 2 +- flexmark-util/pom.xml | 2 +- .../flexmark/ast/DoNotAttributeDecorate.java | 7 + flexmark-youtrack-converter/pom.xml | 2 +- flexmark/pom.xml | 2 +- .../vladsch/flexmark/ast/util/Parsing.java | 9 + pom.xml | 88 +- 92 files changed, 9959 insertions(+), 6660 deletions(-) create mode 100644 flexmark-docx-converter/src/test/java/com/vladsch/flexmark/docx/converter/ComboDeDocxConverterSpec2Test.java create mode 100644 flexmark-docx-converter/src/test/java/com/vladsch/flexmark/docx/converter/ComboDocxConverterSpec2Test.java create mode 100644 flexmark-docx-converter/src/test/java/com/vladsch/flexmark/docx/converter/ComboEnDocxConverterSpec2Test.java create mode 100644 flexmark-docx-converter/src/test/resources/docx_converter_ast_spec2.md create mode 100644 flexmark-ext-attributes/src/main/java/com/vladsch/flexmark/ext/attributes/AttributesDelimiter.java create mode 100644 flexmark-ext-enumerated-reference/src/main/java/com/vladsch/flexmark/ext/enumerated/reference/EnumeratedOrdinalRenderer.java create mode 100644 flexmark-ext-enumerated-reference/src/main/java/com/vladsch/flexmark/ext/enumerated/reference/EnumeratedReferenceRendering.java create mode 100644 flexmark-ext-enumerated-reference/src/main/javadoc/information_source.png create mode 100644 flexmark-util/src/main/java/com/vladsch/flexmark/ast/DoNotAttributeDecorate.java diff --git a/.idea/markdown-exported-files.xml b/.idea/markdown-exported-files.xml index a404d7591c..9319bc56a1 100644 --- a/.idea/markdown-exported-files.xml +++ b/.idea/markdown-exported-files.xml @@ -2,52 +2,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + diff --git a/.idea/markdown-navigator/COPY_HTML_MIME.xml b/.idea/markdown-navigator/COPY_HTML_MIME.xml index bc8aaad07d..b53f944f93 100644 --- a/.idea/markdown-navigator/COPY_HTML_MIME.xml +++ b/.idea/markdown-navigator/COPY_HTML_MIME.xml @@ -1,6 +1,6 @@ -