Merge pull request #5741 from effective-webwork/xmlgraphics

Change version 'org.apache.xmlgraphics' to '2.8' and add removed depe…
kitodo · Aug 4, 2023 · 89a23cb · 89a23cb
2 parents 682ed30 + 8f72448
commit 89a23cb
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 14 deletions.
diff --git a/Kitodo-Docket/pom.xml b/Kitodo-Docket/pom.xml
@@ -40,11 +40,25 @@
         </dependency>
         <dependency>
             <groupId>org.apache.xmlgraphics</groupId>
-            <artifactId>fop</artifactId>
+            <artifactId>xmlgraphics-commons</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.xmlgraphics</groupId>
-            <artifactId>xmlgraphics-commons</artifactId>
+            <artifactId>fop</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.xmlgraphics</groupId>
+                    <artifactId>xmlgraphics-commons</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.avalon.framework</groupId>
+            <artifactId>avalon-framework-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.avalon.framework</groupId>
+            <artifactId>avalon-framework-impl</artifactId>
         </dependency>
         <dependency>
             <groupId>org.jdom</groupId>

diff --git a/Kitodo/pom.xml b/Kitodo/pom.xml
@@ -163,11 +163,19 @@
         </dependency>
         <dependency>
             <groupId>org.apache.xmlgraphics</groupId>
-            <artifactId>fop</artifactId>
+            <artifactId>xmlgraphics-commons</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.xmlgraphics</groupId>
-            <artifactId>xmlgraphics-commons</artifactId>
+            <artifactId>fop</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.avalon.framework</groupId>
+            <artifactId>avalon-framework-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.avalon.framework</groupId>
+            <artifactId>avalon-framework-impl</artifactId>
         </dependency>
         <dependency>
             <groupId>org.elasticsearch.client</groupId>

diff --git a/pom.xml b/pom.xml
@@ -50,7 +50,8 @@
         <commons-io.version>2.11.0</commons-io.version>
         <commons-lang3.version>3.12.0</commons-lang3.version>
         <commons-net.version>3.9.0</commons-net.version>
-        <org.apache.xmlgraphics.version>2.3</org.apache.xmlgraphics.version>
+        <org.apache.xmlgraphics.version>2.8</org.apache.xmlgraphics.version>
+        <org.apache.avalon.framework.version>4.3.1</org.apache.avalon.framework.version>
         <hamcrest.version>2.2-rc1</hamcrest.version>
         <hibernate.version>5.6.10.Final</hibernate.version>
         <jaxb.api.version>2.3.1</jaxb.api.version>
@@ -359,6 +360,17 @@ from system library in Java 11+ -->
                 <version>${tomcat.version}</version>
                 <scope>provided</scope>
             </dependency>
+            <dependency>
+                <groupId>org.apache.xmlgraphics</groupId>
+                <artifactId>xmlgraphics-commons</artifactId>
+                <version>${org.apache.xmlgraphics.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>*</groupId>
+                        <artifactId>*</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
             <dependency>
                 <groupId>org.apache.xmlgraphics</groupId>
                 <artifactId>fop</artifactId>
@@ -385,15 +397,14 @@ from system library in Java 11+ -->
                 </exclusions>
             </dependency>
             <dependency>
-                <groupId>org.apache.xmlgraphics</groupId>
-                <artifactId>xmlgraphics-commons</artifactId>
-                <version>${org.apache.xmlgraphics.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>*</groupId>
-                        <artifactId>*</artifactId>
-                    </exclusion>
-                </exclusions>
+                <groupId>org.apache.avalon.framework</groupId>
+                <artifactId>avalon-framework-api</artifactId>
+                <version>${org.apache.avalon.framework.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.avalon.framework</groupId>
+                <artifactId>avalon-framework-impl</artifactId>
+                <version>${org.apache.avalon.framework.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.awaitility</groupId>