FOP-2856: Support compile on Java 12

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

diff --git a/fop/build.xml b/fop/build.xml
index 3547015fe628b993b7e4261128fb4700310e0115..39106d81fc3f84d9d9834cabb26510b69fbc9ae7 100644 (file)
--- a/fop/build.xml
+++ b/fop/build.xml
@@ -159,8 +159,8 @@ list of possible build targets.
   <property name="javac.debug" value="on"/>
   <property name="javac.optimize" value="off"/>
   <property name="javac.deprecation" value="on"/>
-  <property name="javac.source" value="1.6"/>
-  <property name="javac.target" value="1.6"/>
+  <property name="javac.source" value="1.7"/>
+  <property name="javac.target" value="1.7"/>
   <property name="javac.fork" value="no"/>
   <property name="junit.fork" value="yes"/>
   <property name="junit.haltonfailure" value="off"/>

diff --git a/pom.xml b/pom.xml
index fc2f0fc2c0c396620236a400829e5cfc8aa67bb6..f9c92c3b532f51bd26529b65f2fe48ba2e61f39d 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -20,8 +20,8 @@
     <compiler.plugin.version>3.1</compiler.plugin.version>
     <exec.plugin.version>1.4.0</exec.plugin.version>
     <findbugs.plugin.version>3.0.4</findbugs.plugin.version>
-    <jar.plugin.version>2.6</jar.plugin.version>
-    <java.version>1.6</java.version>
+    <jar.plugin.version>3.1.1</jar.plugin.version>
+    <java.version>1.7</java.version>
     <junit.version>4.11</junit.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.info.reports.plugin.version>2.8</project.info.reports.plugin.version>