svn commit: r1831150 - in /turbine/core/trunk: pom.xml src/java/org/apache/turbine/Turbine.java src/test/org/apache/turbine/test/BaseTestCase.java

[gk...@apache.org]

Author: gk
Date: Tue May  8 07:30:36 2018
New Revision: 1831150

URL: http://svn.apache.org/viewvc?rev=1831150&view=rev
Log:
- update mockito
- revert encoding mixup
- site path change

Modified:
    turbine/core/trunk/pom.xml
    turbine/core/trunk/src/java/org/apache/turbine/Turbine.java
    turbine/core/trunk/src/test/org/apache/turbine/test/BaseTestCase.java

Modified: turbine/core/trunk/pom.xml
URL: http://svn.apache.org/viewvc/turbine/core/trunk/pom.xml?rev=1831150&r1=1831149&r2=1831150&view=diff
==============================================================================
--- turbine/core/trunk/pom.xml (original)
+++ turbine/core/trunk/pom.xml Tue May  8 07:30:36 2018
@@ -1070,10 +1070,11 @@
       <version>1.0.5</version>
       <scope>test</scope>
     </dependency>
+    <!-- moved mockito to testcontainer with v1.0.8 -->
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
-      <version>2.13.0</version>
+      <version>2.18.3</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -1144,7 +1145,8 @@
 
   <properties>
     <!-- TODO: Change for release -->
-    <turbine.site.path>turbine/development/turbine-4.1</turbine.site.path>
+    <!--turbine.site.path>turbine/development/turbine-4.1</turbine.site.path-->
+    <turbine.site.path>turbine/turbine-4.0</turbine.site.path>
     <fulcrum.intake>1.2.3</fulcrum.intake>
     <fulcrum.security>1.1.2</fulcrum.security>
     <slf4j.version>1.7.25</slf4j.version>

Modified: turbine/core/trunk/src/java/org/apache/turbine/Turbine.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/Turbine.java?rev=1831150&r1=1831149&r2=1831150&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/Turbine.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/Turbine.java Tue May  8 07:30:36 2018
@@ -374,9 +374,6 @@ public class Turbine
                 TurbineConstants.PARAMETER_ENCODING_KEY,
                 TurbineConstants.PARAMETER_ENCODING_DEFAULT);
 
-        // RunData needs the following encoding set to override the default charset
-        configuration.setProperty(TurbineConstants.LOCALE_DEFAULT_CHARSET_KEY, inputEncoding);
-
         if (log.isDebugEnabled())
         {
             log.debug("Input Encoding has been set to " + inputEncoding);

Modified: turbine/core/trunk/src/test/org/apache/turbine/test/BaseTestCase.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/test/BaseTestCase.java?rev=1831150&r1=1831149&r2=1831150&view=diff
==============================================================================
--- turbine/core/trunk/src/test/org/apache/turbine/test/BaseTestCase.java (original)
+++ turbine/core/trunk/src/test/org/apache/turbine/test/BaseTestCase.java Tue May  8 07:30:36 2018
@@ -21,9 +21,9 @@ package org.apache.turbine.test;
  */
 
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;