[misc] Update contrib dependencies related hacks in the pom

xwiki · Feb 5, 2024 · fd96460 · fd96460
1 parent 4ace873
commit fd96460
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 26 deletions.
diff --git a/xwiki-platform-distribution/pom.xml b/xwiki-platform-distribution/pom.xml
@@ -212,35 +212,19 @@
   </properties>
 
   <!-- Avoid enforce-upper-bounds rule complains (they're actually false positives since Extension Manager is not
-       affected by that) -->
+       affected by that)
+       Indicate the actual version instead of ${project.version} for xwiki-platform artifacts so that this parent pom
+       can be reused by contrib extensions. -->
   <dependencyManagement>
     <dependencies>
-      <!-- application-tour-ui -->
-      <dependency>
-        <groupId>org.xwiki.platform</groupId>
-        <artifactId>xwiki-platform-appwithinminutes-ui</artifactId>
-        <version>16.1.0-SNAPSHOT</version>
-        <type>xar</type>
-      </dependency>
-      <dependency>
-        <groupId>org.xwiki.platform</groupId>
-        <artifactId>xwiki-platform-security-authorization-script</artifactId>
-        <version>16.1.0-SNAPSHOT</version>
-      </dependency>
       <dependency>
         <groupId>org.xwiki.platform</groupId>
         <artifactId>xwiki-platform-webjars-api</artifactId>
         <version>16.1.0-SNAPSHOT</version>
       </dependency>
-      <!-- application-ckeditor-ui -->
-      <dependency>
-        <groupId>org.xwiki.rendering</groupId>
-        <artifactId>xwiki-rendering-macro-html</artifactId>
-        <version>${rendering.version}</version>
-      </dependency>
       <dependency>
         <groupId>org.xwiki.platform</groupId>
-        <artifactId>xwiki-platform-tree-webjar</artifactId>
+        <artifactId>xwiki-platform-rendering-macro-velocity</artifactId>
         <version>16.1.0-SNAPSHOT</version>
       </dependency>
     </dependencies>

diff --git a/...tion/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-common/pom.xml b/...tion/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-common/pom.xml
@@ -257,12 +257,6 @@
       <version>4.7.1</version>
       <type>xar</type>
       <optional>true</optional>
-      <exclusions>
-        <exclusion>
-          <groupId>org.xwiki.platform</groupId>
-          <artifactId>xwiki-platform-webjars</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <!-- Needed for editor-tool-highlighting-ui because it's depending on some old version of xwiki-platform-webjars
          which has now been moved into xwiki-platform-webjar-api -->