Merge branch 'master' into th2-2150-books-pages

.github/workflows/dev-docker-matrix-publish.yml

@@ -11,46 +11,17 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
     strategy:
       matrix:
         proto:
           - conn-fix
           - conn-ntg
           - conn-soup
-    steps:
-      - uses: actions/checkout@v2
-# Prepare custom build version
-      - name: Get branch name
-        id: branch
-        run: echo ::set-output name=branch_name::${GITHUB_REF#refs/*/}
-      - name: Get release_version
-        id: ver
-        uses: christian-draeger/[email protected]
-        with:
-          path: gradle.properties
-          property: release_version
-      - name: Build custom release version
-        id: release_ver
-        run: echo ::set-output name=value::"${{ steps.ver.outputs.value }}-${{ steps.branch.outputs.branch_name }}-${{ github.run_id }}"
-      - name: Show custom release version
-        run: echo ${{ steps.release_ver.outputs.value }}
-# Build and publish image
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-      - uses: docker/login-action@v1
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.CR_PAT }}
-      - run: echo "::set-output name=REPOSITORY_NAME::$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')"
-        id: meta
-      - name: Build and push
-        id: docker_build
-        uses: docker/build-push-action@v2
-        with:
-          build-args: |
-            project_name=${{ matrix.proto }}
-          push: true
-          tags: ghcr.io/th2-net/th2-${{ matrix.proto }}:${{ steps.release_ver.outputs.value }}
-          labels: com.exactpro.th2.th2-${{ matrix.proto }}=${{ steps.ver.outputs.value }}
+    uses: th2-net/.github/.github/workflows/matrix-java-docker-dev.yml@main
+    with:
+      runsOn: ubuntu-20.04
+      projectName: ${{ matrix.proto }}
+      build-target: 'Docker'
+      docker-username: ${{ github.actor }}
+    secrets:
+      docker-password: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/docker-matrix-publish.yml

@@ -11,36 +11,17 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
     strategy:
       matrix:
         proto:
           - conn-fix
           - conn-ntg
           - conn-soup
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-      - uses: docker/login-action@v1
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.CR_PAT }}
-      - run: echo "::set-output name=REPOSITORY_NAME::$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')"
-        id: meta
-      - name: Read version from gradle.properties
-        id: read_property
-        uses: christian-draeger/[email protected]
-        with:
-          path: ./gradle.properties
-          property: release_version
-      - name: Build and push
-        id: docker_build
-        uses: docker/build-push-action@v2
-        with:
-          build-args: |
-            project_name=${{ matrix.proto }}
-          push: true
-          tags: ghcr.io/th2-net/th2-${{ matrix.proto }}:${{ steps.read_property.outputs.value }}
-          labels: com.exactpro.th2.th2-${{ matrix.proto }}=${{ steps.read_property.outputs.value }}
+    uses: th2-net/.github/.github/workflows/matrix-java-docker.yml@main
+    with:
+      runsOn: ubuntu-20.04
+      projectName: ${{ matrix.proto }}
+      build-target: 'Docker'
+      docker-username: ${{ github.actor }}
+    secrets:
+      docker-password: ${{ secrets.GITHUB_TOKEN }}

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:4.0.0-th2-2150-books-pages-2630141716
+FROM ghcr.io/th2-net/th2-conn-sailfish:4.0.0-dev-version-4-4113294770-6d25069
 ARG project_name
 WORKDIR /home
 COPY --from=build /home/gradle/${project_name}/build/docker .

README.md

@@ -28,6 +28,28 @@ You can find the description for the available service types and their configura
 
 + `th2-conn` version with books/pages
 
