Branch: refs/heads/fix-deprecation-component-overrides Home: https://github.com/xwiki/xwiki-commons Commit: 9ca6b83d3b37083297d5748a340b29cda00ee6fb https://github.com/xwiki/xwiki-commons/commit/9ca6b83d3b37083297d5748a340b29... Author: Simon Urli <[email protected]> Date: 2026-10-01 (Thu, 01 Oct 2026) Changed paths: M xwiki-commons-core/xwiki-commons-component/xwiki-commons-component-default/pom.xml M xwiki-commons-core/xwiki-commons-component/xwiki-commons-component-default/src/main/java/org/xwiki/component/annotation/ComponentAnnotationLoader.java M xwiki-commons-core/xwiki-commons-component/xwiki-commons-component-default/src/test/java/org/xwiki/component/annotation/JakartaComponentAnnotationLoaderTest.java M xwiki-commons-core/xwiki-commons-component/xwiki-commons-component-default/src/test/java/org/xwiki/component/annotation/JavaxComponentAnnotationLoaderTest.java R xwiki-commons-core/xwiki-commons-component/xwiki-commons-component-default/src/test/resources/META-INF/component-overrides.txt M xwiki-commons-core/xwiki-commons-component/xwiki-commons-component-default/src/test/resources/META-INF/components.txt M xwiki-commons-core/xwiki-commons-legacy/xwiki-commons-legacy-component/xwiki-commons-legacy-component-default/pom.xml A xwiki-commons-core/xwiki-commons-legacy/xwiki-commons-legacy-component/xwiki-commons-legacy-component-default/src/main/aspect/org/xwiki/component/annotation/ComponentAnnotationLoaderOverridesCompatibilityAspect.aj A xwiki-commons-core/xwiki-commons-legacy/xwiki-commons-legacy-component/xwiki-commons-legacy-component-default/src/main/java/org/xwiki/component/annotation/CompatibilityComponentAnnotationLoaderConstants.java A xwiki-commons-core/xwiki-commons-legacy/xwiki-commons-legacy-component/xwiki-commons-legacy-component-default/src/test/java/org/xwiki/component/annotation/ComponentAnnotationLoaderOverridesTest.java A xwiki-commons-core/xwiki-commons-legacy/xwiki-commons-legacy-component/xwiki-commons-legacy-component-default/src/test/resources/componentoverrides/META-INF/component-overrides.txt A xwiki-commons-core/xwiki-commons-legacy/xwiki-commons-legacy-component/xwiki-commons-legacy-component-default/src/test/resources/componentoverrides/META-INF/components.txt Log Message: ----------- [Misc] Move the deprecated component-overrides.txt support to legacy * Remove ComponentAnnotationLoader#COMPONENT_OVERRIDE_LIST, deprecated since 3.3M1, and the reading of META-INF/component-overrides.txt from ComponentAnnotationLoader * Re-add both in xwiki-commons-legacy-component-default: the constant through CompatibilityComponentAnnotationLoaderConstants, the override merge (classloader and JAR) through ComponentAnnotationLoaderOverridesCompatibilityAspect * Move the override tests from xwiki-commons-component-default to the new ComponentAnnotationLoaderOverridesTest in the legacy module * Raise the JaCoCo instruction ratios of both modules to their achieved values Co-Authored-By: Claude Opus 5.5 (1M context) <[email protected]> To unsubscribe from these emails, change your notification settings at https://github.com/xwiki/xwiki-commons/settings/notifications