Author: dashorst
Date: Tue May 10 15:55:00 2011
New Revision: 1101518
URL: http://svn.apache.org/viewvc?rev=1101518&view=rev
Log:
WICKET-3697 clean up of NOTICE files and removal of obsolete license file
(concurrent stuff)
Removed:
wicket/trunk/licenses/sun-u.c.license.pdf
wicket/trunk/wicket-auth-roles/src/main/resources/META-INF/
wicket/trunk/wicket-extensions/src/main/resources/META-INF/
wicket/trunk/wicket-ioc/src/main/resources/META-INF/
wicket/trunk/wicket-jmx/src/main/resources/META-INF/
wicket/trunk/wicket-objectssizeof-agent/src/main/resources/META-INF/NOTICE
wicket/trunk/wicket-spring/src/main/resources/META-INF/
Modified:
wicket/trunk/pom.xml
wicket/trunk/release.sh
wicket/trunk/wicket-core/src/main/resources/META-INF/NOTICE
wicket/trunk/wicket-datetime/src/main/resources/META-INF/NOTICE
wicket/trunk/wicket-guice/src/main/resources/META-INF/NOTICE
Modified: wicket/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/wicket/trunk/pom.xml?rev=1101518&r1=1101517&r2=1101518&view=diff
==============================================================================
--- wicket/trunk/pom.xml (original)
+++ wicket/trunk/pom.xml Tue May 10 15:55:00 2011
@@ -204,7 +204,7 @@
</profile>
</profiles>
<url>http://wicket.apache.org/${project.artifactId}</url>
- <inceptionYear>2004</inceptionYear>
+ <inceptionYear>2006</inceptionYear>
<organization>
<name>Apache Software Foundation</name>
<url>http://apache.org</url>
Modified: wicket/trunk/release.sh
URL:
http://svn.apache.org/viewvc/wicket/trunk/release.sh?rev=1101518&r1=1101517&r2=1101518&view=diff
==============================================================================
--- wicket/trunk/release.sh (original)
+++ wicket/trunk/release.sh Tue May 10 15:55:00 2011
@@ -42,7 +42,7 @@ echo "Creating notice file."
NOTICE=NOTICE
> $NOTICE
echo "Apache Wicket" >> $NOTICE
-echo "Copyright 2008 The Apache Software Foundation" >> $NOTICE
+echo "Copyright 2006-$(date +%Y) The Apache Software Foundation" >> $NOTICE
echo "" >> $NOTICE
echo "This product includes software developed at" >> $NOTICE
echo "The Apache Software Foundation (http://www.apache.org/)." >> $NOTICE
Modified: wicket/trunk/wicket-core/src/main/resources/META-INF/NOTICE
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/resources/META-INF/NOTICE?rev=1101518&r1=1101517&r2=1101518&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/resources/META-INF/NOTICE (original)
+++ wicket/trunk/wicket-core/src/main/resources/META-INF/NOTICE Tue May 10
15:55:00 2011
@@ -1,45 +1,16 @@
Apache Wicket
- Copyright 2006 The 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 software from QOS.ch (http://slf4j.org) licensed
under the X11 license
- Copyright (c) 2004-2007 QOS.ch
+ 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.util.upload contains parts of Apache Jakarta Commons
FileUpload,
- released under the Apache Software License, Version 2.0.
- (c) 2001-2004
-
- org.apache.wicket.util.io.IOUtils is taken from Apache Avalon, released
- under the Apache Software License, Version 2.0.
- (c) 2001-2004
-
- org.apache.wicket.util.io.ThresholdingOutputStream is taken from
- Apache Jakarta Commons IO, released under the
- Apache Software License, Version 2.0.
- (c) 2001-2004
-
- org.apache.wicket.util.crypt contains Base64 which is taken from
- Apache Jakarta Commons Codec, released under the
- Apache Software License, Version 2.0. Base64UrlSafe
- is derived from Base64.
- (c) 2001-2005
-
- org.apache.wicket.util.concurrent is taken from [1], which states the
following:
- "All classes are released to the public domain and may be used for
- any purpose whatsoever without permission or acknowledgment.
- Portions of the CopyOnWriteArrayList and ConcurrentReaderHashMap
- classes are adapted from Sun JDK source code. These are copyright
- of Sun Microsystems, Inc, and are used with their kind permission,
- as described in this license[2]."
- [1]:
http://g.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/concurrent/intro.html
- [2]: licenses/sun-u.c.license.pdf
-
org.apache.wicket.markup.html.form.upload.MultiFileUploadField.js is taken
from [1]
and has the following notice:
"Licence:
Modified: wicket/trunk/wicket-datetime/src/main/resources/META-INF/NOTICE
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-datetime/src/main/resources/META-INF/NOTICE?rev=1101518&r1=1101517&r2=1101518&view=diff
==============================================================================
--- wicket/trunk/wicket-datetime/src/main/resources/META-INF/NOTICE (original)
+++ wicket/trunk/wicket-datetime/src/main/resources/META-INF/NOTICE Tue May 10
15:55:00 2011
@@ -1,5 +1,5 @@
Apache Wicket Date Time
- Copyright 2007 The Apache Software Foundation
+ Copyright 2006-2011 Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
Modified: wicket/trunk/wicket-guice/src/main/resources/META-INF/NOTICE
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-guice/src/main/resources/META-INF/NOTICE?rev=1101518&r1=1101517&r2=1101518&view=diff
==============================================================================
--- wicket/trunk/wicket-guice/src/main/resources/META-INF/NOTICE (original)
+++ wicket/trunk/wicket-guice/src/main/resources/META-INF/NOTICE Tue May 10
15:55:00 2011
@@ -1,5 +1,5 @@
Apache Wicket
- Copyright 2007 The Apache Software Foundation
+ Copyright 2006-2011 Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
