Branch: refs/heads/master Home: https://github.com/xwiki-contrib/confluence Commit: 7114b79bf2e70caa3d457e8ff96e0756003902c3 https://github.com/xwiki-contrib/confluence/commit/7114b79bf2e70caa3d457e8ff... Author: Rares-Emil Bancescu <[email protected]> Date: 2025-11-27 (Thu, 27 Nov 2025) Changed paths: M confluence-xml/checkstyle-suppressions.xml M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/event/ConfluenceFilteringEvent.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/input/ConfluenceInputProperties.java A confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/input/OverwriteProtectionMode.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/input/ConfluenceInputFilterStream.java A confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/input/ConfluenceSpaceHelpers.java M confluence-xml/src/main/resources/META-INF/components.txt M confluence-xml/src/test/java/org/xwiki/contrib/confluence/filter/IntegrationTests.java M confluence-xml/src/test/java/org/xwiki/contrib/confluence/filter/internal/input/DefaultLinkMapperTest.java A confluence-xml/src/test/resources/confluencexml/overwritespaces/entities.xml A confluence-xml/src/test/resources/confluencexml/overwritespaces1.test A confluence-xml/src/test/resources/confluencexml/overwritespaces2.test A confluence-xml/src/test/resources/confluencexml/overwritespaces3.test A confluence-xml/src/test/resources/confluencexml/overwritespaces4.test A confluence-xml/src/test/resources/confluencexml/overwritespaces5.test A confluence-xml/src/test/resources/confluencexml/overwritespaces6.test A confluence-xml/src/test/resources/confluencexml/overwritespaces7.test Log Message: ----------- CONFLUENCE-500: Handle collisions with existing spaces when importing Confluence spaces Ref: #78 Added protection against overwriting existing spaces during Confluence imports by introducing overwrite protected space lists, space renaming handling, and configurable overwrite modes. To unsubscribe from these emails, change your notification settings at https://github.com/xwiki-contrib/confluence/settings/notifications