From 5a24cb679a1c178dcc527564c1730f6aef8510f4 Mon Sep 17 00:00:00 2001 From: Emmanuel Venisse Date: Fri, 14 Sep 2007 13:46:58 +0000 Subject: [PATCH] [MRM-498] Update to latest webwork/xwork git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@575677 13f79535-47bb-0310-9956-ffa450edef68 --- archiva-web/archiva-webapp/pom.xml | 2 +- .../java/org/apache/maven/archiva/web/tags/GroupIdLink.java | 4 ++-- pom.xml | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/archiva-web/archiva-webapp/pom.xml b/archiva-web/archiva-webapp/pom.xml index 040aea629..5243d242e 100644 --- a/archiva-web/archiva-webapp/pom.xml +++ b/archiva-web/archiva-webapp/pom.xml @@ -140,7 +140,7 @@ runtime - opensymphony + com.opensymphony webwork diff --git a/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/GroupIdLink.java b/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/GroupIdLink.java index 75b3b8081..37871480c 100644 --- a/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/GroupIdLink.java +++ b/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/GroupIdLink.java @@ -114,7 +114,7 @@ public class GroupIdLink private String determineBrowseActionUrl() { return determineActionURL( "browse", NAMESPACE, method, req, res, parameters, req.getScheme(), includeContext, - encode ); + encode, true ); } private String determineBrowseGroupActionUrl( String gid ) @@ -122,7 +122,7 @@ public class GroupIdLink parameters.put( "groupId", gid ); return determineActionURL( ACTION, NAMESPACE, method, req, res, parameters, req.getScheme(), includeContext, - encode ); + encode, true ); } public String getGroupId() diff --git a/pom.xml b/pom.xml index 68451ff20..cd1833184 100644 --- a/pom.xml +++ b/pom.xml @@ -545,7 +545,7 @@ org.codehaus.plexus plexus-xwork-integration - 1.0-alpha-6 + 1.0-alpha-7 org.codehaus.plexus.cache @@ -639,9 +639,9 @@ ${wagon.version} - opensymphony + com.opensymphony webwork - 2.2.4 + 2.2.6 xmlunit -- 2.39.5