From 5f2e4be642068886c9e2e15ee21ed9cc6637fc0d Mon Sep 17 00:00:00 2001
From: Thomas Mortagne <thomas.mortagne@gmail.com>
Date: Tue, 16 Jul 2024 11:21:51 +0200
Subject: [PATCH] XCOMMONS-3088: Extensions with dependencies that have a
 classifier cannot be installed anymore * add a unit test

---
 .../job/internal/InstallJobTest.java          | 15 +++++++
 .../version/classifierdependency-version.pom  | 39 +++++++++++++++++++
 .../version/classifierdependency-version.test |  1 +
 .../classifierid-version-classifier.test      |  1 +
 .../version/classifierid-version.pom          | 31 +++++++++++++++
 .../version/classifierid-version.test         |  1 +
 6 files changed, 88 insertions(+)
 create mode 100644 xwiki-commons-core/xwiki-commons-extension/xwiki-commons-extension-repositories/xwiki-commons-extension-repository-maven/src/test/resources/repository/maven/groupid/classifierdependency/version/classifierdependency-version.pom
 create mode 100644 xwiki-commons-core/xwiki-commons-extension/xwiki-commons-extension-repositories/xwiki-commons-extension-repository-maven/src/test/resources/repository/maven/groupid/classifierdependency/version/classifierdependency-version.test
 create mode 100644 xwiki-commons-core/xwiki-commons-extension/xwiki-commons-extension-repositories/xwiki-commons-extension-repository-maven/src/test/resources/repository/maven/groupid/classifierid/version/classifierid-version-classifier.test
 create mode 100644 xwiki-commons-core/xwiki-commons-extension/xwiki-commons-extension-repositories/xwiki-commons-extension-repository-maven/src/test/resources/repository/maven/groupid/classifierid/version/classifierid-version.pom
 create mode 100644 xwiki-commons-core/xwiki-commons-extension/xwiki-commons-extension-repositories/xwiki-commons-extension-repository-maven/src/test/resources/repository/maven/groupid/classifierid/version/classifierid-version.test

diff --git a/xwiki-commons-core/xwiki-commons-extension/xwiki-commons-extension-repositories/xwiki-commons-extension-repository-maven/src/test/java/org/xwiki/extension/job/internal/InstallJobTest.java b/xwiki-commons-core/xwiki-commons-extension/xwiki-commons-extension-repositories/xwiki-commons-extension-repository-maven/src/test/java/org/xwiki/extension/job/internal/InstallJobTest.java
index 88c8f316c8..e696e6ce33 100644
--- a/xwiki-commons-core/xwiki-commons-extension/xwiki-commons-extension-repositories/xwiki-commons-extension-repository-maven/src/test/java/org/xwiki/extension/job/internal/InstallJobTest.java
+++ b/xwiki-commons-core/xwiki-commons-extension/xwiki-commons-extension-repositories/xwiki-commons-extension-repository-maven/src/test/java/org/xwiki/extension/job/internal/InstallJobTest.java
@@ -51,6 +51,21 @@ public void setUp() throws Exception
         this.handler = this.componentManager.getInstance(ExtensionHandler.class, "test");
     }
 
