Branch: refs/heads/master Home: https://github.com/xwiki-contrib/confluence Commit: d99baa1169498c3898871838cf35a0f53c4095f9 https://github.com/xwiki-contrib/confluence/commit/d99baa1169498c3898871838… Author: Raphaël Jakse <raphael.jakse(a)xwiki.com> Date: 2024-12-19 (Thu, 19 Dec 2024) Changed paths: M confluence-resolvers/pom.xml M confluence-resolvers/src/main/java/org/xwiki/contrib/confluence/resolvers/ConfluenceScrollPageIdResolver.java M confluence-resolvers/src/main/java/org/xwiki/contrib/confluence/resolvers/internal/DefaultConfluenceScrollVersionsResolver.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/macros/IncludePlusMacroConverter.java M confluence-xml/src/test/java/org/xwiki/contrib/confluence/filter/IntegrationTests.java M confluence-xml/src/test/resources/confluencexml/include.test M confluence-xml/src/test/resources/confluencexml/include/entities.xml Log Message: ----------- CONFLUENCE-354: The scroll page id resolver and the includeplus macro incorrectly assume a long id Commit: 9d850e8b6995e96acc68d20260e6e514585dbe55 https://github.com/xwiki-contrib/confluence/commit/9d850e8b6995e96acc68d202… Author: Raphaël Jakse <raphael.jakse(a)xwiki.com> Date: 2024-12-19 (Thu, 19 Dec 2024) Changed paths: M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/input/ConfluenceConverter.java M confluence-xml/src/test/resources/confluencexml/history.test M confluence-xml/src/test/resources/confluencexml/history/entities.xml M confluence-xml/src/test/resources/confluencexml/links.test M confluence-xml/src/test/resources/confluencexml/rootspace.test M confluence-xml/src/test/resources/confluencexml/rootwiki.test Log Message: ----------- CONFLUENCE-353: Don't try using resolvers for a page in a space that is in the package being imported Commit: 5aa03f7927e4e7febe542354adf49cccee44a439 https://github.com/xwiki-contrib/confluence/commit/5aa03f7927e4e7febe542354… Author: Raphaël Jakse <raphael.jakse(a)xwiki.com> Date: 2024-12-19 (Thu, 19 Dec 2024) Changed paths: M confluence-resolvers/pom.xml M confluence-resource-reference-type-parsers/pom.xml M confluence-syntax-confluence/pom.xml M confluence-syntax-confluence10override/pom.xml M confluence-syntax-xhtml/pom.xml M confluence-url-mapping-scroll-viewport/pom.xml M confluence-url-mapping/pom.xml M confluence-xml/pom.xml M pom.xml Log Message: ----------- [maven-release-plugin] prepare release confluence-9.68.1 Compare: https://github.com/xwiki-contrib/confluence/compare/ce3ff6829ba3...5aa03f79… To unsubscribe from these emails, change your notification settings at https://github.com/xwiki-contrib/confluence/settings/notifications