diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-06-28 19:05:58 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-06-28 19:06:46 +0100 |
| commit | 4f2890a8c9a0c8cadeb469b8b6e23ea7ec3f3b81 (patch) | |
| tree | 8f10eb38ee7b715ab86ee4d84392ddcb2de2b34f /tomcat | |
| parent | 71bdcdf5fdc280be028a021ecdeb2f898c5bcc24 (diff) | |
bump tomcat to 5.5.36
Change-Id: I04e5a96cb7fb5e7b8955a98eae2fdc01d4caa798
Diffstat (limited to 'tomcat')
| -rw-r--r-- | tomcat/ExternalProject_tomcat.mk | 2 | ||||
| -rw-r--r-- | tomcat/Package_tomcat.mk | 2 | ||||
| -rw-r--r-- | tomcat/UnpackedTarball_tomcat.mk | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/tomcat/ExternalProject_tomcat.mk b/tomcat/ExternalProject_tomcat.mk index 0640f4b6b2b5..e4f3ff1053bc 100644 --- a/tomcat/ExternalProject_tomcat.mk +++ b/tomcat/ExternalProject_tomcat.mk @@ -25,6 +25,6 @@ $(call gb_ExternalProject_get_state_target,tomcat,build) : -Dant.build.javac.target=$(JAVA_TARGET_VER) \ ) \ $(if $(debug),-Dbuild.debug="on") \ - ,jakarta-servletapi-5) + ,servletapi) # vim: set noet sw=4 ts=4: diff --git a/tomcat/Package_tomcat.mk b/tomcat/Package_tomcat.mk index 8cd451254f69..1ab9c5c9db21 100644 --- a/tomcat/Package_tomcat.mk +++ b/tomcat/Package_tomcat.mk @@ -11,6 +11,6 @@ $(eval $(call gb_Package_Package,tomcat_inc,$(call gb_UnpackedTarball_get_dir,to $(eval $(call gb_Package_use_external_project,tomcat_inc,tomcat)) -$(eval $(call gb_Package_add_file,tomcat_inc,bin/servlet-api.jar,jakarta-servletapi-5/jsr154/dist/lib/servlet-api.jar)) +$(eval $(call gb_Package_add_file,tomcat_inc,bin/servlet-api.jar,servletapi/jsr154/dist/lib/servlet-api.jar)) # vim: set noet sw=4 ts=4: diff --git a/tomcat/UnpackedTarball_tomcat.mk b/tomcat/UnpackedTarball_tomcat.mk index 6e6a71631491..ed408f19fc32 100644 --- a/tomcat/UnpackedTarball_tomcat.mk +++ b/tomcat/UnpackedTarball_tomcat.mk @@ -12,6 +12,6 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,tomcat)) $(eval $(call gb_UnpackedTarball_set_tarball,tomcat,$(TOMCAT_TARBALL))) -$(eval $(call gb_UnpackedTarball_add_file,tomcat,jakarta-servletapi-5/build.xml,tomcat/build.xml)) +$(eval $(call gb_UnpackedTarball_add_file,tomcat,servletapi/build.xml,tomcat/build.xml)) # vim: set noet sw=4 ts=4: |