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 01e2f87c17536d88b90057f2e63347aae2afdd09..d327549e40d59d13dc0d995bb15f08ff5509c32a 100644 (file)
--- 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 fc820c8b90a09cf91f37574321f6c9f65756ec78..c76b5ab72ce365cddc197804d5cbb339e6d8c522 100644 (file)
--- 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 96a0d0f94b54a0c6483372e02275cc318fa4076c..ae3b097cb41b31edfee4ec9720176162dc3bd3c2 100644 (file)
--- 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 a3fd66117de4d07be12aec1d3b004efb917f6ce1..85707356568536251270cd8a51c5a4978b1e3585 100644 (file)
--- 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 93110f65070e647e724fef5abe10bdcfb0e16dfb..833907f4df07105b3117e0f3540417dbc15f8f04 100644 (file)
--- 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 d2e62e8acc544a4c48791a1c0edfda136c902fe4..6571c3f0d65c582591e62a69d59b35509b4d3eed 100644 (file)
--- 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 fab4c461d15b4e00a4ef7a5bd9049aafd096d0c9..0fd9ed1b1da9d3361639f764e1a71fd2941c88cd 100644 (file)
--- 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 dae00833c3a46ab6c9561a017e52189bf0f0ee4e..572f783dadbde20abfadf3f32b7b4ab19ebccbcc 100644 (file)
--- 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 f21a7362d11fd939cc8e0181ad7de3d46fa43f61..382a04e114cbd7198f39ee5b1244b5b670effa18 100644 (file)
--- 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 10b02bfeba4dded6f12f5ae574c20640933e668e..6f4b00e785d9c0352eaa72f27315dfd1ef7320c0 100644 (file)
--- 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 (file)
index 66b0aaa..0000000
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 (file)
index 0000000..2d8aaf4
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 (file)
index 0000000..62dd65d
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 (file)
index 4dae3d0..0000000
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 59559cea41225f15ca9358dffc7d3ddd4cf63a8d..7c574827b41ecb6214e4ebe9912c82e6e5558497 100644 (file)
--- 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 b7881c7e5a55dedd03c798d2ffaa28a7f42997f1..3aac301c740ce592829a67df3539832e7c12c7db 100644 (file)
--- 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>