Skip to content

Commit 582811e

Browse files
indianwhocodesindianwhocodes
authored
Upgrade Dependencies (#58)
* Dependency Upgrade for java-http-signature * Fixed Checkstyle violations compatible with upgrade * TestNG version fixing testSignedRequestWithFilter, jaxrs-client-signature pom upgrade * Modifications to Signer.java * CHANGELOG.md changes documenting next release
1 parent a4a726c commit 582811e

File tree

11 files changed

+78
-59
lines changed

11 files changed

+78
-59
lines changed

‎CHANGELOG.md

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,32 @@
22
All notable changes to this project will be documented in this file.
33
This project adheres to [Semantic Versioning](http://semver.org/).
44

5+
## [4.1.0]
6+
7+
### Changed
8+
- [Upgraded dependencies to latest stable versions:](https://github.com/joyent/java-http-signature/commit/aa0ad5dd209b86129dfe56e22553054056e7b3bb)
9+
- HTTP Signatures dependency: 4.0.9 → 4.0.10
10+
- BouncyCastle: 1.61 → 1.64
11+
- Apache HttpClient: 4.5.7 → 4.5.11
12+
- Google HttpClient: 1.28.0 → 1.32.1
13+
- Jersey-Client 2.27 → 2.30.1
14+
- Arquillian 1.4.0.Final → 1.6.0.Final
15+
- Arquillian-TestNG 1.4.0.Final → 1.6.0.Final
16+
- Slfj 1.7.25 → 1.7.30
17+
- Checkstyle 8.16 → 8.30
18+
- Commons-Codec 1.11 → 1.13
19+
- Upgraded maven and maven-plugin dependencies.
20+
- Added checkstyle warnings to [HttpSignatureAuthScheme.java](https://github.com/joyent/java-http-signature/blob/master/apache-http-client/src/main/java/com/joyent/http/signature/apache/httpclient/HttpSignatureAuthScheme.java),
21+
[HttpSignatureConfigurator.java](https://github.com/joyent/java-http-signature/blob/master/apache-http-client/src/main/java/com/joyent/http/signature/apache/httpclient/HttpSignatureConfigurator.java) and fixed checkstyle errors.
22+
523
## [4.0.10] - 2019-02-27
624

725
### Changed
826
- Upgraded dependency versions for BC and Apache-Http-Client.
927
- [Upgrade Apache-Http-Client Dependency](https://github.com/joyent/java-http-signature/commit/9ee3137ac7fdc518f5136ee16a3e8161619461f9)
1028
- [Upgraded BC Version To 1.61](https://github.com/joyent/java-http-signature/commit/1e72d58f2b05adc7e401ce29cea02233c4bdd725)
1129

12-
## [4.0.9] - 2019-01-15
30+
## [4.0.9] - 2019-01-15
1331

1432
### Changed
1533
- Upgraded dependency versions.

‎apache-http-client/src/main/java/com/joyent/http/signature/apache/httpclient/HttpSignatureAuthScheme.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@
3333
* @author <a href="https://github.com/dekobon">Elijah Zupancic</a>
3434
* @since 1.0.0
3535
*/
36-
@SuppressWarnings("deprecation")
36+
@SuppressWarnings({"deprecation", "checkstyle:javadocmethod", "checkstyle:javadoctype",
37+
"checkstyle:javadocvariable"})
3738
public class HttpSignatureAuthScheme implements ContextAwareAuthScheme {
3839
/**
3940
* Name of authentication scheme.

‎apache-http-client/src/main/java/com/joyent/http/signature/apache/httpclient/HttpSignatureConfigurator.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
* @author <a href="https://github.com/dekobon">Elijah Zupancic</a>
2323
* @since 2.0.5
2424
*/
25+
@SuppressWarnings({"checkstyle:javadocmethod", "checkstyle:javadoctype",
26+
"checkstyle:javadocvariable", "unused"})
2527
public class HttpSignatureConfigurator {
2628
/**
2729
* Public/private keypair object used to sign HTTP requests.

‎checkstyle.xml

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,11 @@
4242
<!-- Checks for Size Violations. -->
4343
<!-- See http://checkstyle.sf.net/config_sizes.html -->
4444
<module name="FileLength"/>
45+
<module name="LineLength">
46+
<property name="max" value="120" />
47+
<property name="tabWidth" value="4" />
48+
<property name="ignorePattern" value="^.*\*.*@see.+$" />
49+
</module>
4550

4651
<!-- Checks for whitespace -->
4752
<!-- See http://checkstyle.sf.net/config_whitespace.html -->
@@ -69,13 +74,12 @@
6974
<module name="SuppressWarningsHolder" />
7075

7176
<!-- Checks for Javadoc comments. -->
72-
<!-- See http://checkstyle.sf.net/config_javadoc.html -->
73-
<module name="JavadocMethod">
74-
<property name="allowMissingPropertyJavadoc" value="true" />
75-
</module>
76-
<module name="JavadocType" />
77+
<!-- See https://checkstyle.org/config_javadoc.html -->
78+
<module name="InvalidJavadocPosition"/>
79+
<module name="JavadocMethod"/>
80+
<module name="JavadocType"/>
7781
<module name="JavadocVariable"/>
78-
<module name="JavadocStyle" />
82+
<module name="JavadocStyle"/>
7983

8084
<!-- Checks for Naming Conventions. -->
8185
<!-- See http://checkstyle.sf.net/config_naming.html -->
@@ -101,12 +105,7 @@
101105
<module name="UnusedImports"/>
102106

103107
<!-- Checks for Size Violations. -->
104-
<!-- See http://checkstyle.sf.net/config_sizes.html -->
105-
<module name="LineLength">
106-
<property name="max" value="120" />
107-
<property name="tabWidth" value="4" />
108-
<property name="ignorePattern" value="^.*\*.*@see.+$" />
109-
</module>
108+
<!-- See https://checkstyle.org/config_sizes.html -->
110109
<module name="MethodLength" />
111110
<module name="ParameterNumber" />
112111

‎common/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020

2121
<properties>
2222
<!-- Dependency versions -->
23-
<dependency.bouncycastle.version>1.61</dependency.bouncycastle.version>
23+
<dependency.bouncycastle.version>1.64</dependency.bouncycastle.version>
2424
<dependency.jnagmp.version>2.1.0</dependency.jnagmp.version>
25-
<dependency.commons-codec.version>1.11</dependency.commons-codec.version>
25+
<dependency.commons-codec.version>1.13</dependency.commons-codec.version>
2626
</properties>
2727

2828
<dependencies>

‎common/src/main/java/com/joyent/http/signature/Signer.java

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ public Signer(final Builder builder) {
112112
httpHeaderAlgorithm = builder.httpHeaderAlgorithm();
113113
if (provider == null) {
114114
try {
115-
signature = Signature.getInstance(builder.javaStandardName(provider));
115+
signature = Signature.getInstance(builder.javaStandardName(null));
116116
} catch (NoSuchAlgorithmException nsae) {
117117
throw new CryptoException(nsae);
118118
}
@@ -215,6 +215,7 @@ public String createAuthorizationHeader(final String login,
215215
* @param keyPair public/private keypair
216216
* @return value to Authorization header
217217
*/
218+
@SuppressWarnings("unused")
218219
public String createAuthorizationHeader(final String login,
219220
final KeyPair keyPair) {
220221
return createAuthorizationHeader(login, keyPair, defaultSignDateAsString());
@@ -652,15 +653,17 @@ public static SigningAlgorithmHelper create(final KeyPair keyPair) {
652653
* @return New {@code SigningAlgorithmHelper} instance.
653654
*/
654655
public static SigningAlgorithmHelper create(final String algorithm) {
655-
if (algorithm.equals("RSA")) {
656-
return new RsaHelper();
657-
} else if (algorithm.equals("DSA")) {
658-
return new DsaHelper();
656+
switch (algorithm) {
657+
case "RSA":
658+
return new RsaHelper();
659+
case "DSA":
660+
return new DsaHelper();
659661
// See NssBridgeKeyConverter on the two names
660-
} else if (algorithm.equals("ECDSA") || algorithm.equals("EC")) {
661-
return new EcdsaHelper();
662-
} else {
663-
throw new IllegalArgumentException("invalid signing algorithm: " + algorithm);
662+
case "ECDSA":
663+
case "EC":
664+
return new EcdsaHelper();
665+
default:
666+
throw new IllegalArgumentException("invalid signing algorithm: " + algorithm);
664667
}
665668
}
666669

‎google-http-client/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<properties>
2121
<!-- Dependency versions -->
2222
<dependency.http-signature-common.version>4.0.11-SNAPSHOT</dependency.http-signature-common.version>
23-
<dependency.google-http-client.version>1.28.0</dependency.google-http-client.version>
23+
<dependency.google-http-client.version>1.32.1</dependency.google-http-client.version>
2424
</properties>
2525

2626
<dependencies>

‎jaxrs-client/pom.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@
2020

2121
<properties>
2222
<!-- Dependency versions -->
23-
<dependency.arquillian.version>1.4.0.Final</dependency.arquillian.version>
23+
<dependency.arquillian.version>1.6.0.Final</dependency.arquillian.version>
2424
<dependency.arquillian-glassfish-embedded-3.1.version>1.0.2</dependency.arquillian-glassfish-embedded-3.1.version>
2525
<dependency.http-signature-common.version>4.0.11-SNAPSHOT</dependency.http-signature-common.version>
26-
<dependency.javaee.version>8.0</dependency.javaee.version>
26+
<dependency.javaee.version>8.0.1</dependency.javaee.version>
2727
<dependency.jax-rs-api.version>2.1.1</dependency.jax-rs-api.version>
28-
<dependency.jersey-client.version>2.27</dependency.jersey-client.version>
29-
<dependency.payara-embedded-web.version>5.184</dependency.payara-embedded-web.version>
30-
<dependency.arquillian-testng-container>1.4.1.Final</dependency.arquillian-testng-container>
28+
<dependency.jersey-client.version>2.30.1</dependency.jersey-client.version>
29+
<dependency.payara-embedded-web.version>5.201</dependency.payara-embedded-web.version>
30+
<dependency.arquillian-testng-container>1.6.0.Final</dependency.arquillian-testng-container>
3131
</properties>
3232

3333
<dependencyManagement>

‎jaxrs-client/src/test/java/com/joyent/http/signature/jaxrs/client/SignedRequestClientRequestFilterIT.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,6 @@ public void testSignedRequestWithFilter() throws URISyntaxException, IOException
127127
}
128128

129129
Assert.assertNotNull(response);
130-
Assert.assertNotNull(response.getStatus());
131130
Assert.assertEquals(response.getStatus(), 200);
132131
logger.debug("response status code: {}", response.getStatus());
133132
Assert.assertNotNull(response.getMediaType());
@@ -161,6 +160,4 @@ public void testSignedRequestWithFilter() throws URISyntaxException, IOException
161160
&& authorizationString.contains("signature=")
162161
);
163162
}
164-
165-
166163
}

‎microbench/src/main/java/com/joyent/http/signature/BenchmarkSigner.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,7 @@ public boolean verifyHeaderLatency() {
8888
}
8989

9090
protected String signHeader(final String now) {
91-
String authzHeader = signer.createAuthorizationHeader("bench", keyPair, now);
92-
return authzHeader;
91+
return signer.createAuthorizationHeader("bench", keyPair, now);
9392
}
9493

9594
protected boolean verifyHeader(final String ts, final String header) {

‎pom.xml

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -95,36 +95,36 @@
9595
<surefire.forkCount>1</surefire.forkCount>
9696
<surefire.useSystemClassLoader>true</surefire.useSystemClassLoader>
9797
<!-- Dependency versions -->
98-
<dependency.checkstyle.version>8.16</dependency.checkstyle.version>
99-
<dependency.apache-httpclient.version>4.5.7</dependency.apache-httpclient.version>
98+
<dependency.checkstyle.version>8.30</dependency.checkstyle.version>
99+
<dependency.apache-httpclient.version>4.5.11</dependency.apache-httpclient.version>
100100
<dependency.testng.version>6.14.3</dependency.testng.version>
101-
<dependency.slfj.version>1.7.25</dependency.slfj.version>
101+
<dependency.slfj.version>1.7.30</dependency.slfj.version>
102102
<dependency.logback.version>1.2.3</dependency.logback.version>
103103
<!-- Plugin versions -->
104-
<maven-checkstyle-plugin.version>3.0.0</maven-checkstyle-plugin.version>
105-
<maven-clean-plugin.version>3.0.0</maven-clean-plugin.version>
106-
<maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
107-
<maven-dependency-plugin.version>3.0.2</maven-dependency-plugin.version>
108-
<maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version>
109-
<maven-enforcer-plugin.version>1.4.1</maven-enforcer-plugin.version>
110-
<maven-failsafe-plugin.version>2.21.0</maven-failsafe-plugin.version>
104+
<maven-checkstyle-plugin.version>3.1.1</maven-checkstyle-plugin.version>
105+
<maven-clean-plugin.version>3.1.0</maven-clean-plugin.version>
106+
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
107+
<maven-dependency-plugin.version>3.1.1</maven-dependency-plugin.version>
108+
<maven-deploy-plugin.version>3.0.0-M1</maven-deploy-plugin.version>
109+
<maven-enforcer-plugin.version>3.0.0-M2</maven-enforcer-plugin.version>
110+
<maven-failsafe-plugin.version>2.22.2</maven-failsafe-plugin.version>
111111
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
112-
<maven-install-plugin.version>2.5.2</maven-install-plugin.version>
113-
<maven-jar-plugin.version>3.0.2</maven-jar-plugin.version>
114-
<maven-jarsigner-plugin.version>1.4</maven-jarsigner-plugin.version>
115-
<maven-javadoc-plugin.version>3.0.0</maven-javadoc-plugin.version>
116-
<maven-jxr-plugin.version>2.5</maven-jxr-plugin.version>
112+
<maven-install-plugin.version>3.0.0-M1</maven-install-plugin.version>
113+
<maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
114+
<maven-jarsigner-plugin.version>3.0.0</maven-jarsigner-plugin.version>
115+
<maven-javadoc-plugin.version>3.1.1</maven-javadoc-plugin.version>
116+
<maven-jxr-plugin.version>3.0.0</maven-jxr-plugin.version>
117117
<maven-release-plugin.version>2.5.3</maven-release-plugin.version>
118-
<maven-resources-plugin.version>3.0.2</maven-resources-plugin.version>
119-
<maven-shade-plugin.version>2.4.2</maven-shade-plugin.version>
120-
<maven-source-plugin.version>3.0.1</maven-source-plugin.version>
121-
<maven-surefire-plugin.version>2.21.0</maven-surefire-plugin.version>
122-
<maven-jacoco-plugin.version>0.8.1</maven-jacoco-plugin.version>
123-
<maven-project-info-reports-plugin.version>2.9</maven-project-info-reports-plugin.version>
118+
<maven-resources-plugin.version>3.1.0</maven-resources-plugin.version>
119+
<maven-shade-plugin.version>3.2.2</maven-shade-plugin.version>
120+
<maven-source-plugin.version>3.2.1</maven-source-plugin.version>
121+
<maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
122+
<maven-jacoco-plugin.version>0.8.5</maven-jacoco-plugin.version>
123+
<maven-project-info-reports-plugin.version>3.0.0</maven-project-info-reports-plugin.version>
124124

125125
<!-- Maven plugin dependency versions -->
126-
<maven-plexus-compiler-javac-errorprone.version>2.8.5</maven-plexus-compiler-javac-errorprone.version>
127-
<maven-error-prone-core.version>2.3.2</maven-error-prone-core.version>
126+
<maven-plexus-compiler-javac-errorprone.version>2.8.6</maven-plexus-compiler-javac-errorprone.version>
127+
<maven-error-prone-core.version>2.3.4</maven-error-prone-core.version>
128128
</properties>
129129

130130
<dependencies>

0 commit comments

Comments
 (0)