From 2cb1661d7e2c0aacda2822997bccfd9d01062cb6 Mon Sep 17 00:00:00 2001 From: Dennis Ushakov Date: Mon, 28 May 2012 12:19:24 +0400 Subject: [PATCH] Revert "renamed sqljet temporary for patches building" This reverts commit e67360174e112cdfd94c6e3fec9daf0c923eaa4b. --- build/scripts/libLicenses.gant | 2 +- plugins/svn4idea/lib/{sqljet_fix.jar => sqljet.jar} | Bin plugins/svn4idea/svn4idea.iml | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename plugins/svn4idea/lib/{sqljet_fix.jar => sqljet.jar} (100%) diff --git a/build/scripts/libLicenses.gant b/build/scripts/libLicenses.gant index 251288b4f97a..29b981ef038e 100644 --- a/build/scripts/libLicenses.gant +++ b/build/scripts/libLicenses.gant @@ -172,7 +172,7 @@ libraryLicense(name: "Apache Sanselan", libraryName: "Sanselan", version: "0.98" libraryLicense(name: "Automaton", libraryName: "automaton.jar", version: "1.11", license: "BSD", url: "http://www.brics.dk/automaton/", licenseUrl: "http://www.opensource.org/licenses/bsd-license.php") libraryLicense(name: "DTDParser", version: "1.13", license: "LGPL", url: "http://sourceforge.net/projects/dtdparser/", licenseUrl: "http://www.opensource.org/licenses/lgpl-2.1") libraryLicense(name: "Ganymed", version: "bundled with SVNKit", libraryName: "svnkit.jar", license: "BSD", url: "http://www.ganymed.ethz.ch/ssh2/", licenseUrl: "http://www.ganymed.ethz.ch/ssh2/LICENSE.txt") -libraryLicense(name: "sqljet", version: "bundled with SVNKit", libraryName: "sqljet_fix.jar", license: "GPLv2", url: "http://sqljet.com", licenseUrl: "http://www.opensource.org/licenses/lgpl-2.1") +libraryLicense(name: "sqljet", version: "bundled with SVNKit", libraryName: "sqljet.jar", license: "GPLv2", url: "http://sqljet.com", licenseUrl: "http://www.opensource.org/licenses/lgpl-2.1") 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: "javahl", version: "1.7.2", libraryName: "javahl.jar", license: "Apache", url: "http://subversion.apache.org", licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0") libraryLicense(name: "Apache Commons HTTPClient", libraryName: "httpclient-4.1.1.jar", version:"4.1.1", license: "Apache 2.0", diff --git a/plugins/svn4idea/lib/sqljet_fix.jar b/plugins/svn4idea/lib/sqljet.jar similarity index 100% rename from plugins/svn4idea/lib/sqljet_fix.jar rename to plugins/svn4idea/lib/sqljet.jar diff --git a/plugins/svn4idea/svn4idea.iml b/plugins/svn4idea/svn4idea.iml index 7a6e12c5d392..34af8777bc56 100644 --- a/plugins/svn4idea/svn4idea.iml +++ b/plugins/svn4idea/svn4idea.iml @@ -49,7 +49,7 @@ - +