diff --git a/.idea/libraries/Guava.xml b/.idea/libraries/Guava.xml index 649397a32e38..ae7646c40e9d 100644 --- a/.idea/libraries/Guava.xml +++ b/.idea/libraries/Guava.xml @@ -1,11 +1,11 @@ - + - + \ No newline at end of file diff --git a/build/scripts/layouts.gant b/build/scripts/layouts.gant index 46bea37e8657..a9397239f115 100644 --- a/build/scripts/layouts.gant +++ b/build/scripts/layouts.gant @@ -667,7 +667,7 @@ def layout_core(String home, String target) { } fileset(dir: "$home/lib") { - include(name: "guava-12.0.jar") + include(name: "guava-14.0.1.jar") include(name: "picocontainer.jar") include(name: "trove4j.jar") include(name: "asm.jar") @@ -707,7 +707,7 @@ def layout_core_upsource(String home, String target) { } fileset(dir: "$home/lib") { - include(name: "guava-12.0.jar") + include(name: "guava-14.0.1.jar") include(name: "picocontainer.jar") include(name: "trove4j.jar") include(name: "asm.jar") diff --git a/build/scripts/libLicenses.gant b/build/scripts/libLicenses.gant index e7cd2a8fb29a..7dcfb52b7aaf 100644 --- a/build/scripts/libLicenses.gant +++ b/build/scripts/libLicenses.gant @@ -179,7 +179,7 @@ libraryLicense(name: "Apache Commons HTTPCore", libraryName: "httpcore-4.1.jar", url: "http://hc.apache.org/httpcomponents-core-ga/", licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0") libraryLicense(name: "Antlr", libraryName: "antlr.jar", version: "3.1.3", license: "BSD", url: "http://www.antlr.org", licenseUrl: "http://www.antlr.org/license.html") -libraryLicense(name: "Guava", version: "12.0", license: "Apache 2.0", url: "http://code.google.com/p/guava-libraries/", licenseUrl: "http://ant.apache.org/license.html") +libraryLicense(name: "Guava", version: "14.0.1", license: "Apache 2.0", url: "http://code.google.com/p/guava-libraries/", licenseUrl: "http://ant.apache.org/license.html") libraryLicense(name: "Groovy", version: "1.7.3", license: "Apache 2.0", url: "http://groovy.codehaus.org/") libraryLicense(name: "Gson", libraryName: "gson", license: "Apache 2.0", url: "http://code.google.com/p/google-gson/") libraryLicense(name: "ini4j", libraryName: "ini4j-0.5.2-patched", version: "0.5.2 (with a patch by JetBrains)", license: "Apache 2.0", url: "http://ini4j.sourceforge.net/", attachedTo: "git4idea") diff --git a/lib/guava-12.0.jar b/lib/guava-12.0.jar deleted file mode 100644 index fefd6b2713c6..000000000000 Binary files a/lib/guava-12.0.jar and /dev/null differ diff --git a/lib/guava-14.0.1.jar b/lib/guava-14.0.1.jar new file mode 100644 index 000000000000..3a3d9258e3b9 Binary files /dev/null and b/lib/guava-14.0.1.jar differ diff --git a/lib/required_for_dist.txt b/lib/required_for_dist.txt index 8749a25a2c11..187eb0e3b733 100644 --- a/lib/required_for_dist.txt +++ b/lib/required_for_dist.txt @@ -10,7 +10,7 @@ commons-logging-1.1.1.jar commons-net-3.1.jar groovy-all-2.0.6.jar gson-2.2.1.jar -guava-12.0.jar +guava-14.0.1.jar jaxen-1.1.3.jar jcip-annotations.jar jdom.jar diff --git a/lib/src/guava-12.0-sources.jar b/lib/src/guava-12.0-sources.jar deleted file mode 100644 index f6e03018ccdc..000000000000 Binary files a/lib/src/guava-12.0-sources.jar and /dev/null differ diff --git a/lib/src/guava-14.0.1-sources.jar b/lib/src/guava-14.0.1-sources.jar new file mode 100644 index 000000000000..55c848e59bda Binary files /dev/null and b/lib/src/guava-14.0.1-sources.jar differ