Update for release

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

diff --git a/NOTICE b/NOTICE
index 502b96fb2b970979015d5c5a4d88247ad173b45c..d4aad2003288c8fc84dba3c3fd11e2e78a7eccfa 100644 (file)
--- 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 5ec0c8fadfede4dba84a14746287e51f2161f18f..f8a9ecdb26c7fad274290af1a3236b860387b64f 100644 (file)
--- 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 d55769f197bd596d12ff1948f17a5dc70910963a..254c9821e6d4e4526e08af767e689f5152e5a6bb 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.6.0-SNAPSHOT</version>
   </parent>
 
   <properties>

diff --git a/fop-events/pom.xml b/fop-events/pom.xml
index ace013b9b0886aec4695e162c95b529e087deb82..108532e1efc2f63352a7a913940906b5fc0b09f3 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.6.0-SNAPSHOT</version>
   </parent>
 
   <dependencies>

diff --git a/fop-sandbox/pom.xml b/fop-sandbox/pom.xml
index 93110f65070e647e724fef5abe10bdcfb0e16dfb..6e6ece431cbd3a9699446a4f9b6db2e15d0967e0 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.6.0-SNAPSHOT</version>
   </parent>
 
   <dependencies>

diff --git a/fop-servlet/pom.xml b/fop-servlet/pom.xml
index d2e62e8acc544a4c48791a1c0edfda136c902fe4..259049cfce5b254c663f51cbf0e5c793eaa7082b 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.6.0-SNAPSHOT</version>
   </parent>
 
   <dependencies>

diff --git a/fop-transcoder-allinone/pom.xml b/fop-transcoder-allinone/pom.xml
index fab4c461d15b4e00a4ef7a5bd9049aafd096d0c9..b2269dd802c994e265dc9dda59e57dcd4eed5af1 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.6.0-SNAPSHOT</version>
   </parent>
 
   <dependencies>

diff --git a/fop-transcoder/pom.xml b/fop-transcoder/pom.xml
index dae00833c3a46ab6c9561a017e52189bf0f0ee4e..c9f7b6cf2d36d71781fae592037d722a257a73b1 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.6.0-SNAPSHOT</version>
   </parent>
 
   <dependencies>

diff --git a/fop-util/pom.xml b/fop-util/pom.xml
index f21a7362d11fd939cc8e0181ad7de3d46fa43f61..ae88e719a352c56b14ee4b38f77a241b664fb7c3 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.6.0-SNAPSHOT</version>
   </parent>
 
   <dependencies>

diff --git a/fop/build.xml b/fop/build.xml
index 3c2509e5321efcd507d97c341a13974a93c89cd6..c5461da26cbd00411d14c3e2bb305ba5be7e7af5 100644 (file)
--- 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 59559cea41225f15ca9358dffc7d3ddd4cf63a8d..a3677289ded51c4e3cbaaebf2edcbc229beee501 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.6.0-SNAPSHOT</version>
   </parent>
 
   <dependencies>

diff --git a/pom.xml b/pom.xml
index 5671e2a573c023c3496073a5251ee8a58d0c8119..8c129cfa307443bd62d23dc4f4a214621cea8c68 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.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>