Skip to content

Commit

Permalink
XWIKI-21977 : Module xwiki-platform-legacy-oldcore does not expose th…
Browse files Browse the repository at this point in the history
…e same extension features as xwiki-platform-oldcore

* Move oldcore extension features to a property of xwiki-platform-core
* Re-use property in oldcore and legacy-oldcore modules
  • Loading branch information
aubincleme committed Mar 7, 2024
1 parent 9e43a9e commit f1c08e8
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 12 deletions.
13 changes: 13 additions & 0 deletions xwiki-platform-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,19 @@
<!-- JS/CSS minification is on by default, this property is used in order to able to skip minification when the
debug profile is active. It can also be used from the command line to skip minification -->
<xwiki.minification.skip>false</xwiki.minification.skip>
<!-- Define here extension features that will be used within some modules and their legacy versions -->
<!-- Extension features of xwiki-platform-oldcore -->
<xwiki.platform.oldcore.extension.features>
<!-- Old names of this module used for retro compatibility when resolving dependencies of old extensions -->
com.xpn.xwiki.platform:xwiki-core,

<!-- The old org.xwiki.platform:xwiki-platform-filter-instance-oldcore has been merged with oldcore -->
org.xwiki.platform:xwiki-platform-filter-instance-oldcore,

<!-- A contrib extension to use with versions of oldcore which does not support authservice API -->
org.xwiki.contrib:authservice-backport-api,
org.xwiki.contrib:authservice-backport-default
</xwiki.platform.oldcore.extension.features>
</properties>
<build>
<pluginManagement>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<!-- The features provided by this module so that it's found when resolving extension that pretty much never depend on this one -->
<xwiki.extension.features>
org.xwiki.platform:xwiki-platform-oldcore,
com.xpn.xwiki.platform:xwiki-core
${xwiki.platform.oldcore.extension.features}
</xwiki.extension.features>
<xwiki.jacoco.instructionRatio>0.00</xwiki.jacoco.instructionRatio>
<!-- TODO: Remove once the tests have been fixed to not output anything to the console! -->
Expand Down
12 changes: 1 addition & 11 deletions xwiki-platform-core/xwiki-platform-oldcore/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,7 @@
<packaging>jar</packaging>
<description>XWiki Platform - Old Core</description>
<properties>
<xwiki.extension.features>
<!-- Old names of this module used for retro compatibility when resolving dependencies of old extensions -->
com.xpn.xwiki.platform:xwiki-core,

<!-- The old org.xwiki.platform:xwiki-platform-filter-instance-oldcore has been merged with oldcore -->
org.xwiki.platform:xwiki-platform-filter-instance-oldcore,

<!-- A contrib extension to use with versions of oldcore which does not support authservice API -->
org.xwiki.contrib:authservice-backport-api,
org.xwiki.contrib:authservice-backport-default
</xwiki.extension.features>
<xwiki.extension.features>${xwiki.platform.oldcore.extension.features}</xwiki.extension.features>
<!-- Skipping revapi since xwiki-platform-legacy-oldcore wraps this module and runs checks on it -->
<xwiki.revapi.skip>true</xwiki.revapi.skip>
<xwiki.jacoco.instructionRatio>0.38</xwiki.jacoco.instructionRatio>
Expand Down

0 comments on commit f1c08e8

Please sign in to comment.