Dependency versions update

reportportal · Jan 17, 2024 · d2469d6 · d2469d6
1 parent 871c01f
commit d2469d6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,10 @@
 # Changelog
 
 ## [Unreleased]
+### Changed
+- Client version updated on [5.2.0](https://github.com/reportportal/client-java/releases/tag/5.2.0), by @HardNorth
+- `utils-java-formatting` library version updated on version [5.2.0](https://github.com/reportportal/utils-java-formatting/releases/tag/5.2.0), by @HardNorth
+- OkHttp3 dependency marked as `implementation` to force users specify their own versions, by @HardNorth
 
 ## [5.0.3]
 ### Changed

diff --git a/build.gradle b/build.gradle
@@ -37,12 +37,11 @@ repositories {
 }
 
 dependencies {
-    api 'com.epam.reportportal:client-java:5.1.22'
+    api 'com.epam.reportportal:client-java:5.2.0'
     api 'com.google.code.findbugs:jsr305:3.0.2'
     api 'com.epam.reportportal:commons-model:5.0.0'
-    api 'com.squareup.okhttp3:okhttp:4.10.0'
-    api 'com.epam.reportportal:utils-java-formatting:5.1.6'
-    implementation 'org.apache.httpcomponents:httpcore:4.4.15'
+    api 'com.epam.reportportal:utils-java-formatting:5.2.0'
+    implementation 'com.squareup.okhttp3:okhttp:4.12.0'
 
     testImplementation 'com.epam.reportportal:agent-java-test-utils:0.0.2'
 

diff --git a/src/main/java/com/epam/reportportal/okhttp3/support/HttpEntityFactory.java b/src/main/java/com/epam/reportportal/okhttp3/support/HttpEntityFactory.java
@@ -24,9 +24,9 @@
 import com.epam.reportportal.formatting.http.entities.Cookie;
 import com.epam.reportportal.formatting.http.entities.Header;
 import com.epam.reportportal.formatting.http.entities.Param;
+import com.epam.reportportal.utils.http.ContentType;
 import okhttp3.*;
 import okio.Buffer;
-import org.apache.http.entity.ContentType;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -111,7 +111,7 @@ private static List<HttpPartFormatter> toParts(@Nonnull RequestBody body,
 		return multipartBody.parts().stream().map(it -> {
 			RequestBody partBody = it.body();
 			String partMimeType = ofNullable(partBody.contentType()).map(Object::toString)
-					.orElse(ContentType.APPLICATION_OCTET_STREAM.getMimeType());
+					.orElse(ContentType.APPLICATION_OCTET_STREAM);
 			BodyType bodyPartType = getBodyType(partMimeType, bodyTypeMap);
 			HttpPartFormatter.Builder partBuilder;
 			if (BodyType.TEXT == bodyPartType) {