From c157e2d1f70a5a8bb8ea3a9b066d3389f1aac2bb Mon Sep 17 00:00:00 2001
From: chentianming <chentianming11@qq.com>
Date: Sun, 4 Dec 2022 20:20:57 +0800
Subject: [PATCH] support spring boot 3.0

---
 .travis.yml                                      |  2 +-
 README.md                                        |  2 +-
 README_EN.md                                     |  2 +-
 pom.xml                                          | 16 ++++++++--------
 .../boot/config/RetrofitAutoConfiguration.java   |  3 ++-
 src/main/resources/META-INF/spring.factories     |  2 --
 ....boot.autoconfigure.AutoConfiguration.imports |  1 +
 7 files changed, 14 insertions(+), 14 deletions(-)
 delete mode 100644 src/main/resources/META-INF/spring.factories
 create mode 100644 src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

diff --git a/.travis.yml b/.travis.yml
index 4476c24..751065b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,4 @@
 language: java
 jdk:
-  - openjdk8
+  - openjdk17
 install: mvn install -DskipTests=true -Dmaven.javadoc.skip=true -Dgpg.skip=true
diff --git a/README.md b/README.md
index d0dbc81..f160430 100644
--- a/README.md
+++ b/README.md
@@ -51,7 +51,7 @@ gitee项目地址：[https://gitee.com/lianjiatech/retrofit-spring-boot-starter]
 <dependency>
     <groupId>com.github.lianjiatech</groupId>
    <artifactId>retrofit-spring-boot-starter</artifactId>
-   <version>2.3.11</version>
+   <version>3.0.0</version>
 </dependency>
 ```
 
diff --git a/README_EN.md b/README_EN.md
index df6a35a..b6476ff 100644
--- a/README_EN.md
+++ b/README_EN.md
@@ -41,7 +41,7 @@
 <dependency>
     <groupId>com.github.lianjiatech</groupId>
    <artifactId>retrofit-spring-boot-starter</artifactId>
-   <version>2.3.11</version>
+   <version>3.0.0</version>
 </dependency>
 ```
 
diff --git a/pom.xml b/pom.xml
index b8593ee..38ef8c9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.github.lianjiatech</groupId>
     <artifactId>retrofit-spring-boot-starter</artifactId>
-    <version>2.3.11</version>
+    <version>3.0.0</version>
 
     <name>retrofit-spring-boot-starter</name>
     <description>retrofit-spring-boot-starter</description>
@@ -39,7 +39,7 @@
     <properties>
         <retrofit.version>2.9.0</retrofit.version>
         <javax.annotation-api.version>1.3.2</javax.annotation-api.version>
-        <spring-boot.version>2.7.6</spring-boot.version>
+        <spring-boot.version>3.0.0</spring-boot.version>
         <okhttp.version>3.14.9</okhttp.version>
         <sentinel.version>1.6.3</sentinel.version>
         <lombok.version>1.18.24</lombok.version>
@@ -182,19 +182,19 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.6.2</version>
+                <version>3.10.1</version>
                 <configuration>
                     <compilerArgument>-parameters</compilerArgument>
                     <encoding>UTF-8</encoding>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <source>17</source>
+                    <target>17</target>
                 </configuration>
             </plugin>
             <!-- Source -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
-                <version>3.0.1</version>
+                <version>3.2.1</version>
                 <configuration>
                     <attach>true</attach>
                 </configuration>
@@ -211,7 +211,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.2.0</version>
+                <version>3.4.1</version>
                 <configuration>
                     <show>private</show>
                     <nohelp>true</nohelp>
@@ -247,7 +247,7 @@
             <plugin>
                 <groupId>org.sonatype.plugins</groupId>
                 <artifactId>nexus-staging-maven-plugin</artifactId>
-                <version>1.6.7</version>
+                <version>1.6.13</version>
                 <extensions>true</extensions>
                 <configuration>
                     <serverId>oss</serverId>
diff --git a/src/main/java/com/github/lianjiatech/retrofit/spring/boot/config/RetrofitAutoConfiguration.java b/src/main/java/com/github/lianjiatech/retrofit/spring/boot/config/RetrofitAutoConfiguration.java
index 033730a..d91fa8d 100644
--- a/src/main/java/com/github/lianjiatech/retrofit/spring/boot/config/RetrofitAutoConfiguration.java
+++ b/src/main/java/com/github/lianjiatech/retrofit/spring/boot/config/RetrofitAutoConfiguration.java
@@ -4,6 +4,7 @@
 
 import com.github.lianjiatech.retrofit.spring.boot.core.BasicTypeConverterFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -41,7 +42,7 @@
 /**
  * @author 陈添明
  */
-@Configuration
+@AutoConfiguration
 @EnableConfigurationProperties(RetrofitProperties.class)
 public class RetrofitAutoConfiguration {
 
diff --git a/src/main/resources/META-INF/spring.factories b/src/main/resources/META-INF/spring.factories
deleted file mode 100644
index 5cf9633..0000000
--- a/src/main/resources/META-INF/spring.factories
+++ /dev/null
@@ -1,2 +0,0 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-  com.github.lianjiatech.retrofit.spring.boot.config.RetrofitAutoConfiguration
\ No newline at end of file
diff --git a/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
new file mode 100644
index 0000000..996460c
--- /dev/null
+++ b/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1 @@
+com.github.lianjiatech.retrofit.spring.boot.config.RetrofitAutoConfiguration
\ No newline at end of file