Changes to notice files
diff --git a/NOTICE b/NOTICE
index c2b4544..69772a5 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
Apache Wicket
-Copyright 2006-2016 The Apache Software Foundation
+Copyright 2006-2017 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
@@ -12,21 +12,39 @@
AUTOMATICALLY INCLUDE THE NOTICE IN THIS FILE.
---------------------------------------------------------------------------
-src/./wicket-guice
+src/./wicket-datetime
---------------------------------------------------------------------------
- Apache Wicket
- Copyright 2006-2012 Apache Software Foundation
+ Apache Wicket Date Time
+ Copyright 2006-2016 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 Guice, developed at Google, and licensed
- under the Apache License 2.0. (http://code.google.com/p/google-guice/).
+ This product includes software developed by
+ Joda.org (http://www.joda.org/).
+
+---------------------------------------------------------------------------
+src/./wicket-experimental/wicket-metrics
+---------------------------------------------------------------------------
+ Apache Wicket Metrics
+ Copyright 2006-2016 Apache Software Foundation
+
+ This product includes software developed at
+ The Apache Software Foundation (http://www.apache.org/).
+
+ This product uses AspectJ, developed at Eclipse, and licensed
+ under the Eclipse Public License. (https://eclipse.org/aspectj/).
+
---------------------------------------------------------------------------
src/./wicket-examples
---------------------------------------------------------------------------
Apache Wicket Examples
- Copyright 2006-2012 Apache Software Foundation
+ Copyright 2006-2016 Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
@@ -65,11 +83,30 @@
This product includes jhighlight (https://jhighlight.dev.java.net/)
which is released under CDDL 1.0 license (http://www.opensource.org/licenses/cddl1.php).
+ Contains jquery.js javascript library released under a MIT style license.
+ jQuery Foundation, Inc, http://jquery.org/license
+
+ 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-guice
+---------------------------------------------------------------------------
+ Apache Wicket
+ Copyright 2006-2016 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/).
---------------------------------------------------------------------------
src/./wicket-core
---------------------------------------------------------------------------
Apache Wicket
- Copyright 2006-2012 Apache Software Foundation
+ Copyright 2006-2016 Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
@@ -100,32 +137,3 @@
'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
-
- 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-metrics
----------------------------------------------------------------------------
-
- Apache Wicket Metrics
- Copyright 2006-2016 Apache Software Foundation
-
- This product includes software developed at
- The Apache Software Foundation (http://www.apache.org/).
-
- This product uses AspectJ, developed at Eclipse, and licensed
- under the Eclipse Public License. (https://eclipse.org/aspectj/).
\ No newline at end of file