From 5a24cb679a1c178dcc527564c1730f6aef8510f4 Mon Sep 17 00:00:00 2001
From: Emmanuel Venisse <evenisse@apache.org>
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 @@
       <scope>runtime</scope>
     </dependency>
     <dependency>
-      <groupId>opensymphony</groupId>
+      <groupId>com.opensymphony</groupId>
       <artifactId>webwork</artifactId>
     </dependency>
     <dependency>
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 @@
       <dependency>
         <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-xwork-integration</artifactId>
-        <version>1.0-alpha-6</version>
+        <version>1.0-alpha-7</version>
       </dependency>
       <dependency>
         <groupId>org.codehaus.plexus.cache</groupId>
@@ -639,9 +639,9 @@
         <version>${wagon.version}</version>
       </dependency>
       <dependency>
-        <groupId>opensymphony</groupId>
+        <groupId>com.opensymphony</groupId>
         <artifactId>webwork</artifactId>
-        <version>2.2.4</version>
+        <version>2.2.6</version>
       </dependency>
       <dependency>
         <groupId>xmlunit</groupId>