Merge pull request #18 from reportportal/develop

Release

Author: HardNorth

.github/workflows/release.yml

@@ -54,7 +54,7 @@ jobs:
           java-version: '8'
 
       - name: Setup git credentials
-        uses: oleksiyrudenko/gha-git-credentials@v2.1.1
+        uses: oleksiyrudenko/gha-git-credentials@v2-latest
         with:
           name: 'reportportal.io'
           email: '[email protected]'

CHANGELOG.md

@@ -1,6 +1,10 @@
 # Changelog
 
 ## [Unreleased]
+### Added
+- New Json and Text types to `Constants` class, by @HardNorth
+### Changed
+- Client version updated on [5.2.23](https://github.com/reportportal/client-java/releases/tag/5.2.23), by @HardNorth
 
 ## [5.2.3]
 ### Changed

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.13
+client_version=5.2.23
 jsr305_version=3.0.2
 scripts_url=https://raw.githubusercontent.com/reportportal/gradle-scripts
 scripts_branch=master

src/main/java/com/epam/reportportal/formatting/http/Constants.java

@@ -52,7 +52,13 @@ public class Constants {
 					ContentType.TEXT_PLAIN,
 					ContentType.TEXT_HTML,
 					ContentType.TEXT_XML,
-					ContentType.APPLICATION_XML
+					ContentType.APPLICATION_XML,
+					ContentType.APPLICATION_SOAP_XML,
+					ContentType.APPLICATION_ATOM_XML,
+					// Can't use ContentType.TEXT_JSON, etc. because client-java dependency marked as compileOnly
+					"text/json",
+					"application/x.reportportal.launch.v2+json",
+					"application/x.reportportal.test.v2+json"
 			)));
 
 	public static final Set<String> FORM_TYPES = Collections.singleton(ContentType.APPLICATION_FORM_URLENCODED);
@@ -72,7 +78,10 @@ public class Constants {
 				put(ContentType.APPLICATION_XHTML_XML, XmlPrettier.INSTANCE);
 				put(ContentType.TEXT_XML, XmlPrettier.INSTANCE);
 				put(ContentType.APPLICATION_JSON, JsonPrettier.INSTANCE);
+				// Can't use ContentType.TEXT_JSON, etc. because client-java dependency marked as compileOnly
 				put("text/json", JsonPrettier.INSTANCE);
+				put("application/x.reportportal.launch.v2+json", JsonPrettier.INSTANCE);
+				put("application/x.reportportal.test.v2+json", JsonPrettier.INSTANCE);
 				put(ContentType.TEXT_HTML, HtmlPrettier.INSTANCE);
 			}});