good work, thanks -Simo http://people.apache.org/~simonetripodi/ http://simonetripodi.livejournal.com/ http://twitter.com/simonetripodi http://www.99soft.org/
On Sat, Dec 10, 2011 at 11:34 AM, sebb <seb...@gmail.com> wrote: > On 10 December 2011 10:02, sebb <seb...@gmail.com> wrote: >> On 10 December 2011 07:17, Simone Tripodi <simonetrip...@apache.org> wrote: >>> nice approach, thanks! >>> I just wonder if we can move txt files on the root instead that >>> putting in assembly related stuff dir - at the end of the day, names >>> don't collide... >> >> Might be confusing to the end-user. > > I added them to assembly because that seemed the correct place to > "assemble" them from. > They are also needed by the bin.xml assembly file. > >>> Ready to cut a new RC, thanks again, >> >> Please hang back - just realised that the binary archive needs to have >> the updated license too. >> >> WIll fix shortly > > Done: > > URL: http://svn.apache.org/viewvc?rev=1212760&view=rev > Log: > Include the N&L files for the shaded dependencies > > Modified: > commons/proper/digester/trunk/src/main/assembly/bin.xml > > >>> Simo >>> >>> http://people.apache.org/~simonetripodi/ >>> http://simonetripodi.livejournal.com/ >>> http://twitter.com/simonetripodi >>> http://www.99soft.org/ >>> >>> >>> >>> On Fri, Dec 9, 2011 at 10:30 PM, sebb <seb...@gmail.com> wrote: >>>> On 9 December 2011 20:17, Simone Tripodi <simonetrip...@apache.org> wrote: >>>>> OK, fine and thanks >>>> >>>> It was a bit trickier than I thought, but I think it's working now. >>>> >>>> In the end did not need to create a sub-module for the packaging - >>>> just had to find out how to override the default N&L files. >>>> >>>>> -Simo >>>>> >>>>> http://people.apache.org/~simonetripodi/ >>>>> http://simonetripodi.livejournal.com/ >>>>> http://twitter.com/simonetripodi >>>>> http://www.99soft.org/ >>>>> >>>>> >>>>> >>>>> On Fri, Dec 9, 2011 at 9:03 PM, sebb <seb...@gmail.com> wrote: >>>>>> On 9 December 2011 19:25, Simone Tripodi <simonetrip...@apache.org> >>>>>> wrote: >>>>>>>> >>>>>>>> By inclusion, I meant source or binary. >>>>>>>> But in both cases the license must be included in LICENSE file. >>>>>>>> >>>>>>>> http://www.apache.org/dev/release.html#distributing-code-under-several-licenses >>>>>>>> >>>>>>> >>>>>>> thanks, that is useful not just for that release >>>>>>> >>>>>>>> >>>>>>>> It's up to you, but it looks easy enough to change the jarjar >>>>>>>> parameters to include the appropriate N&L files. >>>>>>>> >>>>>>> >>>>>>> for what I can see, right Digester L&N txt files are already included. >>>>>>> Since all license information should be contained in the LICENSE file, >>>>>>> that is what I intend to follow. No extra L&N files. >>>>>> >>>>>> As already mentioned, there need to be two sets of N&L files; one for >>>>>> the main artifacts, and the other for the uberjar. >>>>>> >>>>>> Only the uberjar *includes* the extra code, so only it should have the >>>>>> extra entries in the N&L files. >>>>>> >>>>>>>>>> I mean, after the AL license, one can put: >>>>>>>>>> >>>>>>>>>> APACHE COMMONS DIGESTER SUBCOMPONENTS: >>>>>>>>>> >>>>>>>>>> The Apache Commons Digester with-deps jar ncludes a number of >>>>>>>>>> subcomponents with >>>>>>>>>> separate copyright notices and license terms. Your use of the source >>>>>>>>>> code for the these subcomponents is subject to the terms and >>>>>>>>>> conditions of the following licenses. >>>>>>>>>> >>>>>>>>>> For the CGLIB component (http://cglib.sourceforge.net/) >>>>>>>>>> This is licensed under the AL 2.0, see above >>>>>>>>>> >>>>>>>>>> For the ASM component (http://asm.ow2.org/): >>>>>>>>>> [include the license here] >>>>>>>>>> >>>>>>>>>> See for example: >>>>>>>>>> >>>>>>>>>> http://svn.apache.org/repos/asf/httpd/httpd/trunk/LICENSE >>>>>>> >>>>>>> committed, can you please review - also produced artifacts - before I >>>>>>> cut a new RC? >>>>>> >>>>>> As described above, the N&L files for the uberjar need to be different. >>>>>> >>>>>> If you like, I can modify the pom and files accordingly, and you can >>>>>> review to check I've not broken the build? >>>>>> >>>>>>> TIA, >>>>>>> -Simo >>>>>>> >>>>>>> http://people.apache.org/~simonetripodi/ >>>>>>> http://simonetripodi.livejournal.com/ >>>>>>> http://twitter.com/simonetripodi >>>>>>> http://www.99soft.org/ >>>>>>> >>>>>>> --------------------------------------------------------------------- >>>>>>> To unsubscribe, e-mail: dev-unsubscr...@commons.apache.org >>>>>>> For additional commands, e-mail: dev-h...@commons.apache.org >>>>>>> >>>>>> >>>>>> --------------------------------------------------------------------- >>>>>> To unsubscribe, e-mail: dev-unsubscr...@commons.apache.org >>>>>> For additional commands, e-mail: dev-h...@commons.apache.org >>>>>> >>>>> >>>>> --------------------------------------------------------------------- >>>>> To unsubscribe, e-mail: dev-unsubscr...@commons.apache.org >>>>> For additional commands, e-mail: dev-h...@commons.apache.org >>>>> >>>> >>>> --------------------------------------------------------------------- >>>> To unsubscribe, e-mail: dev-unsubscr...@commons.apache.org >>>> For additional commands, e-mail: dev-h...@commons.apache.org >>>> >>> >>> --------------------------------------------------------------------- >>> To unsubscribe, e-mail: dev-unsubscr...@commons.apache.org >>> For additional commands, e-mail: dev-h...@commons.apache.org >>> > > --------------------------------------------------------------------- > To unsubscribe, e-mail: dev-unsubscr...@commons.apache.org > For additional commands, e-mail: dev-h...@commons.apache.org > --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@commons.apache.org For additional commands, e-mail: dev-h...@commons.apache.org
