From 9654a924b7608d4cc312f0c737b2b66b28472e50 Mon Sep 17 00:00:00 2001
From: Harald Kuhr <harald.kuhr@gmail.com>
Date: Fri, 4 Dec 2015 23:27:23 +0100
Subject: [PATCH] Updated versions and fixed Batik depdendencies for 1.6.1

---
 bom/pom.xml                       |  2 +-
 common/common-image/pom.xml       |  2 +-
 common/common-io/pom.xml          |  2 +-
 common/common-lang/pom.xml        |  2 +-
 common/pom.xml                    |  2 +-
 imageio/imageio-batik/pom.xml     | 32 +++++++++++++++++++++++--------
 imageio/imageio-bmp/pom.xml       |  2 +-
 imageio/imageio-clippath/pom.xml  |  2 +-
 imageio/imageio-core/pom.xml      |  2 +-
 imageio/imageio-hdr/pom.xml       |  2 +-
 imageio/imageio-icns/pom.xml      |  2 +-
 imageio/imageio-iff/pom.xml       |  2 +-
 imageio/imageio-jpeg/pom.xml      |  2 +-
 imageio/imageio-metadata/pom.xml  |  2 +-
 imageio/imageio-pcx/pom.xml       |  2 +-
 imageio/imageio-pdf/pom.xml       |  2 +-
 imageio/imageio-pict/pom.xml      |  2 +-
 imageio/imageio-pnm/pom.xml       |  2 +-
 imageio/imageio-psd/pom.xml       |  2 +-
 imageio/imageio-reference/pom.xml |  2 +-
 imageio/imageio-sgi/pom.xml       |  2 +-
 imageio/imageio-tga/pom.xml       |  2 +-
 imageio/imageio-thumbsdb/pom.xml  |  2 +-
 imageio/imageio-tiff/pom.xml      |  2 +-
 imageio/pom.xml                   |  2 +-
 pom.xml                           |  2 +-
 servlet/pom.xml                   |  2 +-
 27 files changed, 50 insertions(+), 34 deletions(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index 4bd3c7af..ecf92159 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.twelvemonkeys</groupId>
         <artifactId>twelvemonkeys</artifactId>
-        <version>3.2</version>
+        <version>3.2.1-SNAPSHOT</version>
     </parent>
 
     <groupId>com.twelvemonkeys.bom</groupId>
diff --git a/common/common-image/pom.xml b/common/common-image/pom.xml
index 6bd69ece..6ba7035c 100644
--- a/common/common-image/pom.xml
+++ b/common/common-image/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.twelvemonkeys.common</groupId>
         <artifactId>common</artifactId>
-        <version>3.2</version>
+        <version>3.2.1-SNAPSHOT</version>
     </parent>
     <artifactId>common-image</artifactId>
     <packaging>jar</packaging>
diff --git a/common/common-io/pom.xml b/common/common-io/pom.xml
index 2613609b..6f2e2d99 100644
--- a/common/common-io/pom.xml
+++ b/common/common-io/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.twelvemonkeys.common</groupId>
         <artifactId>common</artifactId>
-        <version>3.2</version>
+        <version>3.2.1-SNAPSHOT</version>
     </parent>
     <artifactId>common-io</artifactId>
     <packaging>jar</packaging>
diff --git a/common/common-lang/pom.xml b/common/common-lang/pom.xml
index 72e2cc75..c1822b0e 100644
--- a/common/common-lang/pom.xml
+++ b/common/common-lang/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.twelvemonkeys.common</groupId>
         <artifactId>common</artifactId>
-        <version>3.2</version>
+        <version>3.2.1-SNAPSHOT</version>
     </parent>
     <artifactId>common-lang</artifactId>
     <packaging>jar</packaging>
diff --git a/common/pom.xml b/common/pom.xml
index 96ba0039..d869fb79 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.twelvemonkeys</groupId>
         <artifactId>twelvemonkeys</artifactId>
-        <version>3.2</version>
+        <version>3.2.1-SNAPSHOT</version>
     </parent>
     <groupId>com.twelvemonkeys.common</groupId>
     <artifactId>common</artifactId>
diff --git a/imageio/imageio-batik/pom.xml b/imageio/imageio-batik/pom.xml
index 250cbc01..738a9c29 100644
--- a/imageio/imageio-batik/pom.xml
+++ b/imageio/imageio-batik/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.twelvemonkeys.imageio</groupId>
         <artifactId>imageio</artifactId>
-        <version>3.2</version>
+        <version>3.2.1-SNAPSHOT</version>
     </parent>
     <artifactId>imageio-batik</artifactId>
     <name>TwelveMonkeys :: ImageIO :: Batik Plugin</name>
@@ -26,24 +26,40 @@
             <type>test-jar</type>
         </dependency>
 
+        <!-- Batik 1.6 contains a mysterious xml-apis:xml-apis:1.1.2 that doesn't exist, override with never version -->
         <dependency>
-            <groupId>batik</groupId>
-            <artifactId>batik-rasterizer-ext</artifactId>
-            <version>1.6-1</version>
+            <groupId>xml-apis</groupId>
+            <artifactId>xml-apis</artifactId>
+            <version>1.3.04</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <!-- Nothing works without Xerces. Not sure why neither 1.6 or 1.8 versions needed this... -->
+        <dependency>
+            <groupId>xerces</groupId>
+            <artifactId>xercesImpl</artifactId>
+            <version>2.4.0</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>batik</groupId>
+            <groupId>org.apache.xmlgraphics</groupId>
+            <artifactId>batik-rasterizer</artifactId>
+            <version>1.6.1</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.xmlgraphics</groupId>
             <artifactId>batik-svggen</artifactId>
-            <version>1.6-1</version>
+            <version>1.6.1</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>batik</groupId>
+            <groupId>org.apache.xmlgraphics</groupId>
             <artifactId>batik-transcoder</artifactId>
-            <version>1.6-1</version>
+            <version>1.6.1</version>
             <scope>provided</scope>
 
             <!--
diff --git a/imageio/imageio-bmp/pom.xml b/imageio/imageio-bmp/pom.xml
index f6939c23..279b3881 100644
--- a/imageio/imageio-bmp/pom.xml
+++ b/imageio/imageio-bmp/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.twelvemonkeys.imageio</groupId>
         <artifactId>imageio</artifactId>
-        <version>3.2</version>
+        <version>3.2.1-SNAPSHOT</version>
     </parent>
     <artifactId>imageio-bmp</artifactId>
     <name>TwelveMonkeys :: ImageIO :: BMP plugin</name>
diff --git a/imageio/imageio-clippath/pom.xml b/imageio/imageio-clippath/pom.xml
index ae311ca9..f3010be6 100755
--- a/imageio/imageio-clippath/pom.xml
+++ b/imageio/imageio-clippath/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.twelvemonkeys.imageio</groupId>
         <artifactId>imageio</artifactId>
-        <version>3.2</version>
+        <version>3.2.1-SNAPSHOT</version>
     </parent>
     <artifactId>imageio-clippath</artifactId>
     <name>TwelveMonkeys :: ImageIO :: Photoshop Path Support</name>
diff --git a/imageio/imageio-core/pom.xml b/imageio/imageio-core/pom.xml
index f7b748ee..960e76e1 100644
--- a/imageio/imageio-core/pom.xml
+++ b/imageio/imageio-core/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.twelvemonkeys.imageio</groupId>
         <artifactId>imageio</artifactId>
-        <version>3.2</version>
+        <version>3.2.1-SNAPSHOT</version>
     </parent>
     <artifactId>imageio-core</artifactId>
     <name>TwelveMonkeys :: ImageIO :: Core</name>
diff --git a/imageio/imageio-hdr/pom.xml b/imageio/imageio-hdr/pom.xml
index 372ba3f9..10d364bd 100644
--- a/imageio/imageio-hdr/pom.xml
+++ b/imageio/imageio-hdr/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.twelvemonkeys.imageio</groupId>
         <artifactId>imageio</artifactId>
-        <version>3.2</version>
+        <version>3.2.1-SNAPSHOT</version>
     </parent>
     <artifactId>imageio-hdr</artifactId>
     <name>TwelveMonkeys :: ImageIO :: HDR plugin</name>
diff --git a/imageio/imageio-icns/pom.xml b/imageio/imageio-icns/pom.xml
index 0fc10f43..e8e4ef2b 100644
--- a/imageio/imageio-icns/pom.xml
+++ b/imageio/imageio-icns/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.twelvemonkeys.imageio</groupId>
         <artifactId>imageio</artifactId>
-        <version>3.2</version>
+        <version>3.2.1-SNAPSHOT</version>
     </parent>
     <artifactId>imageio-icns</artifactId>
     <name>TwelveMonkeys :: ImageIO :: ICNS plugin</name>
diff --git a/imageio/imageio-iff/pom.xml b/imageio/imageio-iff/pom.xml
index 2148c662..0ec47235 100644
--- a/imageio/imageio-iff/pom.xml
+++ b/imageio/imageio-iff/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.twelvemonkeys.imageio</groupId>
         <artifactId>imageio</artifactId>
-        <version>3.2</version>
+        <version>3.2.1-SNAPSHOT</version>
     </parent>
     <artifactId>imageio-iff</artifactId>
     <name>TwelveMonkeys :: ImageIO :: IFF plugin</name>
diff --git a/imageio/imageio-jpeg/pom.xml b/imageio/imageio-jpeg/pom.xml
index dd60e707..07246ff3 100644
--- a/imageio/imageio-jpeg/pom.xml
+++ b/imageio/imageio-jpeg/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.twelvemonkeys.imageio</groupId>
         <artifactId>imageio</artifactId>
-        <version>3.2</version>
+        <version>3.2.1-SNAPSHOT</version>
     </parent>
     <artifactId>imageio-jpeg</artifactId>
     <name>TwelveMonkeys :: ImageIO :: JPEG plugin</name>
diff --git a/imageio/imageio-metadata/pom.xml b/imageio/imageio-metadata/pom.xml
index c4cea29e..82de85c8 100644
--- a/imageio/imageio-metadata/pom.xml
+++ b/imageio/imageio-metadata/pom.xml
@@ -3,7 +3,7 @@
     <parent>
 	<groupId>com.twelvemonkeys.imageio</groupId>        
 	<artifactId>imageio</artifactId>        
-        <version>3.2</version>
+        <version>3.2.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>imageio-metadata</artifactId>
diff --git a/imageio/imageio-pcx/pom.xml b/imageio/imageio-pcx/pom.xml
index d1934bcc..f11d19b5 100755
--- a/imageio/imageio-pcx/pom.xml
+++ b/imageio/imageio-pcx/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.twelvemonkeys.imageio</groupId>
         <artifactId>imageio</artifactId>
-        <version>3.2</version>
+        <version>3.2.1-SNAPSHOT</version>
     </parent>
     <artifactId>imageio-pcx</artifactId>
     <name>TwelveMonkeys :: ImageIO :: PCX plugin</name>
diff --git a/imageio/imageio-pdf/pom.xml b/imageio/imageio-pdf/pom.xml
index a79dbc27..500d3d4c 100644
--- a/imageio/imageio-pdf/pom.xml
+++ b/imageio/imageio-pdf/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.twelvemonkeys.imageio</groupId>
         <artifactId>imageio</artifactId>
-        <version>3.2</version>
+        <version>3.2.1-SNAPSHOT</version>
     </parent>
     <artifactId>imageio-pdf</artifactId>
     <name>TwelveMonkeys :: ImageIO :: PDF plugin</name>
diff --git a/imageio/imageio-pict/pom.xml b/imageio/imageio-pict/pom.xml
index b66701f5..2c4e5082 100644
--- a/imageio/imageio-pict/pom.xml
+++ b/imageio/imageio-pict/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.twelvemonkeys.imageio</groupId>
         <artifactId>imageio</artifactId>
-        <version>3.2</version>
+        <version>3.2.1-SNAPSHOT</version>
     </parent>
     <artifactId>imageio-pict</artifactId>
     <name>TwelveMonkeys :: ImageIO :: PICT plugin</name>
diff --git a/imageio/imageio-pnm/pom.xml b/imageio/imageio-pnm/pom.xml
index 679bf429..6c83fb2d 100755
--- a/imageio/imageio-pnm/pom.xml
+++ b/imageio/imageio-pnm/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.twelvemonkeys.imageio</groupId>
         <artifactId>imageio</artifactId>
-        <version>3.2</version>
+        <version>3.2.1-SNAPSHOT</version>
     </parent>
     <artifactId>imageio-pnm</artifactId>
     <name>TwelveMonkeys :: ImageIO :: PNM plugin</name>
diff --git a/imageio/imageio-psd/pom.xml b/imageio/imageio-psd/pom.xml
index 158bd7d4..e38836a7 100644
--- a/imageio/imageio-psd/pom.xml
+++ b/imageio/imageio-psd/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.twelvemonkeys.imageio</groupId>
         <artifactId>imageio</artifactId>
-        <version>3.2</version>
+        <version>3.2.1-SNAPSHOT</version>
     </parent>
     <artifactId>imageio-psd</artifactId>
     <name>TwelveMonkeys :: ImageIO :: PSD plugin</name>
diff --git a/imageio/imageio-reference/pom.xml b/imageio/imageio-reference/pom.xml
index 70f9d932..09288f07 100644
--- a/imageio/imageio-reference/pom.xml
+++ b/imageio/imageio-reference/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.twelvemonkeys.imageio</groupId>
         <artifactId>imageio</artifactId>
-        <version>3.2</version>
+        <version>3.2.1-SNAPSHOT</version>
     </parent>
     <artifactId>imageio-reference</artifactId>
     <name>TwelveMonkeys :: ImageIO :: reference test cases</name>
diff --git a/imageio/imageio-sgi/pom.xml b/imageio/imageio-sgi/pom.xml
index aae85894..eb174bae 100755
--- a/imageio/imageio-sgi/pom.xml
+++ b/imageio/imageio-sgi/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.twelvemonkeys.imageio</groupId>
         <artifactId>imageio</artifactId>
-        <version>3.2</version>
+        <version>3.2.1-SNAPSHOT</version>
     </parent>
     <artifactId>imageio-sgi</artifactId>
     <name>TwelveMonkeys :: ImageIO :: SGI plugin</name>
diff --git a/imageio/imageio-tga/pom.xml b/imageio/imageio-tga/pom.xml
index be31952c..bd6435e9 100755
--- a/imageio/imageio-tga/pom.xml
+++ b/imageio/imageio-tga/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.twelvemonkeys.imageio</groupId>
         <artifactId>imageio</artifactId>
-        <version>3.2</version>
+        <version>3.2.1-SNAPSHOT</version>
     </parent>
     <artifactId>imageio-tga</artifactId>
     <name>TwelveMonkeys :: ImageIO :: TGA plugin</name>
diff --git a/imageio/imageio-thumbsdb/pom.xml b/imageio/imageio-thumbsdb/pom.xml
index 2c397c11..16bb71cc 100644
--- a/imageio/imageio-thumbsdb/pom.xml
+++ b/imageio/imageio-thumbsdb/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.twelvemonkeys.imageio</groupId>
         <artifactId>imageio</artifactId>
-        <version>3.2</version>
+        <version>3.2.1-SNAPSHOT</version>
     </parent>
     <artifactId>imageio-thumbsdb</artifactId>
     <name>TwelveMonkeys :: ImageIO :: Thumbs.db plugin</name>
diff --git a/imageio/imageio-tiff/pom.xml b/imageio/imageio-tiff/pom.xml
index 389cc0c7..8ed85259 100644
--- a/imageio/imageio-tiff/pom.xml
+++ b/imageio/imageio-tiff/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.twelvemonkeys.imageio</groupId>
         <artifactId>imageio</artifactId>
-        <version>3.2</version>
+        <version>3.2.1-SNAPSHOT</version>
     </parent>
     <artifactId>imageio-tiff</artifactId>
     <name>TwelveMonkeys :: ImageIO :: TIFF plugin</name>
diff --git a/imageio/pom.xml b/imageio/pom.xml
index 6842928d..cbb586fb 100644
--- a/imageio/pom.xml
+++ b/imageio/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>com.twelvemonkeys</groupId>
         <artifactId>twelvemonkeys</artifactId>
-        <version>3.2</version>
+        <version>3.2.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.twelvemonkeys.imageio</groupId>
diff --git a/pom.xml b/pom.xml
index cf67fc43..402a7d58 100755
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
     </parent>
     <groupId>com.twelvemonkeys</groupId>
     <artifactId>twelvemonkeys</artifactId>
-    <version>3.2</version>
+    <version>3.2.1-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Twelvemonkeys</name>
 
diff --git a/servlet/pom.xml b/servlet/pom.xml
index 8705f9c6..24b2c86f 100644
--- a/servlet/pom.xml
+++ b/servlet/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>com.twelvemonkeys</groupId>
         <artifactId>twelvemonkeys</artifactId>
-        <version>3.2</version>
+        <version>3.2.1-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>