Skip to content

Commit

Permalink
dotCMS/core#16879 Replacing Apache Struts with Struts 1 Forever
Browse files Browse the repository at this point in the history
  • Loading branch information
Nollymar Longa committed Aug 14, 2019
1 parent 9a952e5 commit 372f17e
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion OSGi/com.dotcms.portlet/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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.*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion static/com.dotcms.portlet/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit 372f17e

Please sign in to comment.