diff --git a/build.gradle b/build.gradle index 2757c3d10..7061949ad 100644 --- a/build.gradle +++ b/build.gradle @@ -33,7 +33,7 @@ plugins { id 'org.openapi.generator' version '7.8.0' // spring - id 'org.springframework.boot' version '3.2.2' apply false + id 'org.springframework.boot' version '3.3.5' apply false // spotless code formatter // (see https://github.com/diffplug/spotless) diff --git a/gradle/libraries.gradle b/gradle/libraries.gradle index a83d0d988..8e5235aac 100644 --- a/gradle/libraries.gradle +++ b/gradle/libraries.gradle @@ -77,7 +77,7 @@ ext { // There exists an issue for it at https://github.com/mercedes-benz/sechub/issues/3080 restDocsApiSpec: "0.17.1", jacksonAnnotations: "2.17.2", - jacksonDatabind: "2.13.4.1", + jacksonDatabind: "2.17.2", jacksonDatatypeJsr310: "2.17.2", jacksonDatabindNullable: "0.2.6", javaxAnnotationApi: "1.3.2", @@ -144,6 +144,7 @@ ext { database_h2: "com.h2database:h2", // here we do NOT set a library version - will be handled automatically by spring boot dependency management flyway: "org.flywaydb:flyway-core", + flyway_database_postgresql: "org.flywaydb:flyway-database-postgresql", /* additional (2): version based on other libraries used by spring boot */ diff --git a/gradle/spring_boot_dependagen.gradle b/gradle/spring_boot_dependagen.gradle index 4a1937c51..84fd7b47c 100644 --- a/gradle/spring_boot_dependagen.gradle +++ b/gradle/spring_boot_dependagen.gradle @@ -1,163 +1,162 @@ -// SPDX-License-Identifier: MIT ext { spring_boot_dependency = [ - // Next parts are dependencies used by Spring Boot v 3.2.4 - // You can use this information to use exact same library version inside - // your own libraries, where you have no spring boot dependency management - // - // Generated by dependagen 1.0.0 - // (see https://github.com/de-jcup/dependagen) + // Next parts are dependencies used by Spring Boot v 3.3.5 + // You can use this information to use exact same library version inside + // your own libraries, where you have no spring boot dependency management + // + // Generated by dependagen 0.3.0 + // (see https://github.com/de-jcup/dependagen) - accessors_smart: 'net.minidev:accessors-smart:2.5.0', - android_json: 'com.vaadin.external.google:android-json:0.0.20131108.vaadin1', - angus_activation: 'org.eclipse.angus:angus-activation:2.0.2', - antlr4_runtime: 'org.antlr:antlr4-runtime:4.13.0', - asm: 'org.ow2.asm:asm:9.3', - aspectjweaver: 'org.aspectj:aspectjweaver:1.9.21', - assertj_core: 'org.assertj:assertj-core:3.24.2', - attoparser: 'org.attoparser:attoparser:2.0.7.RELEASE', - awaitility: 'org.awaitility:awaitility:4.2.0', - byte_buddy: 'net.bytebuddy:byte-buddy:1.14.11', - byte_buddy_agent: 'net.bytebuddy:byte-buddy-agent:1.14.9', - classmate: 'com.fasterxml:classmate:1.5.1', - evo_inflector: 'org.atteo:evo-inflector:1.3', - hamcrest: 'org.hamcrest:hamcrest:2.1', - hdrhistogram: 'org.hdrhistogram:HdrHistogram:2.1.12', - hibernate_commons_annotations: 'org.hibernate.common:hibernate-commons-annotations:6.0.6.Final', - hibernate_core: 'org.hibernate.orm:hibernate-core:6.4.4.Final', - hibernate_validator: 'org.hibernate.validator:hibernate-validator:8.0.1.Final', - hikaricp: 'com.zaxxer:HikariCP:5.0.1', - istack_commons_runtime: 'com.sun.istack:istack-commons-runtime:4.1.2', - jackson_annotations: 'com.fasterxml.jackson.core:jackson-annotations:2.15.4', - jackson_bom: 'com.fasterxml.jackson:jackson-bom:2.15.4', - jackson_core: 'com.fasterxml.jackson.core:jackson-core:2.15.4', - jackson_databind: 'com.fasterxml.jackson.core:jackson-databind:2.15.4', - jackson_datatype_jdk8: 'com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.15.4', - jackson_datatype_jsr310: 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.15.4', - jackson_module_parameter_names: 'com.fasterxml.jackson.module:jackson-module-parameter-names:2.15.4', - jakarta_activation_api: 'jakarta.activation:jakarta.activation-api:2.1.3', - jakarta_annotation_api: 'jakarta.annotation:jakarta.annotation-api:2.1.1', - jakarta_inject_api: 'jakarta.inject:jakarta.inject-api:2.0.1', - jakarta_mail: 'org.eclipse.angus:jakarta.mail:2.0.3', - jakarta_persistence_api: 'jakarta.persistence:jakarta.persistence-api:3.1.0', - jakarta_servlet_api: 'jakarta.servlet:jakarta.servlet-api:6.0.0', - jakarta_transaction_api: 'jakarta.transaction:jakarta.transaction-api:2.0.1', - jakarta_validation_api: 'jakarta.validation:jakarta.validation-api:3.0.2', - jakarta_xml_bind_api: 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.0', - jandex: 'io.smallrye:jandex:3.1.2', - jaxb_core: 'org.glassfish.jaxb:jaxb-core:4.0.5', - jaxb_runtime: 'org.glassfish.jaxb:jaxb-runtime:4.0.2', - jboss_logging: 'org.jboss.logging:jboss-logging:3.5.0.Final', - json_path: 'com.jayway.jsonpath:json-path:2.9.0', - json_smart: 'net.minidev:json-smart:2.5.0', - jsonassert: 'org.skyscreamer:jsonassert:1.5.1', - jul_to_slf4j: 'org.slf4j:jul-to-slf4j:2.0.12', - junit_bom: 'org.junit:junit-bom:5.10.2', - junit_jupiter: 'org.junit.jupiter:junit-jupiter:5.10.2', - junit_jupiter_api: 'org.junit.jupiter:junit-jupiter-api:5.10.2', - junit_jupiter_engine: 'org.junit.jupiter:junit-jupiter-engine:5.10.2', - junit_jupiter_params: 'org.junit.jupiter:junit-jupiter-params:5.10.2', - junit_platform_commons: 'org.junit.platform:junit-platform-commons:1.10.2', - junit_platform_engine: 'org.junit.platform:junit-platform-engine:1.10.2', - latencyutils: 'org.latencyutils:LatencyUtils:2.0.3', - log4j_api: 'org.apache.logging.log4j:log4j-api:2.21.1', - log4j_to_slf4j: 'org.apache.logging.log4j:log4j-to-slf4j:2.21.1', - logback_classic: 'ch.qos.logback:logback-classic:1.4.14', - logback_core: 'ch.qos.logback:logback-core:1.4.14', - micrometer_commons: 'io.micrometer:micrometer-commons:1.12.4', - micrometer_core: 'io.micrometer:micrometer-core:1.12.3', - micrometer_jakarta9: 'io.micrometer:micrometer-jakarta9:1.12.4', - micrometer_observation: 'io.micrometer:micrometer-observation:1.12.4', - mockito_core: 'org.mockito:mockito-core:5.7.0', - mockito_junit_jupiter: 'org.mockito:mockito-junit-jupiter:5.7.0', - objenesis: 'org.objenesis:objenesis:3.3', - opentest4j: 'org.opentest4j:opentest4j:1.3.0', - slf4j_api: 'org.slf4j:slf4j-api:2.0.7', - snakeyaml: 'org.yaml:snakeyaml:2.2', - thymeleaf: 'org.thymeleaf:thymeleaf:3.1.2.RELEASE', - thymeleaf_spring6: 'org.thymeleaf:thymeleaf-spring6:3.1.2.RELEASE', - tomcat_embed_core: 'org.apache.tomcat.embed:tomcat-embed-core:10.1.19', - tomcat_embed_el: 'org.apache.tomcat.embed:tomcat-embed-el:10.1.19', - tomcat_embed_websocket: 'org.apache.tomcat.embed:tomcat-embed-websocket:10.1.19', - txw2: 'org.glassfish.jaxb:txw2:4.0.5', - unbescape: 'org.unbescape:unbescape:1.1.6.RELEASE', - xmlunit_core: 'org.xmlunit:xmlunit-core:2.9.1' + accessors_smart: 'net.minidev:accessors-smart:2.5.1', + android_json: 'com.vaadin.external.google:android-json:0.0.20131108.vaadin1', + angus_activation: 'org.eclipse.angus:angus-activation:2.0.2', + antlr4_runtime: 'org.antlr:antlr4-runtime:4.13.0', + asm: 'org.ow2.asm:asm:9.6', + aspectjweaver: 'org.aspectj:aspectjweaver:1.9.22.1', + assertj_core: 'org.assertj:assertj-core:3.25.3', + attoparser: 'org.attoparser:attoparser:2.0.7.RELEASE', + awaitility: 'org.awaitility:awaitility:4.2.2', + byte_buddy: 'net.bytebuddy:byte-buddy:1.14.15', + byte_buddy_agent: 'net.bytebuddy:byte-buddy-agent:1.14.12', + classmate: 'com.fasterxml:classmate:1.5.1', + evo_inflector: 'org.atteo:evo-inflector:1.3', + hamcrest: 'org.hamcrest:hamcrest:2.1', + hdrhistogram: 'org.hdrhistogram:HdrHistogram:2.2.2', + hibernate_commons_annotations: 'org.hibernate.common:hibernate-commons-annotations:6.0.6.Final', + hibernate_core: 'org.hibernate.orm:hibernate-core:6.5.3.Final', + hibernate_validator: 'org.hibernate.validator:hibernate-validator:8.0.1.Final', + hikaricp: 'com.zaxxer:HikariCP:5.1.0', + istack_commons_runtime: 'com.sun.istack:istack-commons-runtime:4.1.2', + jackson_annotations: 'com.fasterxml.jackson.core:jackson-annotations:2.17.2', + jackson_bom: 'com.fasterxml.jackson:jackson-bom:2.17.2', + jackson_core: 'com.fasterxml.jackson.core:jackson-core:2.17.2', + jackson_databind: 'com.fasterxml.jackson.core:jackson-databind:2.17.2', + jackson_datatype_jdk8: 'com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.17.2', + jackson_datatype_jsr310: 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.17.2', + jackson_module_parameter_names: 'com.fasterxml.jackson.module:jackson-module-parameter-names:2.17.2', + jakarta_activation_api: 'jakarta.activation:jakarta.activation-api:2.1.3', + jakarta_annotation_api: 'jakarta.annotation:jakarta.annotation-api:2.1.1', + jakarta_inject_api: 'jakarta.inject:jakarta.inject-api:2.0.1', + jakarta_mail: 'org.eclipse.angus:jakarta.mail:2.0.3', + jakarta_persistence_api: 'jakarta.persistence:jakarta.persistence-api:3.1.0', + jakarta_servlet_api: 'jakarta.servlet:jakarta.servlet-api:6.0.0', + jakarta_transaction_api: 'jakarta.transaction:jakarta.transaction-api:2.0.1', + jakarta_validation_api: 'jakarta.validation:jakarta.validation-api:3.0.2', + jakarta_xml_bind_api: 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.0', + jandex: 'io.smallrye:jandex:3.1.2', + jaxb_core: 'org.glassfish.jaxb:jaxb-core:4.0.5', + jaxb_runtime: 'org.glassfish.jaxb:jaxb-runtime:4.0.2', + jboss_logging: 'org.jboss.logging:jboss-logging:3.5.0.Final', + json_path: 'com.jayway.jsonpath:json-path:2.9.0', + json_smart: 'net.minidev:json-smart:2.5.0', + jsonassert: 'org.skyscreamer:jsonassert:1.5.3', + jul_to_slf4j: 'org.slf4j:jul-to-slf4j:2.0.16', + junit_bom: 'org.junit:junit-bom:5.10.5', + junit_jupiter: 'org.junit.jupiter:junit-jupiter:5.10.5', + junit_jupiter_api: 'org.junit.jupiter:junit-jupiter-api:5.10.5', + junit_jupiter_engine: 'org.junit.jupiter:junit-jupiter-engine:5.10.5', + junit_jupiter_params: 'org.junit.jupiter:junit-jupiter-params:5.10.5', + junit_platform_commons: 'org.junit.platform:junit-platform-commons:1.10.5', + junit_platform_engine: 'org.junit.platform:junit-platform-engine:1.10.5', + latencyutils: 'org.latencyutils:LatencyUtils:2.0.3', + log4j_api: 'org.apache.logging.log4j:log4j-api:2.23.1', + log4j_to_slf4j: 'org.apache.logging.log4j:log4j-to-slf4j:2.23.1', + logback_classic: 'ch.qos.logback:logback-classic:1.5.11', + logback_core: 'ch.qos.logback:logback-core:1.5.11', + micrometer_commons: 'io.micrometer:micrometer-commons:1.13.6', + micrometer_core: 'io.micrometer:micrometer-core:1.12.6', + micrometer_jakarta9: 'io.micrometer:micrometer-jakarta9:1.13.6', + micrometer_observation: 'io.micrometer:micrometer-observation:1.12.11', + mockito_core: 'org.mockito:mockito-core:5.11.0', + mockito_junit_jupiter: 'org.mockito:mockito-junit-jupiter:5.11.0', + objenesis: 'org.objenesis:objenesis:3.3', + opentest4j: 'org.opentest4j:opentest4j:1.3.0', + slf4j_api: 'org.slf4j:slf4j-api:2.0.15', + snakeyaml: 'org.yaml:snakeyaml:2.2', + thymeleaf: 'org.thymeleaf:thymeleaf:3.1.2.RELEASE', + thymeleaf_spring6: 'org.thymeleaf:thymeleaf-spring6:3.1.2.RELEASE', + tomcat_embed_core: 'org.apache.tomcat.embed:tomcat-embed-core:10.1.31', + tomcat_embed_el: 'org.apache.tomcat.embed:tomcat-embed-el:10.1.31', + tomcat_embed_websocket: 'org.apache.tomcat.embed:tomcat-embed-websocket:10.1.31', + txw2: 'org.glassfish.jaxb:txw2:4.0.5', + unbescape: 'org.unbescape:unbescape:1.1.6.RELEASE', + xmlunit_core: 'org.xmlunit:xmlunit-core:2.9.1' ] spring_boot_dependency_version = [ - accessors_smart: '2.5.0', - android_json: '0.0.20131108.vaadin1', - angus_activation: '2.0.2', - antlr4_runtime: '4.13.0', - asm: '9.3', - aspectjweaver: '1.9.21', - assertj_core: '3.24.2', - attoparser: '2.0.7.RELEASE', - awaitility: '4.2.0', - byte_buddy: '1.14.11', - byte_buddy_agent: '1.14.9', - classmate: '1.5.1', - evo_inflector: '1.3', - hamcrest: '2.1', - hdrhistogram: '2.1.12', - hibernate_commons_annotations: '6.0.6.Final', - hibernate_core: '6.4.4.Final', - hibernate_validator: '8.0.1.Final', - hikaricp: '5.0.1', - istack_commons_runtime: '4.1.2', - jackson_annotations: '2.15.4', - jackson_bom: '2.15.4', - jackson_core: '2.15.4', - jackson_databind: '2.15.4', - jackson_datatype_jdk8: '2.15.4', - jackson_datatype_jsr310: '2.15.4', - jackson_module_parameter_names: '2.15.4', - jakarta_activation_api: '2.1.3', - jakarta_annotation_api: '2.1.1', - jakarta_inject_api: '2.0.1', - jakarta_mail: '2.0.3', - jakarta_persistence_api: '3.1.0', - jakarta_servlet_api: '6.0.0', - jakarta_transaction_api: '2.0.1', - jakarta_validation_api: '3.0.2', - jakarta_xml_bind_api: '4.0.0', - jandex: '3.1.2', - jaxb_core: '4.0.5', - jaxb_runtime: '4.0.2', - jboss_logging: '3.5.0.Final', - json_path: '2.9.0', - json_smart: '2.5.0', - jsonassert: '1.5.1', - jul_to_slf4j: '2.0.12', - junit_bom: '5.10.2', - junit_jupiter: '5.10.2', - junit_jupiter_api: '5.10.2', - junit_jupiter_engine: '5.10.2', - junit_jupiter_params: '5.10.2', - junit_platform_commons: '1.10.2', - junit_platform_engine: '1.10.2', - latencyutils: '2.0.3', - log4j_api: '2.21.1', - log4j_to_slf4j: '2.21.1', - logback_classic: '1.4.14', - logback_core: '1.4.14', - micrometer_commons: '1.12.4', - micrometer_core: '1.12.3', - micrometer_jakarta9: '1.12.4', - micrometer_observation: '1.12.4', - mockito_core: '5.7.0', - mockito_junit_jupiter: '5.7.0', - objenesis: '3.3', - opentest4j: '1.3.0', - slf4j_api: '2.0.7', - snakeyaml: '2.2', - thymeleaf: '3.1.2.RELEASE', - thymeleaf_spring6: '3.1.2.RELEASE', - tomcat_embed_core: '10.1.19', - tomcat_embed_el: '10.1.19', - tomcat_embed_websocket: '10.1.19', - txw2: '4.0.5', - unbescape: '1.1.6.RELEASE', - xmlunit_core: '2.9.1' + accessors_smart: '2.5.1', + android_json: '0.0.20131108.vaadin1', + angus_activation: '2.0.2', + antlr4_runtime: '4.13.0', + asm: '9.6', + aspectjweaver: '1.9.22.1', + assertj_core: '3.25.3', + attoparser: '2.0.7.RELEASE', + awaitility: '4.2.2', + byte_buddy: '1.14.15', + byte_buddy_agent: '1.14.12', + classmate: '1.5.1', + evo_inflector: '1.3', + hamcrest: '2.1', + hdrhistogram: '2.2.2', + hibernate_commons_annotations: '6.0.6.Final', + hibernate_core: '6.5.3.Final', + hibernate_validator: '8.0.1.Final', + hikaricp: '5.1.0', + istack_commons_runtime: '4.1.2', + jackson_annotations: '2.17.2', + jackson_bom: '2.17.2', + jackson_core: '2.17.2', + jackson_databind: '2.17.2', + jackson_datatype_jdk8: '2.17.2', + jackson_datatype_jsr310: '2.17.2', + jackson_module_parameter_names: '2.17.2', + jakarta_activation_api: '2.1.3', + jakarta_annotation_api: '2.1.1', + jakarta_inject_api: '2.0.1', + jakarta_mail: '2.0.3', + jakarta_persistence_api: '3.1.0', + jakarta_servlet_api: '6.0.0', + jakarta_transaction_api: '2.0.1', + jakarta_validation_api: '3.0.2', + jakarta_xml_bind_api: '4.0.0', + jandex: '3.1.2', + jaxb_core: '4.0.5', + jaxb_runtime: '4.0.2', + jboss_logging: '3.5.0.Final', + json_path: '2.9.0', + json_smart: '2.5.0', + jsonassert: '1.5.3', + jul_to_slf4j: '2.0.16', + junit_bom: '5.10.5', + junit_jupiter: '5.10.5', + junit_jupiter_api: '5.10.5', + junit_jupiter_engine: '5.10.5', + junit_jupiter_params: '5.10.5', + junit_platform_commons: '1.10.5', + junit_platform_engine: '1.10.5', + latencyutils: '2.0.3', + log4j_api: '2.23.1', + log4j_to_slf4j: '2.23.1', + logback_classic: '1.5.11', + logback_core: '1.5.11', + micrometer_commons: '1.13.6', + micrometer_core: '1.12.6', + micrometer_jakarta9: '1.13.6', + micrometer_observation: '1.12.11', + mockito_core: '5.11.0', + mockito_junit_jupiter: '5.11.0', + objenesis: '3.3', + opentest4j: '1.3.0', + slf4j_api: '2.0.15', + snakeyaml: '2.2', + thymeleaf: '3.1.2.RELEASE', + thymeleaf_spring6: '3.1.2.RELEASE', + tomcat_embed_core: '10.1.31', + tomcat_embed_el: '10.1.31', + tomcat_embed_websocket: '10.1.31', + txw2: '4.0.5', + unbescape: '1.1.6.RELEASE', + xmlunit_core: '2.9.1' ] } \ No newline at end of file diff --git a/sechub-pds/build.gradle b/sechub-pds/build.gradle index db6a44ab4..28c5e5a6a 100644 --- a/sechub-pds/build.gradle +++ b/sechub-pds/build.gradle @@ -16,6 +16,7 @@ dependencies { implementation(library.springboot_starter_data_jpa) implementation(library.springboot_starter_security) implementation(library.flyway) + implementation(library.flyway_database_postgresql) implementation(library.logstashLogbackEncoder) implementation(library.database_h2) implementation(library.database_postgres) diff --git a/sechub-server/build.gradle b/sechub-server/build.gradle index 0c3a26b41..cad378c0a 100644 --- a/sechub-server/build.gradle +++ b/sechub-server/build.gradle @@ -16,6 +16,7 @@ dependencies { implementation project(':sechub-adapter') // necessary because of adapter mocking factory methods implementation(library.flyway) + implementation(library.flyway_database_postgresql) implementation(library.apache_commons_fileupload2_core) implementation(library.apache_commons_fileupload2_jakarta)