From d073f79c42824dd784868e9302beb86643035754 Mon Sep 17 00:00:00 2001 From: Oleg Smirnov Date: Thu, 18 Nov 2021 16:45:27 +0300 Subject: [PATCH 01/30] [TH2-2683] Fix problem with dropping metadata for FIX conn (#33) * [TH2-2683] Update fix service version. Fix problem with missed metadata * [TH2-2683] Update base image version and sf dependencies --- Dockerfile | 2 +- README.md | 7 ++++++- build.gradle | 3 ++- gradle.properties | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 37ceb3e..047c9fb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM gradle:6.6-jdk11 AS build COPY ./ . RUN gradle --no-daemon clean dockerPrepare -FROM ghcr.io/th2-net/th2-conn:3.9.0 +FROM ghcr.io/th2-net/th2-conn:3.10.0-dev-1476490187 ARG project_name WORKDIR /home COPY --from=build /home/gradle/${project_name}/build/docker . diff --git a/README.md b/README.md index dd5e7fd..f58fc3e 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Generic connects (3.6.1) +# Generic connects (3.7.0) This project contains extensions for the base component "[Connect](https://github.com/th2-net/th2-conn)", which is responsible for supporting communication with the target system by using common protocols. @@ -24,6 +24,11 @@ You can find the description for the available service types and their configura ## Release notes +### 3.7.0 + ++ Update sailfish version to 3.2.1741 + + fix problem with dropping metadata in FIX conn when sending + ### 3.6.1 + Update Sailfish version to 3.2.1684 diff --git a/build.gradle b/build.gradle index 400434f..e6384aa 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ subprojects { ext { sharedDir = file("${project.rootDir}/shared") baseSailfishVersion = '3.2' - sailfishVersion = "${baseSailfishVersion}.1684" + sailfishVersion = "${baseSailfishVersion}.1741" pluginMainDir = file('src/main/plugin') pluginGenDir = file('src/gen/plugin') @@ -32,6 +32,7 @@ subprojects { name 'Sonatype_releases' url 'https://s01.oss.sonatype.org/content/repositories/releases/' } + mavenLocal() configurations.all { resolutionStrategy.cacheChangingModulesFor 0, 'seconds' diff --git a/gradle.properties b/gradle.properties index e71c267..75c3f95 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ sf_service_name = unknown-service -release_version = 3.6.1 +release_version = 3.7.0 From d00abf8127c34221576c97778644f9ab9db5f149 Mon Sep 17 00:00:00 2001 From: "oleg.smirnov" Date: Thu, 18 Nov 2021 19:35:20 +0300 Subject: [PATCH 02/30] Use correct settings for backward compartibility with SF --- conn-fix/src/main/plugin/cfg/services.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/conn-fix/src/main/plugin/cfg/services.xml b/conn-fix/src/main/plugin/cfg/services.xml index 0da5d10..7fdc5d3 100644 --- a/conn-fix/src/main/plugin/cfg/services.xml +++ b/conn-fix/src/main/plugin/cfg/services.xml @@ -1,7 +1,7 @@