From: ssteiner <ssteiner@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 2 Nov 2022 12:14:18 +0000 (+0000)
Subject: Update for release
X-Git-Tag: fop-2_8~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ff5e1a784bf24f18d80d0cc4b0ec00ed3a906683;p=xmlgraphics-fop.git

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 a57b78aa6..ba5923d31 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.8.0-SNAPSHOT</version>
+    <version>2.8</version>
   </parent>
 
   <properties>
diff --git a/fop-events/pom.xml b/fop-events/pom.xml
index 7d7aa2466..25ce1b230 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.8.0-SNAPSHOT</version>
+    <version>2.8</version>
   </parent>
 
   <dependencies>
diff --git a/fop-sandbox/pom.xml b/fop-sandbox/pom.xml
index 20ee4a9a4..f83937f97 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.8.0-SNAPSHOT</version>
+    <version>2.8</version>
   </parent>
 
   <dependencies>
diff --git a/fop-servlet/pom.xml b/fop-servlet/pom.xml
index 12c12df35..c197a7d6e 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.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 3e5d0d0b8..e13567a67 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.8.0-SNAPSHOT</version>
+    <version>2.8</version>
   </parent>
 
   <dependencies>
diff --git a/fop-transcoder/pom.xml b/fop-transcoder/pom.xml
index 565be6bca..ccd9039c6 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.8.0-SNAPSHOT</version>
+    <version>2.8</version>
   </parent>
 
   <dependencies>
diff --git a/fop-util/pom.xml b/fop-util/pom.xml
index 9ddabc935..d341bbda5 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.8.0-SNAPSHOT</version>
+    <version>2.8</version>
   </parent>
 
   <dependencies>
diff --git a/fop/build.xml b/fop/build.xml
index 2daaf627e..27f59eb80 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.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
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.16.jar b/fop/lib/batik-all-1.16.jar
new file mode 100644
index 000000000..60044698d
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 662188f35..d794a759a 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-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
index 77dc14c65..000000000
--- 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
index 000000000..a8457cc4c
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
index 74ca9a7a4..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..c93ae11c6 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-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 68e8844bd..d16607add 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.8.0-SNAPSHOT</version>
+    <version>2.8</version>
   </parent>
 
   <dependencies>
diff --git a/pom.xml b/pom.xml
index 45f63975c..95977a077 100644
--- 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>