From 588107d3628f892507140a4ef26f587488bdaa8a Mon Sep 17 00:00:00 2001
From: lpandzic <lovro.pandzic@infobip.com>
Date: Thu, 20 Nov 2025 13:58:18 +0100
Subject: [PATCH] upgraded to spring boot 4 bumped major added flyway clean to
 tests so tests can be rerun with reusable testcontainers configuration

---
 CHANGELOG.md                                  |   3 +
 infobip-spring-data-bom/pom.xml               |   4 +-
 infobip-spring-data-common/pom.xml            |   2 +-
 .../pom.xml                                   |   2 +-
 .../pom.xml                                   |   2 +-
 .../pom.xml                                   |   2 +-
 infobip-spring-data-jdbc-querydsl/pom.xml     |   2 +-
 .../spring/data/jdbc/TestConfiguration.java   |  24 +++
 .../pom.xml                                   |   2 +-
 .../spring/data/jpa/TestConfiguration.java    |  24 +++
 infobip-spring-data-jpa-querydsl/pom.xml      |   2 +-
 .../spring/data/jpa/TestConfiguration.java    |  24 +++
 .../pom.xml                                   |   2 +-
 .../spring/data/r2dbc/TestConfiguration.java  |  15 +-
 infobip-spring-data-r2dbc-querydsl/pom.xml    |   2 +-
 .../spring/data/r2dbc/TestConfiguration.java  |  17 +-
 pom.xml                                       | 162 +++++++++---------
 17 files changed, 183 insertions(+), 108 deletions(-)
 create mode 100644 infobip-spring-data-jdbc-querydsl/src/test/java/com/infobip/spring/data/jdbc/TestConfiguration.java
 create mode 100644 infobip-spring-data-jpa-querydsl-boot-starter/src/test/java/com/infobip/spring/data/jpa/TestConfiguration.java
 create mode 100644 infobip-spring-data-jpa-querydsl/src/test/java/com/infobip/spring/data/jpa/TestConfiguration.java

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bafcceba..6e1d5a52 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+### 10.0.0
+* upgraded to Spring Boot 4
+
 ### 9.2.0
 * Added BOM (Bill of materials)
 
diff --git a/infobip-spring-data-bom/pom.xml b/infobip-spring-data-bom/pom.xml
index cdb03cdb..adb266b5 100644
--- a/infobip-spring-data-bom/pom.xml
+++ b/infobip-spring-data-bom/pom.xml
@@ -4,7 +4,7 @@
 
 	<groupId>com.infobip</groupId>
 	<artifactId>infobip-spring-data-bom</artifactId>
-	<version>9.2.1-SNAPSHOT</version>
+	<version>10.0.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>Infobip Spring Data Querydsl</name>
@@ -52,7 +52,7 @@
 	</developers>
 
 	<properties>
-		<maven-gpg-plugin.version>3.1.0</maven-gpg-plugin.version>
+		<maven-gpg-plugin.version>4.0.0-RC2</maven-gpg-plugin.version>
 	</properties>
 
 	<dependencyManagement>
diff --git a/infobip-spring-data-common/pom.xml b/infobip-spring-data-common/pom.xml
index 2829bf80..37d38890 100644
--- a/infobip-spring-data-common/pom.xml
+++ b/infobip-spring-data-common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.infobip</groupId>
         <artifactId>infobip-spring-data-querydsl</artifactId>
-        <version>9.2.1-SNAPSHOT</version>
+        <version>10.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>infobip-spring-data-common</artifactId>
diff --git a/infobip-spring-data-jdbc-annotation-processor-common/pom.xml b/infobip-spring-data-jdbc-annotation-processor-common/pom.xml
index 8d582b64..0dafa713 100644
--- a/infobip-spring-data-jdbc-annotation-processor-common/pom.xml
+++ b/infobip-spring-data-jdbc-annotation-processor-common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.infobip</groupId>
         <artifactId>infobip-spring-data-querydsl</artifactId>
