Re: Backport OFBIZ-11317

2020-02-12 Thread Jacques Le Roux
Michael, Inline... Le 13/02/2020 à 07:58, Michael Brohl a écrit : Jacques, as I said, this is a huge patch which spreads over many functionalies in the codebase. It was submitted yesterday and got committed on the same day without enough time for others to review and test. You confuse,

Re: OFBiz contributions & Github Pull Requests

2020-02-12 Thread Jacopo Cappellato
My preference is to lean on GitHub because it is an accepted and common way for ASF projects to get contributions and because it is very popular among contributors. There are still many details (including the one about PR mentioned by Michael) to fine tune but I am confident that we will find a

Re: OFBiz contributions & Github Pull Requests

2020-02-12 Thread Michael Brohl
There is one drawback with PR's I just noticed: the commits of the pull requests will be written to the commit history using the timestamp of the original commits. So if the commits were written a month ago and a committer merges in the codebase now, it appears in the history a month ago.

Re: Backport OFBIZ-11317

2020-02-12 Thread Michael Brohl
Jacques, as I said, this is a huge patch which spreads over many functionalies in the codebase. It was submitted yesterday and got committed on the same day without enough time for others to review and test. You even acknowledged that you did not test. How can this be considered as a

Re: Backport OFBIZ-11317

2020-02-12 Thread Jacques Le Roux
To be crystal clear: I'll only do the backport at the "same time" than when we will backport for OFBIZ-11316. It's not needed before. This should be expected for 17.12.02 version... Jacques Le 13/02/2020 à 06:45, Jacques Le Roux a écrit : Hi Michael, I'll backport to R17 and R17 because this

Re: Backport OFBIZ-11317

2020-02-12 Thread Jacques Le Roux
Hi Michael, I'll backport to R17 and R17 because this will be needed to fix the CSRF vulnerability. I was not clear with my saying. Actually the CSRF fix (OFBIZ-11316) depends upon OFBIZ-11317 because the CSRF fix uses the ofbizURL macro to set the CSRF token. So without the changes in

Re: Backport OFBIZ-11317

2020-02-12 Thread Michael Brohl
Hi Jacques, what exactly are you going to do? And why? OFBIZ-11317 contains a huge patch and we should be really careful backporting IMO. Regards, Michael Brohl ecomify GmbH - www.ecomify.de Am 12.02.20 um 16:08 schrieb Jacques Le Roux: Hi All, Even if OFBIZ-11306 does not directly

Backport OFBIZ-11317

2020-02-12 Thread Jacques Le Roux
Hi All, Even if OFBIZ-11306 does not directly depend upon it, it's safer to have been backported with it. If nobody disagree, I'll do so in a week Thanks Jacques

Re: GraphQL API for OFBiz

2020-02-12 Thread Girish Vasmatkar
Thanks Pierre. Here's the ticket for the same. I'll keep posting updates to it. https://issues.apache.org/jira/browse/OFBIZ-11347 Best, Girish On Mon, Feb 10, 2020 at 4:48 PM Pierre Smits wrote: > Hi Girish, > > Thank you for making the greater OFBiz community aware of this endeavour. I >

Re: Test issue

2020-02-12 Thread Pawan Verma
Hi Jacques, Sorry I was busy in some personal life engagements that's why did not get time to look into it :) Thanks, Nicolas for taking care of my part :) -- Thanks & Regards Pawan Verma Technical Consultant *HotWax Systems* *Enterprise open source experts* http://www.hotwaxsystems.com On

Re: [ofbiz-framework] branch pr/13 created (now ae98498)

2020-02-12 Thread Jacques Le Roux
Yes, found the same indeed, lessons learned and explained on Slack ofbiz channel and all other related places, for the same of documentation Thanks Michael Le 12/02/2020 à 13:27, Michael Brohl a écrit : I guess you made a commit on the PR branch and have your git configured in a way that a git

Re: [ofbiz-framework] branch pr/13 created (now ae98498)

2020-02-12 Thread Pierre Smits
It seems to me the PR was checked out from the official repo before the cherry-pick (but Jacques could verify this). And somehow a 'refs/pull/13/head' was created (and pushed back to the remote). Best regards, Pierre Smits *Proud* *contributor* (but without privileges)* of* Apache OFBiz

