Merge from Trunk:

Avoid dependency on FOP 0.20.5 from the Batik 1.6 transcoder.
Adjust avalon-framework-impl to an actually available version.
Submitted by: Lars Trieloff <lars.trieloff.at.mindquarry.com>

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/fop-0_93@535149 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/xmlgraphics-fop-pom-template.pom b/xmlgraphics-fop-pom-template.pom
index 1bfbc49db32d9837f9b161836eef500fb619a781..fc13c2918a13f05fa507923d472b1ee6a71ab0f8 100644 (file)
--- a/xmlgraphics-fop-pom-template.pom
+++ b/xmlgraphics-fop-pom-template.pom
@@ -96,6 +96,12 @@ http://maven.apache.org/maven-v4_0_0.xsd">
       <groupId>batik</groupId>\r
       <artifactId>batik-transcoder</artifactId>\r
       <version>1.6-1</version>\r
+      <exclusions>\r
+        <exclusion>\r
+          <groupId>fop</groupId>\r
+          <artifactId>fop</artifactId>\r
+        </exclusion>\r
+      </exclusions>\r
     </dependency>\r
     <dependency>\r
       <groupId>batik</groupId>\r
@@ -126,7 +132,7 @@ http://maven.apache.org/maven-v4_0_0.xsd">
     <dependency>\r
       <groupId>org.apache.avalon.framework</groupId>\r
       <artifactId>avalon-framework-impl</artifactId>\r
-      <version>4.3</version>\r
+      <version>4.3.1</version>\r
     </dependency>\r
     <dependency>\r
       <groupId>javax.servlet</groupId>\r