Skip to content

Commit 5c447b9

Browse files
isengrimsDenis PlotnikovNikita-Smirnov-Exactpro
authored
[TH2-4991] Optional book per session configuration (#51)
* Migrated to th2 gradle plugin `0.0.8` --------- Co-authored-by: Denis Plotnikov <denis.plotnikov@exactprosystems.com> Co-authored-by: nikita.smirnov <nikita.smirnov@exactprosystems.com>
1 parent a4768f5 commit 5c447b9

File tree

10 files changed

+114
-169
lines changed

10 files changed

+114
-169
lines changed

‎.github/workflows/build-dev-release.yml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
name: Build and publish dev release Docker image to Github Container Registry ghcr.io
2+
3+
on: workflow_dispatch
4+
5+
jobs:
6+
build:
7+
uses: th2-net/.github/.github/workflows/compound-java.yml@main
8+
with:
9+
build-target: 'Docker'
10+
devRelease: true
11+
createTag: true
12+
docker-username: ${{ github.actor }}
13+
secrets:
14+
docker-password: ${{ secrets.GITHUB_TOKEN }}
15+
nvd-api-key: ${{ secrets.NVD_APIKEY }}

.github/workflows/docker-publish.yml renamed to .github/workflows/build-release.yml

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,15 @@
1-
name: Build and publish Docker distributions to Github Container Registry ghcr.io
1+
name: Build and publish release Docker image to Github Container Registry ghcr.io
22

3-
on:
4-
push:
5-
branches:
6-
- master
7-
- version-*
8-
paths:
9-
- gradle.properties
10-
# - package_info.json
3+
on: workflow_dispatch
114

125
jobs:
13-
build-job:
6+
build:
147
uses: th2-net/.github/.github/workflows/compound-java.yml@main
158
with:
169
build-target: 'Docker'
10+
devRelease: false
11+
createTag: true
1712
docker-username: ${{ github.actor }}
1813
secrets:
1914
docker-password: ${{ secrets.GITHUB_TOKEN }}
20-
15+
nvd-api-key: ${{ secrets.NVD_APIKEY }}

.github/workflows/dev-docker-publish.yml renamed to .github/workflows/build-sanpshot.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Dev build and publish Docker distributions to Github Container Registry ghcr.io
1+
name: Build and publish Docker image to Github Container Registry ghcr.io
22

33
on:
44
push:
@@ -9,7 +9,6 @@ on:
99
paths-ignore:
1010
- README.md
1111

12-
1312
jobs:
1413
build-job:
1514
uses: th2-net/.github/.github/workflows/compound-java-dev.yml@main
@@ -18,3 +17,4 @@ jobs:
1817
docker-username: ${{ github.actor }}
1918
secrets:
2019
docker-password: ${{ secrets.GITHUB_TOKEN }}
20+
nvd-api-key: ${{ secrets.NVD_APIKEY }}

‎.github/workflows/ci-unwelcome-words.yml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@ jobs:
77
test:
88
runs-on: ubuntu-20.04
99
steps:
10-
- uses: actions/checkout@v3
11-
with:
12-
ref: ${{ github.sha }}
13-
- name: Checkout tool
14-
uses: actions/checkout@v3
15-
with:
16-
repository: exactpro-th2/ci-github-action
17-
ref: master
18-
token: ${{ secrets.PAT_CI_ACTION }}
19-
path: ci-github-action
20-
- name: Run CI action
21-
uses: ./ci-github-action
22-
with:
23-
ref: ${{ github.sha }}
10+
- uses: actions/checkout@v4
11+
with:
12+
ref: ${{ github.sha }}
13+
- name: Checkout tool
14+
uses: actions/checkout@v4
15+
with:
16+
repository: exactpro-th2/ci-github-action
17+
ref: master
18+
token: ${{ secrets.PAT_CI_ACTION }}
19+
path: ci-github-action
20+
- name: Run CI action
21+
uses: ./ci-github-action
22+
with:
23+
ref: ${{ github.sha }}

‎.github/workflows/dev-release-docker-publish.yml‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎README.md‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# th2-conn-dirty-fix (1.6.1)
1+
# th2-conn-dirty-fix (1.7.0)
22

33
This microservice allows sending and receiving messages via FIX protocol
44

@@ -335,6 +335,14 @@ spec:
335335

336336
# Changelog
337337

338+
## 1.7.0
339+
* Added support for th2 transport protocol
340+
* Added configuration option for non-default book per session.
341+
* Migrated to th2 gradle plugin `0.0.8`
342+
* Updated:
343+
* common: `5.13.1-dev`
344+
* conn-dirty-tcp-core: `3.6.0-dev`
345+
338346
## 1.6.1
339347

340348
* Channel subscriptions recovery on failure

‎build.gradle‎

Lines changed: 9 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,18 @@
1-
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
21
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
3-
import com.github.jk1.license.filter.LicenseBundleNormalizer
4-
import com.github.jk1.license.render.JsonReportRenderer
52

63
plugins {
7-
id 'java'
4+
id "application"
5+
id "com.exactpro.th2.gradle.component" version "0.0.8"
86
id 'org.jetbrains.kotlin.jvm' version '1.8.22'
9-
id 'com.palantir.docker' version '0.25.0'
10-
id "org.owasp.dependencycheck" version "9.0.9"
11-
id "com.gorylenko.gradle-git-properties" version "2.4.1"
12-
id 'com.github.jk1.dependency-license-report' version '2.5'
13-
id "de.undercouch.download" version "5.6.0"
7+
id "org.jetbrains.kotlin.kapt" version "1.8.22"
148
}
159

16-
apply plugin: 'application'
17-
apply plugin: 'com.palantir.docker'
18-
apply plugin: 'kotlin-kapt'
19-
2010
group 'com.exactpro.th2'
2111
version release_version
2212

23-
sourceCompatibility = 11
24-
targetCompatibility = 11
13+
kotlin {
14+
jvmToolchain(11)
15+
}
2516

2617
repositories {
2718
mavenCentral()
@@ -45,14 +36,12 @@ repositories {
4536
}
4637

4738
dependencies {
48-
api platform('com.exactpro.th2:bom:4.6.1')
49-
50-
implementation("com.exactpro.th2:common:5.10.0-dev") {
39+
implementation("com.exactpro.th2:common:5.13.1-dev") {
5140
exclude group: 'com.exactpro.th2', module: 'task-utils'
5241
}
5342
implementation "com.exactpro.th2:common-utils:2.2.3-dev"
5443
implementation 'com.exactpro.th2:netty-bytebuf-utils:0.0.1'
55-
implementation 'com.exactpro.th2:conn-dirty-tcp-core:3.5.0-dev'
44+
implementation'com.exactpro.th2:conn-dirty-tcp-core:3.6.0-dev'
5645
implementation 'com.exactpro.th2:grpc-lw-data-provider:2.3.1-dev'
5746

5847
implementation 'org.slf4j:slf4j-api'
@@ -66,7 +55,7 @@ dependencies {
6655
implementation 'com.fasterxml.jackson.core:jackson-databind'
6756
implementation 'com.fasterxml.jackson.module:jackson-module-kotlin'
6857

69-
testImplementation 'org.mockito:mockito-all:1.10.19'
58+
testImplementation 'org.mockito:mockito-core:5.12.0'
7059
testImplementation 'org.jetbrains.kotlin:kotlin-test-junit5:1.8.22'
7160

7261
annotationProcessor 'com.google.auto.service:auto-service:1.1.1'
@@ -81,61 +70,8 @@ application {
8170
mainClass.set('com.exactpro.th2.conn.dirty.tcp.core.Main')
8271
}
8372

84-
applicationName = 'service'
85-
86-
distTar {
87-
archiveFileName.set("${applicationName}.tar")
88-
}
89-
90-
dockerPrepare {
91-
dependsOn distTar
92-
}
93-
94-
docker {
95-
copySpec.from(tarTree("$buildDir/distributions/${applicationName}.tar"))
96-
}
97-
98-
tasks.withType(KotlinCompile).configureEach {
99-
compilerOptions {
100-
jvmTarget.set(JvmTarget.JVM_11)
101-
}
102-
}
103-
10473
dependencyCheck {
105-
formats=['SARIF', 'JSON', 'HTML']
106-
failBuildOnCVSS=5
10774
suppressionFile="suppressions.xml"
108-
10975
//FIXME: we should check all used dependencies
11076
skipConfigurations = ['kapt', 'kaptClasspath_kaptKotlin', 'kaptTest', 'kaptTestFixtures', 'annotationProcessor']
111-
analyzers {
112-
assemblyEnabled = false
113-
nugetconfEnabled = false
114-
nodeEnabled = false
115-
}
116-
}
117-
118-
dependencyLocking {
119-
lockAllConfigurations()
120-
}
121-
122-
licenseReport {
123-
def licenseNormalizerBundlePath = "$buildDir/license-normalizer-bundle.json"
124-
125-
if (!file(licenseNormalizerBundlePath).exists()) {
126-
download.run {
127-
src 'https://raw.githubusercontent.com/th2-net/.github/main/license-compliance/gradle-license-report/license-normalizer-bundle.json'
128-
dest "$buildDir/license-normalizer-bundle.json"
129-
overwrite false
130-
}
131-
}
132-
133-
filters = [
134-
new LicenseBundleNormalizer(licenseNormalizerBundlePath, false)
135-
]
136-
renderers = [
137-
new JsonReportRenderer('licenses.json', false),
138-
]
139-
excludeOwnGroup = false
140-
allowedLicensesFile = new URL("https://raw.githubusercontent.com/th2-net/.github/main/license-compliance/gradle-license-report/allowed-licenses.json")
14177
}

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
release_version=1.6.1
1+
release_version=1.7.0
22
description='Dirty-TCP client'
33
vcs_url=https://github.com/th2-net/th2-conn-dirty-fix

0 commit comments

Comments
 (0)