From 5ba4031672df86f8c82747ce5b4657167991e4ed Mon Sep 17 00:00:00 2001
From: Anatoly Karlov <karleowne@gmail.com>
Date: Sat, 15 Nov 2025 13:38:43 +0700
Subject: [PATCH 1/3] bump damsel

---
 pom.xml                                       | 40 ++++---------------
 .../dev/vality/hooker/config/KafkaTest.java   |  7 ++--
 .../config/PostgresqlSpringBootITest.java     |  7 ++--
 3 files changed, 13 insertions(+), 41 deletions(-)

diff --git a/pom.xml b/pom.xml
index 110f558..9168f4d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,11 +13,10 @@
     <parent>
         <groupId>dev.vality</groupId>
         <artifactId>service-parent-pom</artifactId>
-        <version>3.1.7</version>
+        <version>3.1.9</version>
     </parent>
 
     <properties>
-        <project.maintainer>Inal Arsanukaev &lt;i.arsanukaev@rbkmoney.com&gt;</project.maintainer>
         <server.port>8022</server.port>
         <management.port>8023</management.port>
         <exposed.ports>${server.port} ${management.port}</exposed.ports>
@@ -63,11 +62,15 @@
         <dependency>
             <groupId>dev.vality</groupId>
             <artifactId>damsel</artifactId>
+            <version>1.674-368f05b</version>
         </dependency>
         <dependency>
             <groupId>dev.vality.geck</groupId>
             <artifactId>serializer</artifactId>
-            <version>1.0.2</version>
+        </dependency>
+        <dependency>
+            <groupId>dev.vality.geck</groupId>
+            <artifactId>filter</artifactId>
         </dependency>
         <dependency>
             <groupId>dev.vality</groupId>
@@ -86,12 +89,6 @@
         <dependency>
             <groupId>dev.vality.geck</groupId>
             <artifactId>common</artifactId>
-            <version>1.0.2</version>
-        </dependency>
-        <dependency>
-            <groupId>dev.vality.geck</groupId>
-            <artifactId>filter</artifactId>
-            <version>1.0.2</version>
         </dependency>
         <dependency>
             <groupId>dev.vality</groupId>
@@ -167,7 +164,7 @@
         <dependency>
             <groupId>dev.vality</groupId>
             <artifactId>testcontainers-annotations</artifactId>
-            <version>3.0.2</version>
+            <version>3.3.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -239,29 +236,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-site-plugin</artifactId>
-                <version>3.21.0</version>
-            </plugin>
-            <plugin>
-                <groupId>org.cyclonedx</groupId>
-                <artifactId>cyclonedx-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>makeAggregateBom</goal>
-                        </goals>
-                        <configuration>
-                            <projectType>application</projectType>
-                            <outputDirectory>${project.build.directory}</outputDirectory>
-                            <outputFormat>json</outputFormat>
-                            <outputName>bom</outputName>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 
diff --git a/src/test/java/dev/vality/hooker/config/KafkaTest.java b/src/test/java/dev/vality/hooker/config/KafkaTest.java
index 6120c31..b84a5a6 100644
--- a/src/test/java/dev/vality/hooker/config/KafkaTest.java
+++ b/src/test/java/dev/vality/hooker/config/KafkaTest.java
@@ -1,7 +1,6 @@
 package dev.vality.hooker.config;
 
-
-import dev.vality.testcontainers.annotations.KafkaConfig;
+import dev.vality.testcontainers.annotations.KafkaTestConfig;
 import dev.vality.testcontainers.annotations.kafka.KafkaTestcontainerSingleton;
 
 import java.lang.annotation.ElementType;
@@ -14,6 +13,6 @@
 @KafkaTestcontainerSingleton(
         properties = {"kafka.topics.invoice.enabled=true"},
         topicsKeys = {"kafka.topics.invoice.id"})
