svn commit: r1787402 - in /xmlgraphics/fop/branches/fop-2_2: README fop-servlet/pom.xml fop/build.xml fop/lib/batik-all-1.8.jar fop/lib/batik-all-svn-trunk.jar fop/lib/xmlgraphics-commons-2.2.jar fop/lib/xmlgraphics-commons-svn-trunk.jar pom.xml

Author: ssteiner
Date: Fri Mar 17 14:42:15 2017
New Revision: 1787402

URL: http://svn.apache.org/viewvc?rev=1787402&view=rev
Log:
Update artifacts for release and fix dependency

Added:
    xmlgraphics/fop/branches/fop-2_2/fop/lib/batik-all-1.8.jar   (with props)
    xmlgraphics/fop/branches/fop-2_2/fop/lib/xmlgraphics-commons-2.2.jar   (with props)
Removed:
    xmlgraphics/fop/branches/fop-2_2/fop/lib/batik-all-svn-trunk.jar
    xmlgraphics/fop/branches/fop-2_2/fop/lib/xmlgraphics-commons-svn-trunk.jar
Modified:
    xmlgraphics/fop/branches/fop-2_2/README
    xmlgraphics/fop/branches/fop-2_2/fop-servlet/pom.xml
    xmlgraphics/fop/branches/fop-2_2/fop/build.xml
    xmlgraphics/fop/branches/fop-2_2/pom.xml

Modified: xmlgraphics/fop/branches/fop-2_2/README
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-2_2/README?rev=1787402&r1=1787401&r2=1787402&view=diff
==============================================================================
--- xmlgraphics/fop/branches/fop-2_2/README (original)
+++ xmlgraphics/fop/branches/fop-2_2/README Fri Mar 17 14:42:15 2017
@@ -110,7 +110,7 @@ under the ./fop sub-directory.
   RELEASE NOTES
 ==============================================================================
 
-Version 2.2  (Forthcoming)
+Version 2.2
 ===========
 
 Major Changes in Version 2.2

Modified: xmlgraphics/fop/branches/fop-2_2/fop-servlet/pom.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-2_2/fop-servlet/pom.xml?rev=1787402&r1=1787401&r2=1787402&view=diff
==============================================================================
--- xmlgraphics/fop/branches/fop-2_2/fop-servlet/pom.xml (original)
+++ xmlgraphics/fop/branches/fop-2_2/fop-servlet/pom.xml Fri Mar 17 14:42:15 2017
@@ -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>

Modified: xmlgraphics/fop/branches/fop-2_2/fop/build.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-2_2/fop/build.xml?rev=1787402&r1=1787401&r2=1787402&view=diff
==============================================================================
--- xmlgraphics/fop/branches/fop-2_2/fop/build.xml (original)
+++ xmlgraphics/fop/branches/fop-2_2/fop/build.xml Fri Mar 17 14:42:15 2017
@@ -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"/>

Added: xmlgraphics/fop/branches/fop-2_2/fop/lib/batik-all-1.8.jar
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-2_2/fop/lib/batik-all-1.8.jar?rev=1787402&view=auto
==============================================================================
Binary file - no diff available.

Propchange: xmlgraphics/fop/branches/fop-2_2/fop/lib/batik-all-1.8.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: xmlgraphics/fop/branches/fop-2_2/fop/lib/xmlgraphics-commons-2.2.jar
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-2_2/fop/lib/xmlgraphics-commons-2.2.jar?rev=1787402&view=auto
==============================================================================
Binary file - no diff available.

Propchange: xmlgraphics/fop/branches/fop-2_2/fop/lib/xmlgraphics-commons-2.2.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: xmlgraphics/fop/branches/fop-2_2/pom.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-2_2/pom.xml?rev=1787402&r1=1787401&r2=1787402&view=diff
==============================================================================
--- xmlgraphics/fop/branches/fop-2_2/pom.xml (original)
+++ xmlgraphics/fop/branches/fop-2_2/pom.xml Fri Mar 17 14:42:15 2017
@@ -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>