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 2015/08/19 08:50:10 UTC
[1/4] mina-sshd git commit: Fix headers check style validation broken
by the release process
Repository: mina-sshd
Updated Branches:
refs/heads/master 3f05aace2 -> 24a7742f5
Fix headers check style validation broken by the release process
Project: http://git-wip-us.apache.org/repos/asf/mina-sshd/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina-sshd/commit/ee8f4559
Tree: http://git-wip-us.apache.org/repos/asf/mina-sshd/tree/ee8f4559
Diff: http://git-wip-us.apache.org/repos/asf/mina-sshd/diff/ee8f4559
Branch: refs/heads/master
Commit: ee8f4559f4308d191386a0b375459483f0900962
Parents: 3f05aac
Author: Guillaume Nodet <gn...@apache.org>
Authored: Wed Aug 19 08:46:56 2015 +0200
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Wed Aug 19 08:46:56 2015 +0200
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/ee8f4559/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 39050e0..3991c63 100644
--- a/pom.xml
+++ b/pom.xml
@@ -873,7 +873,7 @@
<module name="SuppressWarningsFilter" />
<!-- Header checks -->
<module name="Header">
- <property name="header" value="/*\n * Licensed to the Apache Software Foundation (ASF) under one\n * or more contributor license agreements. See the NOTICE file\n * distributed with this work for additional information\n * regarding copyright ownership. The ASF licenses this file\n * to you under the Apache License, Version 2.0 (the\n * &quot;License&quot;); you may not use this file except in compliance\n * with the License. You may obtain a copy of the License at\n *\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing,\n * software distributed under the License is distributed on an\n * &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY\n * KIND, either express or implied. See the License for the\n * specific language governing permissions and limitations\n * under the License.\n */\n" />
+ <property name="header" value="/*\n * Licensed to the Apache Software Foundation (ASF) under one\n * or more contributor license agreements. See the NOTICE file\n * distributed with this work for additional information\n * regarding copyright ownership. The ASF licenses this file\n * to you under the Apache License, Version 2.0 (the\n * &quot;License&quot;); you may not use this file except in compliance\n * with the License. You may obtain a copy of the License at\n *\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing,\n * software distributed under the License is distributed on an\n * &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY\n * KIND, either express or implied. See the License for the\n * specific language governing permissions and limitations\n * under the License.\n */\n" />
</module>
<!-- <module name="RegexpHeader" /> -->
<module name="FileLength">
[2/4] mina-sshd git commit: Add animal-sniffer plugin and fix a JDK8
call
Posted by gn...@apache.org.
Add animal-sniffer plugin and fix a JDK8 call
Project: http://git-wip-us.apache.org/repos/asf/mina-sshd/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina-sshd/commit/b362b54f
Tree: http://git-wip-us.apache.org/repos/asf/mina-sshd/tree/b362b54f
Diff: http://git-wip-us.apache.org/repos/asf/mina-sshd/diff/b362b54f
Branch: refs/heads/master
Commit: b362b54fb2b43741fd460565ad83667c689a5614
Parents: ee8f455
Author: Guillaume Nodet <gn...@apache.org>
Authored: Wed Aug 19 08:48:34 2015 +0200
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Wed Aug 19 08:48:34 2015 +0200
----------------------------------------------------------------------
pom.xml | 22 +++++++++++++++++++-
.../sshd/common/future/DefaultSshFuture.java | 4 +++-
2 files changed, 24 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/b362b54f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3991c63..511dc71 100644
--- a/pom.xml
+++ b/pom.xml
@@ -409,7 +409,27 @@
</pluginManagement>
<plugins>
- <plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>animal-sniffer-maven-plugin</artifactId>
+ <version>1.14</version>
+ <executions>
+ <execution>
+ <id>check-java-api</id>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ <configuration>
+ <signature>
+ <groupId>org.codehaus.mojo.signature</groupId>
+ <artifactId>java17</artifactId>
+ <version>1.0</version>
+ </signature>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>1.4</version>
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/b362b54f/sshd-core/src/main/java/org/apache/sshd/common/future/DefaultSshFuture.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/common/future/DefaultSshFuture.java b/sshd-core/src/main/java/org/apache/sshd/common/future/DefaultSshFuture.java
index e6bd532..e950ab2 100644
--- a/sshd-core/src/main/java/org/apache/sshd/common/future/DefaultSshFuture.java
+++ b/sshd-core/src/main/java/org/apache/sshd/common/future/DefaultSshFuture.java
@@ -101,7 +101,9 @@ public class DefaultSshFuture<T extends SshFuture> extends AbstractLoggingBean i
try {
return await0(timeoutMillis, false) != null;
} catch (InterruptedIOException e) {
- throw new InternalError("Unexpected interrupted exception wile awaitUninterruptibly " + timeoutMillis + " msec.: " + e.getMessage(), e);
+ // TODO for JDK-8 use the 2-args constructors
+ throw (InternalError) new InternalError("Unexpected interrupted exception wile awaitUninterruptibly "
+ + timeoutMillis + " msec.: " + e.getMessage()).initCause(e);
}
}
[4/4] mina-sshd git commit: Fix copyright year
Posted by gn...@apache.org.
Fix copyright year
Project: http://git-wip-us.apache.org/repos/asf/mina-sshd/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina-sshd/commit/24a7742f
Tree: http://git-wip-us.apache.org/repos/asf/mina-sshd/tree/24a7742f
Diff: http://git-wip-us.apache.org/repos/asf/mina-sshd/diff/24a7742f
Branch: refs/heads/master
Commit: 24a7742f5dee549c07f2d34cf06bbdb2219e88bd
Parents: 2b99d54
Author: Guillaume Nodet <gn...@apache.org>
Authored: Wed Aug 19 08:49:38 2015 +0200
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Wed Aug 19 08:49:38 2015 +0200
----------------------------------------------------------------------
NOTICE.txt | 2 +-
assembly/src/main/distribution/NOTICE.txt | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/24a7742f/NOTICE.txt
----------------------------------------------------------------------
diff --git a/NOTICE.txt b/NOTICE.txt
index be0f742..0617346 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -1,5 +1,5 @@
Apache MINA SSHD
-Copyright 2008-2014 The Apache Software Foundation
+Copyright 2008-2015 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/24a7742f/assembly/src/main/distribution/NOTICE.txt
----------------------------------------------------------------------
diff --git a/assembly/src/main/distribution/NOTICE.txt b/assembly/src/main/distribution/NOTICE.txt
index be0f742..0617346 100644
--- a/assembly/src/main/distribution/NOTICE.txt
+++ b/assembly/src/main/distribution/NOTICE.txt
@@ -1,5 +1,5 @@
Apache MINA SSHD
-Copyright 2008-2014 The Apache Software Foundation
+Copyright 2008-2015 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
[3/4] mina-sshd git commit: Fix distribution README
Posted by gn...@apache.org.
Fix distribution README
Project: http://git-wip-us.apache.org/repos/asf/mina-sshd/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina-sshd/commit/2b99d548
Tree: http://git-wip-us.apache.org/repos/asf/mina-sshd/tree/2b99d548
Diff: http://git-wip-us.apache.org/repos/asf/mina-sshd/diff/2b99d548
Branch: refs/heads/master
Commit: 2b99d548c9f28ecf511763ff3d047b0bafe6e845
Parents: b362b54
Author: Guillaume Nodet <gn...@apache.org>
Authored: Wed Aug 19 08:48:43 2015 +0200
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Wed Aug 19 08:48:43 2015 +0200
----------------------------------------------------------------------
assembly/src/main/distribution/README.txt | 14 ++------------
1 file changed, 2 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/2b99d548/assembly/src/main/distribution/README.txt
----------------------------------------------------------------------
diff --git a/assembly/src/main/distribution/README.txt b/assembly/src/main/distribution/README.txt
index e6852a8..76b4c27 100644
--- a/assembly/src/main/distribution/README.txt
+++ b/assembly/src/main/distribution/README.txt
@@ -23,23 +23,13 @@ Apache SSHD is a library to support the SSH2 protocol on both
client and server side in java.
This distribution provides a simple demonstration of a SSH
-server that you can launched using the shell scripts in the
+server and client that you can launched using the shell scripts in the
bin folder. By default, the port used is 8000 and the authentication
will succeed if the username and password are the same.
SCP and SFTP support are both enabled in this configuration.
The lib folder contains the sshd-core jar which is the main jar
-and its required dependencies (slf4j-api and mina-core).
-Note that if you're running on JDK 7, mina-core becomes an optional
-dependency as a native IO layer built on top of NIO2 is provided
-and selected by default if available.
-
-The sshd-pam module is an experimental module for leveraging the
-Unix PAM authentication mechanism which is not really usable at the
-moment.
-The sshf-sftp module is an experimental module which provides an
-object model for the SFTP subsystem to ease writing custom SFTP
-servers.
+and its required dependencies.
Please send feedback to users@mina.apache.org.