Skip to content

Commit c50a978

Browse files
Nikita-Smirnov-ExactproNikita-Smirnov-Exactpro
authored
Merge pull request #37 from th2-net/dev-version-2
Merge dev-version-2 to master
2 parents ae922eb + 9ec7547 commit c50a978

34 files changed

+3267
-343
lines changed

.github/workflows/java-publish-sonatype.yml renamed to .github/workflows/build-dev-release.yml

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,17 @@
1-
name: Build and release Java distributions to sonatype.
1+
name: Build and publish dev release jar to sonatype repository
22

3-
on:
4-
push:
5-
branches:
6-
- master
7-
- version-*
8-
paths:
9-
- gradle.properties
3+
on: workflow_dispatch
104

115
jobs:
126
build:
137
uses: th2-net/.github/.github/workflows/compound-java.yml@main
148
with:
159
build-target: 'Sonatype'
16-
runsOn: ubuntu-latest
10+
devRelease: true
11+
createTag: true
1712
secrets:
1813
sonatypeUsername: ${{ secrets.SONATYPE_NEXUS_USERNAME }}
1914
sonatypePassword: ${{ secrets.SONATYPE_NEXUS_PASSWORD }}
2015
sonatypeSigningKey: ${{ secrets.SONATYPE_GPG_ARMORED_KEY }}
2116
sonatypeSigningPassword: ${{ secrets.SONATYPE_SIGNING_PASSWORD }}
17+
nvd-api-key: ${{ secrets.NVD_APIKEY }}

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

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: Build and publish release jar to sonatype repository
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: 'Sonatype'
10+
devRelease: false
11+
createTag: true
12+
secrets:
13+
sonatypeUsername: ${{ secrets.SONATYPE_NEXUS_USERNAME }}
14+
sonatypePassword: ${{ secrets.SONATYPE_NEXUS_PASSWORD }}
15+
sonatypeSigningKey: ${{ secrets.SONATYPE_GPG_ARMORED_KEY }}
16+
sonatypeSigningPassword: ${{ secrets.SONATYPE_SIGNING_PASSWORD }}
17+
nvd-api-key: ${{ secrets.NVD_APIKEY }}

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

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
1-
name: Dev build and publish Java distributions to sonatype snapshot repository
1+
name: Build and publish jar to sonatype snapshot repository
22

33
on:
44
push:
55
branches-ignore:
6-
- master
7-
- version-*
8-
- dependabot*
9-
# paths:
10-
# - gradle.properties
6+
- master
7+
- version-*
8+
- dependabot*
119
paths-ignore:
1210
- README.md
1311

@@ -16,9 +14,9 @@ jobs:
1614
uses: th2-net/.github/.github/workflows/compound-java-dev.yml@main
1715
with:
1816
build-target: 'Sonatype'
19-
runsOn: ubuntu-latest
2017
secrets:
2118
sonatypeUsername: ${{ secrets.SONATYPE_NEXUS_USERNAME }}
2219
sonatypePassword: ${{ secrets.SONATYPE_NEXUS_PASSWORD }}
2320
sonatypeSigningKey: ${{ secrets.SONATYPE_GPG_ARMORED_KEY }}
24-
sonatypeSigningPassword: ${{ secrets.SONATYPE_SIGNING_PASSWORD }}
21+
sonatypeSigningPassword: ${{ secrets.SONATYPE_SIGNING_PASSWORD }}
22+
nvd-api-key: ${{ secrets.NVD_APIKEY }}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ on:
55

66
jobs:
77
test:
8-
runs-on: ubuntu-20.04
8+
runs-on: ubuntu-latest
99
steps:
10-
- uses: actions/checkout@v2
10+
- uses: actions/checkout@v4
1111
with:
1212
ref: ${{ github.sha }}
1313
- name: Checkout tool
14-
uses: actions/checkout@v2
14+
uses: actions/checkout@v4
1515
with:
1616
repository: exactpro-th2/ci-github-action
1717
ref: master
@@ -20,4 +20,4 @@ jobs:
2020
- name: Run CI action
2121
uses: ./ci-github-action
2222
with:
23-
ref: ${{ github.sha }}
23+
ref: ${{ github.sha }}

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM gradle:7.4.1-jdk11 AS build
1+
FROM gradle:8.7-jdk11 AS build
22
ARG release_version
33
ARG bintray_user
44
ARG bintray_key

