On Wed, Sep 26, 2012 at 4:39 PM, <dasho...@apache.org> wrote: > Changes to notice files and quickstart archetype > > > Project: http://git-wip-us.apache.org/repos/asf/wicket/repo > Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/19eb2cd0 > Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/19eb2cd0 > Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/19eb2cd0 > > Branch: refs/heads/build/wicket-6.1.0 > Commit: 19eb2cd0ad24a69ea9985be99ec9adad2fef21ee > Parents: 5f5eaff > Author: Martijn Dashorst <dasho...@apache.org> > Authored: Wed Sep 26 14:36:44 2012 +0200 > Committer: Martijn Dashorst <dasho...@apache.org> > Committed: Wed Sep 26 14:36:44 2012 +0200 > > ---------------------------------------------------------------------- > NOTICE | 100 +++++++------- > .../src/main/resources/archetype-resources/pom.xml | 2 +- > 2 files changed, 51 insertions(+), 51 deletions(-) > ---------------------------------------------------------------------- > > > http://git-wip-us.apache.org/repos/asf/wicket/blob/19eb2cd0/NOTICE > ---------------------------------------------------------------------- > diff --git a/NOTICE b/NOTICE > index 61a0b9b..37c715e 100644 > --- a/NOTICE > +++ b/NOTICE > @@ -12,21 +12,62 @@ NB: DO NOT ADD LICENSES/NOTICES/ATTRIBUTIONS TO THIS > FILE, BUT IN THE > AUTOMATICALLY INCLUDE THE NOTICE IN THIS FILE. > > --------------------------------------------------------------------------- > -src/./wicket-guice > +src/./wicket-core > --------------------------------------------------------------------------- > Apache Wicket > - Copyright 2006-2012 Apache Software Foundation > + Copyright 2006-2011 Apache Software Foundation >
It should be 2012, no ? > This product includes software developed at > The Apache Software Foundation (http://www.apache.org/). > > - This product includes Guice, developed at Google, and licensed > - under the Apache License 2.0. (http://code.google.com/p/google-guice/). > + This product includes software from QOS.ch (http://slf4j.org) licensed > under the X11 license > + Copyright (c) 2004-2008 QOS.ch > + > + Contains Diff library from Mavens JRCS, released under > + The Apache Software License, Version 1.1. > + (c) 1999-2003 > + > + org.apache.wicket.markup.html.form.upload.MultiFileUploadField.js is > taken from [1] > + and has the following notice: > + "Licence: > + Use this however/wherever you like, just don't blame me if it breaks > + anything. > + > + Credit: > + If you're nice, you'll leave this bit: > + > + Class by Stickman -- http://www.the-stickman.com > + with thanks to: > + [for Safari fixes] > + Luis Torrefranca -- http://www.law.pitt.edu > + and > + Shawn Parker & John Pennypacker -- http://www.fuzzycoconut.com > + [for duplicate name bug] > + 'neal'" > + [1]: > http://the-stickman.com/web-development/javascript/upload-multiple-files-with-a-single-file-element/ > + > +--------------------------------------------------------------------------- > +src/./wicket-datetime > +--------------------------------------------------------------------------- > + Apache Wicket Date Time > + Copyright 2006-2011 Apache Software Foundation > + > + This product includes software developed at > + The Apache Software Foundation (http://www.apache.org/). > + > + Contains code of the Yahoo User Interface library (version: 2.8.2r1), > + released under the BSD License: > + http://developer.yahoo.net/yui/license.txt > + Copyright (c) 2010, Yahoo! Inc. > + > + This product includes software developed by > + Joda.org (http://www.joda.org/). > + > --------------------------------------------------------------------------- > src/./wicket-examples > --------------------------------------------------------------------------- > Apache Wicket Examples > - Copyright 2006-2012 Apache Software Foundation > + Copyright 2006-2011 Apache Software Foundation > > This product includes software developed at > The Apache Software Foundation (http://www.apache.org/). > @@ -66,54 +107,13 @@ src/./wicket-examples > which is released under CDDL 1.0 license > (http://www.opensource.org/licenses/cddl1.php). > > --------------------------------------------------------------------------- > -src/./wicket-core > +src/./wicket-guice > --------------------------------------------------------------------------- > Apache Wicket > - Copyright 2006-2012 Apache Software Foundation > - > - This product includes software developed at > - The Apache Software Foundation (http://www.apache.org/). > - > - This product includes software from QOS.ch (http://slf4j.org) licensed > under the X11 license > - Copyright (c) 2004-2008 QOS.ch > - > - Contains Diff library from Mavens JRCS, released under > - The Apache Software License, Version 1.1. > - (c) 1999-2003 > - > - org.apache.wicket.markup.html.form.upload.MultiFileUploadField.js is > taken from [1] > - and has the following notice: > - "Licence: > - Use this however/wherever you like, just don't blame me if it breaks > - anything. > - > - Credit: > - If you're nice, you'll leave this bit: > - > - Class by Stickman -- http://www.the-stickman.com > - with thanks to: > - [for Safari fixes] > - Luis Torrefranca -- http://www.law.pitt.edu > - and > - Shawn Parker & John Pennypacker -- http://www.fuzzycoconut.com > - [for duplicate name bug] > - 'neal'" > - [1]: > http://the-stickman.com/web-development/javascript/upload-multiple-files-with-a-single-file-element/ > - > ---------------------------------------------------------------------------- > -src/./wicket-datetime > ---------------------------------------------------------------------------- > - Apache Wicket Date Time > - Copyright 2006-2012 Apache Software Foundation > + Copyright 2006-2011 Apache Software Foundation > > This product includes software developed at > The Apache Software Foundation (http://www.apache.org/). > - > - Contains code of the Yahoo User Interface library (version: 2.8.2r1), > - released under the BSD License: > - http://developer.yahoo.net/yui/license.txt > - Copyright (c) 2010, Yahoo! Inc. > > - This product includes software developed by > - Joda.org (http://www.joda.org/). > - > + This product includes Guice, developed at Google, and licensed > + under the Apache License 2.0. (http://code.google.com/p/google-guice/). > > http://git-wip-us.apache.org/repos/asf/wicket/blob/19eb2cd0/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml > ---------------------------------------------------------------------- > diff --git > a/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml > b/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml > index e26d2a3..14d54db 100644 > --- a/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml > +++ b/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml > @@ -42,7 +42,7 @@ > </license> > </licenses> > <properties> > - <wicket.version>6.1.0-SNAPSHOT</wicket.version> > + <wicket.version>6.1.0</wicket.version> > <jetty.version>7.6.3.v20120416</jetty.version> > > <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> > </properties> > -- Martin Grigorov jWeekend Training, Consulting, Development http://jWeekend.com
