Author: rkanter
Date: Wed Dec 19 18:33:06 2012
New Revision: 1424015
URL: http://svn.apache.org/viewvc?rev=1424015&view=rev
Log:
OOZIE-1139 bump up Tomcat version to 6.0.36 (tucu via 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=1424015&r1=1424014&r2=1424015&view=diff
==============================================================================
--- oozie/trunk/distro/pom.xml (original)
+++ oozie/trunk/distro/pom.xml Wed Dec 19 18:33:06 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/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/oozie/trunk/pom.xml?rev=1424015&r1=1424014&r2=1424015&view=diff
==============================================================================
--- oozie/trunk/pom.xml (original)
+++ oozie/trunk/pom.xml Wed Dec 19 18:33:06 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/trunk/release-log.txt
URL:
http://svn.apache.org/viewvc/oozie/trunk/release-log.txt?rev=1424015&r1=1424014&r2=1424015&view=diff
==============================================================================
--- oozie/trunk/release-log.txt (original)
+++ oozie/trunk/release-log.txt Wed Dec 19 18:33:06 2012
@@ -1,5 +1,6 @@
-- Oozie 3.4.0 release (trunk - unreleased)
+OOZIE-1139 bump up Tomcat version to 6.0.36 (tucu via rkanter)
OOZIE-1035 Improve forkjoin validation to allow same errorTo transitions
(rkanter)
OOZIE-1137 In light of federation use actionLibPath instead of appPath (vaidya
via rkanter)
OOZIE-1126 see if checkstyle works for oozie development. (jaoki via rkanter)
