diff --git a/.idea/libraries/Netty.xml b/.idea/libraries/Netty.xml index 723ad4eef42d..1c2042bff2df 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 872cc5f6e9fe..5319444eaae6 100644 --- a/build/scripts/libLicenses.gant +++ b/build/scripts/libLicenses.gant @@ -252,7 +252,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.5.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: "4.1.0.Beta1", license: "Apache 2.0", url: "http://netty.io", licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0") +libraryLicense(name: "Netty", libraryName: "Netty", version: "4.1.0.Beta3", license: "Apache 2.0", url: "http://netty.io", licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0") libraryLicense(name: "Kryo", libraryName: "Kryo", version: "2.22", license: "New BSD License", url: "https://github.com/EsotericSoftware/kryo", licenseUrl: "https://github.com/EsotericSoftware/kryo/blob/master/license.txt") libraryLicense(name: "Snappy-Java", libraryName: "Snappy-Java", version: "0.3", license: "Apache 2.0", url: "https://github.com/dain/snappy", 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-all-4.1.0.Beta1.jar b/lib/netty-all-4.1.0.Beta3.jar similarity index 52% rename from lib/netty-all-4.1.0.Beta1.jar rename to lib/netty-all-4.1.0.Beta3.jar index cbd8b2cb6d33..fd2f6ba0e6c5 100644 Binary files a/lib/netty-all-4.1.0.Beta1.jar and b/lib/netty-all-4.1.0.Beta3.jar differ diff --git a/lib/required_for_dist.txt b/lib/required_for_dist.txt index 6ea1f4d542ec..094e94784836 100644 --- a/lib/required_for_dist.txt +++ b/lib/required_for_dist.txt @@ -48,7 +48,7 @@ microba.jar miglayout-swing.jar nanoxml-2.2.3.jar nekohtml-1.9.14.jar -netty-all-4.1.0.Beta1.jar +netty-all-4.1.0.Beta3.jar oromatcher.jar picocontainer.jar protobuf-2.5.0.jar diff --git a/lib/src/netty-all-4.1.0.Beta1-sources.jar b/lib/src/netty-all-4.1.0.Beta3-sources.jar similarity index 70% rename from lib/src/netty-all-4.1.0.Beta1-sources.jar rename to lib/src/netty-all-4.1.0.Beta3-sources.jar index 48e83c77330f..80f203cec58a 100644 Binary files a/lib/src/netty-all-4.1.0.Beta1-sources.jar and b/lib/src/netty-all-4.1.0.Beta3-sources.jar differ