Revert "Cleaned up project to be buildable with jdk8. Moved StrutsPortletTestCase to src/test where it belongs! Declared dependencies -junit-plugin and junit as scope test, as it should be."

This reverts commit 4bff5a8748.

plugins/portlet/pom.xml

@@ -11,6 +11,18 @@
     <name>Struts 2 Portlet Plugin</name>
 
     <dependencies>
+        <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-junit-plugin</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <optional>true</optional>
+        </dependency>
+
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>jsp-api</artifactId>
@@ -42,21 +54,6 @@
             <scope>provided</scope>
         </dependency>
 
-        <!-- tests -->
-        <dependency>
-            <groupId>org.apache.struts</groupId>
-            <artifactId>struts2-junit-plugin</artifactId>
-            <optional>true</optional>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <optional>true</optional>
-            <scope>test</scope>
-        </dependency>
-
         <dependency>
             <groupId>mockobjects</groupId>
             <artifactId>mockobjects-jdk1.3-j2ee1.3</artifactId>

plugins/portlet/src/main/java/org/apache/struts2/StrutsPortletTestCase.java

@@ -1,11 +1,8 @@
-package org.apache.struts2.portlet;
+package org.apache.struts2;
 
 import com.opensymphony.xwork2.ActionContext;
-
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
-import org.apache.struts2.StrutsStatics;
-import org.apache.struts2.StrutsTestCase;
 import org.apache.struts2.portlet.PortletConstants;
 import org.apache.struts2.portlet.PortletPhase;
 import org.springframework.mock.web.portlet.MockPortletContext;
@@ -15,7 +12,6 @@ import org.springframework.mock.web.portlet.MockPortletSession;
 import org.springframework.mock.web.portlet.MockStateAwareResponse;
 
 import javax.portlet.PortletMode;
-
 import java.util.HashMap;
 import java.util.Map;