This is an automated email from the ASF dual-hosted git repository.
iwasakims pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-2 by this push:
new 3ded8ec HADOOP-16439. Upgrade bundled Tomcat in branch-2.
3ded8ec is described below
commit 3ded8ece6b31af318134c5f4ccbc78c6499406d0
Author: Masatake Iwasaki <[email protected]>
AuthorDate: Wed Sep 4 17:26:33 2019 +0900
HADOOP-16439. Upgrade bundled Tomcat in branch-2.
Signed-off-by: Masatake Iwasaki <[email protected]>
---
hadoop-common-project/hadoop-kms/pom.xml | 2 +-
hadoop-common-project/hadoop-kms/src/main/tomcat/server.xml | 5 +----
hadoop-common-project/hadoop-kms/src/main/tomcat/ssl-server.xml | 5 +----
hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml | 2 +-
hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/tomcat/server.xml | 5 +----
.../hadoop-hdfs-httpfs/src/main/tomcat/ssl-server.xml | 5 +----
hadoop-project/pom.xml | 2 +-
7 files changed, 7 insertions(+), 19 deletions(-)
diff --git a/hadoop-common-project/hadoop-kms/pom.xml
b/hadoop-common-project/hadoop-kms/pom.xml
index 4c1edbc..5773fad 100644
--- a/hadoop-common-project/hadoop-kms/pom.xml
+++ b/hadoop-common-project/hadoop-kms/pom.xml
@@ -38,7 +38,7 @@
${project.build.directory}/${project.artifactId}-${project.version}/share/hadoop/kms/tomcat
</kms.tomcat.dist.dir>
<tomcat.download.url>
-
https://archive.apache.org/dist/tomcat/tomcat-6/v${tomcat.version}/bin/apache-tomcat-${tomcat.version}.tar.gz
+
https://archive.apache.org/dist/tomcat/tomcat-8/v${tomcat.version}/bin/apache-tomcat-${tomcat.version}.tar.gz
</tomcat.download.url>
</properties>
diff --git a/hadoop-common-project/hadoop-kms/src/main/tomcat/server.xml
b/hadoop-common-project/hadoop-kms/src/main/tomcat/server.xml
index 2b38425..12f9e33 100644
--- a/hadoop-common-project/hadoop-kms/src/main/tomcat/server.xml
+++ b/hadoop-common-project/hadoop-kms/src/main/tomcat/server.xml
@@ -27,13 +27,10 @@
<!--APR library loader. Documentation at /docs/apr.html -->
<Listener className="org.apache.catalina.core.AprLifecycleListener"
SSLEngine="on"/>
- <!--Initialize Jasper prior to webapps are loaded. Documentation at
/docs/jasper-howto.html -->
- <Listener className="org.apache.catalina.core.JasperListener"/>
+
<!-- Prevent memory leaks due to use of particular java/javax APIs-->
<Listener
className="org.apache.catalina.core.JreMemoryLeakPreventionListener"/>
- <!-- JMX Support for the Tomcat server. Documentation at
/docs/non-existent.html -->
- <Listener className="org.apache.catalina.mbeans.ServerLifecycleListener"/>
<Listener
className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener"/>
diff --git a/hadoop-common-project/hadoop-kms/src/main/tomcat/ssl-server.xml
b/hadoop-common-project/hadoop-kms/src/main/tomcat/ssl-server.xml
index 6b63358..4291842 100644
--- a/hadoop-common-project/hadoop-kms/src/main/tomcat/ssl-server.xml
+++ b/hadoop-common-project/hadoop-kms/src/main/tomcat/ssl-server.xml
@@ -27,13 +27,10 @@
<!--APR library loader. Documentation at /docs/apr.html -->
<Listener className="org.apache.catalina.core.AprLifecycleListener"
SSLEngine="on"/>
- <!--Initialize Jasper prior to webapps are loaded. Documentation at
/docs/jasper-howto.html -->
- <Listener className="org.apache.catalina.core.JasperListener"/>
+
<!-- Prevent memory leaks due to use of particular java/javax APIs-->
<Listener
className="org.apache.catalina.core.JreMemoryLeakPreventionListener"/>
- <!-- JMX Support for the Tomcat server. Documentation at
/docs/non-existent.html -->
- <Listener className="org.apache.catalina.mbeans.ServerLifecycleListener"/>
<Listener
className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener"/>
diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml
b/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml
index 90fc663..4c6bd44 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml
@@ -44,7 +44,7 @@
</httpfs.tomcat.dist.dir>
<kerberos.realm>LOCALHOST</kerberos.realm>
<test.exclude.kerberos.test>**/TestHttpFSWithKerberos.java</test.exclude.kerberos.test>
-
<tomcat.download.url>https://archive.apache.org/dist/tomcat/tomcat-6/v${tomcat.version}/bin/apache-tomcat-${tomcat.version}.tar.gz</tomcat.download.url>
+
<tomcat.download.url>https://archive.apache.org/dist/tomcat/tomcat-8/v${tomcat.version}/bin/apache-tomcat-${tomcat.version}.tar.gz</tomcat.download.url>
</properties>
<dependencies>
diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/tomcat/server.xml
b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/tomcat/server.xml
index f160893..61cb371 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/tomcat/server.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/tomcat/server.xml
@@ -26,12 +26,9 @@
<!--APR library loader. Documentation at /docs/apr.html -->
<Listener className="org.apache.catalina.core.AprLifecycleListener"
SSLEngine="on"/>
- <!--Initialize Jasper prior to webapps are loaded. Documentation at
/docs/jasper-howto.html -->
- <Listener className="org.apache.catalina.core.JasperListener"/>
+
<!-- Prevent memory leaks due to use of particular java/javax APIs-->
<Listener
className="org.apache.catalina.core.JreMemoryLeakPreventionListener"/>
- <!-- JMX Support for the Tomcat server. Documentation at
/docs/non-existent.html -->
- <Listener className="org.apache.catalina.mbeans.ServerLifecycleListener"/>
<Listener
className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener"/>
<!-- Global JNDI resources
diff --git
a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/tomcat/ssl-server.xml
b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/tomcat/ssl-server.xml
index a85ada9..2035fbf 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/tomcat/ssl-server.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/tomcat/ssl-server.xml
@@ -27,13 +27,10 @@
<!--APR library loader. Documentation at /docs/apr.html -->
<Listener className="org.apache.catalina.core.AprLifecycleListener"
SSLEngine="on"/>
- <!--Initialize Jasper prior to webapps are loaded. Documentation at
/docs/jasper-howto.html -->
- <Listener className="org.apache.catalina.core.JasperListener"/>
+
<!-- Prevent memory leaks due to use of particular java/javax APIs-->
<Listener
className="org.apache.catalina.core.JreMemoryLeakPreventionListener"/>
- <!-- JMX Support for the Tomcat server. Documentation at
/docs/non-existent.html -->
- <Listener className="org.apache.catalina.mbeans.ServerLifecycleListener"/>
<Listener
className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener"/>
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index f437ec3..64ba62f 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -88,7 +88,7 @@
<curator.version>2.7.1</curator.version>
<findbugs.version>3.0.0</findbugs.version>
- <tomcat.version>6.0.48</tomcat.version>
+ <tomcat.version>8.5.43</tomcat.version>
<joda-time.version>2.9.4</joda-time.version>
<!-- Required for testing LDAP integration -->
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
