From f60819349b19ede9d8c3a9bb7f87265c752ee535 Mon Sep 17 00:00:00 2001
From: Stuart Stock <stuart@int08h.com>
Date: Tue, 27 Mar 2018 12:36:15 -0500
Subject: [PATCH] Update to Netty 4.1.22; update CONTRIBUTING

---
 CONTRIBUTING.md | 34 +++++++++-------------------------
 build.gradle    |  4 ++--
 2 files changed, 11 insertions(+), 27 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 943bf8d..ab73a76 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -8,24 +8,17 @@ Contributions to Nearenough are welcomed!
 4. Open a Pull Request
 5. Discuss and iterate
 
-Notes
-* Please keep pull requests limited to a single issue.
-* Whitespace-only commits should be separate from other code changes. You can commit your new feature
-  or fix first and then follow with a separate whitespace/style commit.
-
 ## Testing
 
-* New features/functionality require new tests. 
-* Please run the test suite and ensure it passes.
-* Bugfixes should be accompanied by a test case covering the bug.
+* Please run the test suite and ensure it passes
+* New features/functionality require new tests
+* Bugfixes should be accompanied by a test case covering the bug
 
 ## Style/Coding Standard
 
+* [Google Java Style Guide](https://google.github.io/styleguide/javaguide.html)
 * Java 8 
-* Java code must comply with the
-  [Google Java Style Guide](https://google.github.io/styleguide/javaguide.html). This is strictly
-  enforced.
-* All files use unix (LF) line endings
+* Unix (LF) line endings
 
 ## External Dependencies
 
@@ -34,7 +27,7 @@ strive to be bare-bones and may depend only on the Java 8 standard library, EdDS
 
 ## Licensing of Contributions
 
-Section 5 of the Apache 2.0 license describes how contributions are handled:
+Nearenough is Apache 2.0 licensed. Contributions are handled as per section 5:
 
    > Submission of Contributions. Unless You explicitly state otherwise,
    > any Contribution intentionally submitted for inclusion in the Work
@@ -44,18 +37,9 @@ Section 5 of the Apache 2.0 license describes how contributions are handled:
    > the terms of any separate license agreement you may have executed
    > with Licensor regarding such Contributions.
       
-### Contributor License Agreement
-
-One-liners, simple fixes, and other minor changes do **not** require a CLA. They are handled as per 
-Section 5 of the Apache 2.0 license. Prior to being merged into `master` you will be asked:
+In your PR please:
 
-  1. To confirm you are the original author of the work.
-  2. To state that you license the work to the Nearenough project under the Apache 2.0 license and 
+  1. Confirm you are the original author of the work.
+  2. State that you license the work to the Nearenough project under the Apache 2.0 license and 
      that you have the legal authority to do so.
 
-Substantial contributions **do** require a completed Contributor License Agreement (CLA) prior to 
-them being accepted. The definition of "substantial" is fuzzy, but we'll know it when we see it. 
-Please contact stuart{at}int08h.com to get the CLA submitted.
-
-
-
diff --git a/build.gradle b/build.gradle
index 314b057..e30865a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,7 +16,7 @@ dependencies {
     // local snapshot of Ed25519
     compile files('lib/eddsa-0.1.0.jar')
 
-    compile 'io.netty:netty-all:4.1.20.Final'
+    compile 'io.netty:netty-all:4.1.22.Final'
 
     testCompile 'junit:junit:4.12'
 }
@@ -34,7 +34,7 @@ task nioExample(type: JavaExec) {
     }
 }
 
-// Runs the NIO example
+// Runs the Netty example
 task nettyExample(type: JavaExec) {
     classpath = sourceSets.main.runtimeClasspath
     main = 'nearenough.examples.NettyClient'