From 439147e87278afda5013ac06a53fbbfcd7b34618 Mon Sep 17 00:00:00 2001 From: Nikita Smirnov <46124551+Nikita-Smirnov-Exactpro@users.noreply.github.com> Date: Mon, 13 Feb 2023 13:35:35 +0400 Subject: [PATCH 1/6] Migrated to `th2-codec:4.7.6` (#24) --- README.md | 6 +++++- build.gradle | 2 +- gradle.properties | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index f6a7a92..8c4805d 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Csv codec (4.0.0) +# Csv codec (4.0.1) ## Description Designed for decode csv raw messages from csv reader to the parsed messages. It is based on [th2-codec](https://github.com/th2-net/th2-codec). @@ -130,6 +130,10 @@ spec: ## Release notes +### 4.0.1 + ++ Migrated to `th2-codec:4.7.6` + ### 4.0.0 + Migrated to `th2-codec` core part. Uses the standard configuration format and pins for th2-codec diff --git a/build.gradle b/build.gradle index c5a922e..b370c1f 100644 --- a/build.gradle +++ b/build.gradle @@ -58,7 +58,7 @@ dependencies { api platform('com.exactpro.th2:bom:4.1.0') implementation 'com.exactpro.th2:common:3.44.0' - implementation 'com.exactpro.th2:codec:4.7.4' + implementation 'com.exactpro.th2:codec:4.7.6' implementation 'net.sourceforge.javacsv:javacsv:2.0' implementation 'org.jetbrains:annotations:23.0.0' diff --git a/gradle.properties b/gradle.properties index ae63539..f1cc7ce 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ -release_version = 4.0.0 +release_version = 4.0.1 docker_image_name= From f7beaa59c0da86cd73f96995421c0de709da5a72 Mon Sep 17 00:00:00 2001 From: "fiodar.rekish" Date: Wed, 22 Feb 2023 21:50:13 +0400 Subject: [PATCH 2/6] updated bom and common --- README.md | 8 +++++++- build.gradle | 12 ++++++++---- gradle.properties | 2 +- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 8c4805d..88cf733 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Csv codec (4.0.1) +# Csv codec (4.0.2) ## Description Designed for decode csv raw messages from csv reader to the parsed messages. It is based on [th2-codec](https://github.com/th2-net/th2-codec). @@ -130,6 +130,12 @@ spec: ## Release notes +### 4.0.2 + ++ Migrated to `th2-codec:4.8.0` ++ Common updated to `3.44.1` ++ Bom updated to `4.2.0` + ### 4.0.1 + Migrated to `th2-codec:4.7.6` diff --git a/build.gradle b/build.gradle index b370c1f..b220895 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java-library' id 'application' id 'com.palantir.docker' version '0.25.0' - id "org.owasp.dependencycheck" version "7.4.4" + id "org.owasp.dependencycheck" version "8.1.0" } dependencyCheck { @@ -55,10 +55,10 @@ jar { } dependencies { - api platform('com.exactpro.th2:bom:4.1.0') + api platform('com.exactpro.th2:bom:4.2.0') - implementation 'com.exactpro.th2:common:3.44.0' - implementation 'com.exactpro.th2:codec:4.7.6' + implementation 'com.exactpro.th2:common:3.44.1' + implementation 'com.exactpro.th2:codec:4.8.0' implementation 'net.sourceforge.javacsv:javacsv:2.0' implementation 'org.jetbrains:annotations:23.0.0' @@ -90,4 +90,8 @@ dockerPrepare { docker { copySpec.from(tarTree("$buildDir/distributions/${applicationName}.tar")) +} + +dependencyCheck { + formats=['SARIF'] } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index f1cc7ce..099e24a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ -release_version = 4.0.1 +release_version = 4.0.2 docker_image_name= From ed7b5caef361d46bafb88f406f42f10a7cf65ea0 Mon Sep 17 00:00:00 2001 From: "fiodar.rekish" Date: Wed, 22 Feb 2023 22:39:41 +0400 Subject: [PATCH 3/6] codec update --- README.md | 1 + build.gradle | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 88cf733..a7443fd 100644 --- a/README.md +++ b/README.md @@ -135,6 +135,7 @@ spec: + Migrated to `th2-codec:4.8.0` + Common updated to `3.44.1` + Bom updated to `4.2.0` ++ Codec to `4.8.1` ### 4.0.1 diff --git a/build.gradle b/build.gradle index b220895..b618ba3 100644 --- a/build.gradle +++ b/build.gradle @@ -58,7 +58,7 @@ dependencies { api platform('com.exactpro.th2:bom:4.2.0') implementation 'com.exactpro.th2:common:3.44.1' - implementation 'com.exactpro.th2:codec:4.8.0' + implementation 'com.exactpro.th2:codec:4.8.1' implementation 'net.sourceforge.javacsv:javacsv:2.0' implementation 'org.jetbrains:annotations:23.0.0' From 00aeabcb2f792f28a2e27b2a256a9860513d6df4 Mon Sep 17 00:00:00 2001 From: "fiodar.rekish" Date: Wed, 22 Feb 2023 22:44:57 +0400 Subject: [PATCH 4/6] updated OWASP config --- build.gradle | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index b618ba3..2cb155a 100644 --- a/build.gradle +++ b/build.gradle @@ -93,5 +93,12 @@ docker { } dependencyCheck { - formats=['SARIF'] + formats=['SARIF', 'JSON', 'HTML'] + failBuildOnCVSS=5 + + analyzers { + assemblyEnabled = false + nugetconfEnabled = false + nodeEnabled = false + } } \ No newline at end of file From 728a988603aa8fe3c05458176db73ceefed78206 Mon Sep 17 00:00:00 2001 From: Nikita Smirnov <46124551+Nikita-Smirnov-Exactpro@users.noreply.github.com> Date: Wed, 22 Feb 2023 23:29:22 +0400 Subject: [PATCH 5/6] Corrected version --- README.md | 4 ++-- gradle.properties | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index a7443fd..42146b6 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Csv codec (4.0.2) +# Csv codec (4.1.0) ## Description Designed for decode csv raw messages from csv reader to the parsed messages. It is based on [th2-codec](https://github.com/th2-net/th2-codec). @@ -130,7 +130,7 @@ spec: ## Release notes -### 4.0.2 +### 4.1.0 + Migrated to `th2-codec:4.8.0` + Common updated to `3.44.1` diff --git a/gradle.properties b/gradle.properties index 099e24a..878d6ca 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ -release_version = 4.0.2 +release_version = 4.1.0 docker_image_name= From 9dce139044778b0b87c8708fa582b1b575a6cf00 Mon Sep 17 00:00:00 2001 From: Denis Plotnikov Date: Wed, 1 Mar 2023 11:49:14 +0400 Subject: [PATCH 6/6] upgrade gradle version --- Dockerfile | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5b78c51..803aa93 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM gradle:6.6-jdk11 AS build +FROM gradle:7.6-jdk11 AS build ARG release_version COPY ./ . RUN gradle build dockerPrepare \ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index af547a8..c34b2dc 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip