From d12a73a154d1826d0293a61d1731f4a7a9326004 Mon Sep 17 00:00:00 2001 From: Vadzim Hushchanskou Date: Thu, 28 Mar 2024 16:08:34 +0300 Subject: [PATCH 1/3] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 280115c..9730f0c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ ## [5.2.2] ### Changed -- Client version updated on [5.2.7](https://github.com/reportportal/client-java/releases/tag/5.2.7), by @HardNorth +- Client version updated on [5.2.8](https://github.com/reportportal/client-java/releases/tag/5.2.8), by @HardNorth - Client and JSR 305 dependencies marked as `compileOnly`, by @HardNorth ## [5.2.1] From 762f3f6089908b0307ed4d923ef1fc987e68ff9b Mon Sep 17 00:00:00 2001 From: Vadzim Hushchanskou Date: Wed, 3 Apr 2024 12:18:23 +0300 Subject: [PATCH 2/3] Client version update --- CHANGELOG.md | 2 ++ gradle.properties | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9730f0c..fc5765e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ # Changelog ## [Unreleased] +### Changed +- Client version updated on [5.2.11](https://github.com/reportportal/client-java/releases/tag/5.2.11), by @HardNorth ## [5.2.2] ### Changed diff --git a/gradle.properties b/gradle.properties index 5f47290..fc169ff 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ description=Report Portal Java formatting utils for Agents and Loggers junit5_version=5.6.3 junit5_runner_version=1.6.3 mockito_version=4.5.1 -client_version=5.2.8 +client_version=5.2.11 jsr305_version=3.0.2 scripts_url=https://raw.githubusercontent.com/reportportal/gradle-scripts scripts_branch=master From 9a67d13f166ab48f36ca3a6e61c2cc5e9d09a3fa Mon Sep 17 00:00:00 2001 From: Vadzim Hushchanskou Date: Thu, 4 Apr 2024 14:18:49 +0300 Subject: [PATCH 3/3] Client version update --- CHANGELOG.md | 2 +- gradle.properties | 2 +- .../epam/reportportal/formatting/http/HttpFormatUtils.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fc5765e..0c784b4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ ## [Unreleased] ### Changed -- Client version updated on [5.2.11](https://github.com/reportportal/client-java/releases/tag/5.2.11), by @HardNorth +- Client version updated on [5.2.13](https://github.com/reportportal/client-java/releases/tag/5.2.13), by @HardNorth ## [5.2.2] ### Changed diff --git a/gradle.properties b/gradle.properties index fc169ff..f8bbea0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ description=Report Portal Java formatting utils for Agents and Loggers junit5_version=5.6.3 junit5_runner_version=1.6.3 mockito_version=4.5.1 -client_version=5.2.11 +client_version=5.2.13 jsr305_version=3.0.2 scripts_url=https://raw.githubusercontent.com/reportportal/gradle-scripts scripts_branch=master diff --git a/src/main/java/com/epam/reportportal/formatting/http/HttpFormatUtils.java b/src/main/java/com/epam/reportportal/formatting/http/HttpFormatUtils.java index f07b1c5..062ee55 100644 --- a/src/main/java/com/epam/reportportal/formatting/http/HttpFormatUtils.java +++ b/src/main/java/com/epam/reportportal/formatting/http/HttpFormatUtils.java @@ -52,7 +52,7 @@ private HttpFormatUtils() { @Nonnull public static String getMimeType(@Nullable String contentType) { return ofNullable(contentType).filter(ct -> !ct.isEmpty()) - .map(ct -> ContentType.parse(contentType)) + .map(ct -> ContentType.stripMediaType(contentType)) .orElse(ContentType.APPLICATION_OCTET_STREAM); } @@ -278,7 +278,7 @@ public static BodyType getBodyType(@Nullable String contentType, @Nullable Map m.getOrDefault(mimeType, BodyType.BINARY)).orElse(BodyType.BINARY); }