diff --git a/README.md b/README.md index 98612b5..a8e7813 100644 --- a/README.md +++ b/README.md @@ -120,13 +120,6 @@ spec: enabled: false ``` -### Gradle metadata note - -ignoreGradleMetadataRedirection is used for sonatype because Sailfish dependencies have constrains that interfere with -BOM, so we exclude Gradle metadata for these repositories. - -It's been verified that Sailfish itself is compatible with versions from BOM and therefore safe to use. - # Release notes ## 0.5.0 @@ -134,7 +127,7 @@ It's been verified that Sailfish itself is compatible with versions from BOM and + Updated common: `5.7.2-dev` + Updated common-utils: `2.2.2-dev` + Updated codec: `5.4.1-dev` -+ Updated sailfish-utils: `4.1.1-dev` ++ Removed sailfish-utils ## 0.4.0 diff --git a/build.gradle b/build.gradle index dca60fa..2ed2790 100644 --- a/build.gradle +++ b/build.gradle @@ -6,62 +6,22 @@ plugins { id "org.owasp.dependencycheck" version "8.2.1" } -ext { - sailfishVersion = '3.3.111' -} - group = 'com.exactpro.th2' version = release_version sourceCompatibility = 11 targetCompatibility = 11 -ext.excludeSailfish = { rcd -> - rcd.excludeModule("com.exactpro.sf", "sailfish-core") - rcd.excludeModule("com.exactpro.sf", "sailfish-common") - rcd.excludeModule("com.exactpro.sf", "sailfish-rest-api-client") - rcd.excludeModule("com.exactpro.sf", "service-http") -} - repositories { + mavenCentral() maven { name 'Sonatype_snapshots' url 'https://s01.oss.sonatype.org/content/repositories/snapshots/' - content { - excludeSailfish(it) - } - } - - // ignoreGradleMetadataRedirection is used for sonatype because - // Sailfish dependencies have constrains that interfere with our BOM - // so we exclude Gradle metadata for this repositories. - // We've checked these versions - they are compatible and safe to use - maven { - name 'Sonatype_snapshots' - url 'https://s01.oss.sonatype.org/content/repositories/snapshots/' - metadataSources { - mavenPom() - artifact() - ignoreGradleMetadataRedirection() - } - } - maven { - name 'Sonatype_releases' - url 'https://s01.oss.sonatype.org/content/repositories/releases/' - content { - excludeSailfish(it) - } } maven { name 'Sonatype_releases' url 'https://s01.oss.sonatype.org/content/repositories/releases/' - metadataSources { - mavenPom() - artifact() - ignoreGradleMetadataRedirection() - } } - mavenCentral() mavenLocal() configurations.configureEach { @@ -91,8 +51,6 @@ dependencies { implementation "com.exactpro.th2:common-utils:2.2.2-dev" implementation "com.exactpro.th2:codec:5.4.1-TH2-5143-+" - implementation "com.exactpro.th2:sailfish-utils:4.1.1-dev" - compileOnly "com.google.auto.service:auto-service:1.1.1" annotationProcessor "com.google.auto.service:auto-service:1.1.1" kapt "com.google.auto.service:auto-service:1.1.1" diff --git a/src/main/kotlin/com/exactpro/th2/codec/http/HttpPipelineCodec.kt b/src/main/kotlin/com/exactpro/th2/codec/http/HttpPipelineCodec.kt index 957e05d..700bc9e 100644 --- a/src/main/kotlin/com/exactpro/th2/codec/http/HttpPipelineCodec.kt +++ b/src/main/kotlin/com/exactpro/th2/codec/http/HttpPipelineCodec.kt @@ -240,7 +240,7 @@ class HttpPipelineCodec : IPipelineCodec { val message = messages[0] require(message is RawMessage) { "Message must be a raw message" } - val body = message.body.toByteArray().toString(UTF_8) + val body = message.body.toString(UTF_8) val decodedMessages = mutableListOf>() when (val direction = message.id.direction) {