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] com.github.lianjiatech retrofit-spring-boot-starter - 2.3.11 + 3.0.0 ``` 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 @@ com.github.lianjiatech retrofit-spring-boot-starter - 2.3.11 + 3.0.0 ``` diff --git a/pom.xml b/pom.xml index b8593ee..38ef8c9 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.github.lianjiatech retrofit-spring-boot-starter - 2.3.11 + 3.0.0 retrofit-spring-boot-starter retrofit-spring-boot-starter @@ -39,7 +39,7 @@ 2.9.0 1.3.2 - 2.7.6 + 3.0.0 3.14.9 1.6.3 1.18.24 @@ -182,19 +182,19 @@ org.apache.maven.plugins maven-compiler-plugin - 3.6.2 + 3.10.1 -parameters UTF-8 - 1.8 - 1.8 + 17 + 17 org.apache.maven.plugins maven-source-plugin - 3.0.1 + 3.2.1 true @@ -211,7 +211,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.2.0 + 3.4.1 private true @@ -247,7 +247,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.7 + 1.6.13 true oss 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