Re: [ofbiz-framework] branch pr/13 created (now ae98498)

2020-02-12 Thread Michael Brohl
I guess you made a commit on the PR branch and have your git configured in a way that a git push does push changes to all remote branches, not just the one you wanted to. Regards, Michael Brohl ecomify GmbH - www.ecomify.de Am 12.02.20 um 12:46 schrieb Jacques Le Roux: I just made a commit

Re: [ofbiz-framework] branch pr/13 created (now ae98498)

2020-02-12 Thread Pierre Smits
Before something can be documented, we need to know what was done. Best regards, Pierre Smits *Proud* *contributor* (but without privileges)* of* Apache OFBiz , since 2008 *Apache Trafodion , Vice President* *Apache Directory

Re: [ofbiz-framework] branch pr/13 created (now ae98498)

2020-02-12 Thread Jacques Le Roux
I just made a commit and a push after cherry-picking your commit from PR13 Seems OK on OFBiz side https://gitbox.apache.org/repos/asf?p=ofbiz-framework.git;a=summary Le 12/02/2020 à 12:34, Pierre Smits a écrit : I don't know how this happened, but the result in my local git clone (through my

Re: [ofbiz-framework] branch pr/13 created (now ae98498)

2020-02-12 Thread Pierre Smits
I don't know how this happened, but the result in my local git clone (through my client SourceTree) is the following when I do a fetch: git --no-optional-locks -c color.branch=false -c color.diff=false -c color.status=false -c diff.mnemonicprefix=false -c core.quotepath=false -c

Re: buildbot failure in on ofbizTrunkFrameworkPlugins

2020-02-12 Thread Gil Portenseigne
It's an error while cherry picking the bugFix from trunk. I will revert. On Wed, Feb 12, 2020 at 12:10:46PM +0100, Gil Portenseigne wrote: > Yes, i'm on it... > On Wed, Feb 12, 2020 at 11:56:14AM +0100, Jacques Le Roux wrote: > > It's OK, but we have now a compilation in R17: > >

Re: [ofbiz-framework] branch pr/13 created (now ae98498)

2020-02-12 Thread jler...@apache.org
Not sure how and why this happened and what it's for... Do we need to document that? Le 12/02/2020 à 12:11, jler...@apache.org a écrit : This is an automated email from the ASF dual-hosted git repository. jleroux pushed a change to branch pr/13 in repository

Re: buildbot failure in on ofbizTrunkFrameworkPlugins

2020-02-12 Thread Gil Portenseigne
Yes, i'm on it... On Wed, Feb 12, 2020 at 11:56:14AM +0100, Jacques Le Roux wrote: > It's OK, but we have now a compilation in R17: > https://ci.apache.org/builders/ofbizBranch17Framework > > Please Gil have a look > > Thanks > > Le 12/02/2020 à 09:00, Jacques Le Roux a écrit : > > Hi Michael,

Re: Git line endings/ renormalize, was: [ofbiz-framework] branch trunk updated: Improved: Equivalent of svn:auto-props properties on the server (OFBIZ-OFBIZ-11279)

2020-02-12 Thread Jacques Le Roux
Hi Michael, I already renormalized the files in the repository: https://markmail.org/message/fmnisdalwfepyb5y Jacques Le 11/02/2020 à 20:34, Michael Brohl a écrit : Hi Jacques, all, this seems to introduce problems when merging or checking out branches. With the .gitattributes and

Re: buildbot failure in on ofbizTrunkFrameworkPlugins

2020-02-12 Thread Jacques Le Roux
It's OK, but we have now a compilation in R17: https://ci.apache.org/builders/ofbizBranch17Framework Please Gil have a look Thanks Le 12/02/2020 à 09:00, Jacques Le Roux a écrit : Hi Michael, There were no issues before your commit: https://ci.apache.org/builders/ofbizTrunkFrameworkPlugins

Re: buildbot failure in on ofbizTrunkFrameworkPlugins

2020-02-12 Thread Jacques Le Roux
Hi Michael, There were no issues before your commit: https://ci.apache.org/builders/ofbizTrunkFrameworkPlugins And it was not squashed with another one: https://ci.apache.org/builders/ofbizTrunkFrameworkPlugins/builds/1150 I suspect a Buildbot error, I'm testing locally to confirm. I'll also