harmony-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Tim Ellison <t.p.elli...@gmail.com>
Subject Re: [java6] Approval for patch to LICENSE
Date Thu, 17 Dec 2009 09:17:35 GMT
On 17/Dec/2009 08:58, Mark Hindess wrote:
> -1.  This change wasn't missed from a merge as a merge
> hasn't happened.  Applying this patch wont fix the other
> missing changes and it wont update mergeinfo property.  The
> correct fix is to merge /repos/asf/harmony/enhanced/trunk to
> /repos/asf/harmony/enhanced/branches/java6.  I'd like permission to do
> this instead?  Any committers approve please?

That would bring in lots of changes that have been added since the 5.0
stream was unfrozen, so I don't think this is a good idea.

I don't see a problem with applying a targeted patch to 6.0 (rather than
doing the merge) to bring specific things like this up to date. A later
merge will auto-merge the file anyway.

However, it sounds like you are disputing Nathan's claim that we
actually use BouncyCastle 1.44 in Java 6.  I need to check.

Regards,
Tim


> In message <3b3f27c60912162057g3ddc6d35xf04ac293cb26e95d@mail.gmail.com>,
> Nathan Beyer writes:
>> Can I get approval to apply the following patch to the LICENSE file in
>> the java6 branch? This is just a merge from trunk that was missed -
>> the java6 branch depends on BouncyCastle 1.44.
>>
>> Index: LICENSE
>> ===================================================================
>> --- LICENSE     (revision 891528)
>> +++ LICENSE     (working copy)
>> @@ -372,10 +372,10 @@
>>
>>
>>
>> -License Notice for Bouncy Castle version 1.41
>> +License Notice for Bouncy Castle version 1.44
>>  =============================================
>>
>> -Copyright (c) 2000 - 2008 The Legion Of The Bouncy Castle
>> (http://www.bouncycastle.org)
>> +Copyright (c) 2000 - 2009 The Legion Of The Bouncy Castle
>> (http://www.bouncycastle.org)
>>
>>  Permission is hereby granted, free of charge, to any person obtaining a copy
>>  of
>>  this software and associated documentation files (the "Software"), to deal i
>> n
>>
> 
> 
> 

Mime
View raw message