This is an automated email from the ASF dual-hosted git repository.
vel pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ranger.git
commit c7694deaab53fd0563193cfb8935213258352447
Author: mateenmansoori <ma3naus...@gmail.com>
AuthorDate: Thu Jan 21 15:39:34 2021 +0530
RANGER-3105 : Upgrade Ranger Tomcat to 8.5 or 9.0
Signed-off-by: Velmurugan Periasamy <v...@apache.org>
---
embeddedwebserver/pom.xml | 10 ----------
.../java/org/apache/ranger/server/tomcat/EmbeddedServer.java | 2 +-
pom.xml | 2 +-
security-admin/src/main/webapp/META-INF/context.xml | 6 +++---
4 files changed, 5 insertions(+), 15 deletions(-)
diff --git a/embeddedwebserver/pom.xml b/embeddedwebserver/pom.xml
index a982f84..2d14f3a 100644
--- a/embeddedwebserver/pom.xml
+++ b/embeddedwebserver/pom.xml
@@ -50,16 +50,6 @@
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
- <artifactId>tomcat-embed-logging-juli</artifactId>
- <version>${tomcat.embed.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat.embed</groupId>
- <artifactId>tomcat-embed-logging-log4j</artifactId>
- <version>${tomcat.embed.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-websocket</artifactId>
<version>${tomcat.embed.version}</version>
</dependency>
diff --git
a/embeddedwebserver/src/main/java/org/apache/ranger/server/tomcat/EmbeddedServer.java
b/embeddedwebserver/src/main/java/org/apache/ranger/server/tomcat/EmbeddedServer.java
index 8edcbbb..b1b242d 100644
---
a/embeddedwebserver/src/main/java/org/apache/ranger/server/tomcat/EmbeddedServer.java
+++
b/embeddedwebserver/src/main/java/org/apache/ranger/server/tomcat/EmbeddedServer.java
@@ -388,7 +388,6 @@ public class EmbeddedServer {
server.getConnector().setAllowTrace(Boolean.valueOf(EmbeddedServerUtil.getConfig("ranger.service.http.connector.attrib.allowTrace",
"false")));
server.getConnector().setAsyncTimeout(EmbeddedServerUtil.getLongConfig("ranger.service.http.connector.attrib.asyncTimeout",
10000L));
server.getConnector().setEnableLookups(Boolean.valueOf(EmbeddedServerUtil.getConfig("ranger.service.http.connector.attrib.enableLookups",
"false")));
-
server.getConnector().setMaxHeaderCount(EmbeddedServerUtil.getIntConfig("ranger.service.http.connector.attrib.maxHeaderCount",
100));
server.getConnector().setMaxParameterCount(EmbeddedServerUtil.getIntConfig("ranger.service.http.connector.attrib.maxParameterCount",
10000));
server.getConnector().setMaxPostSize(EmbeddedServerUtil.getIntConfig("ranger.service.http.connector.attrib.maxPostSize",
2097152));
server.getConnector().setMaxSavePostSize(EmbeddedServerUtil.getIntConfig("ranger.service.http.connector.attrib.maxSavePostSize",
4096));
@@ -396,6 +395,7 @@ public class EmbeddedServer {
server.getConnector().setURIEncoding(EmbeddedServerUtil.getConfig("ranger.service.http.connector.attrib.URIEncoding",
"UTF-8"));
server.getConnector().setXpoweredBy(false);
server.getConnector().setAttribute("server", "Apache Ranger");
+
server.getConnector().setProperty("sendReasonPhrase",EmbeddedServerUtil.getConfig("ranger.service.http.connector.property.sendReasonPhrase",
"true"));
Iterator<Object> iterator =
EmbeddedServerUtil.getRangerConfigProperties().keySet().iterator();
String key = null;
String property = null;
diff --git a/pom.xml b/pom.xml
index b495809..b41b697 100644
--- a/pom.xml
+++ b/pom.xml
@@ -189,7 +189,7 @@
<sqoop.version>1.99.7</sqoop.version>
<storm.version>1.2.0</storm.version>
<sun-jersey-bundle.version>1.19</sun-jersey-bundle.version>
- <tomcat.embed.version>7.0.105</tomcat.embed.version>
+ <tomcat.embed.version>8.5.61</tomcat.embed.version>
<testng.version>6.9.4</testng.version>
<velocity.version>1.7</velocity.version>
<zookeeper.version>3.4.14</zookeeper.version>
diff --git a/security-admin/src/main/webapp/META-INF/context.xml
b/security-admin/src/main/webapp/META-INF/context.xml
index 9c7ea95..30c37cb 100644
--- a/security-admin/src/main/webapp/META-INF/context.xml
+++ b/security-admin/src/main/webapp/META-INF/context.xml
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<Context allowLinking="true" useHttpOnly="true">
- <Loader className="org.apache.catalina.loader.VirtualWebappLoader"
-
virtualClasspath="webapp/WEB-INF/classes/conf;webapp/WEB-INF/classes/lib/*" />
+<Context useHttpOnly="true">
+ <JarScanner scanManifest="false" />
+ <Resources allowLinking="true" />
</Context>
