Merge pull request #40 from dotCMS/issue-16879-replace-apache-struts-…

…with-struts-1-forever dotCMS/core#16879 Replacing Apache Struts with Struts 1 Forever
dotCMS · Aug 15, 2019 · c896cec · c896cec
2 parents 9a952e5 + 372f17e
commit c896cec
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/OSGi/com.dotcms.portlet/build.gradle b/OSGi/com.dotcms.portlet/build.gradle
@@ -10,7 +10,7 @@ repositories {
 }
 
 dependencies {
-    compile('com.dotcms:dotcms:5.1.6') { transitive = true }
+    compile('com.dotcms:dotcms:5.2.0') { transitive = true }
 }
 
 import java.util.jar.*

diff --git a/OSGi/com.dotcms.portlet/src/main/java/com/dotmarketing/osgi/portlet/Activator.java b/OSGi/com.dotcms.portlet/src/main/java/com/dotmarketing/osgi/portlet/Activator.java
@@ -4,7 +4,7 @@
 import com.dotmarketing.osgi.GenericBundleActivator;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.core.LoggerContext;
-import org.apache.struts.action.ActionMapping;
+import com.dotcms.repackage.org.apache.struts.action.ActionMapping;
 import org.osgi.framework.BundleContext;
 
 public class Activator extends GenericBundleActivator {

diff --git a/OSGi/com.dotcms.portlet/src/main/java/com/dotmarketing/osgi/portlet/HelloWorldAction.java b/OSGi/com.dotcms.portlet/src/main/java/com/dotmarketing/osgi/portlet/HelloWorldAction.java
@@ -5,9 +5,9 @@
 import com.dotcms.repackage.javax.portlet.RenderResponse;
 import com.dotcms.repackage.javax.portlet.WindowState;
 import com.dotmarketing.portal.struts.DotPortletAction;
-import org.apache.struts.action.ActionForm;
-import org.apache.struts.action.ActionForward;
-import org.apache.struts.action.ActionMapping;
+import com.dotcms.repackage.org.apache.struts.action.ActionForm;
+import com.dotcms.repackage.org.apache.struts.action.ActionForward;
+import com.dotcms.repackage.org.apache.struts.action.ActionMapping;
 
 public class HelloWorldAction extends DotPortletAction {
 

diff --git a/static/com.dotcms.portlet/build.gradle b/static/com.dotcms.portlet/build.gradle
@@ -16,7 +16,7 @@ repositories {
 // In this section you declare the dependencies for your production and test code
 dependencies {
     compileOnly fileTree(dir: 'lib', include: '*.jar')
-    compileOnly (group: 'com.dotcms', name: 'dotcms', version: '5.1.6'){
+    compileOnly (group: 'com.dotcms', name: 'dotcms', version: '5.2.0'){
         transitive = true
     }
 }

diff --git a/static/com.dotcms.portlet/src/com/dotcms/portlet/struts/ViewHelloWorld.java b/static/com.dotcms.portlet/src/com/dotcms/portlet/struts/ViewHelloWorld.java
@@ -8,9 +8,9 @@
 import com.dotcms.repackage.javax.portlet.RenderResponse;
 import com.dotcms.repackage.javax.portlet.WindowState;
 
-import org.apache.struts.action.ActionForm;
-import org.apache.struts.action.ActionForward;
-import org.apache.struts.action.ActionMapping;
+import com.dotcms.repackage.org.apache.struts.action.ActionForm;
+import com.dotcms.repackage.org.apache.struts.action.ActionForward;
+import com.dotcms.repackage.org.apache.struts.action.ActionMapping;
 
 import com.dotmarketing.portal.struts.DotPortletAction;