-@KafkaConfig
+@KafkaTestConfig
 public @interface KafkaTest {
-}
\ No newline at end of file
+}
diff --git a/src/test/java/dev/vality/hooker/config/PostgresqlSpringBootITest.java b/src/test/java/dev/vality/hooker/config/PostgresqlSpringBootITest.java
index 55162d9..ef77312 100644
--- a/src/test/java/dev/vality/hooker/config/PostgresqlSpringBootITest.java
+++ b/src/test/java/dev/vality/hooker/config/PostgresqlSpringBootITest.java
@@ -1,7 +1,6 @@
 package dev.vality.hooker.config;
 
-
-import dev.vality.testcontainers.annotations.postgresql.PostgresqlTestcontainer;
+import dev.vality.testcontainers.annotations.postgresql.PostgresqlTestcontainerSingleton;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -10,6 +9,6 @@
 
 @Target({ElementType.TYPE})
 @Retention(RetentionPolicy.RUNTIME)
-@PostgresqlTestcontainer
+@PostgresqlTestcontainerSingleton
 public @interface PostgresqlSpringBootITest {
-}
\ No newline at end of file
+}

From 165edc1c389157a997f8761e7dbcf6a4ef5f9d02 Mon Sep 17 00:00:00 2001
From: Anatoly Karlov <karleowne@gmail.com>
Date: Sat, 15 Nov 2025 13:45:02 +0700
Subject: [PATCH 2/3] bump damsel

---
 src/test/java/dev/vality/hooker/config/KafkaTest.java           | 2 ++
 .../dev/vality/hooker/config/PostgresqlSpringBootITest.java     | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/test/java/dev/vality/hooker/config/KafkaTest.java b/src/test/java/dev/vality/hooker/config/KafkaTest.java
index b84a5a6..63b45c4 100644
--- a/src/test/java/dev/vality/hooker/config/KafkaTest.java
+++ b/src/test/java/dev/vality/hooker/config/KafkaTest.java
@@ -2,6 +2,7 @@
 
 import dev.vality.testcontainers.annotations.KafkaTestConfig;
 import dev.vality.testcontainers.annotations.kafka.KafkaTestcontainerSingleton;
+import org.springframework.test.annotation.DirtiesContext;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -14,5 +15,6 @@
         properties = {"kafka.topics.invoice.enabled=true"},
         topicsKeys = {"kafka.topics.invoice.id"})
 @KafkaTestConfig
+@DirtiesContext
 public @interface KafkaTest {
 }
diff --git a/src/test/java/dev/vality/hooker/config/PostgresqlSpringBootITest.java b/src/test/java/dev/vality/hooker/config/PostgresqlSpringBootITest.java
index ef77312..4a65e02 100644
--- a/src/test/java/dev/vality/hooker/config/PostgresqlSpringBootITest.java
+++ b/src/test/java/dev/vality/hooker/config/PostgresqlSpringBootITest.java
@@ -1,6 +1,7 @@
 package dev.vality.hooker.config;
 
 import dev.vality.testcontainers.annotations.postgresql.PostgresqlTestcontainerSingleton;
+import org.springframework.test.annotation.DirtiesContext;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -10,5 +11,6 @@
 @Target({ElementType.TYPE})
 @Retention(RetentionPolicy.RUNTIME)
 @PostgresqlTestcontainerSingleton
+@DirtiesContext
 public @interface PostgresqlSpringBootITest {
 }

From ad25d9c050dad3c0b393404a6e6cf4146c871dde Mon Sep 17 00:00:00 2001
From: Anatoly Karlov <karleowne@gmail.com>
Date: Sat, 15 Nov 2025 13:52:44 +0700
Subject: [PATCH 3/3] bump damsel

---
 .github/workflows/basic-linters.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/basic-linters.yml b/.github/workflows/basic-linters.yml
index 03256b7..6114f14 100644
--- a/.github/workflows/basic-linters.yml
+++ b/.github/workflows/basic-linters.yml
@@ -7,4 +7,4 @@ on:
 
 jobs:
   lint:
-    uses: valitydev/base-workflows/.github/workflows/basic-linters.yml@v2
+    uses: valitydev/base-workflows/.github/workflows/basic-linters.yml@v1