To protect your data, the CISO officer has suggested users to enable GitLab 2FA as soon as possible.

Commit 58e48f66 authored by steveb-oss's avatar steveb-oss
Browse files

[svn r456] version bump for fop 0.94 - 0.95

parent 820d4dbb
......@@ -3,7 +3,7 @@
<property file="dacapo.properties"/>
<property name="bm-name" value="fop"/>
<property name="bm-version" value="0.94"/>
<property name="bm-version" value="0.95"/>
<property name="bm-url" value="${apache.dl.url}/xmlgraphics/fop/source"/>
<property name="bm-src" value="${bm-name}-${bm-version}-src.tar.gz"/>
......@@ -21,10 +21,10 @@
<target name="jar">
<copy file="${bm-build-top}/build/fop.jar" todir="${bm-jars}"/>
<copy file="${bm-build-top}/lib/avalon-framework-4.2.0.jar" todir="${bm-jars}"/>
<copy file="${bm-build-top}/lib/batik-all-1.6.jar" todir="${bm-jars}"/>
<copy file="${bm-build-top}/lib/batik-all-1.7.jar" todir="${bm-jars}"/>
<copy file="${bm-build-top}/lib/commons-io-1.3.1.jar" todir="${bm-jars}"/>
<copy file="${bm-build-top}/lib/commons-logging-1.0.4.jar" todir="${bm-jars}"/>
<copy file="${bm-build-top}/lib/serializer-2.7.0.jar" todir="${bm-jars}"/>
<copy file="${bm-build-top}/lib/xmlgraphics-commons-1.2.jar" todir="${bm-jars}"/>
<copy file="${bm-build-top}/lib/xmlgraphics-commons-1.3.1.jar" todir="${bm-jars}"/>
</target>
</project>
......@@ -2,7 +2,7 @@ benchmark fop
class org.dacapo.harness.Fop
thread-model single
jar "fop.jar"
libs "avalon-framework-4.2.0.jar", "batik-all-1.6.jar", "commons-io-1.3.1.jar", "commons-logging-1.0.4.jar", "serializer-2.7.0.jar", "xmlgraphics-commons-1.2.jar";
libs "avalon-framework-4.2.0.jar", "batik-all-1.7.jar", "commons-io-1.3.1.jar", "commons-logging-1.0.4.jar", "serializer-2.7.0.jar", "xmlgraphics-commons-1.3.1.jar";
/*
* 'small' uses debug mode ("-d"), which puts current stats in the output,
......@@ -27,5 +27,5 @@ description
author "Apache Software Foundation",
license "Apache Public License",
url "http://xmlgraphics.apache.org/fop/",
version "0.94",
version "0.95",
repeats "Single iteration, renders a single XSL-FO file";
diff -ur ../fop-0.94-orig/src/java/org/apache/fop/cli/Main.java src/java/org/apache/fop/cli/Main.java
--- ../fop-0.94-orig/src/java/org/apache/fop/cli/Main.java 2007-08-19 03:56:46.000000000 +1000
+++ fop-0.94/src/java/org/apache/fop/cli/Main.java 2007-11-29 16:13:25.000000000 +1100
diff -ur ../fop-0.95/src/java/org/apache/fop/cli/Main.java fop-0.95/src/java/org/apache/fop/cli/Main.java
--- ../fop-0.95/src/java/org/apache/fop/cli/Main.java 2008-08-01 00:02:56.000000000 +1000
+++ fop-0.95/src/java/org/apache/fop/cli/Main.java 2009-06-16 23:02:09.000000000 +1000
@@ -174,9 +174,9 @@
// System.exit(0) called to close AWT/SVG-created threads, if any.
// AWTRenderer closes with window shutdown, so exit() should not
......@@ -8,9 +8,9 @@ diff -ur ../fop-0.94-orig/src/java/org/apache/fop/cli/Main.java src/java/org/apa
- if (!MimeConstants.MIME_FOP_AWT_PREVIEW.equals(outputFormat)) {
- System.exit(0);
- }
+ // if (!MimeConstants.MIME_FOP_AWT_PREVIEW.equals(outputFormat)) {
+ //if (!MimeConstants.MIME_FOP_AWT_PREVIEW.equals(outputFormat)) {
+ // System.exit(0);
+ // }
+ //}
} catch (Exception e) {
if (options != null) {
options.getLogger().error("Exception", e);
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment