You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by da...@apache.org on 2012/10/23 21:54:52 UTC
[3/5] git commit: Changes to notice files and quickstart archetype
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/20ea26f8
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/20ea26f8
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/20ea26f8
Branch: refs/heads/build/wicket-6.2.0
Commit: 20ea26f88df58d2dad4634f707baf9347b63c93b
Parents: 2785c10
Author: Martijn Dashorst <da...@apache.org>
Authored: Fri Oct 19 21:14:30 2012 +0200
Committer: Martijn Dashorst <da...@apache.org>
Committed: Fri Oct 19 21:14:30 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/20ea26f8/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
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/20ea26f8/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 69ac45d..78966e6 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.2.0-SNAPSHOT</wicket.version>
+ <wicket.version>6.2.0</wicket.version>
<jetty.version>7.6.3.v20120416</jetty.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>