From a126db18fbb513c169d96d8f1e57d8e0521edb7b Mon Sep 17 00:00:00 2001
From: AydarN <9845662+AydarN@users.noreply.github.com>
Date: Fri, 14 Jul 2023 14:08:03 +0300
Subject: [PATCH 1/8] pservice-pom-new-ver

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 6dd774fc..7dfd51c4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>dev.vality</groupId>
         <artifactId>service-parent-pom</artifactId>
-        <version>1.0.19</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>anapi-v2</artifactId>

From 027793a3e36f8af3fba68f28ad9175dcb1f4408f Mon Sep 17 00:00:00 2001
From: AydarN <9845662+AydarN@users.noreply.github.com>
Date: Fri, 14 Jul 2023 14:08:32 +0300
Subject: [PATCH 2/8] wf-new-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 fb5e7ede..04adac98 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -7,4 +7,4 @@ on:
 
 jobs:
   build:
-    uses: valitydev/base-workflow/.github/workflows/maven-service-build.yml@v1
+    uses: valitydev/base-workflow/.github/workflows/maven-service-build.yml@trivy

From b9c28eb39f28a6c8f2d27d74513925642b727997 Mon Sep 17 00:00:00 2001
From: AydarN <9845662+AydarN@users.noreply.github.com>
Date: Wed, 23 Aug 2023 17:30:56 +0300
Subject: [PATCH 3/8] Update pom.xml

---
 pom.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pom.xml b/pom.xml
index 7dfd51c4..fd3e4f54 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,6 +17,8 @@
     <description>anapi v2</description>
 
     <properties>
+        <maven.compiler.source>15</maven.compiler.source>
+        <maven.compiler.target>15</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>15</java.version>

From a71c5e90ea13e19b9f0635b8f9348425eb6a7593 Mon Sep 17 00:00:00 2001
From: AydarN <9845662+AydarN@users.noreply.github.com>
Date: Wed, 23 Aug 2023 17:32:05 +0300
Subject: [PATCH 4/8] Update 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 8c8e4b11..42763150 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,9 +1,9 @@
 server:
-  port: '@server.port@'
+  port: ${@server.port@}
 
 management:
   server:
-    port: '@management.port@'
+    port: ${@management.port@}
   metrics:
     export:
       prometheus:

From 40014d4a3b88724b870e42576976eef870497ff4 Mon Sep 17 00:00:00 2001
From: AydarN <9845662+AydarN@users.noreply.github.com>
Date: Sat, 14 Oct 2023 07:32:01 +0300
Subject: [PATCH 5/8] 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 04adac98..a608ad23 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -7,4 +7,4 @@ on:
 
 jobs:
   build:
-    uses: valitydev/base-workflow/.github/workflows/maven-service-build.yml@trivy
+    uses: valitydev/base-workflow/.github/workflows/maven-service-build.yml@2.0.11

From 80461e658c138e02499f8a1b307fd6368433d42b Mon Sep 17 00:00:00 2001
From: AydarN <9845662+AydarN@users.noreply.github.com>
Date: Sat, 14 Oct 2023 07:32:56 +0300
Subject: [PATCH 6/8] bump-parent-pom

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index fd3e4f54..cb0d26d1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>dev.vality</groupId>
         <artifactId>service-parent-pom</artifactId>
-        <version>2.1.5</version>
+        <version>2.1.7</version>
     </parent>
 
     <artifactId>anapi-v2</artifactId>

From 7d219199e77ec4e4dc23ef3b87551224ceb6ce0b Mon Sep 17 00:00:00 2001
From: AydarN <9845662+AydarN@users.noreply.github.com>
Date: Sat, 14 Oct 2023 07:35:05 +0300
Subject: [PATCH 7/8] 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 a608ad23..44cfa2ed 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -7,4 +7,4 @@ on:
 
 jobs:
   build:
-    uses: valitydev/base-workflow/.github/workflows/maven-service-build.yml@2.0.11
+    uses: valitydev/base-workflow/.github/workflows/maven-service-build.yml@v2.0.11

From d407843709a8948c538fb3c2b4b62d1bb7baf5f5 Mon Sep 17 00:00:00 2001
From: AydarN <9845662+AydarN@users.noreply.github.com>
Date: Fri, 20 Oct 2023 01:28:29 +0300
Subject: [PATCH 8/8] 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 44cfa2ed..b421d20b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -7,4 +7,4 @@ on:
 
 jobs:
   build:
-    uses: valitydev/base-workflow/.github/workflows/maven-service-build.yml@v2.0.11
+    uses: valitydev/java-workflow/.github/workflows/maven-service-build.yml@v2.0.11