To protect your data, the CISO officer has suggested users to enable 2FA as soon as possible.
Currently 2.7% of users enabled 2FA.

Commit ff27401d authored by John Zhang's avatar John Zhang
Browse files

Merge branch 'version-bump-batik'

parents cad0686d e428272c
Pipeline #1731 canceled with stage
benchmark batik benchmark batik
class org.dacapo.harness.Batik class org.dacapo.harness.Batik
thread-model single thread-model single
jars "batik-all.jar", "xml-apis-ext.jar","xml-apis.jar", "crimson-1.1.3.jar", "xerces_2_5_0.jar", "xalan-2.6.0.jar"; jars "batik-all-1.9.jar", "xml-apis-ext-1.3.04.jar","xml-apis-1.3.04.jar", "crimson-1.1.3.jar", "xercesImpl-2.9.1.jar", "xalan-2.7.2.jar", "serializer-2.7.2.jar", "xmlgraphics-commons-2.2.jar";
/* /*
* Validation currently limited to checking existence of output file * Validation currently limited to checking existence of output file
......
--- batik-1.9/batik-dom/src/main/java/org/apache/batik/dom/util/SAXDocumentFactory.java 2017-03-17 15:55:00.000000000 +1100
+++ ../SAXDocumentFactory.java 2017-12-01 12:13:20.811378286 +1100
@@ -399,7 +399,7 @@
static SAXParserFactory saxFactory;
static {
saxFactory = SAXParserFactory.newInstance();
- try {
+ /*try {
saxFactory.setFeature("http://xml.org/sax/features/external-general-entities", false);
saxFactory.setFeature("http://xml.org/sax/features/external-parameter-entities", false);
saxFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false);
@@ -409,7 +409,7 @@
e.printStackTrace();
} catch (ParserConfigurationException e) {
e.printStackTrace();
- }
+ }*/
}
/**
@@ -445,9 +445,9 @@
true);
parser.setFeature("http://xml.org/sax/features/validation",
isValidating);
- parser.setFeature("http://xml.org/sax/features/external-general-entities", false);
+ /*parser.setFeature("http://xml.org/sax/features/external-general-entities", false);
parser.setFeature("http://xml.org/sax/features/external-parameter-entities", false);
- parser.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false);
+ parser.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false);*/
parser.setProperty("http://xml.org/sax/properties/lexical-handler",
this);
parser.parse(is);
...@@ -11,16 +11,22 @@ ...@@ -11,16 +11,22 @@
<property file="dacapo.properties"/> <property file="dacapo.properties"/>
<property name="bm-name" value="batik"/> <property name="bm-name" value="batik"/>
<property name="batik.major.version" value="1.9"/>
<property name="bm-version" value="${batik.major.version}"/>
<property name="bm-src" value="${bm-name}-src-${bm-version}.zip"/>
<property name="bm-url" value="${apache.mirror}/xmlgraphics/batik/source"/>
<!--property name="bm-name" value="batik"/>
<property name="batik.major.version" value="1.7"/> <property name="batik.major.version" value="1.7"/>
<property name="bm-version" value="${batik.major.version}beta1"/> <property name="bm-version" value="${batik.major.version}"/>
<property name="bm-src" value="${bm-name}-src-${bm-version}.zip"/> <property name="bm-src" value="${bm-name}-src-${bm-version}.zip"/>
<property name="bm-url" value="${apache.dl.url}/xmlgraphics/batik"/> <property name="bm-url" value="${apache.dl.url}/xmlgraphics/batik"/-->
<import file="../common.xml"/> <import file="../common.xml"/>
<property name="batik-top" value="${bm-build-dir}/batik-${batik.major.version}"/> <property name="batik-top" value="${bm-build-dir}/batik-${batik.major.version}"/>
<target name="unpack" depends="unzip"/> <target name="unpack" depends="unzip, patch"/>
<target name="bm-build"> <target name="bm-build">
<exec executable="${ant.home}/bin/ant" dir="${batik-top}" failonerror="yes"> <exec executable="${ant.home}/bin/ant" dir="${batik-top}" failonerror="yes">
...@@ -31,17 +37,19 @@ ...@@ -31,17 +37,19 @@
</target> </target>
<target name="jar" depends="deps"> <target name="jar" depends="deps">
<copy file="${batik-top}/batik-${batik.major.version}/lib/batik-all.jar" todir="${bm-jars}"/> <copy file="${batik-top}/batik-${batik.major.version}/lib/batik-all-1.9.jar" todir="${bm-jars}"/>
<copy file="${batik-top}/lib/build/crimson-1.1.3.jar" todir="${bm-jars}"/> <copy file="${batik-top}/lib/build/crimson-1.1.3.jar" todir="${bm-jars}"/>
<copy file="${batik-top}/lib/xalan-2.6.0.jar" todir="${bm-jars}"/> <copy file="${batik-top}/lib/xalan-2.7.2.jar" todir="${bm-jars}"/>
<copy file="${batik-top}/lib/xerces_2_5_0.jar" todir="${bm-jars}"/> <copy file="${batik-top}/lib/xercesImpl-2.9.1.jar" todir="${bm-jars}"/>
<copy file="${batik-top}/lib/xml-apis.jar" todir="${bm-jars}"/> <copy file="${batik-top}/lib/xml-apis-1.3.04.jar" todir="${bm-jars}"/>
<copy file="${batik-top}/lib/xml-apis-ext.jar" todir="${bm-jars}"/> <copy file="${batik-top}/lib/xml-apis-ext-1.3.04.jar" todir="${bm-jars}"/>
<copy file="${batik-top}/lib/serializer-2.7.2.jar" todir="${bm-jars}"/>
<copy file="${batik-top}/lib/xmlgraphics-commons-2.2.jar" todir="${bm-jars}"/>
</target> </target>
<target name="deps"> <target name="deps">
<copy file="${batik-top}/lib/js.jar" todir="${bm-deps-output-dir}"/> <copy file="${batik-top}/lib/js.jar" todir="${bm-deps-output-dir}"/>
<copy file="${batik-top}/lib/pdf-transcoder.jar" todir="${bm-deps-output-dir}"/> <copy file="${batik-top}/lib/fop-transcoder-allinone-2.2.jar" todir="${bm-deps-output-dir}"/>
</target> </target>
</project> </project>
...@@ -10,4 +10,6 @@ mvn.version=2.1.0 ...@@ -10,4 +10,6 @@ mvn.version=2.1.0
sourceforge.dl.url=http://cfhcable.dl.sourceforge.net/project sourceforge.dl.url=http://cfhcable.dl.sourceforge.net/project
sfdata.url=http://dacapobench.sourceforge.net/source-data sfdata.url=http://dacapobench.sourceforge.net/source-data
apache.dl.url=http://archive.apache.org/dist apache.dl.url=http://archive.apache.org/dist
apache.mirror=http://apache.mirror.amaze.com.au
jar-target=dacapo.jar jar-target=dacapo.jar
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