From 877401ea588ae7ba6a6baa432a780fedca4763ea Mon Sep 17 00:00:00 2001 From: AydarN <9845662+AydarN@users.noreply.github.com> Date: Fri, 14 Jul 2023 14:10:33 +0300 Subject: [PATCH 01/16] pservice-pom-new-ver --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 27d9f06c..3e36ce36 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ dev.vality service-parent-pom - 1.0.19 + 2.1.5 magista From fd7b9fda549cebb22d711f6f4f942f463d09e221 Mon Sep 17 00:00:00 2001 From: AydarN <9845662+AydarN@users.noreply.github.com> Date: Fri, 14 Jul 2023 14:11:21 +0300 Subject: [PATCH 02/16] new-wf-trivy-ver --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a6547029..c98a62d4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,4 +7,4 @@ on: jobs: build: - uses: valitydev/java-workflow/.github/workflows/maven-service-build.yml@v1 + uses: valitydev/java-workflow/.github/workflows/maven-service-build.yml@trivy From e08e8b701447044a0ca7b7710c2cfbb8c0cc61bc Mon Sep 17 00:00:00 2001 From: AydarN <9845662+AydarN@users.noreply.github.com> Date: Mon, 7 Aug 2023 01:14:26 +0300 Subject: [PATCH 03/16] bump-deps-for-fix --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 3e36ce36..e1c0061a 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ magista - 0.0.1 + 0.0.2 jar magista @@ -174,7 +174,7 @@ dev.vality testcontainers-annotations - 1.4.1 + 1.4.3 test @@ -210,7 +210,7 @@ org.apache.maven.plugins maven-remote-resources-plugin - 3.0.0 + 3.1.0 org.apache.maven.shared From bc69c6af07b04b0621856d1676fce4419c271197 Mon Sep 17 00:00:00 2001 From: AydarN <9845662+AydarN@users.noreply.github.com> Date: Mon, 7 Aug 2023 01:25:59 +0300 Subject: [PATCH 04/16] revert-wf-version --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c98a62d4..a6547029 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,4 +7,4 @@ on: jobs: build: - uses: valitydev/java-workflow/.github/workflows/maven-service-build.yml@trivy + uses: valitydev/java-workflow/.github/workflows/maven-service-build.yml@v1 From 6fa4e6dd1b372e173162be531e311f3574cbf5a0 Mon Sep 17 00:00:00 2001 From: AydarN <9845662+AydarN@users.noreply.github.com> Date: Mon, 7 Aug 2023 01:27:05 +0300 Subject: [PATCH 05/16] parent-pom-previous-ver --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e1c0061a..312938ba 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ dev.vality service-parent-pom - 2.1.5 + 2.1.4 magista From 04950b8f46727870a7a627bb85719a802209605e Mon Sep 17 00:00:00 2001 From: dmitriibaikov Date: Thu, 17 Aug 2023 16:29:30 +0300 Subject: [PATCH 06/16] Add java.version to pom.xml --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 312938ba..b8f75a56 100644 --- a/pom.xml +++ b/pom.xml @@ -18,6 +18,7 @@ Magista service (event statistics) + 17 ./src/main/resources/checkstyle/checkstyle-suppressions.xml 8022 From c589ddaa4679ed7d373b053dd828809c7d99450a Mon Sep 17 00:00:00 2001 From: dmitriibaikov Date: Thu, 17 Aug 2023 16:36:35 +0300 Subject: [PATCH 07/16] Fix shared-resources version in pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b8f75a56..49427b56 100644 --- a/pom.xml +++ b/pom.xml @@ -141,7 +141,7 @@ dev.vality shared-resources - 2.0.3 + ${shared-resources.version} dev.vality.geck From f0058ce449796df71832a1bb86da2fef83584c34 Mon Sep 17 00:00:00 2001 From: dmitriibaikov Date: Thu, 17 Aug 2023 16:41:24 +0300 Subject: [PATCH 08/16] Fix pom.xml [add maven compiler plug in] --- pom.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pom.xml b/pom.xml index 49427b56..7f05fbf9 100644 --- a/pom.xml +++ b/pom.xml @@ -335,5 +335,18 @@ + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.0 + + ${java.version} + ${java.version} + + + + From eb3a0f984746fd90d4df5a5cb748f36bf1a0ed11 Mon Sep 17 00:00:00 2001 From: dmitriibaikov Date: Thu, 17 Aug 2023 16:43:37 +0300 Subject: [PATCH 09/16] Fix pom.xml [decrease java version to 15] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7f05fbf9..2864d508 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ Magista service (event statistics) - 17 + 15 ./src/main/resources/checkstyle/checkstyle-suppressions.xml 8022 From 6bd00605b63bc9974bd41092e8ff5ffd0fbf795d Mon Sep 17 00:00:00 2001 From: dmitriibaikov Date: Thu, 17 Aug 2023 16:48:22 +0300 Subject: [PATCH 10/16] Fix pom.xml [fix application.yml] --- src/main/resources/application.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 7513452b..48e379d2 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,5 +1,5 @@ server: - port: '@server.port@' + port: ${server.port} spring: datasource: @@ -41,7 +41,7 @@ info: management: server: - port: '@management.port@' + port: ${management.port} metrics: export: prometheus: From 410b73893aad1465404d12852cef47eef769e355 Mon Sep 17 00:00:00 2001 From: dmitriibaikov Date: Thu, 17 Aug 2023 16:53:47 +0300 Subject: [PATCH 11/16] Fix pom.xml [disable plugin management] --- pom.xml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/pom.xml b/pom.xml index 2864d508..4f201b0c 100644 --- a/pom.xml +++ b/pom.xml @@ -335,18 +335,18 @@ - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.0 - - ${java.version} - ${java.version} - - - - + + + + + + + + + + + + + From 94ec9d7ecc423071d1f3cfcbcea55f19e1770377 Mon Sep 17 00:00:00 2001 From: dmitriibaikov Date: Thu, 17 Aug 2023 16:57:19 +0300 Subject: [PATCH 12/16] Fix pom.xml [add maven.compiler properties] --- pom.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pom.xml b/pom.xml index 4f201b0c..9da9dbc6 100644 --- a/pom.xml +++ b/pom.xml @@ -18,6 +18,8 @@ Magista service (event statistics) + 15 + 15 15 ./src/main/resources/checkstyle/checkstyle-suppressions.xml From 2138107d73b3f8cd2e05d207bd29e886d34ea36d Mon Sep 17 00:00:00 2001 From: dmitriibaikov Date: Thu, 17 Aug 2023 17:01:14 +0300 Subject: [PATCH 13/16] Fix pom.xml [delete comments] --- pom.xml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/pom.xml b/pom.xml index 9da9dbc6..a7834a29 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,6 @@ 15 15 - 15 ./src/main/resources/checkstyle/checkstyle-suppressions.xml 8022 @@ -337,18 +336,5 @@ - - - - - - - - - - - - - From 50f7b6948cecabf5f648c4f001ca11ce69aac9e4 Mon Sep 17 00:00:00 2001 From: AydarN <9845662+AydarN@users.noreply.github.com> Date: Thu, 17 Aug 2023 17:36:53 +0300 Subject: [PATCH 14/16] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a6547029..c98a62d4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,4 +7,4 @@ on: jobs: build: - uses: valitydev/java-workflow/.github/workflows/maven-service-build.yml@v1 + uses: valitydev/java-workflow/.github/workflows/maven-service-build.yml@trivy From e2486ab1d7957665870803e470e40c5713b3b775 Mon Sep 17 00:00:00 2001 From: AydarN <9845662+AydarN@users.noreply.github.com> Date: Wed, 27 Sep 2023 13:46:53 +0300 Subject: [PATCH 15/16] bump-parent-version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a7834a29..91f0dadb 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ dev.vality service-parent-pom - 2.1.4 + 2.1.5 magista From 03e7229528b2ea7230832320119859b1ddf147a7 Mon Sep 17 00:00:00 2001 From: AydarN <9845662+AydarN@users.noreply.github.com> Date: Wed, 11 Oct 2023 18:32:26 +0300 Subject: [PATCH 16/16] bump-wf-version --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c98a62d4..df4762b9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,4 +7,4 @@ on: jobs: build: - uses: valitydev/java-workflow/.github/workflows/maven-service-build.yml@trivy + uses: valitydev/java-workflow/.github/workflows/maven-service-build.yml@v2.0.11