Branch: refs/heads/master Home: https://github.com/xwiki-contrib/confluence Commit: bee26ed6301663c4337541aa14938946747e0cbf https://github.com/xwiki-contrib/confluence/commit/bee26ed6301663c4337541aa1... Author: Raphaël Jakse <raphael.jakse@xwiki.com> Date: 2026-03-03 (Tue, 03 Mar 2026) Changed paths: M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/input/ConfluenceConverterListener.java Log Message: ----------- Misc: coding style: simplify a bit the inline comment handling Commit: 04993868635d575e0ef2ab2a61bdc33530d9e2f9 https://github.com/xwiki-contrib/confluence/commit/04993868635d575e0ef2ab2a6... Author: Raphaël Jakse <raphael.jakse@xwiki.com> Date: 2026-03-03 (Tue, 03 Mar 2026) Changed paths: M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/input/ConfluenceConverterListener.java Log Message: ----------- Misc: add a FIXME for the setWrappedListener / getWrappedListener asymetry in ConfluenceConverterListener Commit: 055dbac0312d6c206dc66b4dd111478e994a24e5 https://github.com/xwiki-contrib/confluence/commit/055dbac0312d6c206dc66b4dd... Author: Raphaël Jakse <raphael.jakse@xwiki.com> Date: 2026-03-03 (Tue, 03 Mar 2026) Changed paths: M confluence-xml/checkstyle-suppressions.xml M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/input/ConfluenceConverterListener.java A confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/input/ConfluenceWrappingListener.java A confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/input/NormalizedPlainFilter.java Log Message: ----------- Misc: move ConfluenceConverterListener's inner classes to dedicated java files Commit: da70730d5bdd31e8d43df092daf1b9c0774eb859 https://github.com/xwiki-contrib/confluence/commit/da70730d5bdd31e8d43df092d... Author: Raphaël Jakse <raphael.jakse@xwiki.com> Date: 2026-03-03 (Tue, 03 Mar 2026) Changed paths: M confluence-syntax-xhtml/src/main/java/org/xwiki/contrib/confluence/parser/xhtml/internal/wikimodel/AbstractRichContentTagHandler.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/input/ConfluenceConverterListener.java Log Message: ----------- Misc: fix the getWrappedListener / setWrappedListener asymetry Commit: 9be58c7fd20af7845f241ee4db45c0314f6b20bc https://github.com/xwiki-contrib/confluence/commit/9be58c7fd20af7845f241ee4d... Author: Raphaël Jakse <raphael.jakse@xwiki.com> Date: 2026-03-03 (Tue, 03 Mar 2026) Changed paths: M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/input/ConfluenceWrappingListener.java Log Message: ----------- Misc: code style: simplify queueEvents Commit: 0a116dc856749844bfbca573740e005b3b39434a https://github.com/xwiki-contrib/confluence/commit/0a116dc856749844bfbca5737... Author: Raphaël Jakse <raphael.jakse@xwiki.com> Date: 2026-03-03 (Tue, 03 Mar 2026) Changed paths: M confluence-syntax-xhtml/src/main/java/org/xwiki/contrib/confluence/parser/xhtml/internal/wikimodel/ElementMacroTagHandler.java M confluence-syntax-xhtml/src/main/java/org/xwiki/contrib/confluence/parser/xhtml/internal/wikimodel/LinkBodyTagHandler.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/input/ConfluenceConverterListener.java Log Message: ----------- Misc: code style Commit: eb6c65dbc7954a1532b3a8074a5bcdd3fbf4dae9 https://github.com/xwiki-contrib/confluence/commit/eb6c65dbc7954a1532b3a8074... Author: Raphaël Jakse <raphael.jakse@xwiki.com> Date: 2026-03-03 (Tue, 03 Mar 2026) Changed paths: M confluence-syntax-xhtml/src/main/java/org/xwiki/contrib/confluence/parser/xhtml/internal/ConfluenceXHTMLInputFilterStream.java M confluence-syntax-xhtml/src/main/java/org/xwiki/contrib/confluence/parser/xhtml/internal/ConfluenceXHTMLParser.java M confluence-syntax-xhtml/src/main/java/org/xwiki/contrib/confluence/parser/xhtml/internal/InternalConfluenceXHTMLInputProperties.java M confluence-syntax-xhtml/src/main/java/org/xwiki/contrib/confluence/parser/xhtml/internal/wikimodel/AbstractRichContentTagHandler.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/input/ConfluenceConverterListener.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/input/ConfluenceInputFilterStream.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/input/ConfluenceWrappingListener.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/input/NormalizedPlainFilter.java Log Message: ----------- Misc: Stop changing the wrapped listener in ConfluenceConverterListener * This makes the code easier to follow and more robust, especially since listeners can be queued in ConfluenceWrappingListener to allow complex handling and cleaning. * Whenever a handler needs to save events to replay or render them in a custom way, it must use its own instance of ConfluenceConverterListener. * To allow this, ConfluenceXHTMLParser now has a converter provider, with a setter and getter. * ConfluenceXHTMLParser doesn't have a setConverter and a getConverter method anymore: the converter provider is supposed to be used instead. * Annotation handling now uses the queueing mechanism of ConfluenceWrappingListener instead of changing the wrapped listener. * Any attempt of changing the wrapped listener will now result in an UnsupportedOperationException. Commit: 452360c3f3a4d605997108549567cd34cc9cc3b6 https://github.com/xwiki-contrib/confluence/commit/452360c3f3a4d605997108549... Author: Raphaël Jakse <raphael.jakse@xwiki.com> Date: 2026-03-09 (Mon, 09 Mar 2026) Changed paths: M confluence-syntax-xhtml/src/main/java/org/xwiki/contrib/confluence/parser/xhtml/internal/wikimodel/ConfluenceAttributeXMLFilter.java Log Message: ----------- CONFLUENCE-513: Clean up local-id attributes Commit: fb2b5e97dfc510a4a83d19007093f2d02a62ff76 https://github.com/xwiki-contrib/confluence/commit/fb2b5e97dfc510a4a83d19007... Author: Raphaël Jakse <raphael.jakse@xwiki.com> Date: 2026-03-09 (Mon, 09 Mar 2026) Changed paths: M confluence-syntax-xhtml/src/main/java/org/xwiki/contrib/confluence/parser/xhtml/internal/wikimodel/ConfluenceInlineCommentTagHandler.java M confluence-syntax-xhtml/src/test/resources/confluence+xhtml10/specific/annotation/annotation.test A confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/input/AnnotationUtils.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/input/ConfluenceConverter.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/input/ConfluenceConverterListener.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/input/ConfluenceInputFilterStream.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/input/ConfluenceWrappingListener.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/input/NormalizedPlainFilter.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/macros/AnchorMacroConverter.java M confluence-xml/src/test/resources/confluencexml/annotations.test A confluence-xml/src/test/resources/confluencexml/madinlinecomments.test A confluence-xml/src/test/resources/confluencexml/madinlinecomments/entities.xml Log Message: ----------- CONFLUENCE-512: Set the context for inline comments imported as annotations * move anchor management to the anchor macro converter * correctly handle nested annotations * correctly handle annotations in lists, tables, headings * use fake inline macros instead of format to handle inline comment markers (formats have specific and complicated handling and break nested annotations) * add left selection context Commit: bbfb32bb258f6ecfa3e3b86fdc6805838abf3806 https://github.com/xwiki-contrib/confluence/commit/bbfb32bb258f6ecfa3e3b86fd... Author: Raphaël Jakse <raphael.jakse@xwiki.com> Date: 2026-03-10 (Tue, 10 Mar 2026) Changed paths: M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/input/ConfluenceConverterListener.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/input/ConfluenceInputFilterStream.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/input/ConfluenceWrappingListener.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/input/NormalizedPlainFilter.java A confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/input/RightContextAnnotationFilter.java M confluence-xml/src/test/resources/confluencexml/annotations.test M confluence-xml/src/test/resources/confluencexml/madinlinecomments.test Log Message: ----------- CONFLUENCE-512: Set the context for inline comments imported as annotations * Add right selection context Commit: e9e9069ccd0181b127dd9a7d6d8d5c4f6c0e11f8 https://github.com/xwiki-contrib/confluence/commit/e9e9069ccd0181b127dd9a7d6... Author: Raphaël Jakse <raphael.jakse@xwiki.com> Date: 2026-03-10 (Tue, 10 Mar 2026) Changed paths: M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/input/ConfluenceConverterListener.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/input/ConfluenceWrappingListener.java Log Message: ----------- Misc: explain ConfluenceConfluenceListener and ConfluenceWrappingListeners in their JavaDoc Commit: 80d17a73e080dc329aad76c25f7a0b356b142783 https://github.com/xwiki-contrib/confluence/commit/80d17a73e080dc329aad76c25... Author: Raphaël Jakse <raphael.jakse@xwiki.com> Date: 2026-03-10 (Tue, 10 Mar 2026) Changed paths: M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/input/ConfluenceInputFilterStream.java M confluence-xml/src/test/resources/confluencexml/permissionsnested.test Log Message: ----------- CONFLUENCE-514: InvalidEntityReferenceException thrown because of attempts to import templates while filtering the WebPreference page Compare: https://github.com/xwiki-contrib/confluence/compare/32a3ea9ea39c...80d17a73e... To unsubscribe from these emails, change your notification settings at https://github.com/xwiki-contrib/confluence/settings/notifications