You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by rk...@apache.org on 2013/10/18 20:06:49 UTC
svn commit: r1533573 - in /oozie/trunk: distro/pom.xml pom.xml
release-log.txt
Author: rkanter
Date: Fri Oct 18 18:06:49 2013
New Revision: 1533573
URL: http://svn.apache.org/r1533573
Log:
OOZIE-1582 Bump up Tomcat version to 6.0.37 (rkanter)
Modified:
oozie/trunk/distro/pom.xml
oozie/trunk/pom.xml
oozie/trunk/release-log.txt
Modified: oozie/trunk/distro/pom.xml
URL: http://svn.apache.org/viewvc/oozie/trunk/distro/pom.xml?rev=1533573&r1=1533572&r2=1533573&view=diff
==============================================================================
--- oozie/trunk/distro/pom.xml (original)
+++ oozie/trunk/distro/pom.xml Fri Oct 18 18:06:49 2013
@@ -89,11 +89,12 @@
<target>
<mkdir dir="downloads"/>
<get src="http://archive.apache.org/dist/tomcat/tomcat-6/v${tomcat.version}/bin/apache-tomcat-${tomcat.version}.tar.gz"
- dest="downloads/tomcat.tar.gz" verbose="true" skipexisting="true"/>
+ dest="downloads/tomcat-${tomcat.version}.tar.gz" verbose="true" skipexisting="true"/>
<delete dir="target/tomcat"/>
<mkdir dir="target/tomcat"/>
- <gunzip src="downloads/tomcat.tar.gz" dest="target/tomcat/tomcat.tar"/>
- <untar src="target/tomcat/tomcat.tar" dest="target/tomcat"/>
+ <gunzip src="downloads/tomcat-${tomcat.version}.tar.gz"
+ dest="target/tomcat/tomcat-${tomcat.version}.tar"/>
+ <untar src="target/tomcat/tomcat-${tomcat.version}.tar" dest="target/tomcat"/>
<move file="target/tomcat/apache-tomcat-${tomcat.version}" tofile="target/tomcat/oozie-server"/>
<delete dir="target/tomcat/oozie-server/webapps"/>
<mkdir dir="target/tomcat/oozie-server/webapps"/>
Modified: oozie/trunk/pom.xml
URL: http://svn.apache.org/viewvc/oozie/trunk/pom.xml?rev=1533573&r1=1533572&r2=1533573&view=diff
==============================================================================
--- oozie/trunk/pom.xml (original)
+++ oozie/trunk/pom.xml Fri Oct 18 18:06:49 2013
@@ -94,7 +94,7 @@
<distcp.version>${hadooplib.version}</distcp.version>
<!-- Tomcat version -->
- <tomcat.version>6.0.36</tomcat.version>
+ <tomcat.version>6.0.37</tomcat.version>
<openjpa.version>2.2.2</openjpa.version>
<xerces.version>2.10.0</xerces.version>
Modified: oozie/trunk/release-log.txt
URL: http://svn.apache.org/viewvc/oozie/trunk/release-log.txt?rev=1533573&r1=1533572&r2=1533573&view=diff
==============================================================================
--- oozie/trunk/release-log.txt (original)
+++ oozie/trunk/release-log.txt Fri Oct 18 18:06:49 2013
@@ -58,6 +58,7 @@ OOZIE-1440 Build fails in certain enviro
-- Oozie 4.0.1 release (unreleased)
+OOZIE-1582 Bump up Tomcat version to 6.0.37 (rkanter)
OOZIE-1563 colt jar includes GPL licence (rkanter)
OOZIE-1284 oozie.service.SchemaService.wf.ext.schemas in oozie-site is missing some newer xsd files (rkanter)
OOZIE-1549 Update hcat documentation to mention hcatalog-pig-adapter jar (bowenzhangusa via rohini)