-        <version>9.2.1-SNAPSHOT</version>
+        <version>10.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>infobip-spring-data-jdbc-annotation-processor-common</artifactId>
diff --git a/infobip-spring-data-jdbc-annotation-processor/pom.xml b/infobip-spring-data-jdbc-annotation-processor/pom.xml
index 9943f154..206245cd 100644
--- a/infobip-spring-data-jdbc-annotation-processor/pom.xml
+++ b/infobip-spring-data-jdbc-annotation-processor/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.infobip</groupId>
 		<artifactId>infobip-spring-data-querydsl</artifactId>
-		<version>9.2.1-SNAPSHOT</version>
+		<version>10.0.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>infobip-spring-data-jdbc-annotation-processor</artifactId>
diff --git a/infobip-spring-data-jdbc-querydsl-boot-starter/pom.xml b/infobip-spring-data-jdbc-querydsl-boot-starter/pom.xml
index 12fd727a..a8c1db78 100644
--- a/infobip-spring-data-jdbc-querydsl-boot-starter/pom.xml
+++ b/infobip-spring-data-jdbc-querydsl-boot-starter/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.infobip</groupId>
         <artifactId>infobip-spring-data-querydsl</artifactId>
-        <version>9.2.1-SNAPSHOT</version>
+        <version>10.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>infobip-spring-data-jdbc-querydsl-boot-starter</artifactId>
diff --git a/infobip-spring-data-jdbc-querydsl/pom.xml b/infobip-spring-data-jdbc-querydsl/pom.xml
index 70576f66..8c7fc22a 100644
--- a/infobip-spring-data-jdbc-querydsl/pom.xml
+++ b/infobip-spring-data-jdbc-querydsl/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.infobip</groupId>
 		<artifactId>infobip-spring-data-querydsl</artifactId>
-		<version>9.2.1-SNAPSHOT</version>
+		<version>10.0.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>infobip-spring-data-jdbc-querydsl</artifactId>
diff --git a/infobip-spring-data-jdbc-querydsl/src/test/java/com/infobip/spring/data/jdbc/TestConfiguration.java b/infobip-spring-data-jdbc-querydsl/src/test/java/com/infobip/spring/data/jdbc/TestConfiguration.java
new file mode 100644
index 00000000..ac567a86
--- /dev/null
+++ b/infobip-spring-data-jdbc-querydsl/src/test/java/com/infobip/spring/data/jdbc/TestConfiguration.java
@@ -0,0 +1,24 @@
+package com.infobip.spring.data.jdbc;
+
+import org.flywaydb.core.Flyway;
+import org.springframework.boot.autoconfigure.flyway.FlywayMigrationStrategy;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class TestConfiguration {
+
+    @Bean
+    public FlywayMigrationStrategy clean() {
+        return flyway -> {
+            // Rebuild Flyway with clean enabled for tests
+            Flyway cleanFlyway = Flyway.configure()
+                    .configuration(flyway.getConfiguration())
+                    .cleanDisabled(false)
+                    .load();
+
+            cleanFlyway.clean();
+            flyway.migrate();
+        };
+    }
+}
diff --git a/infobip-spring-data-jpa-querydsl-boot-starter/pom.xml b/infobip-spring-data-jpa-querydsl-boot-starter/pom.xml
index f5313ba7..44052968 100644
--- a/infobip-spring-data-jpa-querydsl-boot-starter/pom.xml
+++ b/infobip-spring-data-jpa-querydsl-boot-starter/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.infobip</groupId>
         <artifactId>infobip-spring-data-querydsl</artifactId>
