Commit 2702e39e authored by Karsten Loesing's avatar Karsten Loesing
Browse files

Use Ivy for resolving external dependencies.

Includes a metrics-lib upgrade to 2.6.2 and an upgrade to the latest
metrics-base commit 256e619.

Implements part of #31326.
parent 106e2aab
# Changes in version 4.2.0 - 2019-0?-??
* Medium changes
- Use Ivy for resolving external dependencies rather than relying
on files found in Debian stable packages. Requires installing Ivy
(using `apt-get install ivy`, `brew install ivy`, or similar) and
running `ant resolve` (or `ant -lib /usr/share/java resolve`).
Retrieved files are then copied to the `lib/` directory, except
for dependencies on other metrics libraries that still need to be
copied to the `lib/` directory manually. Current dependency
versions resolved by Ivy are the same as in Debian stretch with
few exceptions.
# Changes in version 4.1.0 - 2019-05-13
* Medium changes
......
......@@ -4,12 +4,13 @@
<!ENTITY base SYSTEM "src/build/java/base.xml">
]>
<project default="usage" name="exonerator" basedir=".">
<project default="usage" name="exonerator" basedir="."
xmlns:ivy="antlib:org.apache.ivy.ant">
<property name="javadoc-title" value="ExoneraTor API Documentation"/>
<property name="implementation-title" value="ExoneraTor" />
<property name="release.version" value="4.1.0-dev" />
<property name="metricslibversion" value="2.4.0" />
<property name="metricslibversion" value="2.6.2" />
<property name="jetty.version" value="-9.2.21.v20170120" />
<property name="warfile"
value="exonerator-${release.version}.war"/>
......@@ -45,35 +46,35 @@
<patternset id="library" >
<patternset refid="common" />
<include name="metrics-lib-${metricslibversion}.jar"/>
<include name="metrics-lib-${metricslibversion}-thin.jar"/>
<include name="commons-compress-1.13.jar"/>
<include name="servlet-api-3.1.jar"/>
<include name="javax.servlet-api-3.1.0.jar"/>
<include name="xz-1.6.jar"/>
</patternset>
<patternset id="web" >
<include name="jetty9-annotations${jetty.version}.jar"/>
<include name="jetty9-server${jetty.version}.jar"/>
<include name="jetty9-servlet${jetty.version}.jar"/>
<include name="jetty9-util${jetty.version}.jar"/>
<include name="jetty9-http${jetty.version}.jar"/>
<include name="jetty9-io${jetty.version}.jar"/>
<include name="jetty9-xml${jetty.version}.jar"/>
<include name="jetty9-webapp${jetty.version}.jar"/>
<include name="jetty9-continuation${jetty.version}.jar"/>
<include name="jetty9-security${jetty.version}.jar"/>
<include name="jetty-annotations${jetty.version}.jar"/>
<include name="jetty-server${jetty.version}.jar"/>
<include name="jetty-servlet${jetty.version}.jar"/>
<include name="jetty-util${jetty.version}.jar"/>
<include name="jetty-http${jetty.version}.jar"/>
<include name="jetty-io${jetty.version}.jar"/>
<include name="jetty-xml${jetty.version}.jar"/>
<include name="jetty-webapp${jetty.version}.jar"/>
<include name="jetty-continuation${jetty.version}.jar"/>
<include name="jetty-security${jetty.version}.jar"/>
</patternset>
<patternset id="webruntime" >
<include name="asm-5.2.jar" />
<include name="asm-commons-5.2.jar" />
<include name="jetty9-plus${jetty.version}.jar"/>
<include name="jetty9-jndi${jetty.version}.jar"/>
<include name="jetty9-apache-jsp${jetty.version}-tweaked.jar" />
<include name="tomcat8-embed-jasper-8.5.14.jar" />
<include name="tomcat8-embed-el-8.5.14.jar" />
<include name="tomcat8-embed-core-8.5.14.jar" />
<include name="eclipse-ecj-3.11.1.jar" />
<include name="asm-5.0.1.jar" />
<include name="asm-commons-5.0.1.jar" />
<include name="jetty-plus${jetty.version}.jar"/>
<include name="jetty-jndi${jetty.version}.jar"/>
<include name="apache-jsp${jetty.version}.jar" />
<include name="tomcat-embed-jasper-8.5.14.jar" />
<include name="tomcat-embed-el-8.5.14.jar" />
<include name="tomcat-embed-core-8.5.14.jar" />
<include name="ecj-4.6.1.jar" />
</patternset>
<patternset id="runtime" >
......@@ -84,18 +85,7 @@
<!-- Create a .war file for deployment. -->
<target name="war"
depends="compile">
<echo message="Removing problematic service definitions from"/>
<echo message="${libs}/jetty9-apache-jsp${jetty.version}.jar and using "/>
<echo message="${libs}/jetty9-apache-jsp${jetty.version}-tweaked.jar below." />
<delete file="${libs}/jetty9-apache-jsp${jetty.version}-tweaked.jar"
quiet="true" />
<jar destfile="${libs}/jetty9-apache-jsp${jetty.version}-tweaked.jar">
<zipfileset src="${libs}/jetty9-apache-jsp${jetty.version}.jar" >
<exclude name="**/javax.servlet.ServletContainerInitializer"/>
</zipfileset>
</jar>
<war destfile="${dist}/${warfile}"
duplicate="fail"
webxml="${resources}/web.xml"
basedir="${classes}">
<restrict>
......
build @ 256e6192
Subproject commit e639c697e9e94c6dbb26e946e5247c20a62c0661
Subproject commit 256e6192ad0066e48c6abb0ee9ac71714c7a3a0f
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