From 942db3aa2355119e4b5817d0d42cecfb7ed2a57c Mon Sep 17 00:00:00 2001 From: Trustin Lee Date: Sat, 17 May 2014 20:00:21 +0900 Subject: [PATCH] Preparation for porting OpenSSL support in 3.10 - Add licenses and dependencies --- NOTICE.txt | 59 ++++++++++++++++++-------------- handler/pom.xml | 5 +++ license/LICENSE.bouncycastle.txt | 23 +++++++++++++ pom.xml | 28 +++++++++++++++ 4 files changed, 90 insertions(+), 25 deletions(-) create mode 100644 license/LICENSE.bouncycastle.txt diff --git a/NOTICE.txt b/NOTICE.txt index 7da06ae4a5..ef5371b9cb 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -50,14 +50,6 @@ WebSocket and HTTP server, which can be obtained at: * HOMEPAGE: * https://github.com/joewalnes/webbit -This product contains a modified portion of 'Caliper', Google's micro- -benchmarking framework, which can be obtained at: - - * LICENSE: - * license/LICENSE.caliper.txt (Apache License 2.0) - * HOMEPAGE: - * http://code.google.com/p/caliper/ - This product contains a modified portion of 'SLF4J', a simple logging facade for Java, which can be obtained at: @@ -72,6 +64,15 @@ Bloch of Google, Inc: * LICENSE: * license/LICENSE.deque.txt (Public Domain) +This product contains a modified version of Roland Kuhn's ASL2 +AbstractNodeQueue, which is based on Dmitriy Vyukov's non-intrusive MPSC queue. +It can be obtained at: + + * LICENSE: + * license/LICENSE.abstractnodequeue.txt (Public Domain) + * HOMEPAGE: + * https://github.com/akka/akka/blob/wip-2.2.3-for-scala-2.11/akka-actor/src/main/java/akka/dispatch/AbstractNodeQueue.java + This product optionally depends on 'JZlib', a re-implementation of zlib in pure Java, which can be obtained at: @@ -88,6 +89,23 @@ interchange format, which can be obtained at: * HOMEPAGE: * http://code.google.com/p/protobuf/ +This product optionally depends on 'Bouncy Castle Crypto APIs' to generate +a temporary self-signed X.509 certificate when the JVM does not provide the +equivalent functionality. It can be obtained at: + + * LICENSE: + * license/LICENSE.bouncycastle.txt (MIT License) + * HOMEPAGE: + * http://www.bouncycastle.org/ + +This product optionally depends on 'Snappy', a compression library produced +by Google Inc, which can be obtained at: + + * LICENSE: + * license/LICENSE.snappy.txt (New BSD License) + * HOMEPAGE: + * http://code.google.com/p/snappy/ + This product optionally depends on 'JBoss Marshalling', an alternative Java serialization API, which can be obtained at: @@ -96,6 +114,14 @@ serialization API, which can be obtained at: * HOMEPAGE: * http://www.jboss.org/jbossmarshalling +This product optionally depends on 'Caliper', Google's micro- +benchmarking framework, which can be obtained at: + + * LICENSE: + * license/LICENSE.caliper.txt (Apache License 2.0) + * HOMEPAGE: + * http://code.google.com/p/caliper/ + This product optionally depends on 'Apache Commons Logging', a logging framework, which can be obtained at: @@ -111,20 +137,3 @@ can be obtained at: * license/LICENSE.log4j.txt (Apache License 2.0) * HOMEPAGE: * http://logging.apache.org/log4j/ - -This product optionally depends on 'Snappy', a compression library produced -by Google Inc, which can be obtained at: - - * LICENSE: - * license/LICENSE.snappy.txt (New BSD License) - * HOMEPAGE: - * http://code.google.com/p/snappy/ - -This product contains a modified version of Roland Kuhn's ASL2 -AbstractNodeQueue, which is based on Dmitriy Vyukov's non-intrusive MPSC queue. -It can be obtained at: - - * LICENSE: - * license/LICENSE.abstractnodequeue.txt (Public Domain) - * HOMEPAGE: - * https://github.com/akka/akka/blob/wip-2.2.3-for-scala-2.11/akka-actor/src/main/java/akka/dispatch/AbstractNodeQueue.java \ No newline at end of file diff --git a/handler/pom.xml b/handler/pom.xml index 933a7e75b5..beb620dbc7 100644 --- a/handler/pom.xml +++ b/handler/pom.xml @@ -44,6 +44,11 @@ netty-codec ${project.version} + + org.bouncycastle + bcpkix-jdk15on + true + diff --git a/license/LICENSE.bouncycastle.txt b/license/LICENSE.bouncycastle.txt new file mode 100644 index 0000000000..dbba1dd782 --- /dev/null +++ b/license/LICENSE.bouncycastle.txt @@ -0,0 +1,23 @@ +The MIT License (MIT) + +Copyright (c) 2000 - 2013 The Legion of the Bouncy Castle Inc. + (http://www.bouncycastle.org) + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. + diff --git a/pom.xml b/pom.xml index 17cd52210b..7ff7ac1f13 100644 --- a/pom.xml +++ b/pom.xml @@ -246,11 +246,26 @@ 1.1.0.v20120525 + com.google.protobuf protobuf-java 2.5.0 + + + + org.bouncycastle + bcpkix-jdk15on + 1.50 + compile + true + + com.jcraft jzlib @@ -491,6 +506,19 @@ java.nio.channels.MembershipKey java.net.StandardProtocolFamily java.nio.channels.spi.SelectorProvider + + + sun.security.x509.AlgorithmId + sun.security.x509.CertificateAlgorithmId + sun.security.x509.CertificateIssuerName + sun.security.x509.CertificateSerialNumber + sun.security.x509.CertificateSubjectName + sun.security.x509.CertificateValidity + sun.security.x509.CertificateVersion + sun.security.x509.CertificateX509Key + sun.security.x509.X500Name + sun.security.x509.X509CertInfo + sun.security.x509.X509CertImpl