Update for release

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1885382 13f79535-47bb-0310-9956-ffa450edef68

12 files changed, 25 insertions, 14 deletions

diff --git a/NOTICE b/NOTICE
index 502b96fb2..d4aad2003 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
 Apache FOP
-Copyright 1999-2020 The Apache Software Foundation
+Copyright 1999-2021 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
diff --git a/README b/README
index 5ec0c8fad..f8a9ecdb2 100644
--- a/README
+++ b/README
@@ -107,6 +107,17 @@ under the ./fop sub-directory.
   RELEASE NOTES
 ==============================================================================
 
+Version 2.6
+===========
+
+Major Changes in Version 2.6
+----------------------------
+
+* Support OTF/TTF SVG fonts
+* Allow overpaint of PDF border
+
+This release also contains a number of bug fixes.
+
 Version 2.5
 ===========
 
diff --git a/fop-core/pom.xml b/fop-core/pom.xml
index d55769f19..254c9821e 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.6.0-SNAPSHOT</version>
   </parent>
 
   <properties>
diff --git a/fop-events/pom.xml b/fop-events/pom.xml
index ace013b9b..108532e1e 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.6.0-SNAPSHOT</version>
   </parent>
 
   <dependencies>
diff --git a/fop-sandbox/pom.xml b/fop-sandbox/pom.xml
index 93110f650..6e6ece431 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.6.0-SNAPSHOT</version>
   </parent>
 
   <dependencies>
diff --git a/fop-servlet/pom.xml b/fop-servlet/pom.xml
index d2e62e8ac..259049cfc 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.6.0-SNAPSHOT</version>
   </parent>
 
   <dependencies>
diff --git a/fop-transcoder-allinone/pom.xml b/fop-transcoder-allinone/pom.xml
index fab4c461d..b2269dd80 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.6.0-SNAPSHOT</version>
   </parent>
 
   <dependencies>
diff --git a/fop-transcoder/pom.xml b/fop-transcoder/pom.xml
index dae00833c..c9f7b6cf2 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.6.0-SNAPSHOT</version>
   </parent>
 
   <dependencies>
diff --git a/fop-util/pom.xml b/fop-util/pom.xml
index f21a7362d..ae88e719a 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.6.0-SNAPSHOT</version>
   </parent>
 
   <dependencies>
diff --git a/fop/build.xml b/fop/build.xml
index 3c2509e53..c5461da26 100644
--- a/fop/build.xml
+++ b/fop/build.xml
@@ -154,8 +154,8 @@ 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="year" value="1999-2020"/>
+  <property name="version" value="2.6.0-SNAPSHOT"/>
+  <property name="year" value="1999-2021"/>
   <property name="javac.debug" value="on"/>
   <property name="javac.optimize" value="off"/>
   <property name="javac.deprecation" value="on"/>
diff --git a/fop/pom.xml b/fop/pom.xml
index 59559cea4..a3677289d 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.6.0-SNAPSHOT</version>
   </parent>
 
   <dependencies>
diff --git a/pom.xml b/pom.xml
index 5671e2a57..8c129cfa3 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.6.0-SNAPSHOT</version>
   <name>Apache FOP Parent</name>
   <description>XML Graphics Format Object Processor</description>
   <packaging>pom</packaging>
@@ -13,7 +13,7 @@
   <properties>
     <ant.version>1.9.15</ant.version>
     <antrun.plugin.version>1.8</antrun.plugin.version>
-    <batik.version>1.11.0-SNAPSHOT</batik.version>
+    <batik.version>1.14.0-SNAPSHOT</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>
@@ -30,7 +30,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.6.0-SNAPSHOT</xmlgraphics.commons.version>
     <xmlunit.version>1.2</xmlunit.version>
     <jdk.path>${env.JAVA_HOME}</jdk.path>
   </properties>