Author: rkanter
Date: Wed Dec 19 22:07:25 2012
New Revision: 1424165
URL: http://svn.apache.org/viewvc?rev=1424165&view=rev
Log:
OOZIE-1139 bump up Tomcat version to 6.0.36 (tucu via rkanter)
Modified:
oozie/branches/branch-3.3/distro/pom.xml
oozie/branches/branch-3.3/pom.xml
oozie/branches/branch-3.3/release-log.txt
Modified: oozie/branches/branch-3.3/distro/pom.xml
URL:
http://svn.apache.org/viewvc/oozie/branches/branch-3.3/distro/pom.xml?rev=1424165&r1=1424164&r2=1424165&view=diff
==============================================================================
--- oozie/branches/branch-3.3/distro/pom.xml (original)
+++ oozie/branches/branch-3.3/distro/pom.xml Wed Dec 19 22:07:25 2012
@@ -88,13 +88,13 @@
<configuration>
<target>
<mkdir dir="downloads"/>
- <get
src="http://archive.apache.org/dist/tomcat/tomcat-6/v6.0.32/bin/apache-tomcat-6.0.32.tar.gz";
+ <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"/>
<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"/>
- <move
file="target/tomcat/apache-tomcat-6.0.32" tofile="target/tomcat/oozie-server"/>
+ <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"/>
<delete
file="target/tomcat/oozie-server/conf/server.xml"/>
Modified: oozie/branches/branch-3.3/pom.xml
URL:
http://svn.apache.org/viewvc/oozie/branches/branch-3.3/pom.xml?rev=1424165&r1=1424164&r2=1424165&view=diff
==============================================================================
--- oozie/branches/branch-3.3/pom.xml (original)
+++ oozie/branches/branch-3.3/pom.xml Wed Dec 19 22:07:25 2012
@@ -85,6 +85,9 @@
<sqoop.version>1.5.0-incubating-SNAPSHOT</sqoop.version>
<streaming.version>${hadoop.version}</streaming.version>
<distcp.version>${hadooplib.version}</distcp.version>
+
+ <!-- Tomcat version -->
+ <tomcat.version>6.0.36</tomcat.version>
</properties>
<modules>
Modified: oozie/branches/branch-3.3/release-log.txt
URL:
http://svn.apache.org/viewvc/oozie/branches/branch-3.3/release-log.txt?rev=1424165&r1=1424164&r2=1424165&view=diff
==============================================================================
--- oozie/branches/branch-3.3/release-log.txt (original)
+++ oozie/branches/branch-3.3/release-log.txt Wed Dec 19 22:07:25 2012
@@ -1,5 +1,6 @@
-- Oozie 3.3.1 (unreleased)
+OOZIE-1139 bump up Tomcat version to 6.0.36 (tucu via rkanter)
OOZIE-1110 log Error that happens in XCommand to make debug easy (rohini via
virag)
OOZIE-1133 Remove hadoop-auth dependency from oozie-core (virag)
OOZIE-1130 Upgrade from 3.2 to 3.3 failing due to change in WorkflowInstance
structure (virag)
