mirror of https://github.com/apache/archiva.git
[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
This commit is contained in:
parent
1cb0ca6ff0
commit
5a24cb679a
|
@ -140,7 +140,7 @@
|
||||||
<scope>runtime</scope>
|
<scope>runtime</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>opensymphony</groupId>
|
<groupId>com.opensymphony</groupId>
|
||||||
<artifactId>webwork</artifactId>
|
<artifactId>webwork</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|
|
@ -114,7 +114,7 @@ public class GroupIdLink
|
||||||
private String determineBrowseActionUrl()
|
private String determineBrowseActionUrl()
|
||||||
{
|
{
|
||||||
return determineActionURL( "browse", NAMESPACE, method, req, res, parameters, req.getScheme(), includeContext,
|
return determineActionURL( "browse", NAMESPACE, method, req, res, parameters, req.getScheme(), includeContext,
|
||||||
encode );
|
encode, true );
|
||||||
}
|
}
|
||||||
|
|
||||||
private String determineBrowseGroupActionUrl( String gid )
|
private String determineBrowseGroupActionUrl( String gid )
|
||||||
|
@ -122,7 +122,7 @@ public class GroupIdLink
|
||||||
parameters.put( "groupId", gid );
|
parameters.put( "groupId", gid );
|
||||||
|
|
||||||
return determineActionURL( ACTION, NAMESPACE, method, req, res, parameters, req.getScheme(), includeContext,
|
return determineActionURL( ACTION, NAMESPACE, method, req, res, parameters, req.getScheme(), includeContext,
|
||||||
encode );
|
encode, true );
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getGroupId()
|
public String getGroupId()
|
||||||
|
|
6
pom.xml
6
pom.xml
|
@ -545,7 +545,7 @@
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.codehaus.plexus</groupId>
|
<groupId>org.codehaus.plexus</groupId>
|
||||||
<artifactId>plexus-xwork-integration</artifactId>
|
<artifactId>plexus-xwork-integration</artifactId>
|
||||||
<version>1.0-alpha-6</version>
|
<version>1.0-alpha-7</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.codehaus.plexus.cache</groupId>
|
<groupId>org.codehaus.plexus.cache</groupId>
|
||||||
|
@ -639,9 +639,9 @@
|
||||||
<version>${wagon.version}</version>
|
<version>${wagon.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>opensymphony</groupId>
|
<groupId>com.opensymphony</groupId>
|
||||||
<artifactId>webwork</artifactId>
|
<artifactId>webwork</artifactId>
|
||||||
<version>2.2.4</version>
|
<version>2.2.6</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>xmlunit</groupId>
|
<groupId>xmlunit</groupId>
|
||||||
|
|
Loading…
Reference in New Issue