migrate spring-boot 3 (#48)

* migrate spring-boot 3
AzBuilder · Mar 22, 2024 · 7062c6f · 7062c6f
1 parent 7ce14ea
commit 7062c6f
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 14 deletions.
diff --git a/pom.xml b/pom.xml
@@ -11,7 +11,7 @@
 
  <properties>
  <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <revision>0.13.0</revision>
+ <revision>0.14.0-beta.2</revision>
  <sonar.organization>azbuilder</sonar.organization>
  <sonar.host.url>https://sonarcloud.io</sonar.host.url>
  <maven.deploy.skip>true</maven.deploy.skip>

diff --git a/terraform-client/pom.xml b/terraform-client/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>org.springframework.boot</groupId>
  <artifactId>spring-boot-starter-parent</artifactId>
- <version>2.7.18</version>
+ <version>3.0.13</version>
  </parent>
 
  <groupId>org.terrakube.terraform</groupId>
@@ -23,7 +23,7 @@
  <maven-source-plugin.version>3.3.0</maven-source-plugin.version>
  <maven-javadoc-plugin.version>3.6.2</maven-javadoc-plugin.version>
  <maven-gpg-plugin.version>3.1.0</maven-gpg-plugin.version>
- <revision>0.13.0</revision>
+ <revision>0.14.0-beta.2</revision>
  <maven.deploy.skip>false</maven.deploy.skip>
  <commons-io.version>2.15.0</commons-io.version>
  <maven-artifact.version>3.9.5</maven-artifact.version>

diff --git a/terraform-spring-boot-autoconfigure/pom.xml b/terraform-spring-boot-autoconfigure/pom.xml
@@ -4,7 +4,7 @@
  <parent>
  <groupId>org.springframework.boot</groupId>
  <artifactId>spring-boot-starter-parent</artifactId>
- <version>2.7.18</version>
+ <version>3.0.13</version>
  </parent>
 
  <groupId>org.terrakube.terraform</groupId>
@@ -22,7 +22,7 @@
  <maven-source-plugin.version>3.3.0</maven-source-plugin.version>
  <maven-javadoc-plugin.version>3.6.2</maven-javadoc-plugin.version>
  <maven-gpg-plugin.version>3.1.0</maven-gpg-plugin.version>
- <revision>0.13.0</revision>
+ <revision>0.14.0-beta.2</revision>
  <maven.deploy.skip>false</maven.deploy.skip>
  <lombok.version>1.18.30</lombok.version>
  <maven.compiler.source>11</maven.compiler.source>

diff --git a/...rc/main/java/org/terrakube/terraform/spring/autoconfigure/TerraformAutoConfiguration.java b/...rc/main/java/org/terrakube/terraform/spring/autoconfigure/TerraformAutoConfiguration.java
@@ -1,12 +1,13 @@
 package org.terrakube.terraform.spring.autoconfigure;
 
 import lombok.NonNull;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.*;
 import org.springframework.boot.context.properties.*;
 import org.springframework.context.annotation.*;
 import org.terrakube.terraform.TerraformClient;
 
-@Configuration
+@AutoConfiguration
 @EnableConfigurationProperties(TerraformProperties.class)
 @ConditionalOnMissingBean(TerraformClient.class)
 public class TerraformAutoConfiguration {

diff --git a/terraform-spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories b/terraform-spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories
diff --git a/...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1 @@
+org.terrakube.terraform.spring.autoconfigure.TerraformAutoConfiguration
diff --git a/terraform-spring-boot-samples/pom.xml b/terraform-spring-boot-samples/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>org.springframework.boot</groupId>
  <artifactId>spring-boot-starter-parent</artifactId>
- <version>2.7.18</version>
+ <version>3.0.13</version>
  </parent>
 
  <groupId>org.terrakube.terraform</groupId>
@@ -18,7 +18,7 @@
 
  <properties>
  <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <revision>0.13.0</revision>
+ <revision>0.14.0-beta.2</revision>
  <maven.deploy.skip>true</maven.deploy.skip>
  <maven.compiler.source>11</maven.compiler.source>
  <maven.compiler.target>11</maven.compiler.target>

diff --git a/terraform-spring-boot-samples/raw-client-library-sample/pom.xml b/terraform-spring-boot-samples/raw-client-library-sample/pom.xml
@@ -20,7 +20,7 @@
  <properties>
  <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
  <maven.deploy.skip>true</maven.deploy.skip>
- <revision>0.13.0</revision>
+ <revision>0.14.0-beta.2</revision>
  <maven.compiler.source>11</maven.compiler.source>
  <maven.compiler.target>11</maven.compiler.target>
  </properties>

diff --git a/terraform-spring-boot-samples/spring-starter-sample/pom.xml b/terraform-spring-boot-samples/spring-starter-sample/pom.xml
@@ -20,7 +20,7 @@
  <properties>
  <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
  <maven.deploy.skip>true</maven.deploy.skip>
- <revision>0.13.0</revision>
+ <revision>0.14.0-beta.2</revision>
  <maven.compiler.source>11</maven.compiler.source>
  <maven.compiler.target>11</maven.compiler.target>
  </properties>

diff --git a/terraform-spring-boot-starter/pom.xml b/terraform-spring-boot-starter/pom.xml
@@ -4,7 +4,7 @@
  <parent>
  <groupId>org.springframework.boot</groupId>
  <artifactId>spring-boot-starter-parent</artifactId>
- <version>2.7.18</version>
+ <version>3.0.13</version>
  </parent>
 
  <groupId>org.terrakube.terraform</groupId>
@@ -17,7 +17,7 @@
  <maven-source-plugin.version>3.3.0</maven-source-plugin.version>
  <maven-javadoc-plugin.version>3.6.2</maven-javadoc-plugin.version>
  <maven-gpg-plugin.version>3.1.0</maven-gpg-plugin.version>
- <revision>0.13.0</revision>
+ <revision>0.14.0-beta.2</revision>
  <maven.deploy.skip>false</maven.deploy.skip>
  <maven.compiler.source>11</maven.compiler.source>
  <maven.compiler.target>11</maven.compiler.target>