Author: jrthomerson
Date: Wed May 19 07:01:03 2010
New Revision: 946055
URL: http://svn.apache.org/viewvc?rev=946055&view=rev
Log:
NOTICE file from 1.4.9 release and updated release.sh
Modified:
wicket/branches/wicket-1.4.x/NOTICE
wicket/branches/wicket-1.4.x/release.sh
Modified: wicket/branches/wicket-1.4.x/NOTICE
URL:
http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/NOTICE?rev=946055&r1=946054&r2=946055&view=diff
==============================================================================
--- wicket/branches/wicket-1.4.x/NOTICE (original)
+++ wicket/branches/wicket-1.4.x/NOTICE Wed May 19 07:01:03 2010
@@ -12,73 +12,47 @@ NB: DO NOT ADD LICENSES/NOTICES/ATTRIBUT
AUTOMATICALLY INCLUDE THE NOTICE IN THIS FILE.
---------------------------------------------------------------------------
-src/./wicket
+src/./wicket-jmx
---------------------------------------------------------------------------
Apache Wicket
- Copyright 2006 The Apache Software Foundation
+ Copyright 2007 The 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
-
- 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
+---------------------------------------------------------------------------
+src/./wicket-guice
+---------------------------------------------------------------------------
+ Apache Wicket
+ Copyright 2007 The Apache Software Foundation
- 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
+ This product includes software developed at
+ The Apache Software Foundation (http://www.apache.org/).
- 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
+ This product includes Guice, developed at Google, and licensed
+ under the Apache License 2.0. (http://code.google.com/p/google-guice/).
+---------------------------------------------------------------------------
+src/./wicket-spring
+---------------------------------------------------------------------------
+ Apache Wicket
+ Copyright 2007 The Apache Software Foundation
- 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.
+ This product includes software developed at
+ The Apache Software Foundation (http://www.apache.org/).
- Credit:
- If you're nice, you'll leave this bit:
+---------------------------------------------------------------------------
+src/./wicket-quickstart/NOTICE
+---------------------------------------------------------------------------
+ Apache Wicket
+ Copyright 2007 The Apache Software Foundation
- 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/
+ This product includes software developed at
+ The Apache Software Foundation (http://www.apache.org/).
---------------------------------------------------------------------------
-src/./wicket-auth-roles
+src/./wicket-ioc
---------------------------------------------------------------------------
- Apache Wicket Auth Roles
+ Apache Wicket
Copyright 2007 The Apache Software Foundation
This product includes software developed at
@@ -158,7 +132,7 @@ src/./wicket-extensions
(c) 2001-2005
---------------------------------------------------------------------------
-src/./wicket-guice
+src/./wicket-objectssizeof-agent
---------------------------------------------------------------------------
Apache Wicket
Copyright 2007 The Apache Software Foundation
@@ -166,49 +140,75 @@ src/./wicket-guice
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-ioc
+src/./wicket
---------------------------------------------------------------------------
Apache Wicket
- Copyright 2007 The Apache Software Foundation
+ Copyright 2006 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
----------------------------------------------------------------------------
-src/./wicket-jmx
----------------------------------------------------------------------------
- Apache Wicket
- Copyright 2007 The Apache Software Foundation
+ This product includes software from QOS.ch (http://slf4j.org) licensed
under the X11 license
+ Copyright (c) 2004-2007 QOS.ch
+
+ Contains Diff library from Mavens JRCS, released under
+ The Apache Software License, Version 1.1.
+ (c) 1999-2003
- This product includes software developed at
- The Apache Software Foundation (http://www.apache.org/).
+ org.apache.wicket.util.upload contains parts of Apache Jakarta Commons
FileUpload,
+ released under the Apache Software License, Version 2.0.
+ (c) 2001-2004
----------------------------------------------------------------------------
-src/./wicket-objectssizeof-agent
----------------------------------------------------------------------------
- Apache Wicket
- Copyright 2007 The Apache Software Foundation
+ org.apache.wicket.util.io.IOUtils is taken from Apache Avalon, released
+ under the Apache Software License, Version 2.0.
+ (c) 2001-2004
- This product includes software developed at
- The Apache Software Foundation (http://www.apache.org/).
+ 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
----------------------------------------------------------------------------
-src/./wicket-quickstart/NOTICE
----------------------------------------------------------------------------
- Apache Wicket
- Copyright 2007 The Apache Software Foundation
+ 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
- This product includes software developed at
- The Apache Software Foundation (http://www.apache.org/).
+ 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-spring
+src/./wicket-auth-roles
---------------------------------------------------------------------------
- Apache Wicket
+ Apache Wicket Auth Roles
Copyright 2007 The Apache Software Foundation
This product includes software developed at
Modified: wicket/branches/wicket-1.4.x/release.sh
URL:
http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/release.sh?rev=946055&r1=946054&r2=946055&view=diff
==============================================================================
--- wicket/branches/wicket-1.4.x/release.sh (original)
+++ wicket/branches/wicket-1.4.x/release.sh Wed May 19 07:01:03 2010
@@ -62,14 +62,14 @@ mvn5 clean -Pall
# package and assemble the release
echo "Package and assemble the release"
-mvn5 -ff -Dgpg.passphrase='$passphrase' -Prelease deploy javadoc:javadoc
assembly:attached $1
+mvn5 -ff -Dgpg.passphrase="$passphrase" -Prelease deploy javadoc:javadoc
assembly:attached $1
filename=`ls target/dist/apache-wicket*gz`
gpg --print-md MD5 $filename > $filename.md5
gpg --print-md SHA1 $filename > $filename.sha
-echo '$passphrase' | gpg --passphrase-fd 0 --armor --output $filename.asc
--detach-sig $filename
+echo "$passphrase" | gpg --passphrase-fd 0 --armor --output $filename.asc
--detach-sig $filename
filename=`ls target/dist/apache-wicket*zip`
gpg --print-md MD5 $filename > $filename.md5
gpg --print-md SHA1 $filename > $filename.sha
-echo '$passphrase' | gpg --passphrase-fd 0 --armor --output $filename.asc
--detach-sig $filename
+echo "$passphrase" | gpg --passphrase-fd 0 --armor --output $filename.asc
--detach-sig $filename
