migrate spring-boot 3 (#39)

* migrate spring-boot 3

pom.xml

@@ -8,7 +8,7 @@
     <packaging>pom</packaging>
 
     <properties>
-        <revision>0.14.0</revision>
+        <revision>0.15.0-beta.1</revision>
         <maven.deploy.skip>true</maven.deploy.skip>
         <sonar.organization>azbuilder</sonar.organization>
         <sonar.host.url>https://sonarcloud.io</sonar.host.url>

terrakube-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>
 		<relativePath/>
 	</parent>
 	<groupId>org.terrakube.client</groupId>
@@ -20,12 +20,12 @@
 		<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.14.0</revision>
-		<feign.version>13.1</feign.version>
+		<revision>0.15.0-beta.1</revision>
+		<feign.version>13.2.1</feign.version>
 		<feign-form.version>3.8.0</feign-form.version>
 		<maven.deploy.skip>false</maven.deploy.skip>
 		<lombok.version>1.18.30</lombok.version>
-		<jjwt.version>0.12.3</jjwt.version>
+		<jjwt.version>0.12.5</jjwt.version>
 	</properties>
 
 	<licenses>

terrakube-spring-boot-autoconfigure/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>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>org.terrakube.client</groupId>
@@ -20,8 +20,8 @@
 		<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>
-		<feign.version>13.1</feign.version>
-		<revision>0.14.0</revision>
+		<feign.version>13.2.1</feign.version>
+		<revision>0.15.0-beta.1</revision>
 		<maven.deploy.skip>false</maven.deploy.skip>
 		<lombok.version>1.18.30</lombok.version>
 	</properties>

terrakube-spring-boot-autoconfigure/src/main/java/org/terrakube/client/spring/autoconfigure/RestClientAutoConfiguration.java

@@ -4,18 +4,17 @@
 import feign.Logger;
 import feign.okhttp.OkHttpClient;
 import feign.slf4j.Slf4jLogger;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.terrakube.client.TerrakubeClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 import feign.gson.GsonDecoder;
 import feign.gson.GsonEncoder;
 import org.terrakube.client.dex.DexCredentialAuthentication;
-import org.terrakube.client.dex.DexCredentialType;
 
-@Configuration
+@AutoConfiguration
 @EnableConfigurationProperties(RestClientProperties.class)
 @ConditionalOnMissingBean(TerrakubeClient.class)
 public class RestClientAutoConfiguration {

terrakube-spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories → terrakube-spring-boot-autoconfigure/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1,2 +1 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
 org.terrakube.client.spring.autoconfigure.RestClientAutoConfiguration

terrakube-spring-boot-starter-sample/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>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>org.terrakube.client</groupId>
@@ -19,7 +19,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.14.0</revision>
+		<revision>0.15.0-beta.1</revision>
 		<maven.deploy.skip>true</maven.deploy.skip>
 	</properties>
 

terrakube-spring-boot-starter-sample/src/main/java/org/terrakube/client/sample/ApiClientStarterSampleApplication.java

@@ -1,7 +1,9 @@
 package org.terrakube.client.sample;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.terrakube.client.TerrakubeClient;
 
 @SpringBootApplication
 public class ApiClientStarterSampleApplication {
@@ -10,4 +12,7 @@ public static void main(String[] args) {
 		SpringApplication.run(ApiClientStarterSampleApplication.class, args);
 	}
 
+	@Autowired
+	TerrakubeClient terrakubeClient;
+
 }

terrakube-spring-boot-starter-sample/src/main/resources/application.properties

@@ -1 +1,4 @@
-
+org.terrakube.client.url=http://localhost:8080
+org.terrakube.client.enableSecurity = true
+org.terrakube.client.secretKey=JlJkNlVSQHEmOVhYU3heSHckY1pIQSMkenRVWXp2QEU=
+org.terrakube.client.credentialType=INTERNAL

terrakube-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.client</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.14.0</revision>
+    <revision>0.15.0-beta.1</revision>
     <maven.deploy.skip>false</maven.deploy.skip>
   </properties>