DXE-2051 Merge pull request #45 from akamai/release/5.0.0

Release/5.0.0
akamai · Jan 19, 2023 · 1b5a89a · 1b5a89a
2 parents eed6b03 + 797cd12
commit 1b5a89a
Show file tree

Hide file tree

Showing 16 changed files with 92 additions and 34 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,4 +2,4 @@ dist: trusty
 sudo: false
 language: java
 jdk:
- - openjdk8
+ - openjdk11
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Change log
 
+## 5.0.0 (January 19, 2023)
+
+### BREAKING CHANGES
+
+* Minimum Java version is 11.
+
 ## 4.1.2 (July 21, 2022)
 
 ### Improvements

diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@ Before you begin, you need to [Create authentication credentials](https://techdo
 
 ## Install required software
 
-In order to use EdgeGrid Client for Java, you need [Java version 8+](https://www.java.com/en/download/help/download_options.xml).
+In order to use EdgeGrid Client for Java, you need [Java version 11+](https://www.java.com/en/download/help/download_options.xml).
 
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.akamai.edgegrid/edgegrid-signer-parent/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.akamai.edgegrid/edgegrid-signer-parent)
 [![Javadocs](http://www.javadoc.io/badge/com.akamai.edgegrid/edgegrid-signer-parent.svg)](https://www.javadoc.io/doc/com.akamai.edgegrid)
@@ -70,13 +70,17 @@ programming languages, and you can find them at [https://github.com/akamai?q=edg
 
 ### Active
 
-Roberto López López <rlopezlo@akamai.com>
 Michał Wójcik <miwojci@akamai.com>
 
+Tatiana Slonimskaia <tslonims@akamai.com>
+
 ### Inactive
 
 Martin Meyer <mmeyer@akamai.com>
-Maciej Gawinecki <mgawinec@akamai.com>
+
+Maciej Gawinecki
+
+Roberto López López
 
 ## Contribute
 

diff --git a/edgegrid-signer-apache-http-client/README.md b/edgegrid-signer-apache-http-client/README.md
@@ -15,7 +15,7 @@ Include the following Maven dependency in your project POM:
 <dependency>
  <groupId>com.akamai.edgegrid</groupId>
  <artifactId>edgegrid-signer-apache-http-client</artifactId>
- <version>4.1.2</version>
+ <version>5.0.0</version>
 </dependency>
 ```
 

diff --git a/edgegrid-signer-apache-http-client/pom.xml b/edgegrid-signer-apache-http-client/pom.xml
@@ -6,7 +6,7 @@
  <parent>
  <artifactId>edgegrid-signer-parent</artifactId>
  <groupId>com.akamai.edgegrid</groupId>
- <version>4.1.2</version>
+ <version>5.0.0</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/edgegrid-signer-async-http-client/README.md b/edgegrid-signer-async-http-client/README.md
@@ -15,7 +15,7 @@ Include the following Maven dependency in your project POM:
 <dependency>
  <groupId>com.akamai.edgegrid</groupId>
  <artifactId>edgegrid-signer-async-http-client</artifactId>
- <version>4.1.2</version>
+ <version>5.0.0</version>
 </dependency>
 ```
 

diff --git a/edgegrid-signer-async-http-client/pom.xml b/edgegrid-signer-async-http-client/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>edgegrid-signer-parent</artifactId>
  <groupId>com.akamai.edgegrid</groupId>
- <version>4.1.2</version>
+ <version>5.0.0</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/edgegrid-signer-core/pom.xml b/edgegrid-signer-core/pom.xml
@@ -6,7 +6,7 @@
  <parent>
  <artifactId>edgegrid-signer-parent</artifactId>
  <groupId>com.akamai.edgegrid</groupId>
- <version>4.1.2</version>
+ <version>5.0.0</version>
  </parent>
 
  <artifactId>edgegrid-signer-core</artifactId>

diff --git a/edgegrid-signer-core/src/main/java/com/akamai/edgegrid/signer/Request.java b/edgegrid-signer-core/src/main/java/com/akamai/edgegrid/signer/Request.java
@@ -160,10 +160,9 @@ public static class RequestBuilder {
  * @return reference back to this builder instance
  */
  public RequestBuilder body(byte[] requestBody) {
- if (body == null || "".equals(body)) {
- throw new IllegalArgumentException("body cannot be empty");
+ if (requestBody != null && requestBody.length != 0) {
+ this.body = Arrays.copyOf(requestBody, requestBody.length);
  }
- this.body = Arrays.copyOf(requestBody, requestBody.length);
  return this;
  }
 

diff --git a/edgegrid-signer-core/src/test/java/com/akamai/edgegrid/signer/RequestTest.java b/edgegrid-signer-core/src/test/java/com/akamai/edgegrid/signer/RequestTest.java
@@ -103,6 +103,29 @@ public void testHeadersLowercasing() {
  assertThat(request.getHeaders().get("header"), equalTo("h"));
  }
 
+ @Test
+ public void testAcceptRequestWithEmptyRequestBody() {
+ Request request = Request.builder()
+ .body("".getBytes())
+ .method("GET")
+ .uri(URI.create("/check"))
+ .header("HeaDer", "h")
+ .build();
+
+ assertThat(request.getBody(), equalTo(new byte[]{}));
+ }
+
+ @Test
+ public void testAcceptRequestWithNullRequestBody() {
+ Request request = Request.builder()
+ .method("GET")
+ .uri(URI.create("/check"))
+ .header("HeaDer", "h")
+ .build();
+
+ assertThat(request.getBody(), equalTo(new byte[]{}));
+ }
+
  @Test(expectedExceptions = IllegalArgumentException.class)
  public void testRejectDuplicateHeaderNames() {
  Request.builder()

diff --git a/edgegrid-signer-google-http-client/README.md b/edgegrid-signer-google-http-client/README.md
@@ -15,7 +15,7 @@ Include the following Maven dependency in your project POM:
 <dependency>
  <groupId>com.akamai.edgegrid</groupId>
  <artifactId>edgegrid-signer-google-http-client</artifactId>
- <version>4.1.2</version>
+ <version>5.0.0</version>
 </dependency>
 ```
 

diff --git a/edgegrid-signer-google-http-client/pom.xml b/edgegrid-signer-google-http-client/pom.xml
@@ -6,7 +6,7 @@
  <parent>
  <artifactId>edgegrid-signer-parent</artifactId>
  <groupId>com.akamai.edgegrid</groupId>
- <version>4.1.2</version>
+ <version>5.0.0</version>
  </parent>
 
  <artifactId>edgegrid-signer-google-http-client</artifactId>

diff --git a/edgegrid-signer-rest-assured/README.md b/edgegrid-signer-rest-assured/README.md
@@ -15,7 +15,7 @@ Include the following Maven dependency in your project POM:
 <dependency>
  <groupId>com.akamai.edgegrid</groupId>
  <artifactId>edgegrid-signer-rest-assured</artifactId>
- <version>4.1.2</version>
+ <version>5.0.0</version>
 </dependency>
 ```
 

diff --git a/edgegrid-signer-rest-assured/pom.xml b/edgegrid-signer-rest-assured/pom.xml
@@ -6,7 +6,7 @@
  <parent>
  <artifactId>edgegrid-signer-parent</artifactId>
  <groupId>com.akamai.edgegrid</groupId>
- <version>4.1.2</version>
+ <version>5.0.0</version>
  </parent>
 
  <artifactId>edgegrid-signer-rest-assured</artifactId>

diff --git a/edgerc-reader/pom.xml b/edgerc-reader/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>edgegrid-signer-parent</artifactId>
  <groupId>com.akamai.edgegrid</groupId>
- <version>4.1.2</version>
+ <version>5.0.0</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
  <groupId>com.akamai.edgegrid</groupId>
  <artifactId>edgegrid-signer-parent</artifactId>
- <version>4.1.2</version>
+ <version>5.0.0</version>
 
  <modules>
  <module>edgegrid-signer-apache-http-client</module>
@@ -35,25 +35,22 @@
 
  <developers>
  <developer>
- <name>Roberto López López</name>
- <id>rlopezlo</id>
- <email>rlopezlo at akamai.com</email>
+ <name>Michał Wójcik</name>
+ <id>miwojci</id>
  <roles>
  <role>Developer</role>
  </roles>
  </developer>
  <developer>
- <name>Michał Wójcik</name>
- <id>miwojci</id>
- <email>miwojci at akamai.com</email>
+ <name>Martin Meyer</name>
+ <id>mmeyer</id>
  <roles>
  <role>Developer</role>
  </roles>
  </developer>
  <developer>
- <name>Martin Meyer</name>
- <id>mmeyer</id>
- <email>mmeyer at akamai.com</email>
+ <name>Tatiana Slonimskaia</name>
+ <id>tslonims</id>
  <roles>
  <role>Developer</role>
  </roles>
@@ -79,8 +76,8 @@
 
  <properties>
  <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <maven.compiler.source>1.8</maven.compiler.source>
- <maven.compiler.target>1.8</maven.compiler.target>
+ <maven.compiler.source>11</maven.compiler.source>
+ <maven.compiler.target>11</maven.compiler.target>
  <slf4j.version>1.7.36</slf4j.version>
  <netty.version>4.1.78.Final</netty.version>
  <logback.version>1.2.11</logback.version>
@@ -123,6 +120,12 @@
  <artifactId>rest-assured</artifactId>
  <version>4.4.0</version>
  </dependency>
+ <!-- remove after updating commons-configuration2 -->
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-text</artifactId>
+ <version>1.10.0</version>
+ </dependency>
  <dependency>
  <groupId>org.apache.commons</groupId>
  <artifactId>commons-configuration2</artifactId>
@@ -169,7 +172,7 @@
  <dependency>
  <groupId>org.testng</groupId>
  <artifactId>testng</artifactId>
- <version>7.4.0</version>
+ <version>7.7.0</version>
  <scope>test</scope>
  </dependency>
  </dependencies>
@@ -178,10 +181,29 @@
  <build>
  <pluginManagement>
  <plugins>
+ <plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <version>0.8.8</version>
+ <executions>
+ <execution>
+ <id>prepare-agent</id>
+ <goals>
+ <goal>prepare-agent</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>report</id>
+ <goals>
+ <goal>report</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
  <plugin>
  <groupId>org.apache.maven.plugins</groupId>
  <artifactId>maven-javadoc-plugin</artifactId>
- <version>3.3.0</version>
+ <version>3.4.1</version>
  <executions>
  <execution>
  <id>attach-javadocs</id>
@@ -207,7 +229,7 @@
  <plugin>
  <groupId>org.apache.maven.plugins</groupId>
  <artifactId>maven-jar-plugin</artifactId>
- <version>3.2.0</version>
+ <version>3.3.0</version>
  <configuration>
  <archive>
  <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
@@ -237,7 +259,7 @@
  <plugin>
  <groupId>org.apache.maven.plugins</groupId>
  <artifactId>maven-deploy-plugin</artifactId>
- <version>3.0.0-M1</version>
+ <version>3.0.0</version>
  <configuration>
  <skip>true</skip>
  </configuration>
@@ -255,6 +277,10 @@
  </plugins>
  </pluginManagement>
  <plugins>
+ <plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ </plugin>
  <plugin>
  <groupId>org.apache.maven.plugins</groupId>
  <artifactId>maven-javadoc-plugin</artifactId>
@@ -270,7 +296,7 @@
  <plugin>
  <groupId>org.apache.maven.plugins</groupId>
  <artifactId>maven-enforcer-plugin</artifactId>
- <version>3.0.0-M3</version>
+ <version>3.1.0</version>
  <executions>
  <execution>
  <id>enforce-maven</id>