Merge branch 'dev'

ymnk · Sep 25, 2014 · ef491c2 · ef491c2
2 parents 730c563 + 59415ed
commit ef491c2
Show file tree

Hide file tree

Showing 15 changed files with 20 additions and 20 deletions.
diff --git a/README b/README
@@ -27,7 +27,7 @@ Examples
     $ mvn exec:java \
       -Dexec.mainClass="com.jcraft.jsch.agentproxy.examples.UsingPageant"
 
-  * UsingSSHAent.java
+  * UsingSSHAgent.java
     This sample demonstrates how to get accesses to ssh-agent.
     $ cd examples
     $ mvn compile
@@ -63,7 +63,7 @@ Dependencies
 ============
 To work as a proxy to ssh-agent and Pageant,
 the current implementation depends on the following software
-  * JNA: https://github.com/twall/jna licensed under the GNU LGPL
+  * JNA: https://github.com/twall/jna licensed under the GNU LGPL and the Apache License 2.0
   * junixsocket: http://code.google.com/p/junixsocket/ licensed under the Apache License 2.0
   * OpenBSD's netcat: http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/nc/
 

diff --git a/README.md b/README.md
@@ -25,7 +25,7 @@ This software is licensed under [BSD style license](https://github.com/ymnk/jsch
 		$ mvn exec:java \
 		  -Dexec.mainClass="com.jcraft.jsch.agentproxy.examples.UsingPageant"
 
-+ [UsingSSHAent.java](https://github.com/ymnk/jsch-agent-proxy/blob/master/examples/src/main/java/com/jcraft/jsch/agentproxy/examples/UsingSSHAgent.java)  
++ [UsingSSHAgent.java](https://github.com/ymnk/jsch-agent-proxy/blob/master/examples/src/main/java/com/jcraft/jsch/agentproxy/examples/UsingSSHAgent.java)  
     This sample demonstrates how to get accesses to ssh-agent.  
 
 		$ cd examples
@@ -64,7 +64,7 @@ This software is licensed under [BSD style license](https://github.com/ymnk/jsch
 To work as a proxy to ssh-agent and Pageant,
 the current implementation depends on the following software,
 
-+ JNA: https://github.com/twall/jna licensed under the [GNU LGPL](https://github.com/twall/jna/blob/master/LICENSE)
++ JNA: https://github.com/twall/jna licensed under the [GNU LGPL](https://github.com/twall/jna/blob/master/LICENSE) and the [Apache License 2.0](http://code.google.com/p/junixsocket/source/browse/trunk/junixsocket/LICENSE.txt)
 + junixsocket: http://code.google.com/p/junixsocket/ licensed under the [Apache License 2.0](http://code.google.com/p/junixsocket/source/browse/trunk/junixsocket/LICENSE.txt)
 + OpenBSD's netcat: http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/nc/
 

diff --git a/examples/README b/examples/README
@@ -7,7 +7,7 @@ README
   $ mvn exec:java \
       -Dexec.mainClass="com.jcraft.jsch.agentproxy.examples.UsingPageant"
 
-* UsingSSHAent.java
+* UsingSSHAgent.java
   This sample demonstrates how to get accesses to ssh-agent.
   $ cd examples
   $ mvn compile

diff --git a/examples/pom.xml b/examples/pom.xml
@@ -5,7 +5,7 @@
 
   <groupId>com.jcraft</groupId>
   <artifactId>jsch.agentproxy.examples</artifactId>
-  <version>0.0.7</version>
+  <version>0.0.8</version>
   <name>examples to demonstrate how to use jsch-agent-proxy</name>
 
   <dependencies>

diff --git a/jsch-agent-proxy-connector-factory/pom.xml b/jsch-agent-proxy-connector-factory/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.jcraft</groupId>
     <artifactId>jsch.agentproxy</artifactId>
-    <version>0.0.7</version>
+    <version>0.0.8</version>
   </parent>
 
   <artifactId>jsch.agentproxy.connector-factory</artifactId>

diff --git a/jsch-agent-proxy-core/pom.xml b/jsch-agent-proxy-core/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.jcraft</groupId>
     <artifactId>jsch.agentproxy</artifactId>
-    <version>0.0.7</version>
+    <version>0.0.8</version>
   </parent>
 
   <artifactId>jsch.agentproxy.core</artifactId>

diff --git a/jsch-agent-proxy-jsch/pom.xml b/jsch-agent-proxy-jsch/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.jcraft</groupId>
     <artifactId>jsch.agentproxy</artifactId>
-    <version>0.0.7</version>
+    <version>0.0.8</version>
   </parent>
 
   <artifactId>jsch.agentproxy.jsch</artifactId>

diff --git a/jsch-agent-proxy-pageant/pom.xml b/jsch-agent-proxy-pageant/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.jcraft</groupId>
     <artifactId>jsch.agentproxy</artifactId>
-    <version>0.0.7</version>
+    <version>0.0.8</version>
   </parent>
 
   <artifactId>jsch.agentproxy.pageant</artifactId>
@@ -26,7 +26,7 @@
     </dependency>
     <dependency>
       <groupId>net.java.dev.jna</groupId>
-      <artifactId>platform</artifactId>
+      <artifactId>jna-platform</artifactId>
       <version>${jna.version}</version>
     </dependency>
   </dependencies>

diff --git a/jsch-agent-proxy-sshagent/pom.xml b/jsch-agent-proxy-sshagent/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.jcraft</groupId>
     <artifactId>jsch.agentproxy</artifactId>
-    <version>0.0.7</version>
+    <version>0.0.8</version>
   </parent>
 
   <artifactId>jsch.agentproxy.sshagent</artifactId>

diff --git a/jsch-agent-proxy-sshj/pom.xml b/jsch-agent-proxy-sshj/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.jcraft</groupId>
     <artifactId>jsch.agentproxy</artifactId>
-    <version>0.0.7</version>
+    <version>0.0.8</version>
   </parent>
 
   <artifactId>jsch.agentproxy.sshj</artifactId>

diff --git a/jsch-agent-proxy-svnkit-trilead-ssh2/pom.xml b/jsch-agent-proxy-svnkit-trilead-ssh2/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.jcraft</groupId>
     <artifactId>jsch.agentproxy</artifactId>
-    <version>0.0.7</version>
+    <version>0.0.8</version>
   </parent>
 
   <artifactId>jsch.agentproxy.svnkit-trilead-ssh2</artifactId>

diff --git a/jsch-agent-proxy-usocket-jna/pom.xml b/jsch-agent-proxy-usocket-jna/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.jcraft</groupId>
     <artifactId>jsch.agentproxy</artifactId>
-    <version>0.0.7</version>
+    <version>0.0.8</version>
   </parent>
 
   <artifactId>jsch.agentproxy.usocket-jna</artifactId>
@@ -26,7 +26,7 @@
     </dependency>
     <dependency>
       <groupId>net.java.dev.jna</groupId>
-      <artifactId>platform</artifactId>
+      <artifactId>jna-platform</artifactId>
       <version>${jna.version}</version>
     </dependency>
   </dependencies>

diff --git a/jsch-agent-proxy-usocket-junixsocket/pom.xml b/jsch-agent-proxy-usocket-junixsocket/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.jcraft</groupId>
     <artifactId>jsch.agentproxy</artifactId>
-    <version>0.0.7</version>
+    <version>0.0.8</version>
   </parent>
 
   <artifactId>jsch.agentproxy.usocket-junixsocket</artifactId>

diff --git a/jsch-agent-proxy-usocket-nc/pom.xml b/jsch-agent-proxy-usocket-nc/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.jcraft</groupId>
     <artifactId>jsch.agentproxy</artifactId>
-    <version>0.0.7</version>
+    <version>0.0.8</version>
   </parent>
 
   <artifactId>jsch.agentproxy.usocket-nc</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>com.jcraft</groupId>
   <artifactId>jsch.agentproxy</artifactId>
-  <version>0.0.7</version>
+  <version>0.0.8</version>
   <packaging>pom</packaging>
   <name>jsch-agent-proxy: a parent of modules</name>
 
@@ -43,7 +43,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <jsch.version>0.1.49</jsch.version>
-    <jna.version>3.4.0</jna.version>
+    <jna.version>4.1.0</jna.version>
     <trilead.version>1.0.0-build217</trilead.version>
   </properties>