You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2016/07/27 06:37:09 UTC
[1/2] struts git commit: WW-4669 Reverts back to default RegEx
Repository: struts
Updated Branches:
refs/heads/master 164356809 -> 0bd2e7058
WW-4669 Reverts back to default RegEx
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/c6d07d3a
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/c6d07d3a
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/c6d07d3a
Branch: refs/heads/master
Commit: c6d07d3ab66083f32ead69a9e2ff709d4c29dcd3
Parents: 1643568
Author: Lukasz Lenart <lu...@apache.org>
Authored: Wed Jul 27 08:28:00 2016 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Wed Jul 27 08:28:00 2016 +0200
----------------------------------------------------------------------
.../org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/c6d07d3a/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java b/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
index 005f9f2..d0e89be 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
@@ -120,7 +120,7 @@ public class DefaultActionMapper implements ActionMapper {
protected boolean allowSlashesInActionNames = false;
protected boolean alwaysSelectFullNamespace = false;
protected PrefixTrie prefixTrie = null;
- protected Pattern allowedActionNames = Pattern.compile("^[a-zA-Z0-9_!/\\-]*((.htm[l]?)|(.action))?$");
+ protected Pattern allowedActionNames = Pattern.compile("[a-zA-Z0-9._!/\\-]*");
private boolean allowActionPrefix = false;
private boolean allowActionCrossNamespaceAccess = false;
[2/2] struts git commit: WW-4670 Upgrades JFreeChart to the latest
version
Posted by lu...@apache.org.
WW-4670 Upgrades JFreeChart to the latest version
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/0bd2e705
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/0bd2e705
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/0bd2e705
Branch: refs/heads/master
Commit: 0bd2e705897b365740e72229dbd9eb64c8c32229
Parents: c6d07d3
Author: Lukasz Lenart <lu...@apache.org>
Authored: Wed Jul 27 08:37:00 2016 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Wed Jul 27 08:37:00 2016 +0200
----------------------------------------------------------------------
plugins/jfreechart/pom.xml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/0bd2e705/plugins/jfreechart/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/jfreechart/pom.xml b/plugins/jfreechart/pom.xml
index fec4910..b3758ef 100644
--- a/plugins/jfreechart/pom.xml
+++ b/plugins/jfreechart/pom.xml
@@ -35,9 +35,9 @@
<dependencies>
<dependency>
- <groupId>jfree</groupId>
+ <groupId>org.jfree</groupId>
<artifactId>jcommon</artifactId>
- <version>1.0.12</version>
+ <version>1.0.23</version>
<scope>provided</scope>
<exclusions>
<exclusion>
@@ -47,9 +47,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>jfree</groupId>
+ <groupId>org.jfree</groupId>
<artifactId>jfreechart</artifactId>
- <version>1.0.9</version>
+ <version>1.0.19</version>
<scope>provided</scope>
<exclusions>
<exclusion>
@@ -68,7 +68,7 @@
<artifactId>jsp-api</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<scope>test</scope>