FOP-2658: Compile JAIMonochromeBitmapConverter

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1765773 13f79535-47bb-0310-9956-ffa450edef68

9 files changed, 24 insertions, 18 deletions

diff --git a/fop-core/pom.xml b/fop-core/pom.xml
index baf28e89a..34933088a 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.2.0-SNAPSHOT</version>
+    <version>${fop.version}</version>
   </parent>
 
   <properties>
@@ -102,6 +102,16 @@
       <artifactId>fontbox</artifactId>
       <version>2.0.3</version>
     </dependency>
+    <dependency>
+      <groupId>javax.media</groupId>
+      <artifactId>jai-core</artifactId>
+      <version>1.1.3</version>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.media</groupId>
+      <artifactId>jai-codec</artifactId>
+      <version>1.1.3</version>
+    </dependency>
     <!-- test deps -->
     <dependency>
       <groupId>net.sf.offo</groupId>
@@ -277,15 +287,6 @@
           </execution>
         </executions>
       </plugin>
-      <!-- compile exclusions -->
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <excludes>
-            <exclude>org/apache/fop/util/bitmap/JAIMonochromeBitmapConverter.java</exclude>
-          </excludes>
-        </configuration>
-      </plugin>
       <!-- junit testing -->
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
diff --git a/fop-events/pom.xml b/fop-events/pom.xml
index 0303deba5..c2d4fa86f 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.2.0-SNAPSHOT</version>
+    <version>${fop.version}</version>
   </parent>
 
   <dependencies>
diff --git a/fop-sandbox/pom.xml b/fop-sandbox/pom.xml
index 9e6e04e95..594954f1d 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.2.0-SNAPSHOT</version>
+    <version>${fop.version}</version>
   </parent>
 
   <dependencies>
diff --git a/fop-servlet/pom.xml b/fop-servlet/pom.xml
index 48ca597c8..a47d589cc 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.2.0-SNAPSHOT</version>
+    <version>${fop.version}</version>
   </parent>
 
   <dependencies>
diff --git a/fop-transcoder-allinone/pom.xml b/fop-transcoder-allinone/pom.xml
index 64d465182..d35c91616 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.2.0-SNAPSHOT</version>
+    <version>${fop.version}</version>
   </parent>
 
   <dependencies>
diff --git a/fop-transcoder/pom.xml b/fop-transcoder/pom.xml
index 397165773..632bbdf77 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.2.0-SNAPSHOT</version>
+    <version>${fop.version}</version>
   </parent>
 
   <dependencies>
diff --git a/fop-util/pom.xml b/fop-util/pom.xml
index 72fb37b08..17327f3e3 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.2.0-SNAPSHOT</version>
+    <version>${fop.version}</version>
   </parent>
 
   <dependencies>
diff --git a/fop/pom.xml b/fop/pom.xml
index ec01857c1..982da6c0d 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.2.0-SNAPSHOT</version>
+    <version>${fop.version}</version>
   </parent>
 
   <dependencies>
diff --git a/pom.xml b/pom.xml
index 96d14f482..5bea7a20c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,12 +4,13 @@
 
   <groupId>org.apache.xmlgraphics</groupId>
   <artifactId>fop-parent</artifactId>
-  <version>2.2.0-SNAPSHOT</version>
+  <version>${fop.version}</version>
   <name>Apache FOP Parent</name>
   <description>XML Graphics Format Object Processor</description>
   <packaging>pom</packaging>
 
   <properties>
+    <fop.version>2.2.0-SNAPSHOT</fop.version>
     <antrun.plugin.version>1.8</antrun.plugin.version>
     <avalon.version>4.3.1</avalon.version>
     <batik.version>1.9.0-SNAPSHOT</batik.version>
@@ -120,6 +121,10 @@
         <enabled>false</enabled>
       </snapshots>
     </repository>
+    <repository>
+      <id>jboss.org</id>
+      <url>https://repository.jboss.org/nexus/content/repositories/thirdparty-releases/</url>
+    </repository>
   </repositories>
 
   <distributionManagement>