IDEA-148229 Upgraded SVNKit library to 1.8.12

This commit is contained in:
Konstantin Kolosovsky
2016-03-29 16:25:27 +03:00
parent b9edab36cb
commit 8079ddab8b
9 changed files with 17 additions and 16 deletions
+1 -1
View File
@@ -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/")
+10 -9
View File
@@ -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.
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.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -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<String> 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;
}
}