diff --git a/build/scripts/libLicenses.gant b/build/scripts/libLicenses.gant index 0913e62803da..aaa45cc5cd05 100644 --- a/build/scripts/libLicenses.gant +++ b/build/scripts/libLicenses.gant @@ -239,7 +239,7 @@ libraryLicense(name: "XML-RPC", libraryName: "XmlRPC", version: "2.0", license: libraryLicense(name: "XStream", version: "1.4.3", license: "BSD", url: "http://xstream.codehaus.org/", licenseUrl: "http://xstream.codehaus.org/license.html") libraryLicense(name: "YourKit Java Profiler", libraryName: "yjp-controller-api-redist.jar", version: "8.0.x", license: "link (commercial license)", url: "http://yourkit.com/", licenseUrl: "http://www.yourkit.com/purchase/license.html") libraryLicense(name: "protobuf", version: "2.3.0", license: "New BSD", url: "http://code.google.com/p/protobuf/", licenseUrl: "http://code.google.com/p/protobuf/source/browse/trunk/COPYING.txt?r=367") -libraryLicense(name: "Netty", libraryName: "Netty", version: "3.5.10", license: "Apache 2.0", url: "http://netty.io", licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0") +libraryLicense(name: "Netty", libraryName: "Netty", version: "3.6.2", license: "Apache 2.0", url: "http://netty.io", licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0") libraryLicense(name: "Kryo", libraryName: "Kryo", version: "1.04", license: "New BSD License", url: "http://code.google.com/p/kryo/", licenseUrl: "http://www.opensource.org/licenses/bsd-license.php") libraryLicense(name: "Snappy-Java", libraryName: "Snappy-Java", version: "1.0.5-M2", license: "Apache 2.0", url: "http://code.google.com/p/snappy-java/", licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0") libraryLicense(name: "Cucumber-Java", libraryName: "cucumber-java", version: "1.0.14", license: "MIT License", url: "https://github.com/cucumber/cucumber-jvm/", licenseUrl: "http://www.opensource.org/licenses/mit-license.html") diff --git a/lib/netty-3.5.10.Final.jar b/lib/netty-3.5.10.Final.jar deleted file mode 100644 index 0988cadbc6a6..000000000000 Binary files a/lib/netty-3.5.10.Final.jar and /dev/null differ diff --git a/lib/netty-3.6.2.Final.jar b/lib/netty-3.6.2.Final.jar new file mode 100644 index 000000000000..a421e28066f5 Binary files /dev/null and b/lib/netty-3.6.2.Final.jar differ diff --git a/lib/required_for_dist.txt b/lib/required_for_dist.txt index 0620cb8a06bc..ebe07dfdb5f8 100644 --- a/lib/required_for_dist.txt +++ b/lib/required_for_dist.txt @@ -46,7 +46,7 @@ xmlrpc-2.0.jar xpp3-1.1.4-min.jar xstream-1.4.3.jar swingx-core-1.6.2.jar -netty-3.5.10.Final.jar +netty-3.6.2.Final.jar protobuf-2.4.1.jar rhino-js-1_7R4.jar proxy-vole_20120920.jar diff --git a/lib/src/netty-3.5.10.Final-sources.jar b/lib/src/netty-3.5.10.Final-sources.jar deleted file mode 100644 index a5c469997f50..000000000000 Binary files a/lib/src/netty-3.5.10.Final-sources.jar and /dev/null differ diff --git a/lib/src/netty-3.6.2.Final-sources.jar b/lib/src/netty-3.6.2.Final-sources.jar new file mode 100644 index 000000000000..2f62d0494227 Binary files /dev/null and b/lib/src/netty-3.6.2.Final-sources.jar differ