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/15 07:24:07 UTC
[1/3] struts git commit: sync up execution ids with top-level Apache
pom, otherwise the sources are deployed twice during release
Repository: struts
Updated Branches:
refs/heads/master 889e6db56 -> 79beb5679
sync up execution ids with top-level Apache pom, otherwise the sources are deployed twice during release
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/516d3d51
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/516d3d51
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/516d3d51
Branch: refs/heads/master
Commit: 516d3d5136f0ef563feb6b3e0207244745a73a4c
Parents: a2de255
Author: Przemek Bruski <pb...@atlassian.com>
Authored: Tue Jun 21 16:10:29 2016 +0200
Committer: Przemek Bruski <pb...@atlassian.com>
Committed: Tue Jun 21 16:10:29 2016 +0200
----------------------------------------------------------------------
core/pom.xml | 8 --------
pom.xml | 20 ++++++++++++--------
2 files changed, 12 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/516d3d51/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 9864cb1..790fd48 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -185,14 +185,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-source</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
</plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/struts/blob/516d3d51/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 713f5d6..ceea82a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -216,6 +216,18 @@
<artifactId>maven-dependency-plugin</artifactId>
<version>2.10</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
@@ -247,14 +259,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-source</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
[3/3] struts git commit: WW-4653 Drops duplicated source jar
deployment
Posted by lu...@apache.org.
WW-4653 Drops duplicated source jar deployment
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/79beb567
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/79beb567
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/79beb567
Branch: refs/heads/master
Commit: 79beb5679aa70957b597a48c0711c75f4c0d8703
Parents: 889e6db b67bed6
Author: Lukasz Lenart <lu...@apache.org>
Authored: Fri Jul 15 09:23:58 2016 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Fri Jul 15 09:23:58 2016 +0200
----------------------------------------------------------------------
core/pom.xml | 8 --------
.../struts2/components/ServletUrlRenderer.java | 2 +-
pom.xml | 20 ++++++++++++--------
3 files changed, 13 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/79beb567/core/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/79beb567/pom.xml
----------------------------------------------------------------------
[2/3] struts git commit: action parameters should be included when
building URL to action
Posted by lu...@apache.org.
action parameters should be included when building URL to action
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/b67bed67
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/b67bed67
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/b67bed67
Branch: refs/heads/master
Commit: b67bed674a5bcab83ac685d54670174c2c2f5f83
Parents: 516d3d5
Author: Przemek Bruski <pb...@atlassian.com>
Authored: Tue Jun 21 16:19:40 2016 +0200
Committer: Przemek Bruski <pb...@atlassian.com>
Committed: Tue Jun 21 16:19:40 2016 +0200
----------------------------------------------------------------------
.../java/org/apache/struts2/components/ServletUrlRenderer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/b67bed67/core/src/main/java/org/apache/struts2/components/ServletUrlRenderer.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/components/ServletUrlRenderer.java b/core/src/main/java/org/apache/struts2/components/ServletUrlRenderer.java
index 5b63cd4..314f3de 100644
--- a/core/src/main/java/org/apache/struts2/components/ServletUrlRenderer.java
+++ b/core/src/main/java/org/apache/struts2/components/ServletUrlRenderer.java
@@ -204,7 +204,7 @@ public class ServletUrlRenderer implements UrlRenderer {
LOG.warn("No configuration found for the specified action: '{}' in namespace: '{}'. Form action defaulting to 'action' attribute's literal value.", actionName, namespace);
}
- String result = urlHelper.buildUrl(action, formComponent.request, formComponent.response, null, scheme, formComponent.includeContext, true);
+ String result = urlHelper.buildUrl(action, formComponent.request, formComponent.response, actionParams, scheme, formComponent.includeContext, true);
formComponent.addParameter("action", result);
// namespace: cut out anything between the start and the last /