Skip to content

Commit

Permalink
Merge branch 'main' into feature/FDP-2318-spotless
Browse files Browse the repository at this point in the history
# Conflicts:
#	build.gradle.kts
  • Loading branch information
loesimmens committed Sep 16, 2024
2 parents b636aa3 + 3cbd9b5 commit 2b8aa0e
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
12 changes: 6 additions & 6 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile


plugins {
id("org.springframework.boot") version "3.3.2" apply false
id("io.spring.dependency-management") version "1.1.5" apply false
kotlin("jvm") version "2.0.0" apply false
kotlin("plugin.spring") version "2.0.0" apply false
kotlin("plugin.jpa") version "2.0.0" apply false
id("org.springframework.boot") version "3.3.3" apply false
id("io.spring.dependency-management") version "1.1.6" apply false
kotlin("jvm") version "2.0.20" apply false
kotlin("plugin.spring") version "2.0.20" apply false
kotlin("plugin.jpa") version "2.0.20" apply false
id("com.github.davidmc24.gradle.plugin.avro") version "1.9.1" apply false
id("com.diffplug.spotless") version "6.25.0"
id("org.sonarqube") version "5.0.0.4638"
id("org.sonarqube") version "5.1.0.4882"
id("eclipse")
}

Expand Down
2 changes: 1 addition & 1 deletion settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ dependencyResolutionManagement {
create("libs") {
version("californium", "3.12.1")
version("kotlinLogging", "7.0.0")
version("commons-codec", "1.17.0")
version("commons-codec", "1.17.1")

// https://projects.eclipse.org/projects/iot.californium
library("californium-core", "org.eclipse.californium", "californium-core").versionRef("californium")
Expand Down

0 comments on commit 2b8aa0e

Please sign in to comment.