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/06/11 09:47:16 UTC
svn commit: r1348734 - in /mina/sshd/trunk: ./ assembly/src/main/descriptors/
sshd-core/src/main/java/org/apache/sshd/agent/
sshd-core/src/test/java/org/apache/sshd/util/
Author: gnodet
Date: Mon Jun 11 07:47:15 2012
New Revision: 1348734
URL: http://svn.apache.org/viewvc?rev=1348734&view=rev
Log:
Fix legal issues wih release (2 missing headers, wrong notice file for source distribution)
Modified:
mina/sshd/trunk/NOTICE.txt
mina/sshd/trunk/assembly/src/main/descriptors/unix-bin.xml
mina/sshd/trunk/assembly/src/main/descriptors/windows-bin.xml
mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/agent/SshAgentConstants.java
mina/sshd/trunk/sshd-core/src/test/java/org/apache/sshd/util/BogusChannel.java
Modified: mina/sshd/trunk/NOTICE.txt
URL: http://svn.apache.org/viewvc/mina/sshd/trunk/NOTICE.txt?rev=1348734&r1=1348733&r2=1348734&view=diff
==============================================================================
--- mina/sshd/trunk/NOTICE.txt (original)
+++ mina/sshd/trunk/NOTICE.txt Mon Jun 11 07:47:15 2012
@@ -1,11 +1,2 @@
Apache MINA SSHD
Copyright 2008-2012 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
-This product includes software SLF4J (www.slf4j.org)
-Copyright (c) 2004-2008 QOS.ch All rights reserved.
-
-This product includes software The Legion Of The Bouncy Castle (http://www.bouncycastle.org)
-Copyright (c) 2000 - 2006 The Legion Of The Bouncy Castle (http://www.bouncycastle.org)
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=1348734&r1=1348733&r2=1348734&view=diff
==============================================================================
--- mina/sshd/trunk/assembly/src/main/descriptors/unix-bin.xml (original)
+++ mina/sshd/trunk/assembly/src/main/descriptors/unix-bin.xml Mon Jun 11 07:47:15 2012
@@ -26,7 +26,6 @@
<directory>${basedir}/..</directory>
<outputDirectory>/</outputDirectory>
<includes>
- <include>NOTICE*</include>
<include>LICENSE*</include>
</includes>
<lineEnding>unix</lineEnding>
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=1348734&r1=1348733&r2=1348734&view=diff
==============================================================================
--- mina/sshd/trunk/assembly/src/main/descriptors/windows-bin.xml (original)
+++ mina/sshd/trunk/assembly/src/main/descriptors/windows-bin.xml Mon Jun 11 07:47:15 2012
@@ -27,7 +27,6 @@
<outputDirectory>/</outputDirectory>
<includes>
<include>README*</include>
- <include>NOTICE*</include>
<include>LICENSE*</include>
</includes>
<lineEnding>dos</lineEnding>
Modified: mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/agent/SshAgentConstants.java
URL: http://svn.apache.org/viewvc/mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/agent/SshAgentConstants.java?rev=1348734&r1=1348733&r2=1348734&view=diff
==============================================================================
--- mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/agent/SshAgentConstants.java (original)
+++ mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/agent/SshAgentConstants.java Mon Jun 11 07:47:15 2012
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.sshd.agent;
public final class SshAgentConstants {
Modified: mina/sshd/trunk/sshd-core/src/test/java/org/apache/sshd/util/BogusChannel.java
URL: http://svn.apache.org/viewvc/mina/sshd/trunk/sshd-core/src/test/java/org/apache/sshd/util/BogusChannel.java?rev=1348734&r1=1348733&r2=1348734&view=diff
==============================================================================
--- mina/sshd/trunk/sshd-core/src/test/java/org/apache/sshd/util/BogusChannel.java (original)
+++ mina/sshd/trunk/sshd-core/src/test/java/org/apache/sshd/util/BogusChannel.java Mon Jun 11 07:47:15 2012
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.sshd.util;
import org.apache.sshd.client.future.DefaultOpenFuture;
Re: svn commit: r1348734 - in /mina/sshd/trunk: ./
assembly/src/main/descriptors/ sshd-core/src/main/java/org/apache/sshd/agent/ sshd-core/src/test/java/org/apache/sshd/util/
Posted by sebb <se...@gmail.com>.
On 11 June 2012 08:47, <gn...@apache.org> wrote:
> Author: gnodet
> Date: Mon Jun 11 07:47:15 2012
> New Revision: 1348734
>
> URL: http://svn.apache.org/viewvc?rev=1348734&view=rev
> Log:
> Fix legal issues wih release (2 missing headers, wrong notice file for source distribution)
>
> Modified:
> mina/sshd/trunk/NOTICE.txt
> mina/sshd/trunk/assembly/src/main/descriptors/unix-bin.xml
> mina/sshd/trunk/assembly/src/main/descriptors/windows-bin.xml
> mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/agent/SshAgentConstants.java
> mina/sshd/trunk/sshd-core/src/test/java/org/apache/sshd/util/BogusChannel.java
>
> Modified: mina/sshd/trunk/NOTICE.txt
> URL: http://svn.apache.org/viewvc/mina/sshd/trunk/NOTICE.txt?rev=1348734&r1=1348733&r2=1348734&view=diff
> ==============================================================================
> --- mina/sshd/trunk/NOTICE.txt (original)
> +++ mina/sshd/trunk/NOTICE.txt Mon Jun 11 07:47:15 2012
> @@ -1,11 +1,2 @@
> Apache MINA SSHD
> Copyright 2008-2012 The Apache Software Foundation
> -
> -This product includes software developed by
> -The Apache Software Foundation (http://www.apache.org/).
> -
The above 2 lines (and preceeding blank line) are required in all NOTICE files.
> -This product includes software SLF4J (www.slf4j.org)
> -Copyright (c) 2004-2008 QOS.ch All rights reserved.
> -
> -This product includes software The Legion Of The Bouncy Castle (http://www.bouncycastle.org)
> -Copyright (c) 2000 - 2006 The Legion Of The Bouncy Castle (http://www.bouncycastle.org)