diff --git a/components/inspectit-ocelot-configurationserver/build.gradle b/components/inspectit-ocelot-configurationserver/build.gradle index ec6a405884..8827a6ef45 100644 --- a/components/inspectit-ocelot-configurationserver/build.gradle +++ b/components/inspectit-ocelot-configurationserver/build.gradle @@ -111,11 +111,11 @@ dependencies { configServerLibs.orgSpringframeworkSecuritySpringSecurityTest, configServerLibs.orgMockitoMockitoJunitJupiter, configServerLibs.comH2databaseH2, - libs.orgJunitJupiterJunitJupiter, - libs.orgJunitJupiterJunitJupiterApi, - libs.orgAwaitility + configServerLibs.orgJunitJupiterJunitJupiter, + configServerLibs.orgJunitJupiterJunitJupiterApi, + configServerLibs.orgAwaitility ) - testRuntimeOnly libs.orgJunitJupiterJunitJupiterEngine + testRuntimeOnly configServerLibs.orgJunitJupiterJunitJupiterEngine } tasks.register('copyServerJar', Copy) { diff --git a/components/inspectit-ocelot-configurationserver/src/main/resources/application.yml b/components/inspectit-ocelot-configurationserver/src/main/resources/application.yml index 1e5dab04b4..d4a2fc9ee1 100644 --- a/components/inspectit-ocelot-configurationserver/src/main/resources/application.yml +++ b/components/inspectit-ocelot-configurationserver/src/main/resources/application.yml @@ -1,8 +1,3 @@ -logging: - level: - # TODO remove this with next spring boot version (currently 3.1.6) - org.springframework.web.servlet.handler.HandlerMappingIntrospector: error - spring: datasource: url: jdbc:sqlite:${inspectit-config-server.working-directory}/users.db diff --git a/gradle/configserverlibs.versions.toml b/gradle/configserverlibs.versions.toml index 2bdab191bd..43589a1e4e 100644 --- a/gradle/configserverlibs.versions.toml +++ b/gradle/configserverlibs.versions.toml @@ -1,30 +1,35 @@ [versions] -ioJsonwebtoken = "0.12.3" +ioJsonwebtoken = "0.12.5" orgEclipseJgit = "6.8.0.202311291450-r" -orgMockito = "4.7.0" -orgSpringframeworkBoot = { strictly = "3.1.7" } -orgSpringframeworkSecurity = "6.1.6" +orgMockito = "5.10.0" +orgJunitJupiter = "5.10.2" +orgSpringframeworkBoot = { strictly = "3.2.3" } +orgSpringframeworkSecurity = "6.2.2" [libraries] comGoogleCodeGson = "com.google.code.gson:gson:2.10.1" -comGoogleGuava = { module = "com.google.guava:guava", version = { strictly = "32.1.3-jre" } } +comGoogleGuava = { module = "com.google.guava:guava", version = { strictly = "33.0.0-jre" } } comH2databaseH2 = "com.h2database:h2:2.2.224" commonsIo = "commons-io:commons-io:2.15.1" ioJsonwebtokenJjwtApi = { module = "io.jsonwebtoken:jjwt-api", version.ref = "ioJsonwebtoken" } ioJsonwebtokenJjwtImpl = { module = "io.jsonwebtoken:jjwt-impl", version.ref = "ioJsonwebtoken" } ioJsonwebtokenJjwtJackson = { module = "io.jsonwebtoken:jjwt-jackson", version.ref = "ioJsonwebtoken" } -orgApacheCommonsCommonsLang3 = "org.apache.commons:commons-lang3:3.13.0" +orgApacheCommonsCommonsLang3 = "org.apache.commons:commons-lang3:3.14.0" +orgAwaitility = "org.awaitility:awaitility:4.2.0" orgEclipseJgitOrgEclipseJgit = { module = "org.eclipse.jgit:org.eclipse.jgit", version.ref = "orgEclipseJgit" } orgEclipseJgitOrgEclipseJgitSshApache= {module = "org.eclipse.jgit:org.eclipse.jgit.ssh.apache", version.ref = "orgEclipseJgit" } -orgFlywaydbFlywayCore = "org.flywaydb:flyway-core:9.22.3" +orgFlywaydbFlywayCore = "org.flywaydb:flyway-core:10.8.1" orgHibernateOrmHibernateCommunityDialects = "org.hibernate.orm:hibernate-community-dialects:6.3.2.Final" +orgJunitJupiterJunitJupiter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "orgJunitJupiter" } +orgJunitJupiterJunitJupiterApi = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "orgJunitJupiter" } +orgJunitJupiterJunitJupiterEngine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "orgJunitJupiter" } orgMockitoMockitoJunitJupiter = { module = "org.mockito:mockito-junit-jupiter", version.ref = "orgMockito" } orgSpringframeworkBootSpringBootStarterActuator = { module = "org.springframework.boot:spring-boot-starter-actuator", version.ref = "orgSpringframeworkBoot" } orgSpringframeworkBootSpringBootStarterDataJpa = { module = "org.springframework.boot:spring-boot-starter-data-jpa", version.ref = "orgSpringframeworkBoot" } orgSpringframeworkBootSpringBootStarterTest = { module = "org.springframework.boot:spring-boot-starter-test", version.ref = "orgSpringframeworkBoot" } orgSpringframeworkBootSpringBootStarterWeb = { module = "org.springframework.boot:spring-boot-starter-web", version.ref = "orgSpringframeworkBoot" } orgSpringframeworkBootSpringBootStartervalidation = { module = "org.springframework.boot:spring-boot-starter-validation", version.ref = "orgSpringframeworkBoot" } -orgSpringframeworkLdapSpringLdapCore = "org.springframework.ldap:spring-ldap-core:3.2.1" +orgSpringframeworkLdapSpringLdapCore = "org.springframework.ldap:spring-ldap-core:3.2.2" orgSpringframeworkSecuritySpringSecurityLdap = { module = "org.springframework.security:spring-security-ldap", version.ref = "orgSpringframeworkSecurity" } orgSpringframeworkSecuritySpringSecurityTest = { module = "org.springframework.security:spring-security-test", version.ref = "orgSpringframeworkSecurity" } orgSpringframeworkSecuritySpringSecurityWeb = { module = "org.springframework.security:spring-security-web", version.ref = "orgSpringframeworkSecurity" }