You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by gn...@apache.org on 2012/09/25 11:33:36 UTC
svn commit: r1389772 - in /mina/sshd/trunk: LICENSE.txt
assembly/src/main/descriptors/unix-bin.xml
assembly/src/main/descriptors/windows-bin.xml
assembly/src/main/distribution/LICENSE.txt
Author: gnodet
Date: Tue Sep 25 09:33:36 2012
New Revision: 1389772
URL: http://svn.apache.org/viewvc?rev=1389772&view=rev
Log:
[SSHD-176] Fix license / notice files in distribution
Added:
mina/sshd/trunk/assembly/src/main/distribution/LICENSE.txt
- copied, changed from r1389771, mina/sshd/trunk/LICENSE.txt
Modified:
mina/sshd/trunk/LICENSE.txt
mina/sshd/trunk/assembly/src/main/descriptors/unix-bin.xml
mina/sshd/trunk/assembly/src/main/descriptors/windows-bin.xml
Modified: mina/sshd/trunk/LICENSE.txt
URL: http://svn.apache.org/viewvc/mina/sshd/trunk/LICENSE.txt?rev=1389772&r1=1389771&r2=1389772&view=diff
==============================================================================
--- mina/sshd/trunk/LICENSE.txt (original)
+++ mina/sshd/trunk/LICENSE.txt Tue Sep 25 09:33:36 2012
@@ -201,45 +201,3 @@
See the License for the specific language governing permissions and
limitations under the License.
---------------------------------------------------------------------------------
-Copyright (c) 2000 - 2006 The Legion Of The Bouncy Castle (http://www.bouncycastle.org)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in the
-Software without restriction, including without limitation the rights to use, copy,
-modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
-and to permit persons to whom the Software is furnished to do so, subject to the
-following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
-INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
---------------------------------------------------------------------------------
-Copyright (c) 2004-2008 QOS.ch
-All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Modified: mina/sshd/trunk/assembly/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/mina/sshd/trunk/assembly/src/main/descriptors/unix-bin.xml?rev=1389772&r1=1389771&r2=1389772&view=diff
==============================================================================
--- mina/sshd/trunk/assembly/src/main/descriptors/unix-bin.xml (original)
+++ mina/sshd/trunk/assembly/src/main/descriptors/unix-bin.xml Tue Sep 25 09:33:36 2012
@@ -21,16 +21,6 @@
<format>tar.gz</format>
</formats>
<fileSets>
- <!-- Copy license and other files from root -->
- <fileSet>
- <directory>${basedir}/..</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>LICENSE*</include>
- </includes>
- <lineEnding>unix</lineEnding>
- </fileSet>
-
<fileSet>
<directory>src/main/distribution</directory>
<outputDirectory>/</outputDirectory>
Modified: mina/sshd/trunk/assembly/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/mina/sshd/trunk/assembly/src/main/descriptors/windows-bin.xml?rev=1389772&r1=1389771&r2=1389772&view=diff
==============================================================================
--- mina/sshd/trunk/assembly/src/main/descriptors/windows-bin.xml (original)
+++ mina/sshd/trunk/assembly/src/main/descriptors/windows-bin.xml Tue Sep 25 09:33:36 2012
@@ -21,17 +21,6 @@
<format>zip</format>
</formats>
<fileSets>
- <!-- Copy license and other files from root -->
- <fileSet>
- <directory>${basedir}/..</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>README*</include>
- <include>LICENSE*</include>
- </includes>
- <lineEnding>dos</lineEnding>
- </fileSet>
-
<fileSet>
<directory>src/main/distribution</directory>
<outputDirectory>/</outputDirectory>
Copied: mina/sshd/trunk/assembly/src/main/distribution/LICENSE.txt (from r1389771, mina/sshd/trunk/LICENSE.txt)
URL: http://svn.apache.org/viewvc/mina/sshd/trunk/assembly/src/main/distribution/LICENSE.txt?p2=mina/sshd/trunk/assembly/src/main/distribution/LICENSE.txt&p1=mina/sshd/trunk/LICENSE.txt&r1=1389771&r2=1389772&rev=1389772&view=diff
==============================================================================
--- mina/sshd/trunk/LICENSE.txt (original)
+++ mina/sshd/trunk/assembly/src/main/distribution/LICENSE.txt Tue Sep 25 09:33:36 2012
@@ -201,7 +201,12 @@
See the License for the specific language governing permissions and
limitations under the License.
---------------------------------------------------------------------------------
+=======================================================================================
+ Third party licenses
+=======================================================================================
+
+Bouncy Castle
+=============
Copyright (c) 2000 - 2006 The Legion Of The Bouncy Castle (http://www.bouncycastle.org)
Permission is hereby granted, free of charge, to any person obtaining a copy of
@@ -221,7 +226,8 @@ HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
---------------------------------------------------------------------------------
+SLF4J
+=============
Copyright (c) 2004-2008 QOS.ch
All rights reserved.