From e82460e4937fd9206bba32e2659fdfb9e2830db8 Mon Sep 17 00:00:00 2001
From: Simon Steiner <ssteiner@apache.org>
Date: Tue, 22 Jan 2019 11:53:31 +0000
Subject: FOP-2733: Drop dependency on Avalon-Framework

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1851806 13f79535-47bb-0310-9956-ffa450edef68
---
 fop/build.xml | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to 'fop/build.xml')

diff --git a/fop/build.xml b/fop/build.xml
index cc286b2bd..3547015fe 100644
--- a/fop/build.xml
+++ b/fop/build.xml
@@ -73,7 +73,6 @@ list of possible build targets.
   <fileset dir="${basedir}/.." id="dist.bin.lib">
     <patternset id="dist.lib">
       <include name="fop/lib/README*"/>
-      <include name="fop/lib/avalon-framework*"/>
       <include name="fop/lib/batik*"/>
       <include name="fop/lib/commons-io*"/>
       <include name="fop/lib/commons-logging*"/>
@@ -597,7 +596,6 @@ list of possible build targets.
     <echo message="Creating the WAR file"/>
     <war warfile="${build.dir}/fop.war" webxml="${servlet.src.dir}/main/webapp/WEB-INF/web.xml">
       <lib dir="${lib.dir}">
-        <include name="avalon-framework*.jar"/>
         <include name="commons-logging*.jar"/>
         <include name="batik*.jar"/>
         <include name="commons-io*.jar"/>
@@ -642,6 +640,7 @@ list of possible build targets.
       <include name="org/apache/fop/util/DecimalFormatCache*.class"/>
       <include name="org/apache/fop/util/ImageObject.class"/>
       <include name="org/apache/fop/util/HexEncoder.class"/>
+      <include name="org/apache/fop/configuration/**"/>
     </patternset>
 <!-- PDF transcoder -->
     <patternset>
@@ -665,7 +664,6 @@ list of possible build targets.
   </fileset>
   <fileset dir="${lib.dir}" id="transcoder-lib-files">
     <include name="commons-io*.jar"/>
-    <include name="avalon-framework*.jar"/>
     <include name="commons-logging*.jar"/>
     <include name="xmlgraphics-commons*.jar"/>
   </fileset>
@@ -698,10 +696,6 @@ list of possible build targets.
     <mkdir dir="${transcoder-deps}"/>
     <unjar dest="${transcoder-deps}">
       <patternset>
-        <include name="org/apache/avalon/framework/*"/>
-        <include name="org/apache/avalon/framework/activity/*"/>
-        <include name="org/apache/avalon/framework/configuration/*"/>
-        <include name="org/apache/avalon/framework/container/*"/>
         <include name="org/apache/commons/logging/**"/>
         <include name="org/apache/commons/io/*.class"/>
         <include name="org/apache/commons/io/filefilter/*.class"/>
@@ -712,7 +706,6 @@ list of possible build targets.
     <mkdir dir="${transcoder-deps}/legal"/>
     <copy todir="${transcoder-deps}/legal">
       <fileset dir="${lib.dir}">
-        <include name="avalon.LICENSE.txt"/>
         <include name="commons-io.LICENSE.txt"/>
         <include name="commons-logging.LICENSE.txt"/>
       </fileset>
-- 
cgit v1.2.3