-        <version>9.2.1-SNAPSHOT</version>
+        <version>10.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>infobip-spring-data-jpa-querydsl-boot-starter</artifactId>
diff --git a/infobip-spring-data-jpa-querydsl-boot-starter/src/test/java/com/infobip/spring/data/jpa/TestConfiguration.java b/infobip-spring-data-jpa-querydsl-boot-starter/src/test/java/com/infobip/spring/data/jpa/TestConfiguration.java
new file mode 100644
index 00000000..60b07e5b
--- /dev/null
+++ b/infobip-spring-data-jpa-querydsl-boot-starter/src/test/java/com/infobip/spring/data/jpa/TestConfiguration.java
@@ -0,0 +1,24 @@
+package com.infobip.spring.data.jpa;
+
+import org.flywaydb.core.Flyway;
+import org.springframework.boot.autoconfigure.flyway.FlywayMigrationStrategy;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class TestConfiguration {
+
+    @Bean
+    public FlywayMigrationStrategy clean() {
+        return flyway -> {
+            // Rebuild Flyway with clean enabled for tests
+            Flyway cleanFlyway = Flyway.configure()
+                    .configuration(flyway.getConfiguration())
+                    .cleanDisabled(false)
+                    .load();
+
+            cleanFlyway.clean();
+            flyway.migrate();
+        };
+    }
+}
diff --git a/infobip-spring-data-jpa-querydsl/pom.xml b/infobip-spring-data-jpa-querydsl/pom.xml
index bc29bd5f..8b646eb4 100644
--- a/infobip-spring-data-jpa-querydsl/pom.xml
+++ b/infobip-spring-data-jpa-querydsl/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.infobip</groupId>
 		<artifactId>infobip-spring-data-querydsl</artifactId>
-		<version>9.2.1-SNAPSHOT</version>
+		<version>10.0.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>infobip-spring-data-jpa-querydsl</artifactId>
diff --git a/infobip-spring-data-jpa-querydsl/src/test/java/com/infobip/spring/data/jpa/TestConfiguration.java b/infobip-spring-data-jpa-querydsl/src/test/java/com/infobip/spring/data/jpa/TestConfiguration.java
new file mode 100644
index 00000000..60b07e5b
--- /dev/null
+++ b/infobip-spring-data-jpa-querydsl/src/test/java/com/infobip/spring/data/jpa/TestConfiguration.java
@@ -0,0 +1,24 @@
+package com.infobip.spring.data.jpa;
+
+import org.flywaydb.core.Flyway;
+import org.springframework.boot.autoconfigure.flyway.FlywayMigrationStrategy;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class TestConfiguration {
+
+    @Bean
+    public FlywayMigrationStrategy clean() {
+        return flyway -> {
+            // Rebuild Flyway with clean enabled for tests
+            Flyway cleanFlyway = Flyway.configure()
+                    .configuration(flyway.getConfiguration())
+                    .cleanDisabled(false)
+                    .load();
+
+            cleanFlyway.clean();
+            flyway.migrate();
+        };
+    }
+}
diff --git a/infobip-spring-data-r2dbc-querydsl-boot-starter/pom.xml b/infobip-spring-data-r2dbc-querydsl-boot-starter/pom.xml
index d712703b..13fc2e7a 100644
--- a/infobip-spring-data-r2dbc-querydsl-boot-starter/pom.xml
+++ b/infobip-spring-data-r2dbc-querydsl-boot-starter/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.infobip</groupId>
         <artifactId>infobip-spring-data-querydsl</artifactId>