‎README.md‎

Lines changed: 85 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# th2 common util library
1+
# th2 common util library (2.3.0)
22

33
This is th2 java library with useful functions for developers and QA needs.
44

@@ -8,8 +8,90 @@ This is th2 java library with useful functions for developers and QA needs.
88

99
### Single event batcher
1010

11-
The batcher collects single events inside and calls `onBatch` method when `maxFlushTime` has elapsed or number of pending events has reached `maxBatchSize`.
11+
The batcher collects single events inside and calls `onBatch` method when `maxFlushTime` has elapsed or number of
12+
pending events has reached `maxBatchSize`.
1213

1314
### Event batcher
1415

15-
Collects and groups events by their parent-event-id and calls `onBatch` method when `maxFlushTime` for a group has elapsed or number of events in it has reached `maxBatchSize`.
16+
Collects and groups events by their parent-event-id and calls `onBatch` method when `maxFlushTime` for a group has
17+
elapsed or number of events in it has reached `maxBatchSize`.
18+
19+
## message
20+
21+
### Message batcher (th2 transport protocol)
22+
23+
Collects and groups messages by session group and calls `onBatch` method when `maxFlushTime` for a group has
24+
elapsed or number of events in it has reached `maxBatchSize`.
25+
26+
### Raw message batcher (th2 transport protocol)
27+
28+
Collects and groups raw messages by session group and calls `onBatch` method when `maxFlushTime` for a group has
29+
elapsed or number of events in it has reached `maxBatchSize` or batch size in bytes has reached `maxBatchSizeInBytes`.
30+
<br>Note: message batch size calculation logic repeats the logic implemented in [cradle-api:5.4.1-dev](https://github.com/th2-net/cradleapi/tree/5.4.1-dev)
31+
32+
# Changelog
33+
34+
## 2.3.0
35+
36+
* added `RawMessageBatcher` for th2 transport protocol
37+
* updates:
38+
* th2 gradle plugin: `0.1.1`
39+
* bom: `4.6.1`
40+
* common: `5.14.0`
41+
* kotlin-logging: `5.1.4`
42+
43+
## 2.2.3
44+
45+
* fixed: `copyFields` adds nulls if the field does not exist in the source message
46+
* updates:
47+
* common: 5.5.0-dev -> 5.10.0-dev (compileOnly)
48+
* grpc-common: 4.3.0-dev -> 4.4.0-dev
49+
50+
## 2.2.2
51+
52+
* fixed: batch size actually was not limited if `maxBatchSize = 1`
53+
* common: `5.5.0-dev`
54+
55+
## 2.2.1
56+
57+
* The timestamp for message builder is updated under a lock now to avoid reordering under load.
58+
59+
## 2.2.0
60+
61+
* bom: `4.5.0-dev`
62+
* common: `5.4.0-dev`
63+
* kotlin: `1.8.22`
64+
65+
## 2.1.1
66+
67+
#### Update
68+
* common: `5.3.2-dev`
69+
70+
## 2.1.0
71+
72+
#### Feature
73+
* Added extension methods to work with fields for `ParsedMessage` class
74+
* Added extension methods to copy fields for `ParsedMessage.FromMapBuilder` class
75+
76+
#### Update
77+
* grpc-common: `4.3.0-dev`
78+
* common: `5.3.1-dev`
79+
80+
#### Feature
81+
* Added utility method for th2 transport protocol
82+
* Added message batcher for transport protocol
83+
84+
#### Gradle plugins:
85+
+ Added org.owasp.dependencycheck: `8.3.1`
86+
+ Added com.github.jk1.dependency-license-report `2.5`
87+
+ Added de.undercouch.download `5.4.0`
88+
89+
## 2.0.0
90+
91+
* Migrated to book & page concept
92+
* Migrated to bom:4.2.0
93+
* Migrated to grpc-common:4.1.1-dev
94+
95+
## 1.0.0
96+
97+
* book&pages support

0 commit comments

Comments
 (0)