You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by yasserzamani <gi...@git.apache.org> on 2017/06/21 12:15:59 UTC
[GitHub] struts pull request #145: WW-4805 Ports some of PR #142 changes to branch su...
GitHub user yasserzamani opened a pull request:
https://github.com/apache/struts/pull/145
WW-4805 Ports some of PR #142 changes to branch support-2-3
Ports only security related changes of #142 to branch support-2-3
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/yasserzamani/struts support-2-3-WW-4805
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/struts/pull/145.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #145
----
commit 583da3d5df5aeeded3beadca6305a98c5618e46b
Author: Yasser Zamani <ya...@live.com>
Date: 2017-06-21T12:10:29Z
WW-4805 Blocks ognl access to class members of Spring proxy
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org
[GitHub] struts issue #145: WW-4805 Ports some of PR #142 changes to branch support-2...
Posted by lukaszlenart <gi...@git.apache.org>.
Github user lukaszlenart commented on the issue:
https://github.com/apache/struts/pull/145
Nope, I'm getting compilation errors:
```
[ERROR] chainHistory = new LinkedList<>();
```
which means when I fetch your PR it was merged against the `master` branch instead of the `support-2-3` - I need to figure out what's going on.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org
[GitHub] struts issue #145: WW-4805 Ports some of PR #142 changes to branch support-2...
Posted by lukaszlenart <gi...@git.apache.org>.
Github user lukaszlenart commented on the issue:
https://github.com/apache/struts/pull/145
I'm not able to merge this PR as it also contains some changes from the `master` branch - I have no idea how does it happen, maybe some GitHub PR's magic :\ I will try to cherry-pick this.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org
[GitHub] struts issue #145: WW-4805 Ports some of PR #142 changes to branch support-2...
Posted by yasserzamani <gi...@git.apache.org>.
Github user yasserzamani commented on the issue:
https://github.com/apache/struts/pull/145
Thanks! I did not try JDK6. Please let me check.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org
[GitHub] struts issue #145: WW-4805 Ports some of PR #142 changes to branch support-2...
Posted by lukaszlenart <gi...@git.apache.org>.
Github user lukaszlenart commented on the issue:
https://github.com/apache/struts/pull/145
So you have made all the changes by hand, not be merging in another branch, right?
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org
[GitHub] struts pull request #145: WW-4805 Ports some of PR #142 changes to branch su...
Posted by asfgit <gi...@git.apache.org>.
Github user asfgit closed the pull request at:
https://github.com/apache/struts/pull/145
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org
[GitHub] struts issue #145: WW-4805 Ports some of PR #142 changes to branch support-2...
Posted by lukaszlenart <gi...@git.apache.org>.
Github user lukaszlenart commented on the issue:
https://github.com/apache/struts/pull/145
Nope, I mean PRs are a GitHub specific feature, and looks like PR is always merged with the `master` branch so checking out the PR isn't an option to test non-`master` PRs ;-)
https://help.github.com/articles/checking-out-pull-requests-locally/
For reference:
I had to add your repository as an another `remote` and fetch your branch directly and merge it into the `support-2-3` branch to workaround the above problem.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org
[GitHub] struts issue #145: WW-4805 Ports some of PR #142 changes to branch support-2...
Posted by yasserzamani <gi...@git.apache.org>.
Github user yasserzamani commented on the issue:
https://github.com/apache/struts/pull/145
Yes. All done by coping just raw texts then delete or edit them. I was aware that merging will mix things up and is confusing so I avoided.
Do you have trouble withe mirrored github or apache's original repository?
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org
[GitHub] struts issue #145: WW-4805 Ports some of PR #142 changes to branch support-2...
Posted by yasserzamani <gi...@git.apache.org>.
Github user yasserzamani commented on the issue:
https://github.com/apache/struts/pull/145
😕 When I was in my branch `master`, I checked out my `support-2-3`. Then I pulled apache `support-2-3` then pushed into my `support-2-3`. I confirmed via github that my `support-2-3` and apache `support-2-3` are even ( at [here](https://github.com/yasserzamani/struts/tree/support-2-3) ). Then I checked out my `support-2-3` as a new branch named `support-2-3-WW-4805`. Finally I made my changes on it, then commit and push it as a new branch into my github, then create this PR against apache `support-2-3`.
At github all things seems good!
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org
[GitHub] struts issue #145: WW-4805 Ports some of PR #142 changes to branch support-2...
Posted by yasserzamani <gi...@git.apache.org>.
Github user yasserzamani commented on the issue:
https://github.com/apache/struts/pull/145
Forgot to say I did not any cherry-pick :)
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org
[GitHub] struts issue #145: WW-4805 Ports some of PR #142 changes to branch support-2...
Posted by lukaszlenart <gi...@git.apache.org>.
Github user lukaszlenart commented on the issue:
https://github.com/apache/struts/pull/145
After checking out your PR locally I cannot build it on JDK6 (Struts 2.3.x must be built on JDK 6)
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org
[GitHub] struts issue #145: WW-4805 Ports some of PR #142 changes to branch support-2...
Posted by lukaszlenart <gi...@git.apache.org>.
Github user lukaszlenart commented on the issue:
https://github.com/apache/struts/pull/145
Did you cherry-pick changes from your original branch? As this is the only option to port changes merged to the `master` branch back to the `support-2-3` branch.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org
[GitHub] struts issue #145: WW-4805 Ports some of PR #142 changes to branch support-2...
Posted by yasserzamani <gi...@git.apache.org>.
Github user yasserzamani commented on the issue:
https://github.com/apache/struts/pull/145
OK, I tried JDK6 which firstly has failed with heap out of memory message at `Running org.apache.struts2.components.UIComponentTest`. But when I replaced JDK with a 64bit version and `-Xmx2048m`, then `mvn -DskipAssembly=true install` exited successfully with code 0. Used Maven version was 3.2.5, latest JDK6 compatible maven.
Do you get same error message as me (i.e. heap out of memory) when you use `mvn -X`?
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org
[GitHub] struts issue #145: WW-4805 Ports some of PR #142 changes to branch support-2...
Posted by yasserzamani <gi...@git.apache.org>.
Github user yasserzamani commented on the issue:
https://github.com/apache/struts/pull/145
@lukaszlenart , it seems it was occurred just on your local PC during git fetch and there is not any issue with github or original apache repositories. Please revert your local changes and try check out instance of fetch. I remember the fetch does a merge too!
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org