From: Simon Steiner <ssteiner@apache.org>
Date: Tue, 5 May 2020 09:34:11 +0000 (+0000)
Subject: Update for release
X-Git-Tag: fop-2_5~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=72d24c0537cb1ad5173796e63f82e63e6e55a737;p=xmlgraphics-fop.git

Update for release

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/fop-2_5@1877383 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/fop-core/pom.xml b/fop-core/pom.xml
index 01e2f87c1..d327549e4 100644
--- a/fop-core/pom.xml
+++ b/fop-core/pom.xml
@@ -10,7 +10,7 @@
   <parent>
     <groupId>org.apache.xmlgraphics</groupId>
     <artifactId>fop-parent</artifactId>
-    <version>2.5.0-SNAPSHOT</version>
+    <version>2.5</version>
   </parent>
 
   <properties>
diff --git a/fop-core/src/main/java/org/apache/fop/fonts/FontType.java b/fop-core/src/main/java/org/apache/fop/fonts/FontType.java
index fc820c8b9..c76b5ab72 100644
--- a/fop-core/src/main/java/org/apache/fop/fonts/FontType.java
+++ b/fop-core/src/main/java/org/apache/fop/fonts/FontType.java
@@ -61,7 +61,6 @@ public class FontType {
      * Construct a font type.
      * @param name a font type name
      * @param value a font type value
-     * @see org.apache.avalon.framework.Enum#Enum(String)
      */
     protected FontType(String name, int value) {
         this.name = name;
diff --git a/fop-core/src/test/java/org/apache/fop/visual/BitmapProducerJava2D.java b/fop-core/src/test/java/org/apache/fop/visual/BitmapProducerJava2D.java
index 96a0d0f94..ae3b097cb 100644
--- a/fop-core/src/test/java/org/apache/fop/visual/BitmapProducerJava2D.java
+++ b/fop-core/src/test/java/org/apache/fop/visual/BitmapProducerJava2D.java
@@ -66,7 +66,6 @@ public class BitmapProducerJava2D extends AbstractBitmapProducer implements Conf
         fopFactory = FopFactory.newInstance(baseUri);
     }
 
-    /** @see org.apache.avalon.framework.configuration.Configurable */
     public void configure(Configuration cfg) throws ConfigurationException {
         this.deleteTempFiles = cfg.getChild("delete-temp-files").getValueAsBoolean(true);
     }
diff --git a/fop-events/pom.xml b/fop-events/pom.xml
index a3fd66117..857073565 100644
--- a/fop-events/pom.xml
+++ b/fop-events/pom.xml
@@ -10,7 +10,7 @@
   <parent>
     <groupId>org.apache.xmlgraphics</groupId>
     <artifactId>fop-parent</artifactId>
-    <version>2.5.0-SNAPSHOT</version>
+    <version>2.5</version>
   </parent>
 
   <dependencies>
diff --git a/fop-sandbox/pom.xml b/fop-sandbox/pom.xml
index 93110f650..833907f4d 100644
--- a/fop-sandbox/pom.xml
+++ b/fop-sandbox/pom.xml
@@ -10,7 +10,7 @@
   <parent>
     <groupId>org.apache.xmlgraphics</groupId>
     <artifactId>fop-parent</artifactId>
-    <version>2.5.0-SNAPSHOT</version>
+    <version>2.5</version>
   </parent>
 
   <dependencies>
diff --git a/fop-servlet/pom.xml b/fop-servlet/pom.xml
index d2e62e8ac..6571c3f0d 100644
--- a/fop-servlet/pom.xml
+++ b/fop-servlet/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.apache.xmlgraphics</groupId>
     <artifactId>fop-parent</artifactId>
-    <version>2.5.0-SNAPSHOT</version>
+    <version>2.5</version>
   </parent>
 
   <dependencies>
diff --git a/fop-transcoder-allinone/pom.xml b/fop-transcoder-allinone/pom.xml
index fab4c461d..0fd9ed1b1 100644
--- a/fop-transcoder-allinone/pom.xml
+++ b/fop-transcoder-allinone/pom.xml
@@ -10,7 +10,7 @@
   <parent>
     <groupId>org.apache.xmlgraphics</groupId>
     <artifactId>fop-parent</artifactId>
-    <version>2.5.0-SNAPSHOT</version>
+    <version>2.5</version>
   </parent>
 
   <dependencies>
diff --git a/fop-transcoder/pom.xml b/fop-transcoder/pom.xml
index dae00833c..572f783da 100644
--- a/fop-transcoder/pom.xml
+++ b/fop-transcoder/pom.xml
@@ -10,7 +10,7 @@
   <parent>
     <groupId>org.apache.xmlgraphics</groupId>
     <artifactId>fop-parent</artifactId>
-    <version>2.5.0-SNAPSHOT</version>
+    <version>2.5</version>
   </parent>
 
   <dependencies>
diff --git a/fop-util/pom.xml b/fop-util/pom.xml
index f21a7362d..382a04e11 100644
--- a/fop-util/pom.xml
+++ b/fop-util/pom.xml
@@ -10,7 +10,7 @@
   <parent>
     <groupId>org.apache.xmlgraphics</groupId>
     <artifactId>fop-parent</artifactId>
-    <version>2.5.0-SNAPSHOT</version>
+    <version>2.5</version>
   </parent>
 
   <dependencies>
diff --git a/fop/build.xml b/fop/build.xml
index 10b02bfeb..6f4b00e78 100644
--- a/fop/build.xml
+++ b/fop/build.xml
@@ -154,7 +154,7 @@ list of possible build targets.
   <property name="Name" value="Apache FOP"/>
   <property name="name" value="fop"/>
   <property name="NAME" value="FOP"/>
-  <property name="version" value="2.5.0-SNAPSHOT"/>
+  <property name="version" value="2.5"/>
   <property name="year" value="1999-2020"/>
   <property name="javac.debug" value="on"/>
   <property name="javac.optimize" value="off"/>
diff --git a/fop/lib/batik-all-1.11.0-SNAPSHOT.jar b/fop/lib/batik-all-1.11.0-SNAPSHOT.jar
deleted file mode 100644
index 66b0aaa0f..000000000
Binary files a/fop/lib/batik-all-1.11.0-SNAPSHOT.jar and /dev/null differ
diff --git a/fop/lib/batik-all-1.13.jar b/fop/lib/batik-all-1.13.jar
new file mode 100644
index 000000000..2d8aaf4ea
Binary files /dev/null and b/fop/lib/batik-all-1.13.jar differ
diff --git a/fop/lib/xmlgraphics-commons-2.4.jar b/fop/lib/xmlgraphics-commons-2.4.jar
new file mode 100644
index 000000000..62dd65d88
Binary files /dev/null and b/fop/lib/xmlgraphics-commons-2.4.jar differ
diff --git a/fop/lib/xmlgraphics-commons-svn-trunk.jar b/fop/lib/xmlgraphics-commons-svn-trunk.jar
deleted file mode 100644
index 4dae3d05e..000000000
Binary files a/fop/lib/xmlgraphics-commons-svn-trunk.jar and /dev/null differ
diff --git a/fop/pom.xml b/fop/pom.xml
index 59559cea4..7c574827b 100644
--- a/fop/pom.xml
+++ b/fop/pom.xml
@@ -10,7 +10,7 @@
   <parent>
     <groupId>org.apache.xmlgraphics</groupId>
     <artifactId>fop-parent</artifactId>
-    <version>2.5.0-SNAPSHOT</version>
+    <version>2.5</version>
   </parent>
 
   <dependencies>
diff --git a/pom.xml b/pom.xml
index b7881c7e5..3aac301c7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>org.apache.xmlgraphics</groupId>
   <artifactId>fop-parent</artifactId>
-  <version>2.5.0-SNAPSHOT</version>
+  <version>2.5</version>
   <name>Apache FOP Parent</name>
   <description>XML Graphics Format Object Processor</description>
   <packaging>pom</packaging>
@@ -12,7 +12,7 @@
 
   <properties>
     <antrun.plugin.version>1.8</antrun.plugin.version>
-    <batik.version>1.11.0-SNAPSHOT</batik.version>
+    <batik.version>1.13</batik.version>
     <build.helper.plugin.version>1.9.1</build.helper.plugin.version>
     <checkstyle.plugin.version>2.14</checkstyle.plugin.version>
     <commons.io.version>1.3.1</commons.io.version>
@@ -29,7 +29,7 @@
     <surefire.plugin.version>2.18.1</surefire.plugin.version>
     <war.plugin.version>2.2</war.plugin.version>
     <xml.plugin.version>1.0.1</xml.plugin.version>
-    <xmlgraphics.commons.version>2.4.0-SNAPSHOT</xmlgraphics.commons.version>
+    <xmlgraphics.commons.version>2.4</xmlgraphics.commons.version>
     <xmlunit.version>1.2</xmlunit.version>
     <jdk.path>${env.JAVA_HOME}</jdk.path>
   </properties>