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, the commit you speak about was only to complete one missing 
instance, spotted by Pierre Smits, in the commit done one month ago.

Since then James and I work on OFBIZ-11306 (and not OFBIZ-11316 as written below) without any issues related to OFBIZ-11317 on which OFBIZ-11306 
depends upon.


Actually we are working on it for 2 months. Only one month ago I suggested to 
James to extract this part.



You even acknowledged that you did not test.


Of course I test, everyday for a month with OFBIZ-11306




How can this be considered as a valid base for a security fix without in-depth 
testing?


I think you got it answered

Jacques




Michael Brohl

ecomify GmbH - www.ecomify.de


Am 13.02.20 um 06:45 schrieb 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 OFBIZ-11317 the ofbizURL macro would not apply to the cases fixed in OFBIZ-11317 and the CSRF vulnerability would not be 
fixed there.


So I should not even ask this question, OFBIZ-11316 depends on OFBIZ-11317 so 
OFBIZ-11317 needs to be backported

I set all that already (as the link between OFBIZ-11316 and OFBIZ-11317shows) 
but forgot about it.

Case close, thanks to care.

Jacques

Le 12/02/2020 à 16:49, Michael Brohl a écrit :

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 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: 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 good solution
for them.

Jacopo

On Thu, Feb 13, 2020 at 8:03 AM Michael Brohl 
wrote:

