Actually, those two files are the same right now. Just remove 'apisupport.restsample' from the cluster.properties file (it is one of several sample modules we removed, though without updating the cluster.properties file).
If you see similar messages for other modules, do the same thing, i.e., remove the reference from the cluster.properties because it means the module was remove though the cluster.properties wasn't updated to remove the reference. Gj On Wed, Aug 1, 2018 at 11:43 PM, Geertjan Wielenga < [email protected]> wrote: > Does that help, Ryan? I could also copy the cluster.properties from master > to 2ndDonation in my fork, if that would help. > > Gj > > On Wed, Aug 1, 2018 at 8:59 PM, Geertjan Wielenga < > [email protected]> wrote: > >> Yes, you need to use the cluster.properties from master. The one in >> 2ndDonation is incorrect. >> >> Gj >> >> >> On Wednesday, August 1, 2018, Ryan Cuprak <[email protected]> wrote: >> >>> I had forgotten about that - however my build fails. Is anyone else >>> able to build? >>> >>> ant -Dcluster.config=enterprise >>> … >>> >>> init-module-list: >>> >>> BUILD FAILED >>> /Users/rcuprak/open-source/netbeans/nbbuild/build.xml:167: Cannot >>> resolve apisupport.restsample. Neither one exist: >>> /Users/rcuprak/open-source/netbeans/apisupport.restsample >>> /Users/rcuprak/open-source/netbeans/enterprise/apisupport.restsample >>> >>> > On Aug 1, 2018, at 2:09 PM, Geertjan Wielenga >>> <[email protected]> wrote: >>> > >>> > https://github.com/geertjanw/incubator-netbeans/blob/2ndDona >>> tion/nbbuild/cluster.properties >>> > >>> > I believe the Java EE cluster there is called 'enterprise'. >>> > >>> > Gj >>> > >>> > On Wed, Aug 1, 2018 at 8:06 PM, Geertjan Wielenga < >>> > [email protected]> wrote: >>> > >>> >> Take a look in nbbuild/cluster.properties. >>> >> >>> >> That shows you the clusters that are available, the below would build >>> the >>> >> Groovy cluster, as well as the base clusters (platform and java): >>> >> >>> >> ant -Dcluster.config=groovy >>> >> >>> >> <https://github.com/apache/incubator-netbeans#running-netbeans>Gj >>> >> >>> >> >>> >> On Wed, Aug 1, 2018 at 7:58 PM, Ryan Cuprak <[email protected]> >>> wrote: >>> >> >>> >>> Hello, >>> >>> You’ve taken 2nd donation and merged it with master and have it on a >>> >>> branch that now needs to be pulled into master? >>> >>> >>> >>> I built the code on your branch and ran it, however I don’t see any >>> of >>> >>> the Java EE project types when I run ant tryme. Is this expected or >>> is >>> >>> there more work to be done? >>> >>> >>> >>> -Ryan >>> >>> >>> >>>> On Aug 1, 2018, at 5:49 AM, Geertjan Wielenga >>> >>> <[email protected]> wrote: >>> >>>> >>> >>>> OK. There are 430 people registered on this mailing list. >>> >>>> >>> >>>> Until someone responds to this thread or simply uses their existing >>> >>>> knowledge to bring the 2nd donation into master probably in the way >>> >>>> suggested by Jan Lahoda above in this thread, integration of the 2nd >>> >>>> donation is effectvely dead. Want Java EE in Apache NetBeans? Want >>> PHP? >>> >>>> Groovy? JavaScript? Then answer the open questions here or please >>> do the >>> >>>> merge in one way or another yourself. :-) >>> >>>> >>> >>>> Gj >>> >>>> >>> >>>> >>> >>>> On Wednesday, August 1, 2018, Geertjan Wielenga < >>> >>>> [email protected]> wrote: >>> >>>> >>> >>>>> My fork's master is now merged into my fork's 2ndDonation branch: >>> >>>>> >>> >>>>> https://github.com/geertjanw/incubator-netbeans/tree/2ndDonation >>> >>>>> >>> >>>>> Using: >>> >>>>> >>> >>>>> git clone -b 2ndDonation https://github.com/geertjanw/ >>> >>>>> incubator-netbeans.git >>> >>>>> >>> >>>>> git pull https://github.com/apache/incubator-netbeans.git >>> >>>>> --allow-unrelated-histories >>> >>>>> >>> >>>>> From my 2ndDonation branch, I could do a PR for the origin repo's >>> >>>>> 2ndDonation branch. >>> >>>>> >>> >>>>> Is that the next step or something else (or does someone who knows >>> what >>> >>>>> needs to be done want to do it)? >>> >>>>> >>> >>>>> Gj >>> >>>>> >>> >>>>> >>> >>>>> >>> >>>>> On Wed, Aug 1, 2018 at 7:57 AM, Geertjan Wielenga < >>> >>>>> [email protected]> wrote: >>> >>>>> >>> >>>>>> OK. >>> >>>>>> >>> >>>>>> What are the PR checks exactly, i.e., how will we know this >>> approach >>> >>> is >>> >>>>>> successful? >>> >>>>>> >>> >>>>>> Should I do this in my fork first? Or straight into the >>> 2ndDonation >>> >>>>>> branch at https://github.com/apache/incu >>> >>> bator-netbeans/tree/2ndDonation? >>> >>>>>> >>> >>>>>> Gj >>> >>>>>> >>> >>>>>> On Tue, Jul 31, 2018 at 7:04 PM, Jan Lahoda <[email protected]> >>> wrote: >>> >>>>>> >>> >>>>>>> On Tue, Jul 31, 2018 at 5:19 PM, Geertjan Wielenga < >>> >>>>>>> [email protected]> wrote: >>> >>>>>>> >>> >>>>>>>> Did the above (including --allow-unrelated-histories), ran Ant >>> Rat, >>> >>>>>>> and was >>> >>>>>>>> encouraged to find 'only' 1223 unknown licenses identified: >>> >>>>>>>> >>> >>>>>>>> https://cwiki.apache.org/confluence/display/NETBEANS/ >>> >>>>>>>> Initial+Rat+Report+for+2nd+Donation >>> >>>>>>>> >>> >>>>>>>> I believe that if I were to do a push, the Ant Rat that is run >>> >>>>>>>> automatically needs to be tweaked to include the new clusters. >>> >>>>>>>> >>> >>>>>>>> Jan Lahoda, I think you can tell more about this and explain >>> what >>> >>>>>>> needs to >>> >>>>>>>> be done re Rat and then someone can do that. >>> >>>>>>>> >>> >>>>>>> >>> >>>>>>> I think it might be good to merge master into the 2ndDonation >>> branch >>> >>>>>>> (and >>> >>>>>>> push to 2ndDonation). Then it might(?) be possible to create a PR >>> >>> from >>> >>>>>>> 2ndDonation to master (which would run all the PR checks for us >>> >>>>>>> automatically). I though rat wouldn't need need tweaks in travis >>> >>> config, >>> >>>>>>> but apparently it will need some - I can try to do that, but >>> having >>> >>>>>>> master >>> >>>>>>> merged into the 2ndDonation branch would help. >>> >>>>>>> >>> >>>>>>> Thanks, >>> >>>>>>> Jan >>> >>>>>>> >>> >>>>>>> >>> >>>>>>>> Thanks, >>> >>>>>>>> >>> >>>>>>>> Gj >>> >>>>>>>> >>> >>>>>>>> >>> >>>>>>>> On Tue, Jul 31, 2018 at 5:02 PM, Peter Steele < >>> [email protected] >>> >>>> >>> >>>>>>>> wrote: >>> >>>>>>>> >>> >>>>>>>>> You do it locally on your own PC, clone master, pull in chosen >>> >>>>>>> branch, >>> >>>>>>>>> commit and push. I don't know of a way to do it on the GitHub >>> site, >>> >>>>>>> using >>> >>>>>>>>> git commands is easiest. There is probably a gui to do this too >>> >>>>>>>>> >>> >>>>>>>>> On Tue, 31 Jul 2018 15:58 Geertjan Wielenga, >>> >>>>>>>>> <[email protected]> wrote: >>> >>>>>>>>> >>> >>>>>>>>>> Apologies for my ignorance, but should someone do this in >>> their >>> >>> own >>> >>>>>>>> clone >>> >>>>>>>>>> or should it be done directly in >>> >>>>>>>>>> https://github.com/apache/incubator-netbeans? >>> >>>>>>>>>> >>> >>>>>>>>>> Gj >>> >>>>>>>>>> >>> >>>>>>>>>> On Tue, Jul 31, 2018 at 4:45 PM, Peter Steele < >>> >>>>>>> [email protected]> >>> >>>>>>>>>> wrote: >>> >>>>>>>>>> >>> >>>>>>>>>>> https://help.github.com/articles/merging-an-upstream- >>> >>>>>>>>>>> repository-into-your-fork/ >>> >>>>>>>>>>> >>> >>>>>>>>>>> On Tue, 31 Jul 2018 15:41 Geertjan Wielenga, >>> >>>>>>>>>>> <[email protected]> wrote: >>> >>>>>>>>>>> >>> >>>>>>>>>>>> Is there a way to merge the branch into master on GitHub? >>> >>>>>>>>>>>> >>> >>>>>>>>>>>> Or is there someone who can recommend best practices for >>> doing >>> >>>>>>>> this? >>> >>>>>>>>>>>> >>> >>>>>>>>>>>> Thanks, >>> >>>>>>>>>>>> >>> >>>>>>>>>>>> Gj >>> >>>>>>>>>>>> >>> >>>>>>>>>>>> >>> >>>>>>>>>>>> On Tue, Jul 31, 2018 at 4:16 PM, Josh Juneau < >>> >>>>>>> [email protected]> >>> >>>>>>>>>>> wrote: >>> >>>>>>>>>>>> >>> >>>>>>>>>>>>> Looking forward to getting started with the work on this >>> 2nd >>> >>>>>>>>>> donation. >>> >>>>>>>>>>>>> >>> >>>>>>>>>>>>> On Tue, Jul 31, 2018 at 3:09 AM Geertjan Wielenga >>> >>>>>>>>>>>>> <[email protected]> wrote: >>> >>>>>>>>>>>>> >>> >>>>>>>>>>>>>> Is there any objection to merging the 2nddonation branch >>> >>>>>>> into >>> >>>>>>>>>> master >>> >>>>>>>>>>>>> today? >>> >>>>>>>>>>>>>> >>> >>>>>>>>>>>>>> https://github.com/apache/incu >>> >>>>>>> bator-netbeans/tree/2ndDonation >>> >>>>>>>>>>>>>> >>> >>>>>>>>>>>>>> Gj >>> >>>>>>>>>>>>>> >>> >>>>>>>>>>>>>> On Sun, Jul 29, 2018 at 9:44 PM, Geertjan Wielenga < >>> >>>>>>>>>>>>>> [email protected]> wrote: >>> >>>>>>>>>>>>>> >>> >>>>>>>>>>>>>>> Is there anything stopping us from merging the 2nd >>> >>>>>>> donation >>> >>>>>>>>>> branch >>> >>>>>>>>>>>> into >>> >>>>>>>>>>>>>>> master? >>> >>>>>>>>>>>>>>> >>> >>>>>>>>>>>>>>> If not, let's do it, then take a look at the Rat report >>> >>>>>>> after >>> >>>>>>>>> the >>> >>>>>>>>>>>> first >>> >>>>>>>>>>>>>>> build that includes the branch, and see what kind and how >>> >>>>>>>> many >>> >>>>>>>>>>>> problems >>> >>>>>>>>>>>>>> are >>> >>>>>>>>>>>>>>> identified and how to solve them. >>> >>>>>>>>>>>>>>> >>> >>>>>>>>>>>>>>> Thanks, >>> >>>>>>>>>>>>>>> >>> >>>>>>>>>>>>>>> Gj >>> >>>>>>>>>>>>>>> >>> >>>>>>>>>>>>>>> >>> >>>>>>>>>>>>>>> >>> >>>>>>>>>>>>>>> On Thu, Jul 26, 2018 at 11:00 PM, Antonio < >>> >>>>>>>> [email protected]> >>> >>>>>>>>>>>> wrote: >>> >>>>>>>>>>>>>>> >>> >>>>>>>>>>>>>>>> That's easy: I still own one of the NetBeans Day in 2004 >>> >>>>>>>>>>>> somewhere... >>> >>>>>>>>>>>>>>>> >>> >>>>>>>>>>>>>>>> El 26/07/2018 a las 22:58, Emilian Bold escribió: >>> >>>>>>>>>>>>>>>> >>> >>>>>>>>>>>>>>>>> We just need some tshirts to gift people :-) >>> >>>>>>>>>>>>>>>>> >>> >>>>>>>>>>>>>>>>> --emi >>> >>>>>>>>>>>>>>>>> >>> >>>>>>>>>>>>>>>>> ‐‐‐‐‐‐‐ Original Message ‐‐‐‐‐‐‐ >>> >>>>>>>>>>>>>>>>> On 26 July 2018 11:57 PM, Antonio <[email protected]> >>> >>>>>>>>> wrote: >>> >>>>>>>>>>>>>>>>> >>> >>>>>>>>>>>>>>>>> Yep, but on august. Let's call it Hacktaugustfest or >>> >>>>>>>>> something >>> >>>>>>>>>>> :-) >>> >>>>>>>>>>>>>>>>>> >>> >>>>>>>>>>>>>>>>>> El 26/07/2018 a las 22:40, Emilian Bold escribió: >>> >>>>>>>>>>>>>>>>>> >>> >>>>>>>>>>>>>>>>>> Isn't this what we did with #Hacktoberfest 2017? >>> >>>>>>>>>>>>>>>>>>> --emi >>> >>>>>>>>>>>>>>>>>>> >>> >>>>>>>>>>>>>>>>>> >>> >>>>>>>>>>>>>>>>>> >>> >>>>>>>>>>>>>>>> >>> >>>>>>>>>>>> ------------------------------ >>> ------------------------------ >>> >>>>>>>>> --------- >>> >>>>>>>>>>>>>>>> To unsubscribe, e-mail: >>> >>>>>>>>>>>> [email protected] >>> >>>>>>>>>>>>>>>> For additional commands, e-mail: >>> >>>>>>>> [email protected]. >>> >>>>>>>>>>>>> apache.org >>> >>>>>>>>>>>>>>>> >>> >>>>>>>>>>>>>>>> For further information about the NetBeans mailing >>> >>>>>>> lists, >>> >>>>>>>>> visit: >>> >>>>>>>>>>>>>>>> https://cwiki.apache.org/confluence/display/NETBEANS/ >>> >>>>>>>>>>> Mailing+lists >>> >>>>>>>>>>>>>>>> >>> >>>>>>>>>>>>>>>> >>> >>>>>>>>>>>>>>>> >>> >>>>>>>>>>>>>>>> >>> >>>>>>>>>>>>>>> >>> >>>>>>>>>>>>>> >>> >>>>>>>>>>>>> -- >>> >>>>>>>>>>>>> Josh Juneau >>> >>>>>>>>>>>>> [email protected] >>> >>>>>>>>>>>>> http://jj-blogger.blogspot.com >>> >>>>>>>>>>>>> https://www.apress.com/index.p >>> hp/author/author/view/id/1866 >>> >>>>>>>>>>>>> >>> >>>>>>>>>>>> >>> >>>>>>>>>>> >>> >>>>>>>>>> >>> >>>>>>>>> >>> >>>>>>>> >>> >>>>>>> >>> >>>>>> >>> >>>>>> >>> >>>>> >>> >>> >>> >>> >>> >> >>> >>> >
