Le 22/12/2014 21:42, l...@apache.org a écrit : > Repository: commons-math > Updated Branches: > refs/heads/master 649e19b0f -> c4bd6c6a0 > > > Simplifying again repartition between LICENSE and NOTICE files. > > Project: http://git-wip-us.apache.org/repos/asf/commons-math/repo > Commit: http://git-wip-us.apache.org/repos/asf/commons-math/commit/06bfe8c0 > Tree: http://git-wip-us.apache.org/repos/asf/commons-math/tree/06bfe8c0 > Diff: http://git-wip-us.apache.org/repos/asf/commons-math/diff/06bfe8c0 > > Branch: refs/heads/master > Commit: 06bfe8c019e0d90e52bae608f45e4f288bbdbe75 > Parents: 649e19b > Author: Luc Maisonobe <l...@apache.org> > Authored: Mon Dec 22 21:34:11 2014 +0100 > Committer: Luc Maisonobe <l...@apache.org> > Committed: Mon Dec 22 21:35:43 2014 +0100 > > ---------------------------------------------------------------------- > LICENSE.txt | 35 ++++++++++++++++++++++------------- > NOTICE.txt | 12 ------------ > 2 files changed, 22 insertions(+), 25 deletions(-) > ----------------------------------------------------------------------
I have also improved the email template for the vote. Is it OK now, can I try another RC? best regards, Luc > > > http://git-wip-us.apache.org/repos/asf/commons-math/blob/06bfe8c0/LICENSE.txt > ---------------------------------------------------------------------- > diff --git a/LICENSE.txt b/LICENSE.txt > index 13c1d36..d97b49a 100644 > --- a/LICENSE.txt > +++ b/LICENSE.txt > @@ -1,4 +1,3 @@ > - > Apache License > Version 2.0, January 2004 > http://www.apache.org/licenses/ > @@ -202,6 +201,28 @@ > limitations under the License. > > > +Apache Commons Math includes the following code provided to the ASF under the > +Apache License 2.0: > + > + - The inverse error function implementation in the Erf class is based on > CUDA > + code developed by Mike Giles, Oxford-Man Institute of Quantitative > Finance, > + and published in GPU Computing Gems, volume 2, 2010 (grant received on > + March 23th 2013) > + - The LinearConstraint, LinearObjectiveFunction, LinearOptimizer, > + RelationShip, SimplexSolver and SimplexTableau classes in package > + org.apache.commons.math3.optimization.linear include software developed by > + Benjamin McCann (http://www.benmccann.com) and distributed with > + the following copyright: Copyright 2009 Google Inc. (grant received on > + March 16th 2009) > + - The class "org.apache.commons.math3.exception.util.LocalizedFormatsTest" > which > + is an adapted version of "OrekitMessagesTest" test class for the Orekit > library > + - The "org.apache.commons.math3.analysis.interpolation.HermiteInterpolator" > + has been imported from the Orekit space flight dynamics library. > + > +=============================================================================== > + > + > + > APACHE COMMONS MATH DERIVATIVE WORKS: > > The Apache commons-math library includes a number of subcomponents > @@ -335,18 +356,6 @@ org.apache.commons.math3.random: > > > =============================================================================== > > -The class "org.apache.commons.math3.exception.util.LocalizedFormatsTest" is > -an adapted version of "OrekitMessagesTest" test class for the Orekit library > -The "org.apache.commons.math3.analysis.interpolation.HermiteInterpolator" > -has been imported from the Orekit space flight dynamics library. > - > -The Orekit library is described at: > - https://www.orekit.org/forge/projects/orekit > -The original files are distributed under the terms of the Apache 2 license > -which is: Copyright 2010 CS Communication & Systèmes > - > -=============================================================================== > - > The initial code for shuffling an array (originally in class > "org.apache.commons.math3.random.RandomDataGenerator", now replaced by > a method in class "org.apache.commons.math3.util.MathArrays") was > > http://git-wip-us.apache.org/repos/asf/commons-math/blob/06bfe8c0/NOTICE.txt > ---------------------------------------------------------------------- > diff --git a/NOTICE.txt b/NOTICE.txt > index 9b28a60..5af56c4 100644 > --- a/NOTICE.txt > +++ b/NOTICE.txt > @@ -6,18 +6,6 @@ The Apache Software Foundation (http://www.apache.org/). > > > =============================================================================== > > -The inverse error function implementation in the Erf class is based on CUDA > -code developed by Mike Giles, Oxford-Man Institute of Quantitative Finance, > -and published in GPU Computing Gems, volume 2, 2010. > -=============================================================================== > - > -The LinearConstraint, LinearObjectiveFunction, LinearOptimizer, > -RelationShip, SimplexSolver and SimplexTableau classes in package > -org.apache.commons.math3.optimization.linear include software developed by > -Benjamin McCann (http://www.benmccann.com) and distributed with > -the following copyright: Copyright 2009 Google Inc. > -=============================================================================== > - > This product includes software developed for Orekit by > CS Systèmes d'Information (http://www.c-s.fr/) > Copyright 2010-2012 CS Systèmes d'Information > >
