Upgraded library dependencies (#52)

dekobon · web-flow · commit 454eba23a96f · 2019-01-17T10:28:24.000-08:00
* Upgraded library dependencies

- Resolved errorprone warnings and errors.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,11 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [4.0.9] - 2019-01-15
+
+### Changed
+ - Upgraded dependency versions.
+
 ## [4.0.8] - 2018-04-29
 
 ### Fixed
diff --git a/apache-http-client/src/main/java/com/joyent/http/signature/apache/httpclient/HttpSignatureAuthenticationStrategy.java b/apache-http-client/src/main/java/com/joyent/http/signature/apache/httpclient/HttpSignatureAuthenticationStrategy.java
@@ -114,11 +114,8 @@ public boolean isAuthenticationRequested(final HttpHost authHost,
             return true;
         }
 
-        if (clientContext.getTargetAuthState() == null) {
-            return true;
-        }
+        return clientContext.getTargetAuthState() == null;
 
-        return false;
     }
 
     @Override
diff --git a/common/pom.xml b/common/pom.xml
@@ -20,7 +20,7 @@
 
     <properties>
         <!-- Dependency versions -->
-        <dependency.bouncycastle.version>1.59</dependency.bouncycastle.version>
+        <dependency.bouncycastle.version>1.60</dependency.bouncycastle.version>
         <dependency.jnagmp.version>2.1.0</dependency.jnagmp.version>
         <dependency.commons-codec.version>1.11</dependency.commons-codec.version>
     </properties>
diff --git a/common/src/main/java/com/joyent/http/signature/Signer.java b/common/src/main/java/com/joyent/http/signature/Signer.java
@@ -12,7 +12,6 @@
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.security.InvalidKeyException;
@@ -325,7 +324,7 @@ public String createAuthorizationHeader(final String login,
         try {
             signature.initSign(keyPair.getPrivate());
             final String signingString = String.format(AUTHZ_SIGNING_STRING, date);
-            signature.update(signingString.getBytes("UTF-8"));
+            signature.update(signingString.getBytes(StandardCharsets.UTF_8));
             final byte[] signedDate = signature.sign();
             final byte[] encodedSignedDate = Base64.encode(signedDate);
             final String fingerprint = KeyFingerprinter.md5Fingerprint(keyPair);
@@ -336,8 +335,6 @@ public String createAuthorizationHeader(final String login,
             throw new CryptoException("invalid key", e);
         } catch (final SignatureException e) {
             throw new CryptoException("invalid signature", e);
-        } catch (final UnsupportedEncodingException e) {
-            throw new CryptoException("invalid encoding", e);
         }
     }
 
@@ -472,17 +469,15 @@ public boolean verifyAuthorizationHeader(final KeyPair keyPair,
 
             final String encodedSignedDate = authzHeader.substring(startIndex + AUTHZ_PATTERN.length(),
                     authzHeader.length() - 1);
-            final byte[] signedDate = Base64.decode(encodedSignedDate.getBytes("UTF-8"));
+            final byte[] signedDate = Base64.decode(encodedSignedDate.getBytes(StandardCharsets.UTF_8));
 
-            signature.update(myDate.getBytes("UTF-8"));
+            signature.update(myDate.getBytes(StandardCharsets.UTF_8));
             return signature.verify(signedDate);
 
         } catch (final InvalidKeyException e) {
             throw new CryptoException("invalid key", e);
         } catch (final SignatureException e) {
             throw new CryptoException("invalid signature", e);
-        } catch (final UnsupportedEncodingException e) {
-            throw new CryptoException("invalid encoding", e);
         }
     }
 
diff --git a/common/src/test/java/com/joyent/http/signature/KeyFingerprinterIntegrationCycle.java b/common/src/test/java/com/joyent/http/signature/KeyFingerprinterIntegrationCycle.java
@@ -57,6 +57,7 @@ public void keygen(int iteration) throws IOException, InterruptedException {
     }
 
     // NOTE: need -E md5 for openssh > 6.7
