Branch: refs/heads/cherrypick-xwiki22681 Home: https://github.com/xwiki/xwiki-platform Commit: 5e68d1c948c3291c1a2f9247725151c0040e4a12 https://github.com/xwiki/xwiki-platform/commit/5e68d1c948c3291c1a2f924772515... Author: Simon Urli <[email protected]> Date: 2024-12-10 (Tue, 10 Dec 2024) Changed paths: M xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-model-api/pom.xml A xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-model-api/src/main/java/org/xwiki/model/internal/reference/DefaultEntityReferenceValueProvider.java A xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-model-api/src/main/java/org/xwiki/model/reference/EntityReferenceValueProvider.java A xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-model-api/src/main/java/org/xwiki/model/script/LegacyModelScriptService.java M xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-model-api/src/main/resources/META-INF/components.txt A xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-model-api/src/test/java/org/xwiki/model/internal/reference/DefaultEntityReferenceValueProviderTest.java A xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-model-api/src/test/java/org/xwiki/model/script/LegacyModelScriptServiceTest.java M xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-oldcore/pom.xml A xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-oldcore/src/main/java/com/xpn/xwiki/internal/model/reference/CurrentEntityReferenceValueProvider.java A xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-oldcore/src/main/java/com/xpn/xwiki/internal/model/reference/CurrentMixedEntityReferenceValueProvider.java M xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-oldcore/src/main/resources/META-INF/components.txt M xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-api/pom.xml R xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-api/src/main/java/org/xwiki/model/internal/reference/DefaultEntityReferenceValueProvider.java R xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-api/src/main/java/org/xwiki/model/reference/EntityReferenceValueProvider.java M xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-api/src/main/java/org/xwiki/model/script/ModelScriptService.java M xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-api/src/main/resources/META-INF/components.txt R xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-api/src/test/java/org/xwiki/model/internal/reference/DefaultEntityReferenceValueProviderTest.java M xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-api/src/test/java/org/xwiki/model/internal/reference/converter/EntityReferenceConverterTest.java M xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-api/src/test/java/org/xwiki/model/script/ModelScriptServiceTest.java R xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/internal/model/reference/CurrentEntityReferenceValueProvider.java R xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/internal/model/reference/CurrentMixedEntityReferenceValueProvider.java M xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/web/XWikiAction.java M xwiki-platform-core/xwiki-platform-oldcore/src/main/resources/META-INF/components.txt M xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-useravatar/src/main/java/org/xwiki/rendering/internal/macro/useravatar/UserAvatarMacro.java M xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-useravatar/src/test/java/org/xwiki/rendering/macro/useravatar/IntegrationTests.java Log Message: ----------- [Misc] Move some deprecated class from model-api to legacy (cherry picked from commit 4e2efc811fd359eaf87f1bc1e43e78d54777a801) Commit: 0093a3d82ba1418ce86f2c4cd6efdf4af4f17eb8 https://github.com/xwiki/xwiki-platform/commit/0093a3d82ba1418ce86f2c4cd6efd... Author: Simon Urli <[email protected]> Date: 2024-12-10 (Tue, 10 Dec 2024) Changed paths: M xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-api/src/main/java/org/xwiki/model/internal/reference/AbstractReferenceEntityReferenceResolver.java M xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-api/src/main/java/org/xwiki/model/reference/EntityReference.java M xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-api/src/test/java/org/xwiki/model/internal/reference/DefaultReferenceEntityReferenceResolverTest.java M xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-api/src/test/java/org/xwiki/model/internal/reference/RelativeStringEntityReferenceResolverTest.java M xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-api/src/test/java/org/xwiki/model/internal/reference/WithParametersTest.java M xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-api/src/test/java/org/xwiki/model/internal/reference/converter/EntityReferenceConverterTest.java M xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-api/src/test/java/org/xwiki/model/reference/EntityReferenceSetTest.java M xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-api/src/test/java/org/xwiki/model/reference/EntityReferenceTest.java Log Message: ----------- XWIKI-22702: Provide parentType information in EntityReference (#3698) * Provide EntityReference#getParentType * Use it in AbstractReferenceEntityReferenceResolver * Provide a new test * add more explanatory tests * Improve a bit the checks when setting the fallbackParentType parameter value * use back parentType parameter key name (cherry picked from commit c5b9c6051462122a37d8e7001c4776abed599ea8) Commit: ead6a7789f07d121c621fc85870bb11d23b302d2 https://github.com/xwiki/xwiki-platform/commit/ead6a7789f07d121c621fc85870bb... Author: Simon Urli <[email protected]> Date: 2024-12-10 (Tue, 10 Dec 2024) Changed paths: M xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-api/src/test/java/org/xwiki/model/internal/reference/DefaultReferenceEntityReferenceResolverTest.java M xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-api/src/test/java/org/xwiki/model/internal/reference/RelativeStringEntityReferenceResolverTest.java A xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-xwiki/src/main/java/org/xwiki/rendering/internal/resolver/AbstractRelativeResourceReferenceEntityReferenceResolver.java A xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-xwiki/src/main/java/org/xwiki/rendering/internal/resolver/RelativeAttachmentResourceReferenceEntityReferenceResolver.java A xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-xwiki/src/main/java/org/xwiki/rendering/internal/resolver/RelativeDocumentResourceReferenceEntityReferenceResolver.java A xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-xwiki/src/main/java/org/xwiki/rendering/internal/resolver/RelativePageAttachmentResourceReferenceEntityReferenceResolver.java A xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-xwiki/src/main/java/org/xwiki/rendering/internal/resolver/RelativePageResourceReferenceEntityReferenceResolver.java A xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-xwiki/src/main/java/org/xwiki/rendering/internal/resolver/RelativeResourceReferenceEntityReferenceResolver.java A xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-xwiki/src/main/java/org/xwiki/rendering/internal/resolver/RelativeSpaceResourceReferenceEntityReferenceResolver.java M xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-xwiki/src/main/resources/META-INF/components.txt M xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-xwiki/src/test/java/org/xwiki/rendering/internal/resolver/DefaultResourceReferenceEntityReferenceResolverTest.java A xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-xwiki/src/test/java/org/xwiki/rendering/internal/resolver/RelativeResourceReferenceEntityReferenceResolverTest.java Log Message: ----------- XWIKI-22681: Provide a relative ResourceReferenceEntityReferenceResolver (#3673) (cherry picked from commit 65acde038d0b0cddb9a7012e0a29e6bcae852c83) Compare: https://github.com/xwiki/xwiki-platform/compare/5e68d1c948c3%5E...ead6a7789f... To unsubscribe from these emails, change your notification settings at https://github.com/xwiki/xwiki-platform/settings/notifications