Update for release

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

diff --git a/fop-core/pom.xml b/fop-core/pom.xml
index a57b78aa6fac1f04c1e91c9a84f13de97b95052f..ba5923d31f1edd7559cd42bd71e2abc88bb7c7d8 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.8.0-SNAPSHOT</version>
+    <version>2.8</version>
   </parent>
 
   <properties>

diff --git a/fop-events/pom.xml b/fop-events/pom.xml
index 7d7aa24666b6d062befddcec805e387785ddc4c4..25ce1b2305433007d722979cc962045829781e31 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.8.0-SNAPSHOT</version>
+    <version>2.8</version>
   </parent>
 
   <dependencies>

diff --git a/fop-sandbox/pom.xml b/fop-sandbox/pom.xml
index 20ee4a9a4dd3880915c3f17e043d88b6ab1f78a8..f83937f971c17e79019fb5e01971d32d0430b419 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.8.0-SNAPSHOT</version>
+    <version>2.8</version>
   </parent>
 
   <dependencies>

diff --git a/fop-servlet/pom.xml b/fop-servlet/pom.xml
index 12c12df35e37a31d05867c7e5be3782e24317fe9..c197a7d6e4ae15d799c9d5694285a4f710f42dd3 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.8.0-SNAPSHOT</version>
+    <version>2.8</version>
   </parent>
 
   <dependencies>

diff --git a/fop-transcoder-allinone/pom.xml b/fop-transcoder-allinone/pom.xml
index 3e5d0d0b87022bbb3e98447d39a4159d065cc4d5..e13567a677ffd54634031a7ae2b781ac17f4ec47 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.8.0-SNAPSHOT</version>
+    <version>2.8</version>
   </parent>
 
   <dependencies>

diff --git a/fop-transcoder/pom.xml b/fop-transcoder/pom.xml
index 565be6bca4e58ca87384268c584945ce36703ae5..ccd9039c6a80b64c28a788b8cf30e98b8c52d3f4 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.8.0-SNAPSHOT</version>
+    <version>2.8</version>
   </parent>
 
   <dependencies>

diff --git a/fop-util/pom.xml b/fop-util/pom.xml
index 9ddabc9359853bc9b13d7833c027160ec4e99687..d341bbda5f43796f46986fcde7e3ad0d60dcc4e0 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.8.0-SNAPSHOT</version>
+    <version>2.8</version>
   </parent>
 
   <dependencies>

diff --git a/fop/build.xml b/fop/build.xml
index 2daaf627e9bc214b162ca1f15188a22b5665fcd0..27f59eb804e28632c42e11c91626909966b4921f 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.8.0-SNAPSHOT"/>
+  <property name="version" value="2.8"/>
   <property name="year" value="1999-2022"/>
   <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.16.jar b/fop/lib/batik-all-1.16.jar
new file mode 100644 (file)
index 0000000..6004469
Binary files /dev/null and b/fop/lib/batik-all-1.16.jar differ

diff --git a/fop/lib/batik.NOTICE.txt b/fop/lib/batik.NOTICE.txt
index 662188f3570b9c2a594c97e3e2408e84ddda1f81..d794a759ae3ceaf005b5c427e215261fc4a087bd 100644 (file)
--- 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-2022 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).

diff --git a/fop/lib/xercesImpl.NOTICE.txt b/fop/lib/xercesImpl.NOTICE.txt
deleted file mode 100644 (file)
index 77dc14c..0000000
--- a/fop/lib/xercesImpl.NOTICE.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-   =========================================================================
-   ==  NOTICE file corresponding to section 4(d) of the Apache License,   ==
-   ==  Version 2.0, in this case for the Apache Xerces distribution.      ==
-   =========================================================================
-
-   This product includes software developed by
-   The Apache Software Foundation (http://www.apache.org/).
-
-   Portions of this software were originally based on the following:
-     - software copyright (c) 1999, IBM Corporation., http://www.ibm.com.
-     - software copyright (c) 1999, Sun Microsystems., http://www.sun.com.
-     - voluntary contributions made by Paul Eng on behalf of the 
-       Apache Software Foundation that were originally developed at iClick, Inc.,
-       software copyright (c) 1999.
\ No newline at end of file

diff --git a/fop/lib/xmlgraphics-commons-2.8.jar b/fop/lib/xmlgraphics-commons-2.8.jar
new file mode 100644 (file)
index 0000000..a8457cc
Binary files /dev/null and b/fop/lib/xmlgraphics-commons-2.8.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 74ca9a7..0000000
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 76171ea850599d149cb9931758243a69d34c1159..c93ae11c656853301fa878ce6ef36abfe33f1eef 100644 (file)
--- 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-2022 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 68e8844bd009eb99998860c7cb137584b04d7493..d16607add7d96823f022b7bd57fb89a1bef01f36 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.8.0-SNAPSHOT</version>
+    <version>2.8</version>
   </parent>
 
   <dependencies>

diff --git a/pom.xml b/pom.xml
index 45f63975ce0bbf49dd369efcbed22a463384976e..95977a077e6524a1daabbf4df943a8136ab98883 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>org.apache.xmlgraphics</groupId>
   <artifactId>fop-parent</artifactId>
-  <version>2.8.0-SNAPSHOT</version>
+  <version>2.8</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.16.0-SNAPSHOT</batik.version>
+    <batik.version>1.16</batik.version>
     <build.helper.plugin.version>1.9.1</build.helper.plugin.version>
     <checkstyle.plugin.version>2.14</checkstyle.plugin.version>
     <commons.io.version>2.11.0</commons.io.version>
@@ -30,7 +30,7 @@
     <surefire.plugin.version>2.18.1</surefire.plugin.version>
     <war.plugin.version>3.3.2</war.plugin.version>
     <xml.plugin.version>1.0.1</xml.plugin.version>
-    <xmlgraphics.commons.version>2.8.0-SNAPSHOT</xmlgraphics.commons.version>
+    <xmlgraphics.commons.version>2.8</xmlgraphics.commons.version>
     <xmlunit.version>1.2</xmlunit.version>
     <jdk.path>${env.JAVA_HOME}</jdk.path>
   </properties>