Thanks Neil, I am looking at the attributes conflicts. Thanks and kind regards, Gaurav Gupta
On Wed, Jun 26, 2019 at 7:40 PM Neil C Smith <[email protected]> wrote: > On Wed, 26 Jun 2019 at 14:25, Geertjan Wielenga <[email protected]> > wrote: > > Yes, Gaurav’s Payara PRs and Josh’s Java EE 8 work needs to be in beta-2. > > 2 out of 3 were already in master. One of the Payara ones had a merge > conflict with the other one, which was fixed. However, I think there > is a test conflict somewhere between the two Payara PRs - this one is > failing locally too. Everything is in, but it will need looking at. > > These lines look problematic. > > [junit] [org.netbeans.core.projects.cache] THREAD: main MSG: layer > > jar:file:/home/nsigma/Code/NetBeans/netbeans/nbbuild/netbeans/ergonomics/modules/org-netbeans-modules-ide-ergonomics.jar!/org/netbeans/modules/ide/ergonomics/enterprise/layer.xml > contains duplicate attributes position for Templates/PayaraResources > ... > [junit] Test org.netbeans.modules.ide.ergonomics.DynamicVerifyTest FAILED > > > I'm trying a PR to sync master to the release branch - may have some > benefits - you can see what's being pulled across here - > https://github.com/apache/netbeans/pull/1330 > > Best wishes, > > Neil > > --------------------------------------------------------------------- > To unsubscribe, e-mail: [email protected] > For additional commands, e-mail: [email protected] > > For further information about the NetBeans mailing lists, visit: > https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists > > > >
