From: Simon Steiner <ssteiner@apache.org>
Date: Tue, 12 Jan 2021 11:22:43 +0000 (+0000)
Subject: Update for release
X-Git-Tag: fop-2_6~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=e5f45659c28ca58db9288899260aeea139fc4dab;p=xmlgraphics-fop.git

Update for release

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

diff --git a/fop-core/pom.xml b/fop-core/pom.xml
index 254c9821e..12f0c3085 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.6.0-SNAPSHOT</version>
+    <version>2.6</version>
   </parent>
 
   <properties>
diff --git a/fop-events/pom.xml b/fop-events/pom.xml
index 108532e1e..51c2e15e6 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.6.0-SNAPSHOT</version>
+    <version>2.6</version>
   </parent>
 
   <dependencies>
diff --git a/fop-sandbox/pom.xml b/fop-sandbox/pom.xml
index 6e6ece431..603aaef75 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.6.0-SNAPSHOT</version>
+    <version>2.6</version>
   </parent>
 
   <dependencies>
diff --git a/fop-servlet/pom.xml b/fop-servlet/pom.xml
index 259049cfc..6a9121dd8 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.6.0-SNAPSHOT</version>
+    <version>2.6</version>
   </parent>
 
   <dependencies>
diff --git a/fop-transcoder-allinone/pom.xml b/fop-transcoder-allinone/pom.xml
index b2269dd80..00fc38d7a 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.6.0-SNAPSHOT</version>
+    <version>2.6</version>
   </parent>
 
   <dependencies>
diff --git a/fop-transcoder/pom.xml b/fop-transcoder/pom.xml
index c9f7b6cf2..cd1d29a04 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.6.0-SNAPSHOT</version>
+    <version>2.6</version>
   </parent>
 
   <dependencies>
diff --git a/fop-util/pom.xml b/fop-util/pom.xml
index ae88e719a..d0558b1bb 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.6.0-SNAPSHOT</version>
+    <version>2.6</version>
   </parent>
 
   <dependencies>
diff --git a/fop/build.xml b/fop/build.xml
index c5461da26..97f25bac4 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.6.0-SNAPSHOT"/>
+  <property name="version" value="2.6"/>
   <property name="year" value="1999-2021"/>
   <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.14.jar b/fop/lib/batik-all-1.14.jar
new file mode 100644
index 000000000..7452ff694
Binary files /dev/null and b/fop/lib/batik-all-1.14.jar differ
diff --git a/fop/lib/batik.NOTICE.txt b/fop/lib/batik.NOTICE.txt
index 662188f35..21be2329a 100644
--- a/fop/lib/batik.NOTICE.txt
+++ b/fop/lib/batik.NOTICE.txt
@@ -1,5 +1,5 @@
 Apache Batik
-Copyright 1999-2007 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/fop/lib/xmlgraphics-commons-2.6.jar b/fop/lib/xmlgraphics-commons-2.6.jar
new file mode 100644
index 000000000..2e1362d72
Binary files /dev/null and b/fop/lib/xmlgraphics-commons-2.6.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 3cdc9a723..000000000
Binary files a/fop/lib/xmlgraphics-commons-svn-trunk.jar and /dev/null differ
diff --git a/fop/lib/xmlgraphics-commons.NOTICE.txt b/fop/lib/xmlgraphics-commons.NOTICE.txt
index 76171ea85..55056c844 100644
--- a/fop/lib/xmlgraphics-commons.NOTICE.txt
+++ b/fop/lib/xmlgraphics-commons.NOTICE.txt
@@ -1,5 +1,5 @@
 Apache XML Graphics Commons
-Copyright 2006-2007 The Apache Software Foundation
+Copyright 2006-2021 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
diff --git a/fop/pom.xml b/fop/pom.xml
index a3677289d..6a49188b1 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.6.0-SNAPSHOT</version>
+    <version>2.6</version>
   </parent>
 
   <dependencies>
diff --git a/pom.xml b/pom.xml
index 8c129cfa3..a2a718aba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>org.apache.xmlgraphics</groupId>
   <artifactId>fop-parent</artifactId>
-  <version>2.6.0-SNAPSHOT</version>
+  <version>2.6</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.14.0-SNAPSHOT</batik.version>
+    <batik.version>1.14</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.6.0-SNAPSHOT</xmlgraphics.commons.version>
+    <xmlgraphics.commons.version>2.6</xmlgraphics.commons.version>
     <xmlunit.version>1.2</xmlunit.version>
     <jdk.path>${env.JAVA_HOME}</jdk.path>
   </properties>