+### 3.8.0
+
++ Updated `sailfish-core` version from `3.2.1741` to `3.3.54`
++ Updated `common` from `3.33.0` to `3.44.0`
+
+### 3.7.2
+
++ Update sailfish version to 3.2.1860
+  + Various fixes for specific conn types
+
+### 3.7.1
+
++ Update sailfish version to 3.2.1748
+  + fix problem with dropping metadata in FIX conn when sending
+  + add more information into error message when the incorrect CheckSum format was received for sending by FIX client
+  + fix decoding of EndOfSession messages in SOUP conn
++ Updated base image to th2-conn:3.10.1, it includes fix for missed sequences
+
+### 3.7.0
+
++ Update base image th2-conn version from `3.9.0` to `3.10.0`
+
 ### 3.6.1
 
 + Update Sailfish version to 3.2.1684

build.gradle

@@ -1,15 +1,17 @@
 plugins {
     id 'com.palantir.docker' version '0.25.0' apply false
+    id 'java'
 }
 
 subprojects {
     apply plugin: 'base'
+    apply plugin: 'java'
     apply plugin: 'com.palantir.docker'
 
     ext {
         sharedDir                     = file("${project.rootDir}/shared")
-        baseSailfishVersion           = '3.2'
-        sailfishVersion               = "${baseSailfishVersion}.1684"
+        baseSailfishVersion           = '3.3'
+        sailfishVersion               = "${baseSailfishVersion}.54"
 
         pluginMainDir                 = file('src/main/plugin')
         pluginGenDir                  = file('src/gen/plugin')
@@ -32,6 +34,7 @@ subprojects {
             name 'Sonatype_releases'
             url 'https://s01.oss.sonatype.org/content/repositories/releases/'
         }
+        mavenLocal()
 
         configurations.all {
             resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
@@ -48,6 +51,7 @@ subprojects {
             exclude module: 'sailfish-core'
             exclude module: 'sailfish-common'
         }
+
     }
 
     task pluginWriteVersion {

conn-fix/README.md

@@ -1,4 +1,4 @@
-# FIX Connect (3.4.2)
+# FIX Connect (3.8.0)
 
 This "Connect" component extension supports connections to the target system via [FIX protocol](https://www.fixtrading.org/what-is-fix/).
 
@@ -61,7 +61,7 @@ resetOnLogout: false
 # Determines if the sequence numbers should be reset to 1, after an abnormal termination
 resetOnDisconnect: false
 
-# If this parameter is set to true, it will save Heartbeats to logs.
+# Save Heartbeats to QFJ logs file or not. Does not affect appearance of the HB messages in the console log
 logHeartbeats: false
 
 # If it is set to true, it will check required tags.
@@ -122,9 +122,6 @@ sslEnabledProtocols: ""
 # It controls which particular SSL cipher suites are enabled for secure connection
 sslCipherSuites: ""
 
-# It enables fields ordering in raw message by dictionary
-orderingFields: false
-
 # Checks the next expected target SeqNum against the received SeqNum. Checked by default.
 # If a mismatch is detected, the following logic is applied:
 # * if lower than expected SeqNum , logout
@@ -189,12 +186,6 @@ logonTimeout: 10
 # The number of seconds to wait for a logout response before disconnecting.
 logoutTimeout: 10
 
-# Inactivity service timeout (in seconds) in which the service will be shutdown automatically. If set to "0" - the service will not shutdown.
-idleTimeout: 0
-
-# Perform logon when service starts
-doLogonOnStart: true
-
 # The value of the tag DefaultCstmApplVerID(1408) that is used in Logon(A) message
 defaultCstmApplVerID: ""
 
@@ -270,7 +261,7 @@ resetOnLogout: false
 # Determines if the sequence numbers should be reset to 1, after an abnormal termination
 resetOnDisconnect: false
 
-# Save Heartbeats to logs or not.
+# Save Heartbeats to QFJ logs file or not. Does not affect appearance of the HB messages in the console log
 logHeartbeats: false
 
 # Check required tags or not.
@@ -331,9 +322,6 @@ sslEnabledProtocols: ""
 # It controls which particular SSL cipher suites are enabled for secure connection
 sslCipherSuites: ""
 
-# It enables fields ordering in raw message by dictionary
-orderingFields: false
-
 # Checks the next expected target SeqNum against the received SeqNum. Checked by default.
 # If a mismatch is detected, the following logic is applied:
 # * if lower than expected SeqNum , logout
@@ -367,6 +355,15 @@ defaultHeartbeatInterval: 5
 
 ## Release notes
 
+### 3.8.0
+
++ Updated `sailfish-core` version from `3.2.1741` to `3.3.54`
++ Updated `common` from `3.33.0` to `3.44.0`
+
+### 3.7.2
++ Update sailfish version to 3.2.1860 
+  + Detection of errors in FIXSession and FIXCodec during parsing qfj messages
+
 ### 3.4.2
 + Fixed the problem in which conn sends a correct user's message to the remote system but sends an incorrect copy of it to the th2 with short header instead of an enriched version
 

conn-fix/src/main/plugin/cfg/services.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 <!--
   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ Copyright 2020-2020 Exactpro (Exactpro Systems Limited)
+  ~ Copyright 2020-2021 Exactpro (Exactpro Systems Limited)
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -19,12 +19,12 @@
 <Services>
   <Service name="FIX_Client">
     <className>com.exactpro.sf.services.fix.FIXClient</className>
-    <settingsClassName>com.exactpro.sf.services.fix.FIXClientSettings</settingsClassName>
+    <settingsClassName>com.exactpro.sf.services.fix.EvolutionFIXClientSettings</settingsClassName>
     <dictionaryValidatorFactoryName>com.exactpro.sf.configuration.dictionary.FullFIXDictionaryValidatorFactory</dictionaryValidatorFactoryName>
   </Service>
   <Service name="FIX_Server">
     <className>com.exactpro.sf.services.fix.FIXServer</className>
-    <settingsClassName>com.exactpro.sf.services.fix.FIXServerSettings</settingsClassName>
+    <settingsClassName>com.exactpro.sf.services.fix.EvolutionFIXServerSettings</settingsClassName>
     <dictionaryValidatorFactoryName>com.exactpro.sf.configuration.dictionary.FullFIXDictionaryValidatorFactory</dictionaryValidatorFactoryName>
   </Service>
 </Services>

conn-ntg/README.md

@@ -1,4 +1,4 @@
-# Connect Native Trading Gateway (NTG)
+# Connect Native Trading Gateway (NTG) (3.8.0)
 
 ## Available service types
 
@@ -57,3 +57,15 @@ doLoginOnStart: true
 # If the value is set to 0 (ZERO) , the service won't reconnect. In order for the reconnect task to work, the following settings must be enabled: Do Login On Start, Autosend Heartbeat.
 reconnectTimeout: 5000
 ```
+
+## Release notes
+
+### 3.8.0
+
++ Updated `sailfish-core` version from `3.2.1741` to `3.3.54`
++ Updated `common` from `3.33.0` to `3.44.0`
+
+### 3.7.2
++ Update
+  + Add check scale for float and double types during encode
+  + Increased accuracy of division double/float during decoding in ntg codec

conn-soup/README.md

@@ -1,4 +1,4 @@
-# SOUP family codecs (3.6.0)
+# SOUP family codecs (3.8.0)
 
 ## Available service types
 
@@ -137,6 +137,20 @@ evolutionSupportEnabled: true
 
 ## Release notes
 
+### 3.8.0
+
++ Updated `sailfish-core` version from `3.2.1741` to `3.3.54`
++ Updated `common` from `3.33.0` to `3.44.0`
+
+
+### 3.7.2
+
++ Update sailfish version to 3.2.1860
+  + Add declared message length check
+
+### 3.7.0
++ Fixed decoding of EndOfSession messages
+
 ### 3.6.0
 
 + Embedded service based on MINA decodes the message as sender during sending.