diff --git a/build/scripts/libLicenses.gant b/build/scripts/libLicenses.gant index 7bda2f3f0d1b..d957e73a886f 100644 --- a/build/scripts/libLicenses.gant +++ b/build/scripts/libLicenses.gant @@ -298,7 +298,7 @@ libraryLicense(name: "Spantable", libraryName: "spantable.jar", version: "patche libraryLicense(name: "sphinxcontrib-napoleon", attachedTo: "python-helpers", version: "0.3.11", license: "BSD", url: "http://sphinxcontrib-napoleon.readthedocs.org/") libraryLicense(name: "sqljet", version: "bundled with SVNKit", libraryName: "sqljet.jar", license: "link (commercial license)", url: "http://sqljet.com", licenseUrl: "http://svnkit.com/license.html") libraryLicense(name: "svnkit-javahl", version: "bundled with SVNKit", libraryName: "svnkit-javahl.jar", license: "link (commercial license)", url: "http://www.svnkit.com/", licenseUrl: "http://svnkit.com/license.html") -libraryLicense(name: "SVNKit", libraryName: "svnkit.jar", version: "1.8.7", license: "link (commercial license)", url: "http://www.svnkit.com/", licenseUrl: "http://svnkit.com/license.html") +libraryLicense(name: "SVNKit", libraryName: "svnkit.jar", version: "1.8.12", license: "link (commercial license)", url: "http://www.svnkit.com/", licenseUrl: "http://svnkit.com/license.html") libraryLicense(name: "swingx", libraryName: "swingx", version: "1.6.2", license: "LGPL 2.1", url: "http://java.net/downloads/swingx/", licenseUrl: "http://www.opensource.org/licenses/lgpl-2.1.php") libraryLicense(name: "TestNG", version: "6.9 snapshot", license: "Apache 2.0", url: "http://testng.org/doc/", licenseUrl: "https://github.com/cbeust/testng/blob/master/LICENSE.txt") libraryLicense(name: "Trilead SSH", libraryName: "trilead-ssh2", version: "build 213 and 217", license: "BSD style (see LICENSE.txt in trilead.jar)", url: "http://www.trilead.com/SSH_Library/") diff --git a/plugins/svn4idea/lib/licenses/LICENSE-JNA.txt b/plugins/svn4idea/lib/licenses/LICENSE-JNA.txt index b1a63d1686d1..3f12dee191dd 100644 --- a/plugins/svn4idea/lib/licenses/LICENSE-JNA.txt +++ b/plugins/svn4idea/lib/licenses/LICENSE-JNA.txt @@ -1,11 +1,12 @@ -Copyright (c) 2008 Timothy Wall, All Rights Reserved +This copy of JNA is licensed under the +Apache (Software) License, version 2.0 ("the License"). +See the License for details about distribution rights, and the +specific rights regarding derivate works. -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU Lesser General Public -License as published by the Free Software Foundation; either -version 2.1 of the License, or (at your option) any later version. +You may obtain a copy of the License at: -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. \ No newline at end of file +http://www.apache.org/licenses/ + +A copy is also included in the downloadable source code package +containing JNA, in file "ASL2.0", under the same directory +as this file. diff --git a/plugins/svn4idea/lib/svnkit-javahl.jar b/plugins/svn4idea/lib/svnkit-javahl.jar index 0e0950337f75..f85ac7dbcbe3 100644 Binary files a/plugins/svn4idea/lib/svnkit-javahl.jar and b/plugins/svn4idea/lib/svnkit-javahl.jar differ diff --git a/plugins/svn4idea/lib/svnkit-javahl16.zip b/plugins/svn4idea/lib/svnkit-javahl16.zip index 2af108d10732..840b8a8ada13 100644 Binary files a/plugins/svn4idea/lib/svnkit-javahl16.zip and b/plugins/svn4idea/lib/svnkit-javahl16.zip differ diff --git a/plugins/svn4idea/lib/svnkit.jar b/plugins/svn4idea/lib/svnkit.jar index 90e86ef80e30..fcb688cda32e 100644 Binary files a/plugins/svn4idea/lib/svnkit.jar and b/plugins/svn4idea/lib/svnkit.jar differ diff --git a/plugins/svn4idea/lib/svnkitsrc.zip b/plugins/svn4idea/lib/svnkitsrc.zip index 12c57e397882..2799ac920afd 100644 Binary files a/plugins/svn4idea/lib/svnkitsrc.zip and b/plugins/svn4idea/lib/svnkitsrc.zip differ diff --git a/plugins/svn4idea/lib/trilead.jar b/plugins/svn4idea/lib/trilead.jar index 43d882bd05a0..592abc6d185f 100644 Binary files a/plugins/svn4idea/lib/trilead.jar and b/plugins/svn4idea/lib/trilead.jar differ diff --git a/plugins/svn4idea/lib/trileadsrc.zip b/plugins/svn4idea/lib/trileadsrc.zip index bf8b916710c3..42f571fbf66a 100644 Binary files a/plugins/svn4idea/lib/trileadsrc.zip and b/plugins/svn4idea/lib/trileadsrc.zip differ diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/auth/SvnAuthenticationManager.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/auth/SvnAuthenticationManager.java index 88f7f65502aa..adf4882483ea 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/auth/SvnAuthenticationManager.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/auth/SvnAuthenticationManager.java @@ -1102,7 +1102,7 @@ public class SvnAuthenticationManager extends DefaultSVNAuthenticationManager im } @Override - public boolean savePassword(String realm, String password, SVNAuthentication auth, SVNProperties authParameters) throws SVNException { + public boolean savePassword(String realm, char[] password, SVNAuthentication auth, SVNProperties authParameters) throws SVNException { final boolean saved = myDelegate.savePassword(realm, password, auth, authParameters); if (saved) { myListener.getMulticaster().actualSaveWillBeTried(ProviderType.persistent, auth.getURL(), realm, auth.getKind() @@ -1112,12 +1112,12 @@ public class SvnAuthenticationManager extends DefaultSVNAuthenticationManager im } @Override - public String readPassword(String realm, String userName, SVNProperties authParameters) throws SVNException { + public char[] readPassword(String realm, String userName, SVNProperties authParameters) throws SVNException { return myDelegate.readPassword(realm, userName, authParameters); } @Override - public boolean savePassphrase(String realm, String passphrase, SVNAuthentication auth, SVNProperties authParameters, boolean force) + public boolean savePassphrase(String realm, char[] passphrase, SVNAuthentication auth, SVNProperties authParameters, boolean force) throws SVNException { final boolean saved = myDelegate.savePassphrase(realm, passphrase, auth, authParameters, force); if (saved) { @@ -1128,7 +1128,7 @@ public class SvnAuthenticationManager extends DefaultSVNAuthenticationManager im } @Override - public String readPassphrase(String realm, SVNProperties authParameters) throws SVNException { + public char[] readPassphrase(String realm, SVNProperties authParameters) throws SVNException { return myDelegate.readPassphrase(realm, authParameters); } } @@ -1165,7 +1165,7 @@ public class SvnAuthenticationManager extends DefaultSVNAuthenticationManager im } @Override - public String getKeyringPassword(final String keyringName) throws SVNException { + public char[] getKeyringPassword(final String keyringName) throws SVNException { final String message = keyringName != null ? SvnBundle.message("gnome.keyring.prompt.named", keyringName) : SvnBundle.message("gnome.keyring.prompt.nameless"); final Ref result = Ref.create(); @@ -1175,7 +1175,7 @@ public class SvnAuthenticationManager extends DefaultSVNAuthenticationManager im result.set(Messages.showPasswordDialog(myProject, message, SvnBundle.message("subversion.name"), Messages.getQuestionIcon())); } }); - return result.get(); + return !result.isNull() ? result.get().toCharArray() : null; } }