Author: evenisse
Date: Fri Sep 14 06:46:58 2007
New Revision: 575677
URL: http://svn.apache.org/viewvc?rev=575677&view=rev
Log:
[MRM-498] Update to latest webwork/xwork
Modified:
maven/archiva/trunk/archiva-web/archiva-webapp/pom.xml
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/GroupIdLink.java
maven/archiva/trunk/pom.xml
Modified: maven/archiva/trunk/archiva-web/archiva-webapp/pom.xml
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/pom.xml?rev=575677&r1=575676&r2=575677&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-web/archiva-webapp/pom.xml (original)
+++ maven/archiva/trunk/archiva-web/archiva-webapp/pom.xml Fri Sep 14 06:46:58
2007
@@ -140,7 +140,7 @@
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>opensymphony</groupId>
+ <groupId>com.opensymphony</groupId>
<artifactId>webwork</artifactId>
</dependency>
<dependency>
Modified:
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/GroupIdLink.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/GroupIdLink.java?rev=575677&r1=575676&r2=575677&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/GroupIdLink.java
(original)
+++
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/GroupIdLink.java
Fri Sep 14 06:46:58 2007
@@ -114,7 +114,7 @@
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 @@
parameters.put( "groupId", gid );
return determineActionURL( ACTION, NAMESPACE, method, req, res,
parameters, req.getScheme(), includeContext,
- encode );
+ encode, true );
}
public String getGroupId()
Modified: maven/archiva/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/pom.xml?rev=575677&r1=575676&r2=575677&view=diff
==============================================================================
--- maven/archiva/trunk/pom.xml (original)
+++ maven/archiva/trunk/pom.xml Fri Sep 14 06:46:58 2007
@@ -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>
