Commit 27f9acd6 authored by sneha-patil-synacor's avatar sneha-patil-synacor Committed by Rupali Desai
Browse files

ZBUG-1148:Loosing table format with owasp sanitizer

parent 9b9cf7b4
......@@ -22,6 +22,7 @@
<ant antfile="../ant-tar-patched/build.xml" inheritAll="false" target="jar" />
<ant antfile="../nekohtml-1.9.13/build.xml" inheritAll="false" target="jar" />
<ant antfile="../ical4j-0.9.16-patched/build.xml" inheritAll="false" target="package" />
<ant antfile="../java-html-sanitizer-release-20190610.1/build.xml" inheritAll="false" target="jar" />
<move file="../nekohtml-1.9.13/build/lib/nekohtml.jar" tofile="../nekohtml-1.9.13/build/lib/nekohtml-1.9.13.1z.jar"/>
<move file="../ical4j-0.9.16-patched/build/ical4j.jar" tofile="../ical4j-0.9.16-patched/build/ical4j-0.9.16-patched.jar"/>
<copy todir="${dist.dir}">
......@@ -29,6 +30,7 @@
<fileset dir="../ant-tar-patched/build" includes="*.jar" />
<fileset dir="../nekohtml-1.9.13/build/lib" includes="*.jar" />
<fileset dir="../ical4j-0.9.16-patched/build" includes="*.jar" />
<fileset dir="../java-html-sanitizer-release-20190610.1/build/lib" includes="*.jar" />
</copy>
<ivy:install organisation="zimbra" module="zm-charset" revision="latest.integration" settingsRef="dev.settings" from="chain-resolver" to="build-dist" overwrite="true" transitive="true" type="jar" />
<ivy:install organisation="log4j" module="log4j" revision="1.2.16" settingsRef="dev.settings" from="chain-resolver" to="build-dist" overwrite="true" transitive="true" type="jar" />
......
......@@ -11,7 +11,6 @@
<dependency org="com.github.stephenc" name="jamm" rev="0.2.5"/>
<dependency org="com.google.guava" name="guava" rev="23.0"/>
<dependency org="com.googlecode.concurrentlinkedhashmap" name="concurrentlinkedhashmap-lru" rev="1.3.1"/>
<dependency org="com.googlecode.owasp-java-html-sanitizer" name="owasp-java-html-sanitizer" rev="20160924.1"/>
<dependency org="com.ibm.icu" name="icu4j" rev="4.8.1.1"/>
<dependency org="com.jcraft" name="jzlib" rev="1.0.7"/>
<dependency org="com.kohlschutter.junixsocket" name="junixsocket-common" rev="2.0.4"/>
......
......@@ -190,7 +190,6 @@ sub stage_zimbra_core_lib($)
cpy_file("build/dist/neethi-3.0.2.jar", "$stage_base_dir/opt/zimbra/lib/jars/neethi-3.0.2.jar");
cpy_file("build/dist/nekohtml-1.9.13.1z.jar", "$stage_base_dir/opt/zimbra/lib/jars/nekohtml-1.9.13.1z.jar");
cpy_file("build/dist/oauth-20100527.jar", "$stage_base_dir/opt/zimbra/lib/jars/oauth-20100527.jar");
cpy_file("build/dist/owasp-java-html-sanitizer-20160924.1.jar", "$stage_base_dir/opt/zimbra/lib/jars/owasp-java-html-sanitizer-20160924.1.jar");
cpy_file("build/dist/antisamy-1.5.3.jar", "$stage_base_dir/opt/zimbra/lib/jars/antisamy-1.5.3.jar");
cpy_file("build/dist/batik-css-1.7.jar", "$stage_base_dir/opt/zimbra/lib/jars/batik-css-1.7.jar");
cpy_file("build/dist/batik-i18n-1.9.jar", "$stage_base_dir/opt/zimbra/lib/jars/batik-i18n-1.9.jar");
......@@ -295,6 +294,7 @@ sub stage_zimbra_store_lib($)
cpy_file("build/dist/ant-1.7.0-ziputil-patched.jar", "$stage_base_dir/opt/zimbra/jetty_base/common/lib/ant-1.7.0-ziputil-patched.jar");
cpy_file("build/dist/ical4j-0.9.16-patched.jar", "$stage_base_dir/opt/zimbra/jetty_base/common/lib/ical4j-0.9.16-patched.jar");
cpy_file("build/dist/nekohtml-1.9.13.1z.jar", "$stage_base_dir/opt/zimbra/jetty_base/common/lib/nekohtml-1.9.13.1z.jar");
cpy_file("build/dist/owasp-java-html-sanitizer-20190610.1z.jar", "$stage_base_dir/opt/zimbra/jetty_base/common/lib/owasp-java-html-sanitizer-20190610.1z.jar");
cpy_file("build/dist/zmzimbratozimbramig-8.7.jar", "$stage_base_dir/opt/zimbra/lib/jars/zmzimbratozimbramig.jar");
cpy_file("build/dist/jcharset-2.0.jar", "$stage_base_dir/opt/zimbra/jetty_base/common/endorsed/jcharset.jar");
cpy_file("build/dist/java-semver-0.9.0.jar", "$stage_base_dir/opt/zimbra/jetty_base/common/lib/java-semver-0.9.0.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