Skip to content

Commit

Permalink
dependencies updated
Browse files Browse the repository at this point in the history
gradle updated
workflows updated
  • Loading branch information
lumber1000 committed Sep 4, 2024
1 parent a76e601 commit 0b80e12
Show file tree
Hide file tree
Showing 13 changed files with 64 additions and 22 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci-unwelcome-words.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ on:

jobs:
test:
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
ref: ${{ github.sha }}
- name: Checkout tool
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
repository: exactpro-th2/ci-github-action
ref: master
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/dependabot-docker-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ on:

jobs:
build:
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
strategy:
matrix:
proto:
- conn-fix
- conn-ntg
- conn-soup
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
- uses: docker/login-action@v1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dev-docker-matrix-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- conn-soup
uses: th2-net/.github/.github/workflows/matrix-java-docker-dev.yml@main
with:
runsOn: ubuntu-20.04
runsOn: ubuntu-latest
projectName: ${{ matrix.proto }}
build-target: 'Docker'
docker-username: ${{ github.actor }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dev-release-docker-matrix-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- conn-soup
uses: th2-net/.github/.github/workflows/matrix-java-docker.yml@main
with:
runsOn: ubuntu-20.04
runsOn: ubuntu-latest
projectName: ${{ matrix.project }}
build-target: 'Docker'
docker-username: ${{ github.actor }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker-matrix-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- conn-soup
uses: th2-net/.github/.github/workflows/matrix-java-docker.yml@main
with:
runsOn: ubuntu-20.04
runsOn: ubuntu-latest
projectName: ${{ matrix.proto }}
build-target: 'Docker'
docker-username: ${{ github.actor }}
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FROM gradle:7.6-jdk11 AS build
FROM gradle:8.7-jdk11 AS build
COPY ./ .
RUN gradle --no-daemon clean dockerPrepare

FROM ghcr.io/th2-net/th2-conn-sailfish:4.0.1-dev
FROM ghcr.io/th2-net/th2-conn-sailfish:4.1.1-dev
ARG project_name
WORKDIR /home
COPY --from=build /home/gradle/${project_name}/build/docker .
10 changes: 8 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Generic connects (4.0.2)
# Generic connects (4.1.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.
Expand All @@ -24,6 +24,12 @@ You can find the description for the available service types and their configura

## Release notes

### 4.1.0

+ Updated `th2-conn-sailfish` version from `4.0.1-dev` to `4.1.1-dev` (th2-common-j:5.14.0-dev)
+ Updated `sailfish-core` version from `3.3.132` to `3.3.241`
+ Updated `th2-bom` version from `4.5.0-dev` to `4.6.1-dev`

### 4.0.2

#### Fixed:
Expand Down Expand Up @@ -115,4 +121,4 @@ You can find the description for the available service types and their configura
+ Copies the parent event ID from the original raw message to the actual one;
+ Joins all related `IMessage`s to a single raw message;
+ Messages that were sent using this connectivity but did not have any parent event ID
are attached to the dedicated event for this connectivity.
are attached to the dedicated event for this connectivity.
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ subprojects {
ext {
sharedDir = file("${project.rootDir}/shared")
baseSailfishVersion = '3.3'
sailfishVersion = "${baseSailfishVersion}.132"
sailfishVersion = "${baseSailfishVersion}.241"

pluginMainDir = file('src/main/plugin')
pluginGenDir = file('src/gen/plugin')
Expand Down Expand Up @@ -86,8 +86,8 @@ subprojects {
}

dependencies {
service platform("com.exactpro.th2:bom:4.5.0") {
because('we need to fource dependnecies without vulnerabilities')
service platform("com.exactpro.th2:bom:4.6.1") {
because('we need to force dependencies without vulnerabilities')
}
service "com.exactpro.sf:${sf_service_name}:${sailfishVersion}"
}
Expand Down
18 changes: 15 additions & 3 deletions conn-fix/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# FIX Connect (4.0.1)
# FIX Connect (4.1.0)

This "Connect" component extension supports connections to the target system via [FIX protocol](https://www.fixtrading.org/what-is-fix/).

Expand Down Expand Up @@ -29,7 +29,7 @@ beginString: FIXT.1.1
# It is a required parameter. Your ID that is associated with this FIX session.
senderCompID: sender

# It is a required parameter. Counter Parties ID that are associated with this FIX session.
# It is a required parameter. Counterparty ID that are associated with this FIX session.
targetCompID: target

# It is a required parameter. Directory to store sequence number and message files inside the workspace directory.
Expand Down Expand Up @@ -358,6 +358,18 @@ defaultHeartbeatInterval: 5
## Release notes
### 4.1.0
+ Updated `th2-conn-sailfish` version from `4.0.1-dev` to `4.1.1-dev` (th2-common-j:5.14.0-dev)
+ Updated `sailfish-core` version from `3.3.132` to `3.3.241`
+ Updated `th2-bom` version from `4.5.0-dev` to `4.6.1-dev`

### 4.0.2

#### Fixed:

+ Error when sending a message with EventID attached via transport protocol

### 4.0.1

+ Updated `sailfish-core` version from `3.3.54` to `3.3.93`
Expand All @@ -380,4 +392,4 @@ defaultHeartbeatInterval: 5
+ 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

### 3.1.0
+ Validates a message to be sent by the configured dictionary during decoding, for future header update.
+ Validates a message to be sent by the configured dictionary during decoding, for future header update.
14 changes: 13 additions & 1 deletion conn-ntg/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Connect Native Trading Gateway (NTG) (4.0.1)
# Connect Native Trading Gateway (NTG) (4.1.0)

## Available service types

Expand Down Expand Up @@ -60,6 +60,18 @@ reconnectTimeout: 5000
## Release notes
### 4.1.0
+ Updated `th2-conn-sailfish` version from `4.0.1-dev` to `4.1.1-dev` (th2-common-j:5.14.0-dev)
+ Updated `sailfish-core` version from `3.3.132` to `3.3.241`
+ Updated `th2-bom` version from `4.5.0-dev` to `4.6.1-dev`

### 4.0.2

#### Fixed:

+ Error when sending a message with EventID attached via transport protocol

### 4.0.1

+ Updated `sailfish-core` version from `3.3.54` to `3.3.93`
Expand Down
14 changes: 13 additions & 1 deletion conn-soup/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# SOUP family codecs (4.0.1)
# SOUP family codecs (4.1.0)

## Available service types

Expand Down Expand Up @@ -137,6 +137,18 @@ evolutionSupportEnabled: true
## Release notes
### 4.1.0
+ Updated `th2-conn-sailfish` version from `4.0.1-dev` to `4.1.1-dev` (th2-common-j:5.14.0-dev)
+ Updated `sailfish-core` version from `3.3.132` to `3.3.241`
+ Updated `th2-bom` version from `4.5.0-dev` to `4.6.1-dev`

### 4.0.2

#### Fixed:

+ Error when sending a message with EventID attached via transport protocol

### 4.0.1

+ Updated `sailfish-core` version from `3.3.54` to `3.3.93`
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
sf_service_name = unknown-service
release_version = 4.0.2
release_version = 4.1.0
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#Tue Apr 14 11:21:33 MSK 2020
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
Expand Down

0 comments on commit 0b80e12

Please sign in to comment.