[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

diff --git a/archiva-web/archiva-webapp/pom.xml b/archiva-web/archiva-webapp/pom.xml
index 040aea629644a5416a95d833831978d6533ec9d4..5243d242e3ed7ccc49aee16f96cd354b8646dbff 100644 (file)
--- 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 75b3b8081be2a919bc5b0af18ef08595a6a75dd3..37871480cfb84b66f786e328918acbc9f0b7c029 100644 (file)
--- 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 68451ff20cb9767f7dab16e4973151dfc3240567..cd1833184602e9911b87be8b76416a3b783ca8b0 100644 (file)
--- 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>