-        <version>9.2.1-SNAPSHOT</version>
+        <version>10.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>infobip-spring-data-r2dbc-querydsl-boot-starter</artifactId>
diff --git a/infobip-spring-data-r2dbc-querydsl-boot-starter/src/test/java/com/infobip/spring/data/r2dbc/TestConfiguration.java b/infobip-spring-data-r2dbc-querydsl-boot-starter/src/test/java/com/infobip/spring/data/r2dbc/TestConfiguration.java
index 5ae510ff..bffe5525 100644
--- a/infobip-spring-data-r2dbc-querydsl-boot-starter/src/test/java/com/infobip/spring/data/r2dbc/TestConfiguration.java
+++ b/infobip-spring-data-r2dbc-querydsl-boot-starter/src/test/java/com/infobip/spring/data/r2dbc/TestConfiguration.java
@@ -14,12 +14,15 @@ public class TestConfiguration {
 
     @Bean(initMethod = "migrate")
     public Flyway flyway() {
-        return new Flyway(Flyway.configure()
-                                .baselineOnMigrate(true)
-                                .dataSource(
-                                        env.getRequiredProperty("spring.flyway.url"),
-                                        env.getRequiredProperty("spring.flyway.username"),
-                                        env.getRequiredProperty("spring.flyway.password"))
+        var flyway = new Flyway(Flyway.configure()
+                                      .cleanDisabled(false)
+                                      .baselineOnMigrate(true)
+                                      .dataSource(
+                                              env.getRequiredProperty("spring.flyway.url"),
+                                              env.getRequiredProperty("spring.flyway.username"),
+                                              env.getRequiredProperty("spring.flyway.password"))
         );
+        flyway.clean();
+        return flyway;
     }
 }
diff --git a/infobip-spring-data-r2dbc-querydsl/pom.xml b/infobip-spring-data-r2dbc-querydsl/pom.xml
index 73fba9a7..417e56e0 100644
--- a/infobip-spring-data-r2dbc-querydsl/pom.xml
+++ b/infobip-spring-data-r2dbc-querydsl/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.infobip</groupId>
         <artifactId>infobip-spring-data-querydsl</artifactId>
-        <version>9.2.1-SNAPSHOT</version>
+        <version>10.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>infobip-spring-data-r2dbc-querydsl</artifactId>
diff --git a/infobip-spring-data-r2dbc-querydsl/src/test/java/com/infobip/spring/data/r2dbc/TestConfiguration.java b/infobip-spring-data-r2dbc-querydsl/src/test/java/com/infobip/spring/data/r2dbc/TestConfiguration.java
index a4b6ce49..4ee7323e 100644
--- a/infobip-spring-data-r2dbc-querydsl/src/test/java/com/infobip/spring/data/r2dbc/TestConfiguration.java
+++ b/infobip-spring-data-r2dbc-querydsl/src/test/java/com/infobip/spring/data/r2dbc/TestConfiguration.java
@@ -14,13 +14,16 @@ public class TestConfiguration {
 
     @Bean(initMethod = "migrate")
     public Flyway flyway() {
-        return new Flyway(Flyway.configure()
-                                .baselineOnMigrate(true)
-                                  .locations(env.getRequiredProperty("spring.flyway.locations"))
-                                .dataSource(
-                                        env.getRequiredProperty("spring.flyway.url"),
-                                        env.getRequiredProperty("spring.flyway.username"),
-                                        env.getRequiredProperty("spring.flyway.password"))
+        var flyway = new Flyway(Flyway.configure()
+                                      .cleanDisabled(false)
+                                      .baselineOnMigrate(true)
+                                      .locations(env.getRequiredProperty("spring.flyway.locations"))
+                                      .dataSource(
+                                              env.getRequiredProperty("spring.flyway.url"),
+                                              env.getRequiredProperty("spring.flyway.username"),
+                                              env.getRequiredProperty("spring.flyway.password"))
         );
+        flyway.clean();
+        return flyway;
     }
 }
diff --git a/pom.xml b/pom.xml
index e3097dda..14002306 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 
 	<groupId>com.infobip</groupId>
 	<artifactId>infobip-spring-data-querydsl</artifactId>
-	<version>9.2.1-SNAPSHOT</version>
+	<version>10.0.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>Infobip Spring Data Querydsl</name>
@@ -76,7 +76,7 @@
 		<!-- PLUGIN VERSIONS -->
 		<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
 		<coveralls-maven-plugin.version>4.3.0</coveralls-maven-plugin.version>
-		<jacoco-maven-plugin.version>0.8.10</jacoco-maven-plugin.version>
+		<jacoco-maven-plugin.version>0.8.14</jacoco-maven-plugin.version>
 		<maven-gpg-plugin.version>3.1.0</maven-gpg-plugin.version>
 		<maven-javadoc-plugin.version>3.3.0</maven-javadoc-plugin.version>
 		<maven-surefire-plugin.version>3.1.2</maven-surefire-plugin.version>
@@ -156,14 +156,6 @@
 	<build>
 		<pluginManagement>
 			<plugins>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-javadoc-plugin</artifactId>
-					<version>${maven-javadoc-plugin.version}</version>
-					<configuration>
-						<source>${java.version}</source>
-					</configuration>
-				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-surefire-plugin</artifactId>
@@ -177,57 +169,10 @@
 			</plugins>
 		</pluginManagement>
 		<plugins>
-			<plugin>
-				<artifactId>kotlin-maven-plugin</artifactId>
-				<configuration>
-					<jvmTarget>1.8</jvmTarget>
-				</configuration>
-				<groupId>org.jetbrains.kotlin</groupId>
-				<version>${kotlin.version}</version>
-
-				<executions>
-					<execution>
-						<id>test-compile</id>
-						<goals>
-							<goal>test-compile</goal>
-						</goals>
-						<configuration>
-							<sourceDirs>
-								<sourceDir>${project.basedir}/src/test/java</sourceDir>
-								<sourceDir>${project.basedir}/src/test/kotlin</sourceDir>
-							</sourceDirs>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>${maven-compiler-plugin.version}</version>
-				<executions>
-					<execution>
-						<id>default-compile</id>
-						<phase>none</phase>
-					</execution>
-					<execution>
-						<id>default-testCompile</id>
-						<phase>none</phase>
-					</execution>
-					<execution>
-						<id>java-compile</id>
-						<phase>compile</phase>
-						<goals>
-							<goal>compile</goal>
-						</goals>
-					</execution>
-					<execution>
-						<id>java-test-compile</id>
-						<phase>test-compile</phase>
-						<goals>
-							<goal>testCompile</goal>
-						</goals>
-					</execution>
-				</executions>
 				<configuration>
 					<release>${java.version}</release>
 					<compilerArgument>-parameters</compilerArgument>
@@ -267,44 +212,93 @@
 					</dependency>
 				</dependencies>
 			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-source-plugin</artifactId>
+				<version>3.3.0</version>
+				<executions>
+					<execution>
+						<id>attach-sources</id>
+						<phase>package</phase>
+						<goals>
+							<goal>jar-no-fork</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<version>${maven-javadoc-plugin.version}</version>
+				<configuration>
+					<doclint>none</doclint>
+				</configuration>
+				<executions>
+					<execution>
+						<id>attach-javadocs</id>
+						<phase>package</phase>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-gpg-plugin</artifactId>
+				<version>${maven-gpg-plugin.version}</version>
+				<executions>
+					<execution>
+						<id>sign-artifacts</id>
+						<phase>verify</phase>
+						<goals>
+							<goal>sign</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<groupId>org.sonatype.central</groupId>
+				<artifactId>central-publishing-maven-plugin</artifactId>
+				<version>0.9.0</version>
+				<extensions>true</extensions>
+				<configuration>
+					<publishingServerId>central</publishingServerId>
+					<autoPublish>true</autoPublish>
+					<waitUntil>published</waitUntil>
+					<skipPublishing>true</skipPublishing>
+				</configuration>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-deploy-plugin</artifactId>
+				<version>3.1.2</version>
+				<configuration>
+					<skip>true</skip>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
 
 	<profiles>
 		<profile>
-			<id>release-sign-artifacts</id>
-			<activation>
-				<property>
-					<name>performRelease</name>
-					<value>true</value>
-				</property>
-			</activation>
+			<id>release-to-central</id>
 			<build>
 				<plugins>
 					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-gpg-plugin</artifactId>
-						<version>${maven-gpg-plugin.version}</version>
-						<executions>
-							<execution>
-								<id>sign-artifacts</id>
-								<phase>verify</phase>
-								<goals>
-									<goal>sign</goal>
-								</goals>
-							</execution>
-						</executions>
+						<groupId>org.sonatype.central</groupId>
+						<artifactId>central-publishing-maven-plugin</artifactId>
+						<configuration>
+							<skipPublishing>false</skipPublishing>
+						</configuration>
 					</plugin>
 				</plugins>
 			</build>
 		</profile>
 	</profiles>
-
-	<distributionManagement>
-		<repository>
-			<id>ossrh</id>
-			<name>SonatypeReleases</name>
-			<url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
-		</repository>
-	</distributionManagement>
 </project>