Update artifacts for release and fix dependency

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

diff --git a/README b/README
index 96b7565e1a4db7aee8f8bb00df67dc0f9e31dece..cc83c721652960a2b2a17513edcb445e1e582b96 100644 (file)
--- a/README
+++ b/README
@@ -110,7 +110,7 @@ under the ./fop sub-directory.
   RELEASE NOTES
 ==============================================================================
 
-Version 2.2  (Forthcoming)
+Version 2.2
 ===========
 
 Major Changes in Version 2.2

diff --git a/fop-servlet/pom.xml b/fop-servlet/pom.xml
index 48ca597c8b51564579be9120fa635d3e191bca91..7cd07954dbd7241471573419e22090e9dd79aac1 100644 (file)
--- a/fop-servlet/pom.xml
+++ b/fop-servlet/pom.xml
@@ -22,11 +22,11 @@
       <version>${project.version}</version>
     </dependency>
     <!-- batik deps -->
-    <dependency>
+<!--     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>batik-all</artifactId>
       <version>${batik.version}</version>
-    </dependency>
+    </dependency> -->
     <!-- xgc deps -->
     <dependency>
       <groupId>${project.groupId}</groupId>

diff --git a/fop/build.xml b/fop/build.xml
index 8e2cb0d6a6f0f607e6a9489a11052af7b2a31b70..3110bf00dd0063dd59383a4361dfc64c448cf3c3 100644 (file)
--- a/fop/build.xml
+++ b/fop/build.xml
@@ -155,7 +155,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.2.0-SNAPSHOT"/>
+  <property name="version" value="2.2"/>
   <property name="year" value="1999-2017"/>
   <property name="javac.debug" value="on"/>
   <property name="javac.optimize" value="off"/>

diff --git a/fop/lib/batik-all-1.8.jar b/fop/lib/batik-all-1.8.jar
new file mode 100644 (file)
index 0000000..f48e30b
Binary files /dev/null and b/fop/lib/batik-all-1.8.jar differ

diff --git a/fop/lib/batik-all-svn-trunk.jar b/fop/lib/batik-all-svn-trunk.jar
deleted file mode 100644 (file)
index 335a831..0000000
Binary files a/fop/lib/batik-all-svn-trunk.jar and /dev/null differ

diff --git a/fop/lib/xmlgraphics-commons-2.2.jar b/fop/lib/xmlgraphics-commons-2.2.jar
new file mode 100644 (file)
index 0000000..d1813ff
Binary files /dev/null and b/fop/lib/xmlgraphics-commons-2.2.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 2d0285c..0000000
Binary files a/fop/lib/xmlgraphics-commons-svn-trunk.jar and /dev/null differ

diff --git a/pom.xml b/pom.xml
index c411e639b0664c264f11cbe84321773ab43a33bb..ed175f0b92e687a47f44f3bcbd8e67ce68116389 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>org.apache.xmlgraphics</groupId>
   <artifactId>fop-parent</artifactId>
-  <version>2.2.0-SNAPSHOT</version>
+  <version>2.2</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>
     <avalon.version>4.3.1</avalon.version>
-    <batik.version>1.9.0-SNAPSHOT</batik.version>
+    <batik.version>1.8</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.2.0-SNAPSHOT</xmlgraphics.commons.version>
+    <xmlgraphics.commons.version>2.2</xmlgraphics.commons.version>
     <xmlunit.version>1.2</xmlunit.version>
     <jdk.path>${env.JAVA_HOME}</jdk.path>
   </properties>