diff --git a/.idea/libraries/Netty.xml b/.idea/libraries/Netty.xml index c5b98b3964c1..aafde743ce14 100644 --- a/.idea/libraries/Netty.xml +++ b/.idea/libraries/Netty.xml @@ -1,11 +1,11 @@ - + - + \ No newline at end of file diff --git a/build/scripts/libLicenses.gant b/build/scripts/libLicenses.gant index b90f42d3b3b4..419e77599b99 100644 --- a/build/scripts/libLicenses.gant +++ b/build/scripts/libLicenses.gant @@ -234,7 +234,7 @@ libraryLicense(name: "XML-RPC", libraryName: "XmlRPC", version: "2.0", license: libraryLicense(name: "XStream", version: "1.2.1", 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.2.5", license: "Apache 2.0", url: "http://www.jboss.org/netty", licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0") +libraryLicense(name: "Netty", libraryName: "Netty", version: "3.3.1", 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") jetbrainsLibrary("JPS") jetbrainsLibrary("Maven Embedder") diff --git a/lib/netty-3.3.0.Final.jar b/lib/netty-3.3.1.Final.jar similarity index 76% rename from lib/netty-3.3.0.Final.jar rename to lib/netty-3.3.1.Final.jar index 7929a276f775..a107dc9b3874 100644 Binary files a/lib/netty-3.3.0.Final.jar and b/lib/netty-3.3.1.Final.jar differ diff --git a/lib/required_for_dist.txt b/lib/required_for_dist.txt index f275d28c8ff6..411e62e755c6 100644 --- a/lib/required_for_dist.txt +++ b/lib/required_for_dist.txt @@ -44,5 +44,5 @@ xmlrpc-2.0.jar xpp3-1.1.4-min.jar xstream.jar swingx-core-1.6.2.jar -netty-3.3.0.Final.jar +netty-3.3.1.Final.jar protobuf-2.3.0.jar diff --git a/lib/src/netty-3.3.0.Final-sources.jar b/lib/src/netty-3.3.1.Final-sources.jar similarity index 84% rename from lib/src/netty-3.3.0.Final-sources.jar rename to lib/src/netty-3.3.1.Final-sources.jar index 40d5a4efc500..a29b723be1d7 100644 Binary files a/lib/src/netty-3.3.0.Final-sources.jar and b/lib/src/netty-3.3.1.Final-sources.jar differ