+    @SuppressWarnings("StringSplitter")
     public String readMd5Fingerprint(int iteration) throws IOException, InterruptedException {
         Process p = Runtime.getRuntime().exec(new String[] {
                 "ssh-keygen", "-l", "-f", privateFileName(iteration) + ".pub"});
diff --git a/common/src/test/java/com/joyent/http/signature/SignerTestUtil.java b/common/src/test/java/com/joyent/http/signature/SignerTestUtil.java
@@ -14,7 +14,7 @@
 import java.util.Map;
 
 public class SignerTestUtil {
-    @SuppressWarnings("serial")
+    @SuppressWarnings({"serial", "DoubleBraceInitialization"})
     public static final Map<String,TestKeyResource> keys = new HashMap<String,TestKeyResource>() {{
             put("rsa_1024", new TestKeyResource("9f:0b:50:ae:e3:da:f6:eb:b5:71:9a:69:ee:79:9e:c2",
                                                 "LP3pWCEhg6rdmE05GhUKbZ7uOZqsJd0sK0AR3sVoMq4",
diff --git a/google-http-client/pom.xml b/google-http-client/pom.xml
@@ -20,7 +20,7 @@
     <properties>
         <!-- Dependency versions -->
         <dependency.http-signature-common.version>4.0.9-SNAPSHOT</dependency.http-signature-common.version>
-        <dependency.google-http-client.version>1.23.0</dependency.google-http-client.version>
+        <dependency.google-http-client.version>1.28.0</dependency.google-http-client.version>
     </properties>
 
     <dependencies>
diff --git a/google-http-client/src/test/java/com/joyent/http/signature/google/httpclient/RequestHttpSignerTest.java b/google-http-client/src/test/java/com/joyent/http/signature/google/httpclient/RequestHttpSignerTest.java
@@ -8,6 +8,7 @@
 import com.google.api.client.http.HttpRequestFactory;
 import com.google.api.client.http.HttpTransport;
 import com.google.api.client.testing.http.MockHttpTransport;
+import com.google.common.primitives.Ints;
 import com.joyent.http.signature.Signer;
 import com.joyent.http.signature.SignerTestUtil;
 import com.joyent.http.signature.ThreadLocalSigner;
@@ -97,7 +98,7 @@ public void canSignRequest() throws IOException {
             System.out.println(String.format("Total signing time for request: %dms", total));
         }
 
-        long average = Math.round(running / iterations);
+        long average = Ints.saturatedCast(running / iterations);
         System.out.println(String.format("Average signing time: %dms", average));
 
         String authorization = request.getHeaders().getAuthorization();
diff --git a/jaxrs-client/pom.xml b/jaxrs-client/pom.xml
@@ -24,10 +24,10 @@
         <dependency.arquillian-glassfish-embedded-3.1.version>1.0.2</dependency.arquillian-glassfish-embedded-3.1.version>
         <dependency.http-signature-common.version>4.0.9-SNAPSHOT</dependency.http-signature-common.version>
         <dependency.javaee.version>8.0</dependency.javaee.version>
-        <dependency.jax-rs-api.version>2.1</dependency.jax-rs-api.version>
-        <dependency.jersey-client.version>2.26</dependency.jersey-client.version>
-        <dependency.payara-embedded-web.version>5.181</dependency.payara-embedded-web.version>
-        <dependency.arquillian-testng-container>1.4.0.Final</dependency.arquillian-testng-container>
+        <dependency.jax-rs-api.version>2.1.1</dependency.jax-rs-api.version>
+        <dependency.jersey-client.version>2.27</dependency.jersey-client.version>
+        <dependency.payara-embedded-web.version>5.184</dependency.payara-embedded-web.version>
+        <dependency.arquillian-testng-container>1.4.1.Final</dependency.arquillian-testng-container>
     </properties>
 
     <dependencyManagement>
diff --git a/microbench/pom.xml b/microbench/pom.xml
@@ -21,7 +21,7 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/.
     <properties>
         <!-- Dependency versions -->
         <dependency.http-signature-common.version>4.0.9-SNAPSHOT</dependency.http-signature-common.version>
-        <dependency.jmh.version>1.19</dependency.jmh.version>
+        <dependency.jmh.version>1.21</dependency.jmh.version>
         <uberjar.name>benchmarks</uberjar.name>
     </properties>
 
diff --git a/pom.xml b/pom.xml
@@ -89,9 +89,9 @@
         <surefire.forkCount>1</surefire.forkCount>
         <surefire.useSystemClassLoader>true</surefire.useSystemClassLoader>
         <!-- Dependency versions -->
-        <dependency.checkstyle.version>8.8</dependency.checkstyle.version>
-        <dependency.apache-httpclient.version>4.5.5</dependency.apache-httpclient.version>
-        <dependency.testng.version>6.14.2</dependency.testng.version>
+        <dependency.checkstyle.version>8.16</dependency.checkstyle.version>
+        <dependency.apache-httpclient.version>4.5.6</dependency.apache-httpclient.version>
+        <dependency.testng.version>6.14.3</dependency.testng.version>
         <dependency.slfj.version>1.7.25</dependency.slfj.version>
         <dependency.logback.version>1.2.3</dependency.logback.version>
         <!-- Plugin versions -->
@@ -117,8 +117,8 @@
         <maven-project-info-reports-plugin.version>2.9</maven-project-info-reports-plugin.version>
 
         <!-- Maven plugin dependency versions -->
-        <maven-plexus-compiler-javac-errorprone.version>2.8.3</maven-plexus-compiler-javac-errorprone.version>
-        <maven-error-prone-core.version>2.2.0</maven-error-prone-core.version>
+        <maven-plexus-compiler-javac-errorprone.version>2.8.5</maven-plexus-compiler-javac-errorprone.version>
+        <maven-error-prone-core.version>2.3.2</maven-error-prone-core.version>
     </properties>
 
     <dependencies>

Original file line number	Diff line number	Diff line change
`@@ -114,11 +114,8 @@ public boolean isAuthenticationRequested(final HttpHost authHost,`
`114`	`114`	`return true;`
`115`	`115`	`}`
`116`	`116`
`117`		`- if (clientContext.getTargetAuthState() == null) {`
`118`		`- return true;`
`119`		`- }`
	`117`	`+ return clientContext.getTargetAuthState() == null;`
`120`	`118`
`121`		`- return false;`
`122`	`119`	`}`
`123`	`120`
`124`	`121`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,7 @@ public void keygen(int iteration) throws IOException, InterruptedException {`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`// NOTE: need -E md5 for openssh > 6.7`
	`60`	`+ @SuppressWarnings("StringSplitter")`
`60`	`61`	`public String readMd5Fingerprint(int iteration) throws IOException, InterruptedException {`
`61`	`62`	`Process p = Runtime.getRuntime().exec(new String[] {`
`62`	`63`	`"ssh-keygen", "-l", "-f", privateFileName(iteration) + ".pub"});`