+    @Test
+    public void testInstallWithClassifierDependency() throws Throwable
+    {
+        ExtensionId extensionId = new ExtensionId("groupid:classifierdependency", "version");
+
+        install(extensionId, LogLevel.ERROR);
+
+        // Is extension installed
+        InstalledExtension installedExtension =
+            this.installedExtensionRepository.getInstalledExtension(extensionId.getId(), null);
+        assertNotNull(installedExtension);
+        assertTrue(installedExtension.isValid(null));
+        assertTrue(this.handler.getExtensions().get(null).contains(installedExtension));
+    }
+
     @Test
     void testInstallOnRootWithNonDefaultTypeDependency() throws Throwable
     {
diff --git a/xwiki-commons-core/xwiki-commons-extension/xwiki-commons-extension-repositories/xwiki-commons-extension-repository-maven/src/test/resources/repository/maven/groupid/classifierdependency/version/classifierdependency-version.pom b/xwiki-commons-core/xwiki-commons-extension/xwiki-commons-extension-repositories/xwiki-commons-extension-repository-maven/src/test/resources/repository/maven/groupid/classifierdependency/version/classifierdependency-version.pom
new file mode 100644
index 0000000000..a2edc80d9d
--- /dev/null
+++ b/xwiki-commons-core/xwiki-commons-extension/xwiki-commons-extension-repositories/xwiki-commons-extension-repository-maven/src/test/resources/repository/maven/groupid/classifierdependency/version/classifierdependency-version.pom
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ * See the NOTICE file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>groupid</groupId>
+  <artifactId>classifierdependency</artifactId>
+  <version>version</version>
+  <packaging>test</packaging>
+  <dependencies>
+    <dependency>
+      <groupId>groupid</groupId>
+      <artifactId>classifierid</artifactId>
+      <classifier>classifier</classifier>
+      <version>version</version>
+      <type>test</type>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/xwiki-commons-core/xwiki-commons-extension/xwiki-commons-extension-repositories/xwiki-commons-extension-repository-maven/src/test/resources/repository/maven/groupid/classifierdependency/version/classifierdependency-version.test b/xwiki-commons-core/xwiki-commons-extension/xwiki-commons-extension-repositories/xwiki-commons-extension-repository-maven/src/test/resources/repository/maven/groupid/classifierdependency/version/classifierdependency-version.test
new file mode 100644
index 0000000000..6b584e8ece
--- /dev/null
+++ b/xwiki-commons-core/xwiki-commons-extension/xwiki-commons-extension-repositories/xwiki-commons-extension-repository-maven/src/test/resources/repository/maven/groupid/classifierdependency/version/classifierdependency-version.test
@@ -0,0 +1 @@
+content
\ No newline at end of file
diff --git a/xwiki-commons-core/xwiki-commons-extension/xwiki-commons-extension-repositories/xwiki-commons-extension-repository-maven/src/test/resources/repository/maven/groupid/classifierid/version/classifierid-version-classifier.test b/xwiki-commons-core/xwiki-commons-extension/xwiki-commons-extension-repositories/xwiki-commons-extension-repository-maven/src/test/resources/repository/maven/groupid/classifierid/version/classifierid-version-classifier.test
new file mode 100644
index 0000000000..dc92d94c98
--- /dev/null
+++ b/xwiki-commons-core/xwiki-commons-extension/xwiki-commons-extension-repositories/xwiki-commons-extension-repository-maven/src/test/resources/repository/maven/groupid/classifierid/version/classifierid-version-classifier.test
@@ -0,0 +1 @@
+classifier content
\ No newline at end of file
diff --git a/xwiki-commons-core/xwiki-commons-extension/xwiki-commons-extension-repositories/xwiki-commons-extension-repository-maven/src/test/resources/repository/maven/groupid/classifierid/version/classifierid-version.pom b/xwiki-commons-core/xwiki-commons-extension/xwiki-commons-extension-repositories/xwiki-commons-extension-repository-maven/src/test/resources/repository/maven/groupid/classifierid/version/classifierid-version.pom
new file mode 100644
index 0000000000..9997462306
--- /dev/null
+++ b/xwiki-commons-core/xwiki-commons-extension/xwiki-commons-extension-repositories/xwiki-commons-extension-repository-maven/src/test/resources/repository/maven/groupid/classifierid/version/classifierid-version.pom
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ * See the NOTICE file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>groupid</groupId>
+  <artifactId>classifierid</artifactId>
+  <name>name</name>
+  <version>version</version>
+  <packaging>test</packaging>
+</project>
diff --git a/xwiki-commons-core/xwiki-commons-extension/xwiki-commons-extension-repositories/xwiki-commons-extension-repository-maven/src/test/resources/repository/maven/groupid/classifierid/version/classifierid-version.test b/xwiki-commons-core/xwiki-commons-extension/xwiki-commons-extension-repositories/xwiki-commons-extension-repository-maven/src/test/resources/repository/maven/groupid/classifierid/version/classifierid-version.test
new file mode 100644
index 0000000000..6b584e8ece
--- /dev/null
+++ b/xwiki-commons-core/xwiki-commons-extension/xwiki-commons-extension-repositories/xwiki-commons-extension-repository-maven/src/test/resources/repository/maven/groupid/classifierid/version/classifierid-version.test
@@ -0,0 +1 @@
+content
\ No newline at end of file