From f287caf67c67bd68e7a08f1155701bb216d568ff Mon Sep 17 00:00:00 2001 From: "nikita.smirnov" Date: Wed, 4 Oct 2023 11:52:27 +0400 Subject: [PATCH] [TS-1574] Sailfish updated from `3.3.132` to `3.3.144` --- Dockerfile | 2 +- README.md | 24 ++++++++++++++---------- build.gradle | 4 ++-- gradle.properties | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 5 files changed, 19 insertions(+), 15 deletions(-) diff --git a/Dockerfile b/Dockerfile index 84d6f55..5e8af41 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM gradle:6.6-jdk11 AS build +FROM gradle:7.6-jdk11 AS build ARG release_version COPY ./ . RUN gradle --no-daemon clean build dockerPrepare -Prelease_version=${release_version} diff --git a/README.md b/README.md index 2f3a14a..63c45a0 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Connect (3.11.1) +# Connect (3.11.2) The "Connect" component is responsible for the communication with a target system. This component implements the logic of the interaction protocol, receiving and sending messages from and to the system, respectively. @@ -121,6 +121,10 @@ spec: ## Release notes +### 3.11.2 + ++ Sailfish updated from `3.3.132` to `3.3.144` + ### 3.11.1 + Updated `sailfish-core` version from `3.3.54` to `3.3.132` @@ -140,7 +144,7 @@ spec: ### 3.10.1 -+ Update `sailfish-core` version from `3.2.1674` to `3.2.1741` ++ Updated `sailfish-core` version from `3.2.1674` to `3.2.1741` + Add exception for checking the property in `IMetadata` + Added synchronization by processor to `ServiceListener.onMessage()` otherwise processor sometimes misses some sequences + Added log about missed sequences @@ -148,15 +152,15 @@ spec: ### 3.10.0 -+ Update `th2-common` version from `3.25.1` to `3.33.0` -+ Update `org.jetbrains.kotlin.jvm` version from `1.3.72` to `1.5.30` ++ Updated `th2-common` version from `3.25.1` to `3.33.0` ++ Updated `org.jetbrains.kotlin.jvm` version from `1.3.72` to `1.5.30` ### 3.9.0 -+ Update `sailfish-core` version from `3.2.1650` to `3.2.1674` ++ Updated `sailfish-core` version from `3.2.1650` to `3.2.1674` + Embedded Sailfish service based on MINA decodes the message as sender during sending. This approach is important for protocols in which a pair of messages have the same protocol message type and different structures depending on the direction. -+ Update `th2-common` version from `3.16.5` to `3.25.1` -+ Update `th2-sailfish-utils` version from `3.4.0` to `3.8.0` ++ Updated `th2-common` version from `3.16.5` to `3.25.1` ++ Updated `th2-sailfish-utils` version from `3.4.0` to `3.8.0` ### 3.8.1 @@ -168,11 +172,11 @@ spec: ### 3.7.2 -+ Update Sailfish version to 3.2.1603 ++ Updated Sailfish version to 3.2.1603 ### 3.7.1 -+ Update Sailfish version to 3.2.1572 (unwraps the EvolutionBatch when sending raw message) ++ Updated Sailfish version to 3.2.1572 (unwraps the EvolutionBatch when sending raw message) ### 3.7.0 @@ -200,7 +204,7 @@ spec: + reads dictionaries from the /var/th2/config/dictionary folder. + uses mq_router, grpc_router, cradle_manager optional JSON configs from the /var/th2/config folder + tries to load log4j.properties files from sources in order: '/var/th2/config', '/home/etc', configured path via cmd, default configuration -+ update Cradle version. Introduce async API for storing events ++ updated Cradle version. Introduce async API for storing events ### 3.4.1 diff --git a/build.gradle b/build.gradle index 3671f53..5a358f4 100644 --- a/build.gradle +++ b/build.gradle @@ -10,7 +10,7 @@ dependencyCheck { } ext { - sailfishVersion = '3.3.132' + sailfishVersion = '3.3.144' } ext.excludeSailfish = { rcd -> @@ -63,7 +63,7 @@ repositories { mavenCentral() mavenLocal() - configurations.all { + configurations.configureEach { resolutionStrategy.cacheChangingModulesFor 0, 'seconds' resolutionStrategy.cacheDynamicVersionsFor 0, 'seconds' } diff --git a/gradle.properties b/gradle.properties index 9e655ad..f8a1209 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1 @@ -release_version = 3.11.1 \ No newline at end of file +release_version = 3.11.2 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d97373f..bdf0ae0 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -15,7 +15,7 @@ # #Tue Jun 09 10:46:12 MSK 2020 -distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStorePath=wrapper/dists