From 5296c7e4e64c5003c97acf0f2c3b2d313d86af7b Mon Sep 17 00:00:00 2001 From: Marvin Schramm Date: Fri, 29 Oct 2021 20:49:39 +0200 Subject: [PATCH] update depencies and add changelog (#7) --- .github/dependabot.yml | 6 ++++++ CHANGELOG.md | 21 ++++++++++++++++++--- build.gradle.kts | 19 +++++++------------ gradle.properties | 4 ++-- settings.gradle.kts | 1 - spring-json-api/build.gradle.kts | 2 +- 6 files changed, 34 insertions(+), 19 deletions(-) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..b00c3bd --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,6 @@ +version: 2 +updates: + - package-ecosystem: "gradle" + directory: "/" + schedule: + interval: "daily" diff --git a/CHANGELOG.md b/CHANGELOG.md index 54253a1..1682510 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,22 @@ -## [unreleased] +# Changelog + +All notable changes to this project will be documented in this file. + +The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres +to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + +## [Unreleased] + +- dependency upgrade kotlin 1.4.20 to 1.5.30 +- Bump spring-boot-dependencies from 2.4.2 to 2.5.6 + +## [1.0.0] ### Added -### Changed +- AutoConfigured ExceptionHandler to expose ```ErrorResponse``` +- AutoConfigured ResponseAdvice to expose ```Response``` via ```JsonApiResponse + +[unreleased]: https://github.com/hndrs/jsonapi-spring-boot-starter/compare/v1.0.0...HEAD -### Removed +[1.0.0]: https://github.com/hndrs/jsonapi-spring-boot-starter/compare/a9b56be382ab065e05c602815dba1d77536f6595...v1.0.0 diff --git a/build.gradle.kts b/build.gradle.kts index 3459dbc..23aa741 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -7,10 +7,6 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile buildscript { repositories { mavenCentral() - maven(url = "https://repo.spring.io/plugins-release") - } - dependencies { - classpath("io.spring.gradle:propdeps-plugin:0.0.9.RELEASE") } } @@ -18,7 +14,7 @@ val springBootDependencies: String by extra val kotlinVersion: String by extra plugins { - id("org.sonarqube").version("3.1.1") + id("org.sonarqube").version("3.3") id("io.spring.dependency-management") kotlin("jvm") kotlin("plugin.spring") @@ -27,7 +23,7 @@ plugins { id("maven-publish") id("idea") id("signing") - id("io.hndrs.publishing-info").version("1.1.0") + id("io.hndrs.publishing-info").version("2.0.0") } group = "io.hndrs" @@ -44,8 +40,10 @@ sonarqube { property("sonar.projectKey", "hndrs_jsonapi-spring-boot-starter") property("sonar.organization", "hndrs") property("sonar.host.url", "https://sonarcloud.io") - property("sonar.exclusions", "**/sample/**, **/response/Meta.kt," + - " **/response/Response.kt, **/response/ErrorResponse.kt") + property( + "sonar.exclusions", "**/sample/**, **/response/Meta.kt," + + " **/response/Response.kt, **/response/ErrorResponse.kt" + ) } } @@ -58,12 +56,9 @@ subprojects { apply(plugin = "kotlin-kapt") apply(plugin = "maven-publish") apply(plugin = "jacoco") - apply(plugin = "propdeps") - apply(plugin = "propdeps-idea") apply(plugin = "signing") - apply(plugin = "io.hndrs.publishing-info") - publishingInfo { + publishingInfo { name = project.name url = "https://github.com/hndrs/jsonapi-spring-boot-starter" license = License( diff --git a/gradle.properties b/gradle.properties index 668e04f..2d59bf7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ -kotlinVersion=1.4.30 +kotlinVersion=1.5.30 springDependencyManagement=1.0.11.RELEASE -springBootDependencies=2.4.2 +springBootDependencies=2.5.6 diff --git a/settings.gradle.kts b/settings.gradle.kts index c094d83..e9fb5f8 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -12,7 +12,6 @@ project(":sample").projectDir = File("sample") pluginManagement { val kotlinVersion: String by settings val springDependencyManagement: String by settings - println("Settings ${settings.extra.properties}") plugins { id("io.spring.dependency-management").version(springDependencyManagement) kotlin("jvm").version(kotlinVersion) diff --git a/spring-json-api/build.gradle.kts b/spring-json-api/build.gradle.kts index 3165763..cc6e0b7 100644 --- a/spring-json-api/build.gradle.kts +++ b/spring-json-api/build.gradle.kts @@ -1,5 +1,5 @@ dependencies { - optional(group = "org.springframework.boot", name = "spring-boot-starter-web") + api(group = "org.springframework.boot", name = "spring-boot-starter-web") testImplementation("io.mockk:mockk:1.10.6") }