From 1af2a442ff899528d044a4cb162cb1cfc4558046 Mon Sep 17 00:00:00 2001
From: Martin Perina <mperina@redhat.com>
Date: Fri, 21 Oct 2022 10:25:10 +0200
Subject: [PATCH] Remove apache-commons-jxpath dependency

apache-commons-jxpath is no longer needed, it was a dependency of
apache-commons-configuration, which has been already removed in
https://github.com/oVirt/ovirt-engine/pull/619

Signed-off-by: Martin Perina <mperina@redhat.com>
---
 backend/manager/dependencies/common/pom.xml   | 11 ----------
 .../org/apache/commons/jxpath/main/module.xml | 20 -------------------
 ovirt-engine.spec.in                          |  2 --
 pom.xml                                       |  6 ------
 4 files changed, 39 deletions(-)
 delete mode 100644 backend/manager/dependencies/common/src/main/modules/org/apache/commons/jxpath/main/module.xml

diff --git a/backend/manager/dependencies/common/pom.xml b/backend/manager/dependencies/common/pom.xml
index 56600f7e52b..10dcaec7b3f 100644
--- a/backend/manager/dependencies/common/pom.xml
+++ b/backend/manager/dependencies/common/pom.xml
@@ -30,11 +30,6 @@
       <artifactId>java-client-kubevirt</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>commons-jxpath</groupId>
-      <artifactId>commons-jxpath</artifactId>
-    </dependency>
-
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-compress</artifactId>
@@ -234,12 +229,6 @@
                 <moduleName>org.ovirt.java-client-kubevirt</moduleName>
               </module>
 
-              <module>
-                <groupId>commons-jxpath</groupId>
-                <artifactId>commons-jxpath</artifactId>
-                <moduleName>org.apache.commons.jxpath</moduleName>
-              </module>
-
               <module>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-compress</artifactId>
diff --git a/backend/manager/dependencies/common/src/main/modules/org/apache/commons/jxpath/main/module.xml b/backend/manager/dependencies/common/src/main/modules/org/apache/commons/jxpath/main/module.xml
deleted file mode 100644
index 493478a1b5f..00000000000
--- a/backend/manager/dependencies/common/src/main/modules/org/apache/commons/jxpath/main/module.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- We need this module because the engine-config tool uses
-     commons-configuration in a way that requires it to parse
-     configuration files, but it is not included in JBoss AS
-     because the application server doesn't use
-     commons-configuration in this way: -->
-
-<module xmlns="urn:jboss:module:1.1" name="org.apache.commons.jxpath">
-
-  <resources>
-    <resource-root path="commons-jxpath.jar"/>
-  </resources>
-
-  <dependencies>
-    <module name="javax.api"/>
-    <module name="org.apache.commons.logging"/>
-  </dependencies>
-
-</module>
diff --git a/ovirt-engine.spec.in b/ovirt-engine.spec.in
index 3bb5570bf52..ed66e5a4ec8 100644
--- a/ovirt-engine.spec.in
+++ b/ovirt-engine.spec.in
@@ -278,7 +278,6 @@ Obsoletes:	python3-ansible-runner < 2.0.0
 %endif
 
 Requires:	apache-commons-compress
-Requires:	apache-commons-jxpath
 Requires:	java-11-openjdk-headless >= %{openjdk_version}
 Requires:	javapackages-tools
 Requires:	ovirt-imageio-daemon >= 2.0.10-1
@@ -859,7 +858,6 @@ common/com/woorea/openstack/sdk/main/resteasy-connector.jar openstack-java-sdk/r
 common/net/i2p/crypto/eddsa/main/eddsa.jar
 common/org/aopalliance/main/aopalliance.jar
 common/org/apache/commons/compress/main/commons-compress.jar
-common/org/apache/commons/jxpath/main/commons-jxpath.jar
 common/org/apache/sshd/main/sshd-core.jar apache-sshd/sshd-core.jar
 common/org/apache/sshd/main/sshd-common.jar apache-sshd/sshd-common.jar
 common/org/apache/ws/commons/main/ws-commons-util.jar
diff --git a/pom.xml b/pom.xml
index d6dea56f1b3..00a227ee110 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,7 +60,6 @@
     <commons-collections.version>3.2.2</commons-collections.version>
     <commons-compress.version>1.21</commons-compress.version>
     <commons-configuration.version>1.6</commons-configuration.version>
-    <commons-jxpath.version>1.3</commons-jxpath.version>
     <commons-lang.version>2.6</commons-lang.version>
     <cors-filter.version>1.0.1</cors-filter.version>
     <cxf.version>2.2.7</cxf.version>
@@ -203,11 +202,6 @@
         <artifactId>commons-beanutils</artifactId>
         <version>${commons-beanutils.version}</version>
       </dependency>
-      <dependency>
-        <groupId>commons-jxpath</groupId>
-        <artifactId>commons-jxpath</artifactId>
-        <version>${commons-jxpath.version}</version>
-      </dependency>
       <dependency>
         <groupId>com.sun.istack</groupId>
         <artifactId>istack-commons-runtime</artifactId>