Author: painter
Date: Tue Oct 9 14:20:43 2018
New Revision: 1843288
URL: http://svn.apache.org/viewvc?rev=1843288&view=rev
Log:
Rollback servlet-api dependencies to 3.1 until next release
Modified:
turbine/core/trunk/pom.xml
turbine/core/trunk/src/java/org/apache/turbine/util/TurbineConfig.java
turbine/core/trunk/src/test-cactus/testapp/WEB-INF/web.xml
Modified: turbine/core/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/pom.xml?rev=1843288&r1=1843287&r2=1843288&view=diff
==============================================================================
--- turbine/core/trunk/pom.xml (original)
+++ turbine/core/trunk/pom.xml Tue Oct 9 14:20:43 2018
@@ -830,7 +830,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
- <version>4.0.1</version>
+ <version>3.1.0</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -1045,17 +1045,10 @@
<version>2.2.9</version>
<scope>test</scope>
</dependency>
- <!-- moved mockito to testcontainer with v1.0.8 -->
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <version>2.18.3</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-testcontainer</artifactId>
- <version>1.0.7</version>
+ <version>1.0.8-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: turbine/core/trunk/src/java/org/apache/turbine/util/TurbineConfig.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/TurbineConfig.java?rev=1843288&r1=1843287&r2=1843288&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/util/TurbineConfig.java
(original)
+++ turbine/core/trunk/src/java/org/apache/turbine/util/TurbineConfig.java Tue
Oct 9 14:20:43 2018
@@ -938,48 +938,4 @@ public class TurbineConfig
throw new UnsupportedOperationException();
}
- @Override
- public Dynamic addJspFile(String servletName, String jspFile) {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public int getSessionTimeout() {
- // set the session timeout if specified in TR.properties
- if (timeout > 0)
- {
- return timeout;
- }
-
- return 0;
- }
-
- @Override
- public void setSessionTimeout(int sessionTimeout) {
- timeout = sessionTimeout;
- }
-
- @Override
- public String getRequestCharacterEncoding() {
- // TODO Auto-generated method stub
- return null;
- }
-
- @Override
- public void setRequestCharacterEncoding(String encoding) {
- // TODO Auto-generated method stub
-
- }
-
- @Override
- public String getResponseCharacterEncoding() {
- // TODO Auto-generated method stub
- return null;
- }
-
- @Override
- public void setResponseCharacterEncoding(String encoding) {
- // TODO Auto-generated method stub
-
- }
}
Modified: turbine/core/trunk/src/test-cactus/testapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/test-cactus/testapp/WEB-INF/web.xml?rev=1843288&r1=1843287&r2=1843288&view=diff
==============================================================================
--- turbine/core/trunk/src/test-cactus/testapp/WEB-INF/web.xml (original)
+++ turbine/core/trunk/src/test-cactus/testapp/WEB-INF/web.xml Tue Oct 9
14:20:43 2018
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,9 +19,11 @@
under the License.
-->
-<!DOCTYPE web-app
- PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
- "http://java.sun.com/dtd/web-app_2_3.dtd";>
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
+
http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd";
+ version="3.1">
+
-<web-app>
</web-app>
