Repository: wicket Updated Branches: refs/heads/build/wicket-7.0.0-M2 [created] d1e690fa9
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/4a4dff21 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/4a4dff21 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/4a4dff21 Branch: refs/heads/build/wicket-7.0.0-M2 Commit: 4a4dff21a2c0faa135e4faf8bf6db742aaf02c8d Parents: 785c04a Author: Martijn Dashorst <[email protected]> Authored: Fri Jun 6 15:07:43 2014 +0200 Committer: Martijn Dashorst <[email protected]> Committed: Fri Jun 6 15:07:43 2014 +0200 ---------------------------------------------------------------------- NOTICE | 109 ++++++++++--------- .../main/resources/archetype-resources/pom.xml | 2 +- 2 files changed, 60 insertions(+), 51 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/4a4dff21/NOTICE ---------------------------------------------------------------------- diff --git a/NOTICE b/NOTICE index 61a0b9b..e0601a7 100644 --- a/NOTICE +++ b/NOTICE @@ -1,5 +1,5 @@ Apache Wicket -Copyright 2006-2012 The Apache Software Foundation +Copyright 2006-2014 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). @@ -11,22 +11,64 @@ NB: DO NOT ADD LICENSES/NOTICES/ATTRIBUTIONS TO THIS FILE, BUT IN THE NOTICE FILE OF THE CORRESPONDING PROJECT. THE RELEASE PROCEDURE WILL 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 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/). @@ -65,55 +107,22 @@ src/./wicket-examples This product includes jhighlight (https://jhighlight.dev.java.net/) which is released under CDDL 1.0 license (http://www.opensource.org/licenses/cddl1.php). ---------------------------------------------------------------------------- -src/./wicket-core ---------------------------------------------------------------------------- - 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: + Contains jquery.js javascript library released under a MIT style license. + jQuery Foundation, Inc, http://jquery.org/license - 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/ + Contains qunit.js javascript library released under a MIT style license. + jQuery Foundation, Inc, http://jquery.org/license + Contains qunit.css released under a MIT style license. + jQuery Foundation, Inc, http://jquery.org/license --------------------------------------------------------------------------- -src/./wicket-datetime +src/./wicket-guice --------------------------------------------------------------------------- - Apache Wicket Date Time - Copyright 2006-2012 Apache Software Foundation + Apache Wicket + 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/4a4dff21/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 ea69f64..9ceae0d 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>7.0.0-SNAPSHOT</wicket.version> + <wicket.version>7.0.0-M2</wicket.version> <jetty9.version>9.2.0.v20140526</jetty9.version> <log4j.version>1.2.17</log4j.version> <slf4j.version>1.7.7</slf4j.version>
