From: Simon Steiner <ssteiner@apache.org>
Date: Fri, 25 Oct 2019 11:51:27 +0000 (+0000)
Subject: Update to release version
X-Git-Tag: fop-2_4~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fheads%2Ffop-2_4;p=xmlgraphics-fop.git

Update to release version

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

diff --git a/fop-core/pom.xml b/fop-core/pom.xml
index e3345932c..e6225cc1d 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.4.0-SNAPSHOT</version>
+    <version>2.4</version>
   </parent>
 
   <properties>
diff --git a/fop-events/pom.xml b/fop-events/pom.xml
index b5148541c..9d2ff5a2f 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.4.0-SNAPSHOT</version>
+    <version>2.4</version>
   </parent>
 
   <dependencies>
diff --git a/fop-sandbox/pom.xml b/fop-sandbox/pom.xml
index b6782c5ff..59ba2e4cd 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.4.0-SNAPSHOT</version>
+    <version>2.4</version>
   </parent>
 
   <dependencies>
diff --git a/fop-servlet/pom.xml b/fop-servlet/pom.xml
index 73779cd27..0327c51b5 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.4.0-SNAPSHOT</version>
+    <version>2.4</version>
   </parent>
 
   <dependencies>
diff --git a/fop-transcoder-allinone/pom.xml b/fop-transcoder-allinone/pom.xml
index ca93d1251..8907b0c7e 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.4.0-SNAPSHOT</version>
+    <version>2.4</version>
   </parent>
 
   <dependencies>
diff --git a/fop-transcoder/pom.xml b/fop-transcoder/pom.xml
index b77e3841d..bb78d98ad 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.4.0-SNAPSHOT</version>
+    <version>2.4</version>
   </parent>
 
   <dependencies>
diff --git a/fop-util/pom.xml b/fop-util/pom.xml
index e1fa790fb..392cc0a2a 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.4.0-SNAPSHOT</version>
+    <version>2.4</version>
   </parent>
 
   <dependencies>
diff --git a/fop/build.xml b/fop/build.xml
index 398879bb8..1bd733550 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.4.0-SNAPSHOT"/>
+  <property name="version" value="2.4"/>
   <property name="year" value="1999-2019"/>
   <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.12.jar b/fop/lib/batik-all-1.12.jar
new file mode 100644
index 000000000..92ab58356
Binary files /dev/null and b/fop/lib/batik-all-1.12.jar differ
diff --git a/fop/lib/xmlgraphics-commons-2.4.jar b/fop/lib/xmlgraphics-commons-2.4.jar
new file mode 100644
index 000000000..e4cbe7c60
Binary files /dev/null and b/fop/lib/xmlgraphics-commons-2.4.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 4dae3d05e..000000000
Binary files a/fop/lib/xmlgraphics-commons-svn-trunk.jar and /dev/null differ
diff --git a/fop/pom.xml b/fop/pom.xml
index dc1f7eb43..3b90db2a7 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.4.0-SNAPSHOT</version>
+    <version>2.4</version>
   </parent>
 
   <dependencies>
diff --git a/pom.xml b/pom.xml
index f9c92c3b5..7e0b8dbc4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>org.apache.xmlgraphics</groupId>
   <artifactId>fop-parent</artifactId>
-  <version>2.4.0-SNAPSHOT</version>
+  <version>2.4</version>
   <name>Apache FOP Parent</name>
   <description>XML Graphics Format Object Processor</description>
   <packaging>pom</packaging>
@@ -12,7 +12,7 @@
 
   <properties>
     <antrun.plugin.version>1.8</antrun.plugin.version>
-    <batik.version>1.11.0-SNAPSHOT</batik.version>
+    <batik.version>1.12</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>
@@ -29,7 +29,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.4</xmlgraphics.commons.version>
     <xmlunit.version>1.2</xmlunit.version>
     <jdk.path>${env.JAVA_HOME}</jdk.path>
   </properties>