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

xmlgraphics-fop-pom-template.pom

@@ -96,6 +96,12 @@ http://maven.apache.org/maven-v4_0_0.xsd">
       <groupId>batik</groupId>
       <artifactId>batik-transcoder</artifactId>
       <version>1.6-1</version>
+      <exclusions>
+        <exclusion>
+          <groupId>fop</groupId>
+          <artifactId>fop</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>batik</groupId>
@@ -126,7 +132,7 @@ http://maven.apache.org/maven-v4_0_0.xsd">
     <dependency>
       <groupId>org.apache.avalon.framework</groupId>
       <artifactId>avalon-framework-impl</artifactId>
-      <version>4.3</version>
+      <version>4.3.1</version>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>