upgraded to spring boot 4

CHANGELOG.md

@@ -1,3 +1,6 @@
+### 10.0.0
+* upgraded to Spring Boot 4
+
 ### 9.2.0
 * Added BOM (Bill of materials)
 

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>

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>

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>

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>

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>

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>

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();
+        };
+    }
+}

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>

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();
+        };
+    }
+}

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>

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();
+        };
+    }
+}

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>

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;
     }
 }

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>

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;
     }
 }