diff --git a/build.gradle b/build.gradle index 4f84cacc..4f8b0b81 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,7 @@ buildscript { jacksonVersion = '2.15.2' // https://github.com/FasterXML/jackson-databind/tags // retrofit is why we need allow-opens. context: https://stackoverflow.com/questions/60915381/retrofit2-maven-project-illegal-reflective-access-warning // https://github.com/square/retrofit/issues/3341 retrofitVersion = "2.9.0" // https://github.com/square/retrofit/tags - shadowVersion = '7.1.2' // https://github.com/johnrengelman/shadow/releases // only works on gradle 7 + shadowVersion = '8.1.1' // https://github.com/johnrengelman/shadow/releases ioLibVersion = '2.3.0' // https://github.com/retrodaredevil/io-lib/releases okhttpVersion = "4.11.0" // https://mvnrepository.com/artifact/com.squareup.okhttp3/okhttp // couchdbJavaVersion = '1.1.0' @@ -298,6 +298,6 @@ project(":action-lang"){ } wrapper { - gradleVersion = '7.4.2' + gradleVersion = '8.1.1' distributionType = Wrapper.DistributionType.ALL } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7454180f..41d9927a 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 92f06b50..1f017e4e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/server/build.gradle b/server/build.gradle index bc275cd5..c414f52c 100644 --- a/server/build.gradle +++ b/server/build.gradle @@ -2,7 +2,7 @@ buildscript { ext { // https://github.com/spring-projects/spring-boot/wiki#release-notes // https://github.com/spring-projects/spring-boot/releases - springBootVersion = '2.6.6' + springBootVersion = '3.1.1' } repositories { mavenCentral() diff --git a/server/src/main/java/me/retrodaredevil/solarthing/rest/CommonProvider.java b/server/src/main/java/me/retrodaredevil/solarthing/rest/CommonProvider.java index 869cf488..c56f5a16 100644 --- a/server/src/main/java/me/retrodaredevil/solarthing/rest/CommonProvider.java +++ b/server/src/main/java/me/retrodaredevil/solarthing/rest/CommonProvider.java @@ -15,7 +15,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.stereotype.Component; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import java.nio.file.Path; import java.util.Objects; diff --git a/server/src/main/java/me/retrodaredevil/solarthing/rest/cache/CacheHandlerProvider.java b/server/src/main/java/me/retrodaredevil/solarthing/rest/cache/CacheHandlerProvider.java index e4c87572..2ffca97c 100644 --- a/server/src/main/java/me/retrodaredevil/solarthing/rest/cache/CacheHandlerProvider.java +++ b/server/src/main/java/me/retrodaredevil/solarthing/rest/cache/CacheHandlerProvider.java @@ -8,7 +8,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.stereotype.Component; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; @Component public class CacheHandlerProvider { diff --git a/server/src/main/java/me/retrodaredevil/solarthing/rest/command/CommandHandlerProvider.java b/server/src/main/java/me/retrodaredevil/solarthing/rest/command/CommandHandlerProvider.java index 0223b5b8..0b10e60d 100644 --- a/server/src/main/java/me/retrodaredevil/solarthing/rest/command/CommandHandlerProvider.java +++ b/server/src/main/java/me/retrodaredevil/solarthing/rest/command/CommandHandlerProvider.java @@ -13,7 +13,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.stereotype.Component; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import java.io.IOException; import java.io.InputStream; import java.nio.file.Files; diff --git a/server/src/main/java/me/retrodaredevil/solarthing/rest/graphql/GraphQLProvider.java b/server/src/main/java/me/retrodaredevil/solarthing/rest/graphql/GraphQLProvider.java index 3d1fe809..bd44fded 100644 --- a/server/src/main/java/me/retrodaredevil/solarthing/rest/graphql/GraphQLProvider.java +++ b/server/src/main/java/me/retrodaredevil/solarthing/rest/graphql/GraphQLProvider.java @@ -28,7 +28,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.stereotype.Component; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import java.io.IOException; import java.io.InputStream; import java.lang.annotation.Annotation;