[ 
https://issues.apache.org/jira/browse/OFBIZ-12888?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17814288#comment-17814288
 ] 

Michael Brohl edited comment on OFBIZ-12888 at 2/5/24 9:10 AM:
---------------------------------------------------------------

[~jleroux] I appreciate you help but would also appreciate if you could take 
your time when doing changes/reverts etc. on the work of others.

You could simply let me commit my work which was based upon the latest trunk 
changes. Now it was incomplete/has errors (see my last commit) and I was not 
able to merge my PR due to conflicts based on your changes. Also the history 
now looks poor.


was (Author: mbrohl):
[~jleroux] I appreciate you help but would also appreciate if you could take 
your time when doing changes/reverts etc. on the work of others.

You could simply let me commit my work which was based upon the latest trunk 
changes. Now it was incomplete/has errors (see my last commit) and I was not 
able to merge my PR due to conflicts based on your changes.

> Gradle eclipse target produces duplicate build path entries in .classpath
> -------------------------------------------------------------------------
>
>                 Key: OFBIZ-12888
>                 URL: https://issues.apache.org/jira/browse/OFBIZ-12888
>             Project: OFBiz
>          Issue Type: Bug
>          Components: Gradle
>    Affects Versions: Upcoming Branch
>            Reporter: Michael Brohl
>            Assignee: Michael Brohl
>            Priority: Major
>             Fix For: Upcoming Branch
>
>
> I'm currently working on a solution for this.
> Maybe someone can explain why we use the GroovyScripts source set for the 
> codenarc checks in the pre-push hook:
>  
> {code:java}
> gitHooks {
>    hooks = ['pre-push': 'checkstyleMain codenarcGroovyScripts']
> }
> {code}
> That target seems to be automatically defined through the source set 
> definition for groovyScripts.
> If I remove that source set and the following task configuration:
>  
> {code:java}
> tasks.named('compileGroovyScriptsGroovy') {
> // We don't want to build groovyScripts as they should be considered as 
> standalone elements executed in
> // isolation by ofbiz. Building them will result in numerous error due to 
> duplicated classes.
> enabled = false
> }
> {code}
>  
> And change the git hooks to
>  
> {code:java}
> }
> gitHooks {
> hooks = ['pre-push': 'checkstyleMain codenarcMain codenarcTest']
> }
> {code}
>  
> (which is accoring to the pre-push hook definition in .git/hooks/pre-push) 
> everything seems to work fine, tests are working and the codenarc Main and 
> Test reports are build.
> I provide a PR for it.



--
This message was sent by Atlassian Jira
(v8.20.10#820010)

Reply via email to