Corrected after review

th2-net · May 15, 2024 · 5d3312f · 5d3312f
1 parent aea03b5
commit 5d3312f
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 3 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -95,6 +95,7 @@ jobs:
       docker-username: ${{ github.actor }}
       version: ${{ needs.versions.outputs.version }}
       versionNumber: ${{ needs.versions.outputs.version }}
+      dockerContext: '.'
       gradleParameters: '["clean", "build", "dockerPrepare"]'
     secrets:
       docker-password: ${{ secrets.GITHUB_TOKEN }}

diff --git a/.github/workflows/dev-build.yml b/.github/workflows/dev-build.yml
@@ -69,6 +69,7 @@ jobs:
       docker-username: ${{ github.actor }}
       version: ${{ needs.app-version.outputs.version }}
       versionNumber: ${{ needs.app-version.outputs.versionNumber }}
+      dockerContext: '.'
       gradleParameters: ${{ format('["clean", "build", "dockerPrepare", "-Pversion_suffix={0}"]', needs.app-version.outputs.versionSuffix) }}
     secrets:
       docker-password: ${{ secrets.GITHUB_TOKEN }}

diff --git a/.github/workflows/dev-release-build.yml b/.github/workflows/dev-release-build.yml
@@ -147,6 +147,7 @@ jobs:
       docker-username: ${{ github.actor }}
       version: ${{ needs.app-version.outputs.version }}-dev
       versionNumber: ${{ needs.app-version.outputs.version }}
+      dockerContext: '.'
       gradleParameters: '["clean", "build", "dockerPrepare"]'
     secrets:
       docker-password: ${{ secrets.GITHUB_TOKEN }}

diff --git a/README.md b/README.md
@@ -230,6 +230,7 @@ spec:
 + Updated cradle api: `5.3.0-dev`
 + Updated common: `5.11.0-dev`
 + Updated micrometer-bom: `1.12.5`
++ Updated jetty-bom: `11.0.20`
 
 ## 2.7.0
 

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -17,7 +17,7 @@ dependencies {
         exclude(group = "com.exactpro.th2", module = "cradle-cassandra")
     }
 
-    implementation(platform("org.eclipse.jetty:jetty-bom:11.0.15")) {
+    implementation(platform("org.eclipse.jetty:jetty-bom:11.0.20")) {
         because("vulnerabilities in version 11.0.13. Can be removed after updating Javalin and Kotlin")
     }
 
@@ -75,6 +75,5 @@ dependencies {
 }
 
 application {
-    applicationName = "service"
     mainClass.set("com.exactpro.th2.lwdataprovider.MainKt")
 }
diff --git a/grpc/setup.py b/grpc/setup.py
@@ -120,7 +120,7 @@ def make_packages(root_dir):
     license='Apache License 2.0',
     python_requires='>=3.7',
     install_requires=[
-        'th2-grpc-common==4.5.0.dev0',
+        'th2-grpc-common==4.5.0.rc1',
         'mypy-protobuf==3.4'
     ],
     packages=packages,