> 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.
>
> This might be confusing, at least when retracing problems or following
> changes.
>
> Michael Brohl
>
> ecomify GmbH - www.ecomify.de
>
>
> Michael Brohl
> Geschäftsführer
>
> Fon  +49 521 448 157-91
> Fax  +49 521 448 157-99
> Mobil+49 160 3664918
> Xing xing.com/profile/Michael_Brohl
> LinkedIn linkedin.com/in/michaelbrohl
>
> Company and Management Headquarters:
> ecomify GmbH, Gustav-Winkler-Str. 22, 33699 Bielefeld, Deutschland
> Fon: +49 521 448157-90, Fax: +49 521 448157-99, www.ecomify.de
>
> Court Registration: Amtsgericht Bielefeld HRB 41683
> Chief Executive Officer: Martin Becker, Michael Brohl
>
> Am 30.01.20 um 14:25 schrieb Pierre Smits:
> > Hi All,
> >
> > Recently we saw some postings in various threads how to deal with commits
> > from contributors coming via pull requests in Github.
> > If I understand it correctly, the issue we're dealing with has to do with
> > the commit message (as defined in
> >
> https://cwiki.apache.org/confluence/display/OFBIZ/OFBiz+commit+message+template
> > ).
> > After a code contribution has been accepted by a committer, this commit
> > message appears in:
> >
> > 1. the OFBiz repo
> > 2. a posting to the commit@ mailing list
> > 3. in the referenced JIRA ticket (as a comment, and in the commit
> > section, see e.g. https://issues.apache.org/jira/browse/OFBIZ-10954)
> >
> > Elements of the commit message are also used in the regularly occurring
> > blog posts of the project.
> >
> > With our repositories available via Github, we can expect that more and
> > more contributors work within their local clones, and publish their code
> > changes (commits) in their own public forks on Github and from there
> issue
> > a pull request to get these contributions evaluated by community members
> > and when good incorporated into the OFBiz repositories.
> >
> > A pull request can contain one or more commits (from the contributor - or
> > in git parlance: the author).
> >
> > So, when the commit message by the contributor (author) of each of his
> > commits is formatted in accordance with the commit-message template there
> > is nothing that stands in the way to take it to the next step. Which is
> the
> > evaluation of the contribution by other community members.
> >
> > Is my assessment so far correct?
> >
> > Best regards,
> >
> > Pierre Smits
> >
> > *Apache Trafodion , Vice President*
> > *Apache Directory , PMC Member*
> > Apache Incubator , committer
> > *Apache OFBiz , contributor (without
> privileges)
> > since 2008*
> > Apache Steve , committer
> >
>
>


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.


This might be confusing, at least when retracing problems or following 
changes.


Michael Brohl

ecomify GmbH - www.ecomify.de


Michael Brohl
Geschäftsführer

Fon  +49 521 448 157-91
Fax  +49 521 448 157-99
Mobil+49 160 3664918
Xing xing.com/profile/Michael_Brohl
LinkedIn linkedin.com/in/michaelbrohl

Company and Management Headquarters:
ecomify GmbH, Gustav-Winkler-Str. 22, 33699 Bielefeld, Deutschland
Fon: +49 521 448157-90, Fax: +49 521 448157-99, www.ecomify.de

Court Registration: Amtsgericht Bielefeld HRB 41683
Chief Executive Officer: Martin Becker, Michael Brohl

Am 30.01.20 um 14:25 schrieb Pierre Smits:

Hi All,

Recently we saw some postings in various threads how to deal with commits
from contributors coming via pull requests in Github.
If I understand it correctly, the issue we're dealing with has to do with
the commit message (as defined in
https://cwiki.apache.org/confluence/display/OFBIZ/OFBiz+commit+message+template
).
After a code contribution has been accepted by a committer, this commit
message appears in:

1. the OFBiz repo
2. a posting to the commit@ mailing list
3. in the referenced JIRA ticket (as a comment, and in the commit
section, see e.g. https://issues.apache.org/jira/browse/OFBIZ-10954)

Elements of the commit message are also used in the regularly occurring
blog posts of the project.

With our repositories available via Github, we can expect that more and
more contributors work within their local clones, and publish their code
changes (commits) in their own public forks on Github and from there issue
a pull request to get these contributions evaluated by community members
and when good incorporated into the OFBiz repositories.

A pull request can contain one or more commits (from the contributor - or
in git parlance: the author).

So, when the commit message by the contributor (author) of each of his
commits is formatted in accordance with the commit-message template there
is nothing that stands in the way to take it to the next step. Which is the
evaluation of the contribution by other community members.

Is my assessment so far correct?

Best regards,

Pierre Smits

*Apache Trafodion , Vice President*
*Apache Directory , PMC Member*
Apache Incubator , committer
*Apache OFBiz , contributor (without privileges)
since 2008*
Apache Steve , committer





smime.p7s
Description: S/MIME Cryptographic Signature


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 valid base for a security fix without 
in-depth testing?



Michael Brohl

ecomify GmbH - www.ecomify.de


Am 13.02.20 um 06:45 schrieb 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 OFBIZ-11317 the ofbizURL macro would not 
apply to the cases fixed in OFBIZ-11317 and the CSRF vulnerability 
would not be fixed there.


So I should not even ask this question, OFBIZ-11316 depends on 
OFBIZ-11317 so OFBIZ-11317 needs to be backported


I set all that already (as the link between OFBIZ-11316 and 
OFBIZ-11317shows) but forgot about it.


Case close, thanks to care.

Jacques

Le 12/02/2020 à 16:49, Michael Brohl a écrit :

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 depend upon it, it's safer to 
have been backported with it.


If nobody disagree, I'll do so in a week

Thanks

Jacques







smime.p7s
Description: S/MIME Cryptographic Signature


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 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 OFBIZ-11317 the ofbizURL macro would not apply to the cases fixed in OFBIZ-11317 and the CSRF vulnerability would not be 
fixed there.


So I should not even ask this question, OFBIZ-11316 depends on OFBIZ-11317 so 
OFBIZ-11317 needs to be backported

I set all that already (as the link between OFBIZ-11316 and OFBIZ-11317shows) 
but forgot about it.

Case close, thanks to care.

Jacques

Le 12/02/2020 à 16:49, Michael Brohl a écrit :

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 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: 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 OFBIZ-11317 the ofbizURL macro would not apply to the cases fixed in OFBIZ-11317 and the CSRF vulnerability would not be 
fixed there.


So I should not even ask this question, OFBIZ-11316 depends on OFBIZ-11317 so 
OFBIZ-11317 needs to be backported

I set all that already (as the link between OFBIZ-11316 and OFBIZ-11317shows) 
but forgot about it.

Case close, thanks to care.

Jacques

Le 12/02/2020 à 16:49, Michael Brohl a écrit :

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 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: 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 depend upon it, it's safer to 
have been backported with it.


If nobody disagree, I'll do so in a week

Thanks

Jacques





smime.p7s
Description: S/MIME Cryptographic Signature


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
> welcome such initiatives as it increases the appeal of our main product.
> Not only does it increase the appeal of OFBiz for (potential) adopters, but
> it may also lead to more parties willing to contribute.
>
> Best regards,
>
> Pierre Smits
> *Proud* *contributor* (but without privileges)* of* Apache OFBiz
> , since 2008
>
> *Apache Trafodion , Vice President*
> *Apache Directory , PMC Member*
> Apache Incubator , committer
> Apache Steve , committer
>
>
> On Mon, Feb 10, 2020 at 11:40 AM Girish Vasmatkar <
> girish.vasmat...@hotwaxsystems.com> wrote:
>
> > Hello
> >
> > I had been working on adding GraphQL support to OFBiz and could come up
> > with something that might be of interest to the community. Wanted to
> gauge
> > community's interest on the same.
> >
> > Essentially, I have first tried to enable GraphQL support such that OFBiz
> > is able to server GraphQL queries, mutations and subscriptions as per the
> > GraphQL specification (http://spec.graphql.org/). The Java GraphQL
> library
> > mostly takes care of it.
> >
> > The other major part is writing GraphQL schema and I have tried to
> include
> > both SDL and programmatic approach to generate the schema. Included a
> demo
> > query in the SDL approach to showcase hw OFBiz can server GraphQL
> requests.
> >
> > This is the part that I feel needs more work in order to make it more
> > generalised and I am still working on this.
> >
> > I have included GraphiQL(https://github.com/graphql/graphiql) and
> > Playground (https://github.com/prisma-labs/graphql-playground) as two
> > visual editor tools as well.
> >
> > Here's the github link for the plug in.
> > https://github.com/hotwax/ofbiz-graphql
> >
> > Any feedback, questions, concerns or suggestions are welcome.
> >
> > Best,
> > Girish
> >
>


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 Sat, Feb 8, 2020 at 6:49 PM Jacques Le Roux 
wrote:

> Hi Nicolas,
>
> Clean and rebased I have now 37688 error: +5
>
> We need a mean to compare before and after to quickly fix. Or do I miss
> something?
>
> Jacques
>
> Le 06/02/2020 à 10:40, Nicolas Malin a écrit :
> > Hi Jacques,
> >
> > Strange, after :
> >
> > ~/workspace/apache-git/ofbiz-framework
> > poveglia$ git pull --rebase && cd plugins && git pull --rebase
> > poveglia$ ./gradlew check
> >
> > I have 37683 error and not 37776
> >
> > Nicolas
> >
> > On 06/02/2020 09:03, Jacques Le Roux wrote:
> >> Hi Nicolas,
> >>
> >> Sorry to get back on this, but it's now almost a month and check style
> >> errors are also piling up: tasks.checkstyleMain.maxErrors = 37713 vs
> >> actual 37776
> >>
> >> Thanks
> >>
> >> Jacques
> >>
> >> Le 02/02/2020 à 15:49, Nicolas Malin a écrit :
> >>> Thanks jacques, I will take care
> >>>
> >>> Nicolas
> >>>
> >>> On 02/02/2020 11:41, Jacques Le Roux wrote:
>  About Javadoc and Infra
> 
>  https://issues.apache.org/jira/browse/INFRA-19807
> 
>  Le 02/02/2020 à 11:23, Jacques Le Roux a écrit :
> > Hi Pawan, Nicolas,
> >
> > Pawan, we have a test issue reported by Buildbot for R17 and R18
> > branch with plugins
> >
> > R17
> >
> >  https://ci.apache.org/builders/ofbizBranch17FrameworkPlugins
> >  1st case:
> >
> https://ci.apache.org/builders/ofbizBranch17FrameworkPlugins/builds/440
> >
> >  failures:
> > https://ci.apache.org/projects/ofbiz/logs/17.12/plugins/html/
> >
> > R18
> >
> > https://ci.apache.org/builders/ofbizBranch18FrameworkPlugins
> > 1st case:
> >
> https://ci.apache.org/builders/ofbizBranch18FrameworkPlugins/builds/271
> >
> > failures:
> > https://ci.apache.org/projects/ofbiz/logs/18.12/plugins/html/
> >
> > So it's the same case.
> >
> > Nicolas, we have a test issue reported by Buildbot for the trunk with
> > plugins
> >
> >
> https://ci.apache.org/builders/ofbizTrunkFrameworkPlugins?numbuilds=30
> > 1st case:
> >
> https://ci.apache.org/builders/ofbizTrunkFrameworkPlugins/builds/1108
> > failures: we have another issue with access to URLs for Javadoc from
> > Buildbot. They work locally so I'll open an Infra Jira for that. But
> > I reproduce the same 8 failures than in R17/R18 locally
> >
> > It seems the oldest failures are on Nicolas side. But could you
> > please both have a look at it?
> >
> > Thanks
> >
> > Jacques
> >
>


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 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 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 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
credential.helper=sourcetree fetch --prune OFBiz

fatal: Cannot fetch both refs/pull/13/head and refs/heads/pr/13 to
refs/remotes/OFBiz/pr/13

Completed with errors, see above



Best regards,

Pierre Smits
*Proud* *contributor* (but without privileges)* of* Apache OFBiz
, since 2008

*Apache Trafodion , Vice President*
*Apache Directory , PMC Member*
Apache Incubator , committer
Apache Steve , committer


On Wed, Feb 12, 2020 at 12:18 PM jler...@apache.org 
wrote:


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 https://gitbox.apache.org/repos/asf/ofbiz-framework.git.


    at ae98498  Implemented: Add 'controlPath' attribute

No new revisions were added by this update.





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
, since 2008

*Apache Trafodion , Vice President*
*Apache Directory , PMC Member*
Apache Incubator , committer
Apache Steve , committer


On Wed, Feb 12, 2020 at 1:27 PM Michael Brohl 
wrote:

> 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 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 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
> >> credential.helper=sourcetree fetch --prune OFBiz
> >>
> >> fatal: Cannot fetch both refs/pull/13/head and refs/heads/pr/13 to
> >> refs/remotes/OFBiz/pr/13
> >>
> >> Completed with errors, see above
> >>
> >>
> >>
> >> Best regards,
> >>
> >> Pierre Smits
> >> *Proud* *contributor* (but without privileges)* of* Apache OFBiz
> >> , since 2008
> >>
> >> *Apache Trafodion , Vice President*
> >> *Apache Directory , PMC Member*
> >> Apache Incubator , committer
> >> Apache Steve , committer
> >>
> >>
> >> On Wed, Feb 12, 2020 at 12:18 PM jler...@apache.org  >
> >> wrote:
> >>
> >>> 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 https://gitbox.apache.org/repos/asf/ofbiz-framework.git
> .
> 
> 
>  at ae98498  Implemented: Add 'controlPath' attribute
> 
>  No new revisions were added by this update.
> 
>
>


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 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 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

credential.helper=sourcetree fetch --prune OFBiz

fatal: Cannot fetch both refs/pull/13/head and refs/heads/pr/13 to
refs/remotes/OFBiz/pr/13

Completed with errors, see above



Best regards,

Pierre Smits
*Proud* *contributor* (but without privileges)* of* Apache OFBiz
, since 2008

*Apache Trafodion , Vice President*
*Apache Directory , PMC Member*
Apache Incubator , committer
Apache Steve , committer


On Wed, Feb 12, 2020 at 12:18 PM jler...@apache.org 
wrote:


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 https://gitbox.apache.org/repos/asf/ofbiz-framework.git.


    at ae98498  Implemented: Add 'controlPath' attribute

No new revisions were added by this update.





smime.p7s
Description: S/MIME Cryptographic Signature


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 , PMC Member*
Apache Incubator , committer
Apache Steve , committer


On Wed, Feb 12, 2020 at 12:34 PM Pierre Smits 
wrote:

> 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
> credential.helper=sourcetree fetch --prune OFBiz
>
> fatal: Cannot fetch both refs/pull/13/head and refs/heads/pr/13 to
> refs/remotes/OFBiz/pr/13
>
> Completed with errors, see above
>
>
>
> Best regards,
>
> Pierre Smits
> *Proud* *contributor* (but without privileges)* of* Apache OFBiz
> , since 2008
>
> *Apache Trafodion , Vice President*
> *Apache Directory , PMC Member*
> Apache Incubator , committer
> Apache Steve , committer
>
>
> On Wed, Feb 12, 2020 at 12:18 PM jler...@apache.org 
> wrote:
>
>> 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 https://gitbox.apache.org/repos/asf/ofbiz-framework.git.
>> >
>> >
>> >at ae98498  Implemented: Add 'controlPath' attribute
>> >
>> > No new revisions were added by this update.
>> >
>>
>


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 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
credential.helper=sourcetree fetch --prune OFBiz

fatal: Cannot fetch both refs/pull/13/head and refs/heads/pr/13 to
refs/remotes/OFBiz/pr/13

Completed with errors, see above



Best regards,

Pierre Smits
*Proud* *contributor* (but without privileges)* of* Apache OFBiz
, since 2008

*Apache Trafodion , Vice President*
*Apache Directory , PMC Member*
Apache Incubator , committer
Apache Steve , committer


On Wed, Feb 12, 2020 at 12:18 PM jler...@apache.org 
wrote:


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 https://gitbox.apache.org/repos/asf/ofbiz-framework.git.


at ae98498  Implemented: Add 'controlPath' attribute

No new revisions were added by this update.



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
credential.helper=sourcetree fetch --prune OFBiz

fatal: Cannot fetch both refs/pull/13/head and refs/heads/pr/13 to
refs/remotes/OFBiz/pr/13

Completed with errors, see above



Best regards,

Pierre Smits
*Proud* *contributor* (but without privileges)* of* Apache OFBiz
, since 2008

*Apache Trafodion , Vice President*
*Apache Directory , PMC Member*
Apache Incubator , committer
Apache Steve , committer


On Wed, Feb 12, 2020 at 12:18 PM jler...@apache.org 
wrote:

> 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 https://gitbox.apache.org/repos/asf/ofbiz-framework.git.
> >
> >
> >at ae98498  Implemented: Add 'controlPath' attribute
> >
> > No new revisions were added by this update.
> >
>


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: 
> > 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
> > > 
> > > 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 
> > > launch the same on Buildbot
> > > 
> > > Jacques
> > > 
> > > Le 12/02/2020 à 07:57, Michael Brohl a écrit :
> > > > Hi all,
> > > > 
> > > > the errors reported during the build (test classes not found) do not 
> > > > seem to have been introduced by my latest change.
> > > > 
> > > > Any ideas where this come from?
> > > > 
> > > > See 
> > > > https://ci.apache.org/builders/ofbizTrunkFrameworkPlugins/builds/1150/steps/shell_5/logs/stdio
> > > > 
> > > > Best regards,
> > > > 
> > > > Michael Brohl
> > > > 
> > > > ecomify GmbH - www.ecomify.de
> > > > 
> > > > Am 11.02.20 um 23:51 schrieb build...@apache.org:
> > > > > The Buildbot has detected a new failure on builder 
> > > > > ofbizTrunkFrameworkPlugins while building ofbiz-framework. Full 
> > > > > details are available at:
> > > > > https://ci.apache.org/builders/ofbizTrunkFrameworkPlugins/builds/1150
> > > > > 
> > > > > Buildbot URL: https://ci.apache.org/
> > > > > 
> > > > > Buildslave for this Build: asf946_ubuntu
> > > > > 
> > > > > Build Reason: downstream
> > > > > Build Source Stamp: [branch trunk] 
> > > > > 3788f6766a01eb476c15d32e6b9d9127061d12f4
> > > > > Blamelist: Michael Brohl 
> > > > > 
> > > > > BUILD FAILED: failed shell_5
> > > > > 
> > > > > Sincerely,
> > > > >   -The Buildbot
> > > > > 
> > > > > 
> > > > > 
> > > > 




signature.asc
Description: PGP signature


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 https://gitbox.apache.org/repos/asf/ofbiz-framework.git.


   at ae98498  Implemented: Add 'controlPath' attribute

No new revisions were added by this update.



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,
> > 
> > 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 
> > launch the same on Buildbot
> > 
> > Jacques
> > 
> > Le 12/02/2020 à 07:57, Michael Brohl a écrit :
> > > Hi all,
> > > 
> > > the errors reported during the build (test classes not found) do not seem 
> > > to have been introduced by my latest change.
> > > 
> > > Any ideas where this come from?
> > > 
> > > See 
> > > https://ci.apache.org/builders/ofbizTrunkFrameworkPlugins/builds/1150/steps/shell_5/logs/stdio
> > > 
> > > Best regards,
> > > 
> > > Michael Brohl
> > > 
> > > ecomify GmbH - www.ecomify.de
> > > 
> > > Am 11.02.20 um 23:51 schrieb build...@apache.org:
> > > > The Buildbot has detected a new failure on builder 
> > > > ofbizTrunkFrameworkPlugins while building ofbiz-framework. Full details 
> > > > are available at:
> > > > https://ci.apache.org/builders/ofbizTrunkFrameworkPlugins/builds/1150
> > > > 
> > > > Buildbot URL: https://ci.apache.org/
> > > > 
> > > > Buildslave for this Build: asf946_ubuntu
> > > > 
> > > > Build Reason: downstream
> > > > Build Source Stamp: [branch trunk] 
> > > > 3788f6766a01eb476c15d32e6b9d9127061d12f4
> > > > Blamelist: Michael Brohl 
> > > > 
> > > > BUILD FAILED: failed shell_5
> > > > 
> > > > Sincerely,
> > > >   -The Buildbot
> > > > 
> > > > 
> > > > 
> > > 


signature.asc
Description: PGP signature


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 text=auto present git automatically converts files which have other settings in the repository. It happens that git then 
reports changes for files which were not edited locally. I experienced the problem which is decribed in [1] while merging within a customer project.


It is recommended to renormalize the files in the repository like it is 
decribed in [2].

Is there someone who has already experienced similar problems?

Best regards,

Michael Brohl

ecomify GmbH - www.ecomify.de


[1] https://stackoverflow.com/questions/1967370/git-replacing-lf-with-crlf

[2] 
https://help.github.com/en/github/using-git/configuring-git-to-handle-line-endings#refreshing-a-repository-after-changing-line-endings


Am 19.12.19 um 13:15 schrieb jler...@apache.org:

This is an automated email from the ASF dual-hosted git repository.

jleroux pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git


The following commit(s) were added to refs/heads/trunk by this push:
  new b424d26  Improved: Equivalent of svn:auto-props properties on the 
server (OFBIZ-OFBIZ-11279)
b424d26 is described below

commit b424d2683e0679aeb4d49d3a28a2a682eed50b48
Author: Jacques Le Roux 
AuthorDate: Thu Dec 19 13:15:10 2019 +0100

 Improved: Equivalent of svn:auto-props properties on the server
 (OFBIZ-OFBIZ-11279)
  We should have an equivalent of svn:auto-props properties on the 
server:
https://help.github.com/articles/dealing-with-line-endings/#per-repository-settings
---
  .gitattributes | 41 +
  1 file changed, 41 insertions(+)

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000..2865b16
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,41 @@
+# Set the default behavior, in case people don't have core.autocrlf set.
+*    text=auto
+
+# Explicitly declare text files to always be normalized and converted
+# to native line endings on checkout.
+*.java   text
+*.groovy text
+*.jsp    text
+*.ftl    text
+*.js text
+*.sql    text
+*.txt    text
+*.properties text
+*.xml    text
+*.xsl    text
+*.xsd    text
+*.html   text
+*.htm    text
+*.css    text
+*.gradle text
+*.md text
+Makefile text
+README   text
+NOTICE   text
+LICENSE  text
+rc.ofbiz.*   text
+*.less   text
+*.adoc   text
+*.sh text
+
+# Declare files that will always have CRLF line endings on checkout.
+*.bat    text eol=crlf
+
+# Denote all files that are truly binary and should not be modified.
+*.png    binary
+*.jpg    binary
+*.gif    binary
+*.tif    binary
+*.zip    binary
+*.jks    binary
+*.ttf    binary





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

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 launch 
the same on Buildbot

Jacques

Le 12/02/2020 à 07:57, Michael Brohl a écrit :

Hi all,

the errors reported during the build (test classes not found) do not seem to 
have been introduced by my latest change.

Any ideas where this come from?

See 
https://ci.apache.org/builders/ofbizTrunkFrameworkPlugins/builds/1150/steps/shell_5/logs/stdio

Best regards,

Michael Brohl

ecomify GmbH - www.ecomify.de

Am 11.02.20 um 23:51 schrieb build...@apache.org:

The Buildbot has detected a new failure on builder ofbizTrunkFrameworkPlugins 
while building ofbiz-framework. Full details are available at:
https://ci.apache.org/builders/ofbizTrunkFrameworkPlugins/builds/1150

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: asf946_ubuntu

Build Reason: downstream
Build Source Stamp: [branch trunk] 3788f6766a01eb476c15d32e6b9d9127061d12f4
Blamelist: Michael Brohl 

BUILD FAILED: failed shell_5

Sincerely,
  -The Buildbot







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 launch 
the same on Buildbot

Jacques

Le 12/02/2020 à 07:57, Michael Brohl a écrit :

Hi all,

the errors reported during the build (test classes not found) do not seem to 
have been introduced by my latest change.

Any ideas where this come from?

See 
https://ci.apache.org/builders/ofbizTrunkFrameworkPlugins/builds/1150/steps/shell_5/logs/stdio

Best regards,

Michael Brohl

ecomify GmbH - www.ecomify.de

Am 11.02.20 um 23:51 schrieb build...@apache.org:

The Buildbot has detected a new failure on builder ofbizTrunkFrameworkPlugins 
while building ofbiz-framework. Full details are available at:
https://ci.apache.org/builders/ofbizTrunkFrameworkPlugins/builds/1150

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: asf946_ubuntu

Build Reason: downstream
Build Source Stamp: [branch trunk] 3788f6766a01eb476c15d32e6b9d9127061d12f4
Blamelist: Michael Brohl 

BUILD FAILED: failed shell_5

Sincerely,
  -The Buildbot