Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

WICKET-3697 clean up of NOTICE files and removal of obsolete license …

…file (concurrent stuff)

git-svn-id: https://svn.apache.org/repos/asf/wicket/trunk@1101518 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information...
commit 6655df06cea744aec5ef0fa2b557df9538244e88 1 parent 211a3b5
Martijn Dashorst authored
BIN  licenses/sun-u.c.license.pdf
Binary file not shown
2  pom.xml
@@ -204,7 +204,7 @@
204 204
 		</profile>
205 205
 	</profiles>
206 206
 	<url>http://wicket.apache.org/${project.artifactId}</url>
207  
-	<inceptionYear>2004</inceptionYear>
  207
+	<inceptionYear>2006</inceptionYear>
208 208
 	<organization>
209 209
 		<name>Apache Software Foundation</name>
210 210
 		<url>http://apache.org</url>
2  release.sh
@@ -42,7 +42,7 @@ echo "Creating notice file."
42 42
 NOTICE=NOTICE
43 43
 > $NOTICE 
44 44
 echo "Apache Wicket" >> $NOTICE
45  
-echo "Copyright 2008 The Apache Software Foundation" >> $NOTICE
  45
+echo "Copyright 2006-$(date +%Y) The Apache Software Foundation" >> $NOTICE
46 46
 echo "" >> $NOTICE
47 47
 echo "This product includes software developed at" >> $NOTICE
48 48
 echo "The Apache Software Foundation (http://www.apache.org/)." >> $NOTICE
5  wicket-auth-roles/src/main/resources/META-INF/NOTICE
... ...
@@ -1,5 +0,0 @@
1  
-   Apache Wicket Auth Roles
2  
-   Copyright 2007 The Apache Software Foundation
3  
-
4  
-   This product includes software developed at
5  
-   The Apache Software Foundation (http://www.apache.org/).
33  wicket-core/src/main/resources/META-INF/NOTICE
... ...
@@ -1,45 +1,16 @@
1 1
    Apache Wicket
2  
-   Copyright 2006 The Apache Software Foundation
  2
+   Copyright 2006-2011 Apache Software Foundation
3 3
 
4 4
    This product includes software developed at
5 5
    The Apache Software Foundation (http://www.apache.org/).
6 6
 
7 7
    This product includes software from QOS.ch (http://slf4j.org) licensed under the X11 license
8  
-   Copyright (c) 2004-2007 QOS.ch
  8
+   Copyright (c) 2004-2008 QOS.ch
9 9
    
10 10
    Contains Diff library from Mavens JRCS, released under
11 11
    The Apache Software License, Version 1.1.
12 12
    (c) 1999-2003
13 13
 
14  
-   org.apache.wicket.util.upload contains parts of Apache Jakarta Commons FileUpload,
15  
-   released under the Apache Software License, Version 2.0. 
16  
-   (c) 2001-2004
17  
-
18  
-   org.apache.wicket.util.io.IOUtils is taken from Apache Avalon, released
19  
-   under the Apache Software License, Version 2.0.
20  
-   (c) 2001-2004
21  
-
22  
-   org.apache.wicket.util.io.ThresholdingOutputStream is taken from
23  
-   Apache Jakarta Commons IO, released under the
24  
-   Apache Software License, Version 2.0.
25  
-   (c) 2001-2004
26  
-
27  
-   org.apache.wicket.util.crypt contains Base64 which is taken from
28  
-   Apache Jakarta Commons Codec, released under the
29  
-   Apache Software License, Version 2.0. Base64UrlSafe
30  
-   is derived from Base64.
31  
-   (c) 2001-2005
32  
-
33  
-   org.apache.wicket.util.concurrent is taken from [1], which states the following:
34  
-     "All classes are released to the public domain and may be used for 
35  
-      any purpose whatsoever without permission or acknowledgment. 
36  
-      Portions of the CopyOnWriteArrayList and ConcurrentReaderHashMap 
37  
-      classes are adapted from Sun JDK source code. These are copyright 
38  
-      of Sun Microsystems, Inc, and are used with their kind permission,  
39  
-      as described in this license[2]."
40  
-   [1]: http://g.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/concurrent/intro.html
41  
-   [2]: licenses/sun-u.c.license.pdf
42  
-
43 14
    org.apache.wicket.markup.html.form.upload.MultiFileUploadField.js is taken from [1]
44 15
    and has the following notice:
45 16
       "Licence:
2  wicket-datetime/src/main/resources/META-INF/NOTICE
... ...
@@ -1,5 +1,5 @@
1 1
    Apache Wicket Date Time
2  
-   Copyright 2007 The Apache Software Foundation
  2
+   Copyright 2006-2011 Apache Software Foundation
3 3
 
4 4
    This product includes software developed at
5 5
    The Apache Software Foundation (http://www.apache.org/).
9  wicket-extensions/src/main/resources/META-INF/NOTICE
... ...
@@ -1,9 +0,0 @@
1  
-   Apache Wicket Extensions
2  
-   Copyright 2007 The Apache Software Foundation
3  
-
4  
-   This product includes software developed at
5  
-   The Apache Software Foundation (http://www.apache.org/).
6  
-
7  
-   Contains software developed in Apache Turbine, released
8  
-   under the Apache Software License, Version 2.0. 
9  
-   (c) 2001-2005
2  wicket-guice/src/main/resources/META-INF/NOTICE
... ...
@@ -1,5 +1,5 @@
1 1
    Apache Wicket
2  
-   Copyright 2007 The Apache Software Foundation
  2
+   Copyright 2006-2011 Apache Software Foundation
3 3
 
4 4
    This product includes software developed at
5 5
    The Apache Software Foundation (http://www.apache.org/).
5  wicket-ioc/src/main/resources/META-INF/NOTICE
... ...
@@ -1,5 +0,0 @@
1  
-   Apache Wicket
2  
-   Copyright 2007 The Apache Software Foundation
3  
-
4  
-   This product includes software developed at
5  
-   The Apache Software Foundation (http://www.apache.org/).
5  wicket-jmx/src/main/resources/META-INF/NOTICE
... ...
@@ -1,5 +0,0 @@
1  
-   Apache Wicket
2  
-   Copyright 2007 The Apache Software Foundation
3  
-
4  
-   This product includes software developed at
5  
-   The Apache Software Foundation (http://www.apache.org/).
6  wicket-objectssizeof-agent/src/main/resources/META-INF/NOTICE
... ...
@@ -1,6 +0,0 @@
1  
-   Apache Wicket
2  
-   Copyright 2007 The Apache Software Foundation
3  
-
4  
-   This product includes software developed at
5  
-   The Apache Software Foundation (http://www.apache.org/).
6  
-
5  wicket-spring/src/main/resources/META-INF/NOTICE
... ...
@@ -1,5 +0,0 @@
1  
-   Apache Wicket
2  
-   Copyright 2007 The Apache Software Foundation
3  
-
4  
-   This product includes software developed at
5  
-   The Apache Software Foundation (http://www.apache.org/).

0 notes on commit 6655df0

Please sign in to comment.
Something went wrong with that request. Please try again.