Repository: bigtop Updated Branches: refs/heads/master ce67355a7 -> 37d3b5e48
BIGTOP-2376: Update Tomcat and remove obsolete downloads Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/37d3b5e4 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/37d3b5e4 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/37d3b5e4 Branch: refs/heads/master Commit: 37d3b5e4891014e05ee604d3614cd4f17c2c02f8 Parents: ce67355 Author: Olaf Flebbe <o...@fleb.be> Authored: Fri Apr 8 22:16:15 2016 +0200 Committer: Olaf Flebbe <o...@fleb.be> Committed: Sat Apr 9 09:11:01 2016 +0200 ---------------------------------------------------------------------- bigtop-packages/src/common/bigtop-tomcat/do-component-build | 9 ++++++--- bigtop.bom | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/37d3b5e4/bigtop-packages/src/common/bigtop-tomcat/do-component-build ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/bigtop-tomcat/do-component-build b/bigtop-packages/src/common/bigtop-tomcat/do-component-build index 83bbb78..7480f24 100644 --- a/bigtop-packages/src/common/bigtop-tomcat/do-component-build +++ b/bigtop-packages/src/common/bigtop-tomcat/do-component-build @@ -16,10 +16,13 @@ set -ex +# This download may fail and is unneccesary +sed -i '/<!-- Download NSIS (Nullsoft Scriptable Install System) -->/,+5d' build.xml mkdir dl -ant -Dbase.path=dl clean download -ant -Dbase.path=dl -ant -Dbase.path=dl -Dskip.installer=true -f dist.xml dist-static package-tgz +#update to supported commons pool version +ant -Dbase.path=dl -Dcommons-pool.version=1.6 clean download +ant -Dbase.path=dl -Dcommons-pool.version=1.6 +ant -Dbase.path=dl -Dcommons-pool.version=1.6 -Dskip.installer=true -f dist.xml dist-static package-tgz mkdir build tar -C build --strip-components=1 -xzf output/release/v*/bin/apache-tomcat-*[0-9].tar.gz http://git-wip-us.apache.org/repos/asf/bigtop/blob/37d3b5e4/bigtop.bom ---------------------------------------------------------------------- diff --git a/bigtop.bom b/bigtop.bom index 2a709bf..1be2e98 100644 --- a/bigtop.bom +++ b/bigtop.bom @@ -337,7 +337,7 @@ bigtop { 'bigtop-tomcat' { name = "bigtop-tomcat" relNotes = "Apache Tomcat" - version { base = '6.0.36'; pkg = base; release = 1 } + version { base = '6.0.45'; pkg = base; release = 1 } tarball { source = "apache-tomcat-${version.base}-src.tar.gz" destination = "apache-tomcat-${version.base}.tar.gz" } url { download_path = "/tomcat/tomcat-6/v${version.base}/src"
