[misc] Fix the xwiki.extension.features and also indicate the previous extension id.

Author: mflorea

xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/pom.xml

@@ -34,6 +34,8 @@
   <properties>
     <!-- Name to display by the Extension Manager -->
     <xwiki.extension.name>CKEditor Plugins for XWiki</xwiki.extension.name>
+    <!-- This module has been moved from XWiki Contrib to platform. -->
+    <xwiki.extension.previousIds>org.xwiki.contrib:application-ckeditor-plugins</xwiki.extension.previousIds>
     <!-- Old name of this module used for retro compatibility when resolving dependencies of old extensions -->
     <xwiki.extension.features>org.xwiki.contrib:application-ckeditor-plugins</xwiki.extension.features>
   </properties>

xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/pom.xml

@@ -34,10 +34,13 @@
   <properties>
     <!-- Name to display by the Extension Manager -->
     <xwiki.extension.name>CKEditor Integration</xwiki.extension.name>
-    <!-- Don't run Revapi here because there's no Java code. -->
-    <xwiki.revapi.skip>true</xwiki.revapi.skip>
+    <!-- This module has been moved from XWiki Contrib to platform. -->
+    <xwiki.extension.previousIds>org.xwiki.contrib:application-ckeditor-ui</xwiki.extension.previousIds>
     <!-- Old name of this module used for retro compatibility when resolving dependencies of old extensions -->
     <xwiki.extension.features>org.xwiki.contrib:application-ckeditor-ui</xwiki.extension.features>
+
+    <!-- Don't run Revapi here because there's no Java code. -->
+    <xwiki.revapi.skip>true</xwiki.revapi.skip>
   </properties>
 
   <dependencies>

xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-webjar/pom.xml

@@ -34,13 +34,18 @@
   <properties>
     <!-- Name to display by the Extension Manager -->
     <xwiki.extension.name>CKEditor WebJar</xwiki.extension.name>
-    <!-- Old name of this module used for retro compatibility when resolving dependencies of old extensions -->
-    <xwiki.extension.features>org.xwiki.contrib:application-ckeditor-webjar</xwiki.extension.features>
-    <!-- We bundle the CKEditor code. -->
-    <xwiki.extension.features>org.webjars:ckeditor</xwiki.extension.features>
-    <xwiki.extension.features>org.webjars.npm:ckeditor</xwiki.extension.features>
-    <!-- See https://www.npmjs.com/package/ckeditor4 -->
-    <xwiki.extension.features>ckeditor4</xwiki.extension.features>
+    <!-- This module has been moved from XWiki Contrib to platform. -->
+    <xwiki.extension.previousIds>org.xwiki.contrib:application-ckeditor-webjar</xwiki.extension.previousIds>
+    <!-- The list of extensions that this module either replaces or bundles:
+      * this module replaces the CKEditor Integration WebJar extension from XWiki Contrib
+      * this module bundles the CKEditor code (so it can be seen as a replacement for both the CKEditor default WebJar
+        and the CKEditor node module) -->
+    <xwiki.extension.features>
+      org.xwiki.contrib:application-ckeditor-webjar,
+      org.webjars:ckeditor/${ckeditor.version},
+      org.webjars.npm:ckeditor/${ckeditor.version},
+      ckeditor4/${ckeditor.version}
+    </xwiki.extension.features>
 
     <!-- The path to the folder where we clone the CKEditor sources. -->
     <ckeditor.path>${project.build.directory}/ckeditor4-${ckeditor.version}</ckeditor.path>