diff --git a/.3rd-party/DEPENDENCIES b/.3rd-party/DEPENDENCIES index ce98ba844..0991d2623 100644 --- a/.3rd-party/DEPENDENCIES +++ b/.3rd-party/DEPENDENCIES @@ -2,281 +2,200 @@ maven/mavencentral/ch.qos.logback/logback-classic/1.5.32, EPL-1.0 AND LGPL-2.1-o maven/mavencentral/ch.qos.logback/logback-core/1.5.32, EPL-1.0 AND LGPL-2.1-only, approved, #15210 maven/mavencentral/com.cronutils/cron-utils/9.2.1, Apache-2.0, approved, clearlydefined maven/mavencentral/com.ethlo.time/itu/1.14.0, Apache-2.0, approved, #19505 +maven/mavencentral/com.fasterxml.jackson.core/jackson-annotations/2.20, Apache-2.0, approved, #23056 maven/mavencentral/com.fasterxml.jackson.core/jackson-annotations/2.21, Apache-2.0, approved, #25587 maven/mavencentral/com.fasterxml.jackson.core/jackson-core/2.21.2, Apache-2.0 AND MIT, approved, #25590 maven/mavencentral/com.fasterxml.jackson.core/jackson-databind/2.21.2, Apache-2.0, approved, #25591 -maven/mavencentral/com.fasterxml.jackson.dataformat/jackson-dataformat-cbor/2.21.2, Apache-2.0, approved, #26062 -maven/mavencentral/com.fasterxml.jackson.dataformat/jackson-dataformat-toml/2.21.2, Apache-2.0, approved, #26778 maven/mavencentral/com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/2.21.2, Apache-2.0, approved, #25589 -maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jdk8/2.21.2, Apache-2.0, approved, #26613 -maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-joda/2.21.2, Apache-2.0, approved, #26776 maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jsr310/2.21.2, Apache-2.0, approved, #26441 maven/mavencentral/com.fasterxml.jackson.module/jackson-module-jsonSchema/2.21.2, Apache-2.0, approved, #26779 -maven/mavencentral/com.fasterxml.jackson.module/jackson-module-parameter-names/2.21.2, Apache-2.0, approved, #26614 maven/mavencentral/com.fasterxml/classmate/1.7.3, Apache-2.0, approved, #24482 maven/mavencentral/com.github.ben-manes.caffeine/caffeine/3.2.3, Apache-2.0 AND (Apache-2.0 AND CC0-1.0), approved, #18889 -maven/mavencentral/com.github.javaparser/javaparser-core/3.26.4, (Apache-2.0 AND LGPL-2.1-or-later AND LGPL-3.0 AND LGPL-3.0-only) OR (Apache-2.0 AND LGPL-2.1-or-later AND LGPL-3.0-only), approved, clearlydefined -maven/mavencentral/com.github.javaparser/javaparser-symbol-solver-core/3.26.4, Apache-2.0 OR (Apache-2.0 AND LGPL-3.0) OR (Apache-2.0 AND LGPL-3.0-only) OR (LGPL-3.0 AND LGPL-3.0-only), approved, clearlydefined -maven/mavencentral/com.github.oshi/oshi-core/6.6.5, MIT, approved, #14290 maven/mavencentral/com.github.stephenc.jcip/jcip-annotations/1.0-1, Apache-2.0, approved, CQ21949 maven/mavencentral/com.github.victools/jsonschema-generator/4.38.0, Apache-2.0, approved, clearlydefined maven/mavencentral/com.github.victools/jsonschema-module-jackson/4.38.0, Apache-2.0, approved, clearlydefined maven/mavencentral/com.github.victools/jsonschema-module-swagger-2/4.38.0, Apache-2.0, approved, clearlydefined -maven/mavencentral/com.google.code.findbugs/jsr305/3.0.2, Apache-2.0 and CC-BY-2.5, approved, #15220 -maven/mavencentral/com.google.errorprone/error_prone_annotations/2.41.0, Apache-2.0, approved, #22631 maven/mavencentral/com.google.errorprone/error_prone_annotations/2.43.0, Apache-2.0, approved, #24436 -maven/mavencentral/com.google.guava/failureaccess/1.0.3, Apache-2.0, approved, CQ22654 -maven/mavencentral/com.google.guava/guava/33.5.0-jre, Apache-2.0 AND CC0-1.0 AND CC-PDDC, approved, #23378 -maven/mavencentral/com.google.guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava, Apache-2.0, approved, CQ22657 -maven/mavencentral/com.google.j2objc/j2objc-annotations/3.1, Apache-2.0, approved, #23379 -maven/mavencentral/com.h2database/h2/2.3.232, (MPL-2.0 AND EPL-1.0) AND (MPL-2.0 AND EPL-1.0 AND LGPL-3.0-or-later) AND BSD-3-Clause, approved, #15708 -maven/mavencentral/com.helger.commons/ph-commons/11.2.0, Apache-2.0 AND BSD-3-Clause, approved, #21949 -maven/mavencentral/com.helger/ph-css/7.0.4, Apache-2.0, approved, #12134 -maven/mavencentral/com.jayway.jsonpath/json-path/2.9.0, Apache-2.0, approved, #20009 +maven/mavencentral/com.h2database/h2/2.4.240, EPL-1.0 AND MPL-2.0 AND LGPL-2.1-or-later AND BSD-3-Clause AND LicenseRef-Public-Domain, approved, #23567 +maven/mavencentral/com.jayway.jsonpath/json-path/2.10.0, Apache-2.0, approved, clearlydefined maven/mavencentral/com.knuddels/jtokkit/1.1.0, MIT, approved, clearlydefined maven/mavencentral/com.networknt/json-schema-validator/2.0.0, Apache-2.0 AND Unicode-TOU, approved, #25988 -maven/mavencentral/com.nimbusds/content-type/2.2, Apache-2.0, approved, clearlydefined +maven/mavencentral/com.nimbusds/content-type/2.3, Apache-2.0, approved, clearlydefined maven/mavencentral/com.nimbusds/lang-tag/1.7, Apache-2.0, approved, clearlydefined -maven/mavencentral/com.nimbusds/nimbus-jose-jwt/9.37.4, Apache-2.0, approved, #11701 -maven/mavencentral/com.nimbusds/oauth2-oidc-sdk/9.43.6, Apache-2.0, approved, clearlydefined -maven/mavencentral/com.rabbitmq/amqp-client/5.25.0, (Apache-2.0 OR GPL-2.0-only OR MPL-2.0) AND (Apache-2.0 OR GPL-2.0-only OR MPL-1.1), approved, #19537 -maven/mavencentral/com.rabbitmq/http-client/5.5.0, Apache-2.0, approved, #26777 +maven/mavencentral/com.nimbusds/nimbus-jose-jwt/10.4, Apache-2.0, approved, #22824 +maven/mavencentral/com.nimbusds/oauth2-oidc-sdk/11.26.1, Apache-2.0, approved, clearlydefined +maven/mavencentral/com.rabbitmq.client/amqp-client/0.8.0, , restricted, clearlydefined +maven/mavencentral/com.rabbitmq/amqp-client/5.27.1, (Apache-2.0 AND GPL-2.0-only AND GPL-2.0-or-later AND LicenseRef-scancode-warranty-disclaimer AND MPL-1.1 AND MPL-2.0) OR (Apache-2.0 AND GPL-2.0-only AND GPL-2.0-or-later AND LicenseRef-scancode-warranty-disclaimer AND MPL-2.0) OR (Apache-2.0 AND GPL-2.0-only AND LGPL-2.1-or-later AND LicenseRef-scancode-warranty-disclaimer AND MPL-1.1 AND MPL-2.0) OR (Apache-2.0 AND GPL-2.0-only AND LGPL-2.1-or-later AND LicenseRef-scancode-warranty-disclaimer AND MPL-2.0) OR (Apache-2.0 AND GPL-2.0-only AND LicenseRef-scancode-warranty-disclaimer AND MPL-1.1 AND MPL-2.0), restricted, clearlydefined maven/mavencentral/com.sun.istack/istack-commons-runtime/4.1.2, BSD-3-Clause, approved, #15290 maven/mavencentral/com.vaadin.external.atmosphere/atmosphere-runtime/3.0.5.slf4jvaadin1, Apache-2.0, approved, #12113 -maven/mavencentral/com.vaadin.external.google/android-json/0.0.20131108.vaadin1, Apache-2.0, approved, CQ21310 -maven/mavencentral/com.vaadin.external.gwt/gwt-elemental/2.8.2.vaadin2, Apache-2.0, approved, clearlydefined maven/mavencentral/com.vaadin.external/gentyref/1.2.0.vaadin1, Apache-2.0, approved, CQ20645 -maven/mavencentral/com.vaadin.servletdetector/throw-if-servlet3/1.0.2, Apache-2.0, approved, #12159 -maven/mavencentral/com.vaadin/collaboration-engine/6.6.0, Apache-2.0, approved, #23473 -maven/mavencentral/com.vaadin/copilot/24.9.11, Apache-2.0, approved, #23502 -maven/mavencentral/com.vaadin/flow-client/24.9.12, Apache-2.0, approved, #23514 -maven/mavencentral/com.vaadin/flow-data/24.9.12, Apache-2.0, approved, #23457 -maven/mavencentral/com.vaadin/flow-dnd/24.9.12, Apache-2.0, approved, #23452 -maven/mavencentral/com.vaadin/flow-html-components/24.9.12, Apache-2.0, approved, #23461 -maven/mavencentral/com.vaadin/flow-lit-template/24.9.12, Apache-2.0, approved, #23497 -maven/mavencentral/com.vaadin/flow-push/24.9.12, Apache-2.0, approved, #23506 -maven/mavencentral/com.vaadin/flow-react/24.9.12, Apache-2.0, approved, #23519 -maven/mavencentral/com.vaadin/flow-server/24.9.12, Apache-2.0 AND MIT, approved, #23490 -maven/mavencentral/com.vaadin/hilla-dev/24.9.11, Apache-2.0, approved, #23474 -maven/mavencentral/com.vaadin/hilla-endpoint/24.9.11, Apache-2.0, approved, #23472 -maven/mavencentral/com.vaadin/hilla-engine-core/24.9.11, Apache-2.0, approved, #23478 -maven/mavencentral/com.vaadin/hilla-engine-runtime/24.9.11, Apache-2.0, approved, #23479 -maven/mavencentral/com.vaadin/hilla-parser-jvm-core/24.9.11, Apache-2.0, approved, #23501 -maven/mavencentral/com.vaadin/hilla-parser-jvm-plugin-backbone/24.9.11, Apache-2.0, approved, #23523 -maven/mavencentral/com.vaadin/hilla-parser-jvm-plugin-model/24.9.11, Apache-2.0, approved, #23454 -maven/mavencentral/com.vaadin/hilla-parser-jvm-plugin-nonnull-kotlin/24.9.11, Apache-2.0, approved, #23466 -maven/mavencentral/com.vaadin/hilla-parser-jvm-plugin-nonnull/24.9.11, Apache-2.0, approved, #23520 -maven/mavencentral/com.vaadin/hilla-parser-jvm-plugin-subtypes/24.9.11, Apache-2.0, approved, #23493 -maven/mavencentral/com.vaadin/hilla-parser-jvm-plugin-transfertypes/24.9.11, Apache-2.0, approved, #23450 -maven/mavencentral/com.vaadin/hilla-parser-jvm-utils/24.9.11, Apache-2.0, approved, #23508 -maven/mavencentral/com.vaadin/hilla-runtime-plugin-transfertypes/24.9.11, Apache-2.0, approved, #23500 -maven/mavencentral/com.vaadin/hilla/24.9.11, Apache-2.0, approved, #23460 -maven/mavencentral/com.vaadin/license-checker/2.0.1, Apache-2.0, approved, #23484 -maven/mavencentral/com.vaadin/open/8.5.0.5, MIT AND Apache-2.0, approved, #17743 -maven/mavencentral/com.vaadin/signals/24.9.12, Apache-2.0, approved, #23470 -maven/mavencentral/com.vaadin/ui-tests/1.1.5, Apache-2.0, approved, clearlydefined -maven/mavencentral/com.vaadin/vaadin-accordion-flow/24.9.11, Apache-2.0, approved, #23521 -maven/mavencentral/com.vaadin/vaadin-app-layout-flow/24.9.11, Apache-2.0, approved, #23446 -maven/mavencentral/com.vaadin/vaadin-avatar-flow/24.9.11, Apache-2.0, approved, #23477 -maven/mavencentral/com.vaadin/vaadin-button-flow/24.9.11, Apache-2.0, approved, #23471 -maven/mavencentral/com.vaadin/vaadin-card-flow/24.9.11, Apache-2.0, approved, #23517 -maven/mavencentral/com.vaadin/vaadin-checkbox-flow/24.9.11, Apache-2.0, approved, #23496 -maven/mavencentral/com.vaadin/vaadin-combo-box-flow/24.9.11, Apache-2.0, approved, #23507 -maven/mavencentral/com.vaadin/vaadin-confirm-dialog-flow/24.9.11, Apache-2.0, approved, #23495 -maven/mavencentral/com.vaadin/vaadin-context-menu-flow/24.9.11, Apache-2.0, approved, #23467 -maven/mavencentral/com.vaadin/vaadin-core-components/24.9.11, Apache-2.0, approved, #23503 -maven/mavencentral/com.vaadin/vaadin-core-internal/24.9.11, Apache-2.0, approved, #23469 -maven/mavencentral/com.vaadin/vaadin-core/24.9.11, Apache-2.0, approved, #23476 -maven/mavencentral/com.vaadin/vaadin-custom-field-flow/24.9.11, Apache-2.0, approved, #23458 -maven/mavencentral/com.vaadin/vaadin-date-picker-flow/24.9.11, Apache-2.0, approved, #23516 -maven/mavencentral/com.vaadin/vaadin-date-time-picker-flow/24.9.11, Apache-2.0, approved, #23463 -maven/mavencentral/com.vaadin/vaadin-details-flow/24.9.11, Apache-2.0, approved, #23511 -maven/mavencentral/com.vaadin/vaadin-dev-bundle/24.9.11, MIT AND Apache-2.0 AND BSD-3-Clause AND BSD-2-Clause AND BlueOak-1.0.0 AND 0BSD AND Python-2.0 AND CC-BY-4.0 AND (AFL-2.1 OR BSD-3-Clause) AND (MIT OR CC0-1.0) AND (MPL-2.0 OR Apache-2.0) AND (MIT AND Zlib), approved, #23488 -maven/mavencentral/com.vaadin/vaadin-dev-server/24.9.12, Apache-2.0, approved, #23453 -maven/mavencentral/com.vaadin/vaadin-dev/24.9.11, Apache-2.0, approved, #23447 -maven/mavencentral/com.vaadin/vaadin-dialog-flow/24.9.11, Apache-2.0, approved, #23481 -maven/mavencentral/com.vaadin/vaadin-field-highlighter-flow/24.9.11, Apache-2.0, approved, #23464 -maven/mavencentral/com.vaadin/vaadin-flow-components-base/24.9.11, Apache-2.0, approved, #23485 -maven/mavencentral/com.vaadin/vaadin-form-layout-flow/24.9.11, Apache-2.0, approved, #23445 -maven/mavencentral/com.vaadin/vaadin-grid-flow/24.9.11, Apache-2.0, approved, #23483 -maven/mavencentral/com.vaadin/vaadin-icons-flow/24.9.11, Apache-2.0, approved, #23524 -maven/mavencentral/com.vaadin/vaadin-list-box-flow/24.9.11, Apache-2.0, approved, #23512 -maven/mavencentral/com.vaadin/vaadin-login-flow/24.9.11, Apache-2.0, approved, #23518 -maven/mavencentral/com.vaadin/vaadin-lumo-theme/24.9.11, Apache-2.0, approved, #23442 -maven/mavencentral/com.vaadin/vaadin-markdown-flow/24.9.11, Apache-2.0, approved, #23504 -maven/mavencentral/com.vaadin/vaadin-master-detail-layout-flow/24.9.11, Apache-2.0, approved, #23491 -maven/mavencentral/com.vaadin/vaadin-material-theme/24.9.11, Apache-2.0, approved, #23451 -maven/mavencentral/com.vaadin/vaadin-menu-bar-flow/24.9.11, Apache-2.0, approved, #23498 -maven/mavencentral/com.vaadin/vaadin-messages-flow/24.9.11, Apache-2.0, approved, #23480 -maven/mavencentral/com.vaadin/vaadin-notification-flow/24.9.11, Apache-2.0, approved, #23482 -maven/mavencentral/com.vaadin/vaadin-ordered-layout-flow/24.9.11, Apache-2.0, approved, #23448 -maven/mavencentral/com.vaadin/vaadin-popover-flow/24.9.11, Apache-2.0, approved, #23443 -maven/mavencentral/com.vaadin/vaadin-progress-bar-flow/24.9.11, Apache-2.0, approved, #23459 -maven/mavencentral/com.vaadin/vaadin-radio-button-flow/24.9.11, Apache-2.0, approved, #23486 -maven/mavencentral/com.vaadin/vaadin-renderer-flow/24.9.11, Apache-2.0, approved, #23455 -maven/mavencentral/com.vaadin/vaadin-select-flow/24.9.11, Apache-2.0, approved, #23475 -maven/mavencentral/com.vaadin/vaadin-side-nav-flow/24.9.11, Apache-2.0, approved, #23513 -maven/mavencentral/com.vaadin/vaadin-split-layout-flow/24.9.11, Apache-2.0, approved, #23487 -maven/mavencentral/com.vaadin/vaadin-spring-boot-starter/24.9.11, Apache-2.0, approved, #23505 -maven/mavencentral/com.vaadin/vaadin-spring/24.9.12, Apache-2.0, approved, #23492 -maven/mavencentral/com.vaadin/vaadin-tabs-flow/24.9.11, Apache-2.0, approved, #23510 -maven/mavencentral/com.vaadin/vaadin-text-field-flow/24.9.11, Apache-2.0, approved, #23465 -maven/mavencentral/com.vaadin/vaadin-time-picker-flow/24.9.11, Apache-2.0, approved, #23509 -maven/mavencentral/com.vaadin/vaadin-upload-flow/24.9.11, Apache-2.0, approved, #23449 -maven/mavencentral/com.vaadin/vaadin-virtual-list-flow/24.9.11, Apache-2.0, approved, #23462 -maven/mavencentral/com.zaxxer/HikariCP/6.3.3, Apache-2.0, approved, #23029 -maven/mavencentral/commons-codec/commons-codec/1.18.0, Apache-2.0 AND (Apache-2.0 AND BSD-3-Clause), approved, #19214 +maven/mavencentral/com.vaadin/collaboration-engine/7.0.0, , restricted, clearlydefined +maven/mavencentral/com.vaadin/flow-client/25.0.4, Apache-2.0, approved, clearlydefined +maven/mavencentral/com.vaadin/flow-data/25.0.4, Apache-2.0, approved, clearlydefined +maven/mavencentral/com.vaadin/flow-dnd/25.0.4, Apache-2.0, approved, clearlydefined +maven/mavencentral/com.vaadin/flow-html-components/25.0.4, Apache-2.0, approved, clearlydefined +maven/mavencentral/com.vaadin/flow-lit-template/25.0.4, Apache-2.0, approved, clearlydefined +maven/mavencentral/com.vaadin/flow-push/25.0.4, , restricted, clearlydefined +maven/mavencentral/com.vaadin/flow-react/25.0.4, Apache-2.0, approved, clearlydefined +maven/mavencentral/com.vaadin/flow-server/25.0.4, Apache-2.0, restricted, clearlydefined +maven/mavencentral/com.vaadin/signals/25.0.4, , restricted, clearlydefined +maven/mavencentral/com.vaadin/vaadin-accordion-flow/25.0.3, , restricted, clearlydefined +maven/mavencentral/com.vaadin/vaadin-app-layout-flow/25.0.3, , restricted, clearlydefined +maven/mavencentral/com.vaadin/vaadin-aura-theme/25.0.3, , restricted, clearlydefined +maven/mavencentral/com.vaadin/vaadin-avatar-flow/25.0.3, , restricted, clearlydefined +maven/mavencentral/com.vaadin/vaadin-button-flow/25.0.3, , restricted, clearlydefined +maven/mavencentral/com.vaadin/vaadin-card-flow/25.0.3, , restricted, clearlydefined +maven/mavencentral/com.vaadin/vaadin-checkbox-flow/25.0.3, , restricted, clearlydefined +maven/mavencentral/com.vaadin/vaadin-combo-box-flow/25.0.3, , restricted, clearlydefined +maven/mavencentral/com.vaadin/vaadin-confirm-dialog-flow/25.0.3, , restricted, clearlydefined +maven/mavencentral/com.vaadin/vaadin-context-menu-flow/25.0.3, , restricted, clearlydefined +maven/mavencentral/com.vaadin/vaadin-core-components/25.0.3, , restricted, clearlydefined +maven/mavencentral/com.vaadin/vaadin-core-internal/25.0.3, , restricted, clearlydefined +maven/mavencentral/com.vaadin/vaadin-core/25.0.3, , restricted, clearlydefined +maven/mavencentral/com.vaadin/vaadin-custom-field-flow/25.0.3, , restricted, clearlydefined +maven/mavencentral/com.vaadin/vaadin-date-picker-flow/25.0.3, , restricted, clearlydefined +maven/mavencentral/com.vaadin/vaadin-date-time-picker-flow/25.0.3, , restricted, clearlydefined +maven/mavencentral/com.vaadin/vaadin-details-flow/25.0.3, , restricted, clearlydefined +maven/mavencentral/com.vaadin/vaadin-dialog-flow/25.0.3, , restricted, clearlydefined +maven/mavencentral/com.vaadin/vaadin-field-highlighter-flow/25.0.3, , restricted, clearlydefined +maven/mavencentral/com.vaadin/vaadin-flow-components-base/25.0.3, , restricted, clearlydefined +maven/mavencentral/com.vaadin/vaadin-form-layout-flow/25.0.3, , restricted, clearlydefined +maven/mavencentral/com.vaadin/vaadin-grid-flow/25.0.3, , restricted, clearlydefined +maven/mavencentral/com.vaadin/vaadin-icons-flow/25.0.3, , restricted, clearlydefined +maven/mavencentral/com.vaadin/vaadin-list-box-flow/25.0.3, , restricted, clearlydefined +maven/mavencentral/com.vaadin/vaadin-login-flow/25.0.3, , restricted, clearlydefined +maven/mavencentral/com.vaadin/vaadin-lumo-theme/25.0.3, , restricted, clearlydefined +maven/mavencentral/com.vaadin/vaadin-markdown-flow/25.0.3, , restricted, clearlydefined +maven/mavencentral/com.vaadin/vaadin-master-detail-layout-flow/25.0.3, , restricted, clearlydefined +maven/mavencentral/com.vaadin/vaadin-menu-bar-flow/25.0.3, , restricted, clearlydefined +maven/mavencentral/com.vaadin/vaadin-messages-flow/25.0.3, , restricted, clearlydefined +maven/mavencentral/com.vaadin/vaadin-notification-flow/25.0.3, , restricted, clearlydefined +maven/mavencentral/com.vaadin/vaadin-ordered-layout-flow/25.0.3, , restricted, clearlydefined +maven/mavencentral/com.vaadin/vaadin-popover-flow/25.0.3, , restricted, clearlydefined +maven/mavencentral/com.vaadin/vaadin-progress-bar-flow/25.0.3, , restricted, clearlydefined +maven/mavencentral/com.vaadin/vaadin-radio-button-flow/25.0.3, , restricted, clearlydefined +maven/mavencentral/com.vaadin/vaadin-renderer-flow/25.0.3, , restricted, clearlydefined +maven/mavencentral/com.vaadin/vaadin-select-flow/25.0.3, , restricted, clearlydefined +maven/mavencentral/com.vaadin/vaadin-side-nav-flow/25.0.3, , restricted, clearlydefined +maven/mavencentral/com.vaadin/vaadin-split-layout-flow/25.0.3, , restricted, clearlydefined +maven/mavencentral/com.vaadin/vaadin-spring-boot-starter/25.0.3, , restricted, clearlydefined +maven/mavencentral/com.vaadin/vaadin-spring/25.0.4, , restricted, clearlydefined +maven/mavencentral/com.vaadin/vaadin-tabs-flow/25.0.3, , restricted, clearlydefined +maven/mavencentral/com.vaadin/vaadin-text-field-flow/25.0.3, , restricted, clearlydefined +maven/mavencentral/com.vaadin/vaadin-time-picker-flow/25.0.3, , restricted, clearlydefined +maven/mavencentral/com.vaadin/vaadin-upload-flow/25.0.3, , restricted, clearlydefined +maven/mavencentral/com.vaadin/vaadin-virtual-list-flow/25.0.3, , restricted, clearlydefined +maven/mavencentral/com.zaxxer/HikariCP/7.0.2, Apache-2.0, approved, clearlydefined maven/mavencentral/commons-fileupload/commons-fileupload/1.6.0, Apache-2.0, approved, #21847 maven/mavencentral/commons-io/commons-io/2.21.0, Apache-2.0, approved, #24652 -maven/mavencentral/commons-logging/commons-logging/1.2, Apache-2.0, approved, CQ10162 +maven/mavencentral/commons-logging/commons-logging/1.3.6, Apache-2.0, approved, #11783 maven/mavencentral/cz.jirutka.rsql/rsql-parser/2.1.0, MIT, approved, CQ12964 maven/mavencentral/io.github.openfeign/feign-core/13.6, Apache-2.0, approved, clearlydefined maven/mavencentral/io.github.openfeign/feign-form-spring/13.6, Apache-2.0, approved, clearlydefined maven/mavencentral/io.github.openfeign/feign-form/13.6, Apache-2.0, approved, clearlydefined maven/mavencentral/io.github.openfeign/feign-hc5/13.11, Apache-2.0, approved, #26780 -maven/mavencentral/io.github.openfeign/feign-hc5/13.6, Apache-2.0, approved, #21983 maven/mavencentral/io.github.openfeign/feign-slf4j/13.6, Apache-2.0, approved, clearlydefined -maven/mavencentral/io.methvin/directory-watcher/0.19.0, Apache-2.0, approved, clearlydefined -maven/mavencentral/io.micrometer/context-propagation/1.1.4, Apache-2.0, approved, #26109 -maven/mavencentral/io.micrometer/micrometer-commons/1.15.10, Apache-2.0 AND (Apache-2.0 AND MIT), approved, #23144 -maven/mavencentral/io.micrometer/micrometer-core/1.15.10, Apache-2.0 AND (Apache-2.0 AND MIT), approved, #23142 -maven/mavencentral/io.micrometer/micrometer-observation/1.15.10, Apache-2.0, approved, #23139 +maven/mavencentral/io.micrometer/context-propagation/1.2.1, , restricted, clearlydefined +maven/mavencentral/io.micrometer/micrometer-commons/1.16.4, Apache-2.0 AND (Apache-2.0 AND MIT), approved, #24726 +maven/mavencentral/io.micrometer/micrometer-core/1.16.4, Apache-2.0 AND (Apache-2.0 AND MIT), approved, #24722 +maven/mavencentral/io.micrometer/micrometer-jakarta9/1.16.4, Apache-2.0, approved, #25608 +maven/mavencentral/io.micrometer/micrometer-observation/1.16.4, Apache-2.0, approved, #24713 maven/mavencentral/io.modelcontextprotocol.sdk/mcp-core/0.17.0, MIT, approved, #25999 maven/mavencentral/io.modelcontextprotocol.sdk/mcp-json-jackson2/0.17.0, MIT, approved, #25995 maven/mavencentral/io.modelcontextprotocol.sdk/mcp-json/0.17.0, MIT, approved, #26001 maven/mavencentral/io.modelcontextprotocol.sdk/mcp-spring-webmvc/0.17.0, MIT, approved, #25993 maven/mavencentral/io.modelcontextprotocol.sdk/mcp/0.17.0, MIT AND Apache-2.0, approved, #25997 -maven/mavencentral/io.netty/netty-all/4.1.132.Final, Apache-2.0 AND MIT AND BSD-3-Clause AND CC0-1.0 AND LicenseRef-Public-Domain, approved, CQ22582 -maven/mavencentral/io.netty/netty-buffer/4.1.132.Final, Apache-2.0, approved, CQ21842 -maven/mavencentral/io.netty/netty-codec-dns/4.1.132.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926 -maven/mavencentral/io.netty/netty-codec-haproxy/4.1.132.Final, Apache-2.0 AND MIT AND BSD-3-Clause AND CC0-1.0 AND LicenseRef-Public-Domain, approved, CQ21553 -maven/mavencentral/io.netty/netty-codec-http/4.1.132.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926 -maven/mavencentral/io.netty/netty-codec-http2/4.1.132.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926 -maven/mavencentral/io.netty/netty-codec-memcache/4.1.132.Final, Apache-2.0 AND MIT AND BSD-3-Clause AND CC0-1.0 AND LicenseRef-Public-Domain, approved, CQ21553 -maven/mavencentral/io.netty/netty-codec-mqtt/4.1.132.Final, Apache-2.0 OR LicenseRef-Public-Domain OR BSD-2-Clause OR MIT, approved, CQ15280 -maven/mavencentral/io.netty/netty-codec-redis/4.1.132.Final, Apache-2.0 AND MIT AND BSD-3-Clause AND CC0-1.0 AND LicenseRef-Public-Domain, approved, CQ21553 -maven/mavencentral/io.netty/netty-codec-smtp/4.1.132.Final, Apache-2.0 AND MIT AND BSD-3-Clause AND CC0-1.0 AND LicenseRef-Public-Domain, approved, CQ21553 -maven/mavencentral/io.netty/netty-codec-socks/4.1.132.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926 -maven/mavencentral/io.netty/netty-codec-stomp/4.1.132.Final, Apache-2.0 AND MIT AND BSD-3-Clause AND CC0-1.0 AND LicenseRef-Public-Domain, approved, CQ21553 -maven/mavencentral/io.netty/netty-codec-xml/4.1.132.Final, Apache-2.0 AND MIT AND BSD-3-Clause AND CC0-1.0 AND LicenseRef-Public-Domain, approved, CQ21553 -maven/mavencentral/io.netty/netty-codec/4.1.132.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926 -maven/mavencentral/io.netty/netty-common/4.1.132.Final, Apache-2.0 AND MIT AND CC0-1.0, approved, CQ21843 -maven/mavencentral/io.netty/netty-handler-proxy/4.1.132.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926 -maven/mavencentral/io.netty/netty-handler-ssl-ocsp/4.1.132.Final, Apache-2.0, approved, #6365 -maven/mavencentral/io.netty/netty-handler/4.1.132.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926 -maven/mavencentral/io.netty/netty-resolver-dns-classes-macos/4.1.132.Final, Apache-2.0, approved, #6367 -maven/mavencentral/io.netty/netty-resolver-dns-native-macos/4.1.132.Final, Apache-2.0, approved, #7004 -maven/mavencentral/io.netty/netty-resolver-dns/4.1.132.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926 -maven/mavencentral/io.netty/netty-resolver/4.1.132.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926 -maven/mavencentral/io.netty/netty-transport-classes-epoll/4.1.132.Final, Apache-2.0, approved, #6366 -maven/mavencentral/io.netty/netty-transport-classes-kqueue/4.1.132.Final, Apache-2.0, approved, #4107 -maven/mavencentral/io.netty/netty-transport-native-epoll/4.1.132.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926 -maven/mavencentral/io.netty/netty-transport-native-unix-common/4.1.132.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926 -maven/mavencentral/io.netty/netty-transport-rxtx/4.1.132.Final, Apache-2.0 AND MIT AND BSD-3-Clause AND CC0-1.0 AND LicenseRef-Public-Domain, approved, CQ21553 -maven/mavencentral/io.netty/netty-transport-sctp/4.1.132.Final, Apache-2.0 AND MIT AND BSD-3-Clause AND CC0-1.0 AND LicenseRef-Public-Domain, approved, CQ21553 -maven/mavencentral/io.netty/netty-transport-udt/4.1.132.Final, Apache-2.0 AND MIT AND BSD-3-Clause AND CC0-1.0 AND LicenseRef-Public-Domain, approved, CQ21553 -maven/mavencentral/io.netty/netty-transport/4.1.132.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926 -maven/mavencentral/io.projectreactor.netty/reactor-netty-core/1.2.16, Apache-2.0, approved, #23393 -maven/mavencentral/io.projectreactor.netty/reactor-netty-http/1.2.16, Apache-2.0, approved, #23394 -maven/mavencentral/io.projectreactor.netty/reactor-netty/1.2.16, Apache-2.0, approved, #23499 -maven/mavencentral/io.projectreactor/reactor-core/3.7.17, Apache-2.0, approved, #17529 +maven/mavencentral/io.netty/netty-buffer/4.2.12.Final, Apache-2.0, approved, #16116 +maven/mavencentral/io.netty/netty-codec-base/4.2.12.Final, Apache-2.0, approved, #21322 +maven/mavencentral/io.netty/netty-codec-classes-quic/4.2.12.Final, Apache-2.0, approved, #21311 +maven/mavencentral/io.netty/netty-codec-compression/4.2.12.Final, Apache-2.0, approved, #16109 +maven/mavencentral/io.netty/netty-codec-dns/4.2.12.Final, Apache-2.0, approved, #16112 +maven/mavencentral/io.netty/netty-codec-http/4.2.12.Final, Apache-2.0 AND (Apache-2.0 AND MIT) AND (Apache-2.0 AND BSD-3-Clause), approved, #16121 +maven/mavencentral/io.netty/netty-codec-http2/4.2.12.Final, Apache-2.0, approved, #16125 +maven/mavencentral/io.netty/netty-codec-http3/4.2.12.Final, Apache-2.0, approved, #25607 +maven/mavencentral/io.netty/netty-codec-marshalling/4.2.12.Final, Apache-2.0, approved, #21321 +maven/mavencentral/io.netty/netty-codec-protobuf/4.2.12.Final, Apache-2.0, approved, #21326 +maven/mavencentral/io.netty/netty-codec-socks/4.2.12.Final, Apache-2.0, approved, #16117 +maven/mavencentral/io.netty/netty-codec/4.2.12.Final, Apache-2.0 AND (Apache-2.0 AND CC-PDDC), approved, #16119 +maven/mavencentral/io.netty/netty-common/4.2.12.Final, Apache-2.0 AND (Apache-2.0 AND CC0-1.0) AND (Apache-2.0 AND MIT), approved, #16124 +maven/mavencentral/io.netty/netty-handler-proxy/4.2.12.Final, Apache-2.0, approved, #16111 +maven/mavencentral/io.netty/netty-handler/4.2.12.Final, Apache-2.0, approved, #16123 +maven/mavencentral/io.netty/netty-resolver-dns/4.2.12.Final, Apache-2.0, approved, #16110 +maven/mavencentral/io.netty/netty-resolver/4.2.12.Final, Apache-2.0, approved, #16126 +maven/mavencentral/io.netty/netty-transport-native-unix-common/4.2.12.Final, Apache-2.0, approved, #21329 +maven/mavencentral/io.netty/netty-transport/4.2.12.Final, Apache-2.0, approved, #16113 +maven/mavencentral/io.projectreactor.netty/reactor-netty-core/1.3.4, Apache-2.0, approved, #25603 +maven/mavencentral/io.projectreactor.netty/reactor-netty-http/1.3.4, Apache-2.0, approved, #25597 +maven/mavencentral/io.projectreactor/reactor-core/3.8.4, Apache-2.0, approved, #25635 maven/mavencentral/io.protostuff/protostuff-api/1.8.0, Apache-2.0, approved, clearlydefined maven/mavencentral/io.protostuff/protostuff-collectionschema/1.8.0, Apache-2.0, approved, clearlydefined maven/mavencentral/io.protostuff/protostuff-core/1.8.0, Apache-2.0, approved, clearlydefined maven/mavencentral/io.protostuff/protostuff-runtime/1.8.0, Apache-2.0, approved, clearlydefined -maven/mavencentral/io.smallrye/jandex/3.2.0, Apache-2.0, approved, clearlydefined -maven/mavencentral/io.swagger.core.v3/swagger-annotations-jakarta/2.2.32, Apache-2.0, approved, #5947 +maven/mavencentral/io.smallrye/jandex/3.3.2, Apache-2.0, approved, #22775 maven/mavencentral/io.swagger.core.v3/swagger-annotations-jakarta/2.2.36, Apache-2.0, approved, #5947 -maven/mavencentral/io.swagger.core.v3/swagger-annotations-jakarta/2.2.43, Apache-2.0, approved, #5947 -maven/mavencentral/io.swagger.core.v3/swagger-core-jakarta/2.2.32, Apache-2.0, approved, #5929 -maven/mavencentral/io.swagger.core.v3/swagger-core-jakarta/2.2.43, Apache-2.0, approved, #5929 -maven/mavencentral/io.swagger.core.v3/swagger-models-jakarta/2.2.32, Apache-2.0, approved, #5919 -maven/mavencentral/io.swagger.core.v3/swagger-models-jakarta/2.2.43, Apache-2.0, approved, #5919 +maven/mavencentral/io.swagger.core.v3/swagger-annotations-jakarta/2.2.47, Apache-2.0, approved, #5947 +maven/mavencentral/io.swagger.core.v3/swagger-core-jakarta/2.2.47, Apache-2.0, approved, #5929 +maven/mavencentral/io.swagger.core.v3/swagger-models-jakarta/2.2.47, Apache-2.0, approved, #5919 maven/mavencentral/jakarta.activation/jakarta.activation-api/2.1.4, EPL-2.0 OR BSD-3-Clause OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jaf -maven/mavencentral/jakarta.annotation/jakarta.annotation-api/2.1.1, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.ca -maven/mavencentral/jakarta.persistence/jakarta.persistence-api/3.1.0, EPL-2.0 OR BSD-3-Clause, approved, ee4j.jpa -maven/mavencentral/jakarta.servlet/jakarta.servlet-api/6.0.0, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.servlet +maven/mavencentral/jakarta.annotation/jakarta.annotation-api/3.0.0, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.ca +maven/mavencentral/jakarta.el/jakarta.el-api/4.0.0, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.el +maven/mavencentral/jakarta.persistence/jakarta.persistence-api/3.2.0, EPL-2.0 OR BSD-3-Clause, approved, ee4j.jpa +maven/mavencentral/jakarta.servlet/jakarta.servlet-api/6.1.0, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.servlet maven/mavencentral/jakarta.transaction/jakarta.transaction-api/2.0.1, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jta -maven/mavencentral/jakarta.validation/jakarta.validation-api/3.0.2, Apache-2.0, approved, ee4j.validation +maven/mavencentral/jakarta.validation/jakarta.validation-api/3.1.1, Apache-2.0, approved, ee4j.validation maven/mavencentral/jakarta.xml.bind/jakarta.xml.bind-api/4.0.4, BSD-3-Clause, approved, ee4j.jaxb maven/mavencentral/javax.validation/validation-api/1.1.0.Final, Apache-2.0, approved, CQ15114 maven/mavencentral/joda-time/joda-time/2.12.7, Apache-2.0, approved, #12739 -maven/mavencentral/net.bytebuddy/byte-buddy-agent/1.17.8, Apache-2.0, approved, #19238 maven/mavencentral/net.bytebuddy/byte-buddy/1.17.8, Apache-2.0 AND BSD-3-Clause, approved, #19239 -maven/mavencentral/net.java.dev.jna/jna-platform/5.15.0, Apache-2.0 OR LGPL-2.1-or-later, approved, #16141 -maven/mavencentral/net.java.dev.jna/jna/5.15.0, Apache-2.0 AND LGPL-2.1-or-later, approved, #16139 -maven/mavencentral/net.minidev/accessors-smart/2.5.2, Apache-2.0, approved, #19432 -maven/mavencentral/net.minidev/json-smart/2.5.2, Apache-2.0, approved, #19431 +maven/mavencentral/net.minidev/accessors-smart/2.6.0, Apache-2.0, approved, #24380 +maven/mavencentral/net.minidev/json-smart/2.6.0, Apache-2.0, approved, clearlydefined maven/mavencentral/org.antlr/ST4/4.3.4, BSD-3-Clause, approved, #1495 maven/mavencentral/org.antlr/antlr-runtime/3.5.3, BSD-3-Clause, approved, #8916 -maven/mavencentral/org.antlr/antlr4-runtime/4.13.0, BSD-3-Clause, approved, #10767 maven/mavencentral/org.antlr/antlr4-runtime/4.13.1, BSD-3-Clause, approved, #10767 +maven/mavencentral/org.antlr/antlr4-runtime/4.13.2, BSD-3-Clause, approved, #10767 maven/mavencentral/org.apache.commons/commons-collections4/4.5.0, Apache-2.0 AND LicenseRef-Public-Domain, approved, #20791 -maven/mavencentral/org.apache.commons/commons-compress/1.27.1, Apache-2.0 AND (Apache-2.0 AND BSD-3-Clause), approved, #17651 -maven/mavencentral/org.apache.commons/commons-configuration2/2.12.0, Apache-2.0, approved, clearlydefined -maven/mavencentral/org.apache.commons/commons-fileupload2-core/2.0.0-M4, Apache-2.0, approved, #15738 -maven/mavencentral/org.apache.commons/commons-fileupload2-jakarta-servlet6/2.0.0-M4, Apache-2.0, approved, #21710 maven/mavencentral/org.apache.commons/commons-lang3/3.20.0, Apache-2.0, approved, #24711 maven/mavencentral/org.apache.commons/commons-text/1.13.0, Apache-2.0, approved, #17931 maven/mavencentral/org.apache.httpcomponents.client5/httpclient5/5.5.2, Apache-2.0 AND MPL-2.0, approved, #24483 maven/mavencentral/org.apache.httpcomponents.core5/httpcore5-h2/5.3.6, Apache-2.0, approved, #16867 maven/mavencentral/org.apache.httpcomponents.core5/httpcore5/5.3.6, Apache-2.0, approved, #16866 -maven/mavencentral/org.apache.httpcomponents/httpclient/4.5.14, Apache-2.0, approved, #15248 -maven/mavencentral/org.apache.httpcomponents/httpcore/4.4.16, Apache-2.0, approved, CQ23528 -maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-core/10.1.53, Apache-2.0 AND (EPL-2.0 OR (GPL-2.0-only WITH Classpath-exception-2.0)) AND CDDL-1.0 AND (CDDL-1.1 OR (GPL-2.0-only WITH Classpath-exception-2.0)) AND EPL-2.0, approved, #15195 -maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-el/10.1.53, Apache-2.0, approved, #6997 -maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-websocket/10.1.53, Apache-2.0, approved, #7920 -maven/mavencentral/org.apiguardian/apiguardian-api/1.1.2, Apache-2.0, approved, #17641 +maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-core/11.0.20, Apache-2.0 AND (EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0) AND (CDDL-1.0 OR GPL-2.0-or-later), approved, #19217 +maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-el/11.0.20, Apache-2.0, approved, #22421 +maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-websocket/11.0.20, Apache-2.0, approved, #21065 maven/mavencentral/org.aspectj/aspectjrt/1.9.25.1, EPL-1.0, approved, tools.aspectj maven/mavencentral/org.aspectj/aspectjweaver/1.9.25.1, EPL-1.0, approved, tools.aspectj -maven/mavencentral/org.assertj/assertj-core/3.27.7, Apache-2.0, approved, #17980 -maven/mavencentral/org.awaitility/awaitility/4.3.0, Apache-2.0, approved, clearlydefined -maven/mavencentral/org.bouncycastle/bcpkix-jdk18on/1.83, MIT, approved, #25011 -maven/mavencentral/org.bouncycastle/bcprov-jdk18on/1.80, MIT AND CC0-1.0, approved, #18694 -maven/mavencentral/org.bouncycastle/bcutil-jdk18on/1.83, MIT, approved, #25009 -maven/mavencentral/org.flywaydb/flyway-core/11.7.2, Apache-2.0, approved, clearlydefined -maven/mavencentral/org.flywaydb/flyway-database-postgresql/11.7.2, Apache-2.0, approved, #21919 -maven/mavencentral/org.flywaydb/flyway-mysql/11.7.2, Apache-2.0, approved, #21980 +maven/mavencentral/org.bouncycastle/bcpkix-jdk18on/1.84, None, restricted, #27142 +maven/mavencentral/org.bouncycastle/bcprov-jdk18on/1.81, MIT AND CC0-1.0, approved, #21819 +maven/mavencentral/org.bouncycastle/bcutil-jdk18on/1.84, None, restricted, #27144 +maven/mavencentral/org.flywaydb/flyway-core/11.14.1, Apache-2.0, approved, #25604 +maven/mavencentral/org.flywaydb/flyway-database-postgresql/11.14.1, Apache-2.0, approved, #25627 +maven/mavencentral/org.flywaydb/flyway-mysql/11.14.1, NOASSERTION, restricted, clearlydefined maven/mavencentral/org.glassfish.jaxb/jaxb-core/4.0.6, BSD-3-Clause, approved, ee4j.jaxb-impl maven/mavencentral/org.glassfish.jaxb/jaxb-runtime/4.0.6, BSD-3-Clause, approved, ee4j.jaxb-impl maven/mavencentral/org.glassfish.jaxb/txw2/4.0.6, BSD-3-Clause, approved, ee4j.jaxb-impl -maven/mavencentral/org.hamcrest/hamcrest-core/3.0, BSD-3-Clause, approved, clearlydefined -maven/mavencentral/org.hamcrest/hamcrest-library/3.0, BSD-3-Clause, approved, clearlydefined -maven/mavencentral/org.hamcrest/hamcrest/3.0, BSD-3-Clause, approved, #17661 -maven/mavencentral/org.hibernate.common/hibernate-commons-annotations/7.0.3.Final, Apache-2.0, approved, clearlydefined -maven/mavencentral/org.hibernate.orm/hibernate-core/6.6.45.Final, (EPL-2.0 OR BSD-3-Clause) AND LGPL-2.1-or-later AND MIT, approved, #17553 -maven/mavencentral/org.hibernate.orm/hibernate-jpamodelgen/6.6.45.Final, EPL-2.0 OR BSD-3-Clause AND LGPL-2.1-only AND MIT, approved, #18221 -maven/mavencentral/org.hibernate.validator/hibernate-validator/8.0.3.Final, Apache-2.0 AND CC-PDDC, approved, #18198 -maven/mavencentral/org.javassist/javassist/3.30.2-GA, Apache-2.0 AND LGPL-2.1-or-later AND MPL-1.1, approved, #12108 +maven/mavencentral/org.glassfish/jakarta.el/4.0.2, EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0, approved, #7937 +maven/mavencentral/org.hibernate.models/hibernate-models/1.0.1, Apache-2.0, approved, clearlydefined +maven/mavencentral/org.hibernate.orm/hibernate-core/7.2.7.Final, Apache-2.0 AND (EPL-2.0 OR BSD-3-Clause), approved, #25611 +maven/mavencentral/org.hibernate.orm/hibernate-processor/7.2.7.Final, , restricted, clearlydefined +maven/mavencentral/org.hibernate.validator/hibernate-validator/9.0.1.Final, Apache-2.0, approved, clearlydefined maven/mavencentral/org.jboss.logging/jboss-logging/3.6.3.Final, Apache-2.0, approved, #26108 -maven/mavencentral/org.jetbrains.kotlin/kotlin-reflect/1.9.25, Apache-2.0, approved, clearlydefined -maven/mavencentral/org.jetbrains.kotlin/kotlin-stdlib/1.9.25, Apache-2.0, approved, #11827 -maven/mavencentral/org.jetbrains/annotations/13.0, Apache-2.0, approved, clearlydefined -maven/mavencentral/org.jline/jline-builtins/3.30.4, BSD-3-Clause AND (Apache-2.0 AND BSD-3-Clause), approved, #25257 -maven/mavencentral/org.jline/jline-console/3.30.4, BSD-3-Clause, approved, clearlydefined -maven/mavencentral/org.jline/jline-native/3.30.4, BSD-3-Clause AND Apache-2.0, approved, #24519 -maven/mavencentral/org.jline/jline-reader/3.30.4, BSD-3-Clause, approved, #25255 -maven/mavencentral/org.jline/jline-style/3.30.4, BSD-3-Clause, approved, #25258 -maven/mavencentral/org.jline/jline-terminal/3.30.4, BSD-3-Clause AND Apache-2.0, approved, #23127 +maven/mavencentral/org.jline/jline/3.30.6, BSD-3-Clause AND Apache-2.0, approved, #25548 maven/mavencentral/org.jsoup/jsoup/1.22.1, MIT AND (Apache-2.0 AND BSD-3-Clause), approved, #25465 maven/mavencentral/org.jspecify/jspecify/1.0.0, Apache-2.0, approved, #21897 maven/mavencentral/org.mariadb.jdbc/mariadb-java-client/3.5.7, LGPL-2.1-or-later AND CC0-1.0, approved, #22822 -maven/mavencentral/org.mockito/mockito-core/5.17.0, MIT AND (Apache-2.0 AND MIT) AND Apache-2.0, approved, #20444 -maven/mavencentral/org.mockito/mockito-junit-jupiter/5.17.0, MIT, approved, #20445 -maven/mavencentral/org.opentest4j/opentest4j/1.3.0, Apache-2.0, approved, #9713 +maven/mavencentral/org.ow2.asm/asm-commons/9.9.1, BSD-3-Clause, approved, #25265 +maven/mavencentral/org.ow2.asm/asm-tree/9.9.1, BSD-3-Clause, approved, #25267 maven/mavencentral/org.ow2.asm/asm/9.7.1, BSD-3-Clause, approved, #16464 -maven/mavencentral/org.ow2.asm/asm/9.8, BSD-3-Clause, approved, #20388 +maven/mavencentral/org.ow2.asm/asm/9.9.1, BSD-3-Clause, approved, #25264 maven/mavencentral/org.postgresql/postgresql/42.7.10, BSD-2-Clause AND Apache-2.0, approved, #11681 maven/mavencentral/org.projectlombok/lombok/1.18.44, MIT, approved, #15192 maven/mavencentral/org.reactivestreams/reactive-streams/1.0.4, CC0-1.0, approved, CQ16332 -maven/mavencentral/org.reflections/reflections/0.10.2, Apache-2.0 AND WTFPL, approved, clearlydefined -maven/mavencentral/org.skyscreamer/jsonassert/1.5.3, Apache-2.0, approved, clearlydefined maven/mavencentral/org.slf4j/jul-to-slf4j/2.0.17, MIT, approved, #7698 maven/mavencentral/org.slf4j/slf4j-api/2.0.17, MIT, approved, #5915 maven/mavencentral/org.springaicommunity/mcp-annotations/0.8.0, MIT AND Apache-2.0, approved, #25991 -maven/mavencentral/org.springdoc/springdoc-openapi-starter-common/2.8.16, Apache-2.0, approved, #18209 -maven/mavencentral/org.springdoc/springdoc-openapi-starter-webmvc-api/2.8.16, Apache-2.0, approved, #18210 -maven/mavencentral/org.springdoc/springdoc-openapi-starter-webmvc-ui/2.8.16, Apache-2.0, approved, #18211 +maven/mavencentral/org.springdoc/springdoc-openapi-starter-common/3.0.3, Apache-2.0, approved, #25648 +maven/mavencentral/org.springdoc/springdoc-openapi-starter-webmvc-api/3.0.3, Apache-2.0, approved, #25723 +maven/mavencentral/org.springdoc/springdoc-openapi-starter-webmvc-ui/3.0.3, , restricted, clearlydefined maven/mavencentral/org.springframework.ai/spring-ai-autoconfigure-mcp-server-common/1.1.4, Apache-2.0, approved, #25998 maven/mavencentral/org.springframework.ai/spring-ai-autoconfigure-mcp-server-webmvc/1.1.4, Apache-2.0, approved, #25987 maven/mavencentral/org.springframework.ai/spring-ai-commons/1.1.4, Apache-2.0, approved, #25989 @@ -285,87 +204,120 @@ maven/mavencentral/org.springframework.ai/spring-ai-mcp/1.1.4, Apache-2.0, appro maven/mavencentral/org.springframework.ai/spring-ai-model/1.1.4, Apache-2.0, approved, #25994 maven/mavencentral/org.springframework.ai/spring-ai-starter-mcp-server-webmvc/1.1.4, Apache-2.0 AND BSD-3-Clause, approved, #25996 maven/mavencentral/org.springframework.ai/spring-ai-template-st/1.1.4, Apache-2.0, approved, #25990 -maven/mavencentral/org.springframework.amqp/spring-amqp/3.2.9, Apache-2.0, approved, #18234 -maven/mavencentral/org.springframework.amqp/spring-rabbit-junit/3.2.9, Apache-2.0, approved, #23456 -maven/mavencentral/org.springframework.amqp/spring-rabbit-test/3.2.9, Apache-2.0, approved, #23489 -maven/mavencentral/org.springframework.amqp/spring-rabbit/3.2.9, Apache-2.0, approved, #18214 -maven/mavencentral/org.springframework.boot/spring-boot-actuator-autoconfigure/3.5.13, Apache-2.0, approved, #23038 -maven/mavencentral/org.springframework.boot/spring-boot-actuator/3.5.13, Apache-2.0, approved, #23035 -maven/mavencentral/org.springframework.boot/spring-boot-autoconfigure/3.5.13, Apache-2.0, approved, #23034 -maven/mavencentral/org.springframework.boot/spring-boot-configuration-processor/3.5.13, Apache-2.0, approved, #23037 -maven/mavencentral/org.springframework.boot/spring-boot-devtools/3.5.13, Apache-2.0, approved, #23515 -maven/mavencentral/org.springframework.boot/spring-boot-starter-amqp/3.5.13, Apache-2.0, approved, #21951 -maven/mavencentral/org.springframework.boot/spring-boot-starter-data-jpa/3.5.13, Apache-2.0, approved, #22162 -maven/mavencentral/org.springframework.boot/spring-boot-starter-hateoas/3.5.13, Apache-2.0, approved, #21971 -maven/mavencentral/org.springframework.boot/spring-boot-starter-jdbc/3.5.13, Apache-2.0, approved, #22180 -maven/mavencentral/org.springframework.boot/spring-boot-starter-json/3.5.13, Apache-2.0, approved, #23033 -maven/mavencentral/org.springframework.boot/spring-boot-starter-logging/3.5.13, Apache-2.0, approved, #22825 -maven/mavencentral/org.springframework.boot/spring-boot-starter-oauth2-client/3.5.13, Apache-2.0, approved, #22178 -maven/mavencentral/org.springframework.boot/spring-boot-starter-reactor-netty/3.5.13, Apache-2.0, approved, #22185 -maven/mavencentral/org.springframework.boot/spring-boot-starter-security/3.5.13, Apache-2.0, approved, #22151 -maven/mavencentral/org.springframework.boot/spring-boot-starter-test/3.5.13, Apache-2.0, approved, #21921 -maven/mavencentral/org.springframework.boot/spring-boot-starter-tomcat/3.5.13, Apache-2.0, approved, #23031 -maven/mavencentral/org.springframework.boot/spring-boot-starter-validation/3.5.13, Apache-2.0, approved, #22150 -maven/mavencentral/org.springframework.boot/spring-boot-starter-web/3.5.13, Apache-2.0, approved, #23027 -maven/mavencentral/org.springframework.boot/spring-boot-starter-webflux/3.5.13, Apache-2.0, approved, #22118 -maven/mavencentral/org.springframework.boot/spring-boot-starter/3.5.13, Apache-2.0, approved, #23030 -maven/mavencentral/org.springframework.boot/spring-boot-test-autoconfigure/3.5.13, Apache-2.0, approved, #22215 -maven/mavencentral/org.springframework.boot/spring-boot-test/3.5.13, Apache-2.0, approved, #22213 -maven/mavencentral/org.springframework.boot/spring-boot/3.5.13, Apache-2.0, approved, #23032 -maven/mavencentral/org.springframework.cloud/spring-cloud-commons/4.3.1, Apache-2.0, approved, clearlydefined -maven/mavencentral/org.springframework.cloud/spring-cloud-context/4.3.1, Apache-2.0, approved, clearlydefined -maven/mavencentral/org.springframework.cloud/spring-cloud-function-context/4.3.1, Apache-2.0, approved, #21964 -maven/mavencentral/org.springframework.cloud/spring-cloud-function-core/4.3.1, Apache-2.0, approved, #22002 -maven/mavencentral/org.springframework.cloud/spring-cloud-openfeign-core/4.3.1, Apache-2.0, approved, clearlydefined -maven/mavencentral/org.springframework.cloud/spring-cloud-starter-openfeign/4.3.1, MIT AND Apache-2.0, approved, #25561 -maven/mavencentral/org.springframework.cloud/spring-cloud-starter-stream-rabbit/4.3.1, Apache-2.0, approved, #25560 -maven/mavencentral/org.springframework.cloud/spring-cloud-starter/4.3.1, Apache-2.0, approved, #25562 -maven/mavencentral/org.springframework.cloud/spring-cloud-stream-binder-rabbit-core/4.3.1, Apache-2.0, approved, #21992 -maven/mavencentral/org.springframework.cloud/spring-cloud-stream-binder-rabbit/4.3.1, Apache-2.0, approved, #21988 -maven/mavencentral/org.springframework.cloud/spring-cloud-stream/4.3.1, Apache-2.0, approved, clearlydefined -maven/mavencentral/org.springframework.data/spring-data-commons/3.5.10, Apache-2.0, approved, #21920 -maven/mavencentral/org.springframework.data/spring-data-jpa/3.5.10, Apache-2.0, approved, #21922 -maven/mavencentral/org.springframework.hateoas/spring-hateoas/2.5.2, Apache-2.0, approved, #22189 -maven/mavencentral/org.springframework.integration/spring-integration-amqp/6.5.8, Apache-2.0, approved, #21953 -maven/mavencentral/org.springframework.integration/spring-integration-core/6.5.8, Apache-2.0, approved, #23444 -maven/mavencentral/org.springframework.integration/spring-integration-jdbc/6.5.8, Apache-2.0, approved, #21987 -maven/mavencentral/org.springframework.integration/spring-integration-jmx/6.5.8, Apache-2.0, approved, #23494 -maven/mavencentral/org.springframework.plugin/spring-plugin-core/3.0.0, Apache-2.0, approved, #7104 -maven/mavencentral/org.springframework.retry/spring-retry/2.0.12, Apache-2.0, approved, #16889 -maven/mavencentral/org.springframework.security/spring-security-aspects/6.5.9, Apache-2.0, approved, #21979 -maven/mavencentral/org.springframework.security/spring-security-config/6.5.9, Apache-2.0, approved, #22177 -maven/mavencentral/org.springframework.security/spring-security-core/6.5.9, Apache-2.0, approved, #23039 -maven/mavencentral/org.springframework.security/spring-security-crypto/6.5.9, Apache-2.0 AND ISC, approved, #22171 -maven/mavencentral/org.springframework.security/spring-security-oauth2-client/6.5.9, Apache-2.0, approved, #22136 -maven/mavencentral/org.springframework.security/spring-security-oauth2-core/6.5.9, Apache-2.0, approved, #22138 -maven/mavencentral/org.springframework.security/spring-security-oauth2-jose/6.5.9, Apache-2.0, approved, #22174 -maven/mavencentral/org.springframework.security/spring-security-oauth2-resource-server/6.5.9, Apache-2.0, approved, #22113 -maven/mavencentral/org.springframework.security/spring-security-test/6.5.9, Apache-2.0, approved, #22420 -maven/mavencentral/org.springframework.security/spring-security-web/6.5.9, Apache-2.0, approved, #22173 -maven/mavencentral/org.springframework.shell/spring-shell-autoconfigure/3.4.1, Apache-2.0, approved, clearlydefined -maven/mavencentral/org.springframework.shell/spring-shell-core/3.4.1, Apache-2.0, approved, clearlydefined -maven/mavencentral/org.springframework.shell/spring-shell-standard-commands/3.4.1, Apache-2.0, approved, clearlydefined -maven/mavencentral/org.springframework.shell/spring-shell-standard/3.4.1, Apache-2.0, approved, clearlydefined -maven/mavencentral/org.springframework.shell/spring-shell-starter/3.4.1, Apache-2.0, approved, clearlydefined -maven/mavencentral/org.springframework.shell/spring-shell-table/3.4.1, Apache-2.0, approved, clearlydefined -maven/mavencentral/org.springframework/spring-aop/6.2.17, Apache-2.0, approved, #17530 -maven/mavencentral/org.springframework/spring-aspects/6.2.17, Apache-2.0, approved, #17550 -maven/mavencentral/org.springframework/spring-beans/6.2.17, Apache-2.0, approved, #17528 -maven/mavencentral/org.springframework/spring-context-support/6.2.17, Apache-2.0, approved, #18233 -maven/mavencentral/org.springframework/spring-context/6.2.17, Apache-2.0, approved, #17554 -maven/mavencentral/org.springframework/spring-core/6.2.17, Apache-2.0 AND BSD-3-Clause, approved, #17535 -maven/mavencentral/org.springframework/spring-expression/6.2.17, Apache-2.0, approved, #17544 -maven/mavencentral/org.springframework/spring-jcl/6.2.17, Apache-2.0, approved, #17571 -maven/mavencentral/org.springframework/spring-jdbc/6.2.17, Apache-2.0, approved, #17543 -maven/mavencentral/org.springframework/spring-messaging/6.2.17, Apache-2.0, approved, #18225 -maven/mavencentral/org.springframework/spring-orm/6.2.17, Apache-2.0, approved, #17572 -maven/mavencentral/org.springframework/spring-test/6.2.17, Apache-2.0, approved, #17559 -maven/mavencentral/org.springframework/spring-tx/6.2.17, Apache-2.0, approved, #17547 -maven/mavencentral/org.springframework/spring-web/6.2.17, Apache-2.0, approved, #17558 -maven/mavencentral/org.springframework/spring-webflux/6.2.17, Apache-2.0, approved, #17567 -maven/mavencentral/org.springframework/spring-webmvc/6.2.17, Apache-2.0, approved, #17532 -maven/mavencentral/org.springframework/spring-websocket/6.2.17, Apache-2.0, approved, #18223 -maven/mavencentral/org.webjars/swagger-ui/5.32.0, Apache-2.0, approved, clearlydefined +maven/mavencentral/org.springframework.amqp/spring-amqp/4.0.2, , restricted, clearlydefined +maven/mavencentral/org.springframework.amqp/spring-rabbit/4.0.2, Apache-2.0, approved, clearlydefined +maven/mavencentral/org.springframework.amqp/spring-rabbitmq-client/4.0.2, , restricted, clearlydefined +maven/mavencentral/org.springframework.boot/spring-boot-actuator-autoconfigure/4.0.5, Apache-2.0, approved, #26090 +maven/mavencentral/org.springframework.boot/spring-boot-actuator/4.0.5, Apache-2.0, approved, #26087 +maven/mavencentral/org.springframework.boot/spring-boot-amqp/4.0.5, , restricted, clearlydefined +maven/mavencentral/org.springframework.boot/spring-boot-autoconfigure/4.0.5, Apache-2.0, approved, #24987 +maven/mavencentral/org.springframework.boot/spring-boot-cache/4.0.5, Apache-2.0, approved, #26128 +maven/mavencentral/org.springframework.boot/spring-boot-configuration-processor/4.0.5, Apache-2.0, approved, #26123 +maven/mavencentral/org.springframework.boot/spring-boot-data-commons/4.0.5, Apache-2.0, approved, #25784 +maven/mavencentral/org.springframework.boot/spring-boot-data-jpa/4.0.5, Apache-2.0, approved, #25785 +maven/mavencentral/org.springframework.boot/spring-boot-devtools/4.0.5, , restricted, clearlydefined +maven/mavencentral/org.springframework.boot/spring-boot-flyway/4.0.5, Apache-2.0, approved, #25631 +maven/mavencentral/org.springframework.boot/spring-boot-hateoas/4.0.5, , restricted, clearlydefined +maven/mavencentral/org.springframework.boot/spring-boot-health/4.0.5, Apache-2.0, approved, #26072 +maven/mavencentral/org.springframework.boot/spring-boot-hibernate/4.0.5, Apache-2.0, approved, #25787 +maven/mavencentral/org.springframework.boot/spring-boot-http-client/4.0.5, Apache-2.0, approved, #26125 +maven/mavencentral/org.springframework.boot/spring-boot-http-codec/4.0.5, Apache-2.0, approved, #26127 +maven/mavencentral/org.springframework.boot/spring-boot-http-converter/4.0.5, Apache-2.0, approved, #26122 +maven/mavencentral/org.springframework.boot/spring-boot-integration/4.0.5, , restricted, clearlydefined +maven/mavencentral/org.springframework.boot/spring-boot-jackson/4.0.5, Apache-2.0, approved, #26138 +maven/mavencentral/org.springframework.boot/spring-boot-jdbc/4.0.5, Apache-2.0, approved, #25788 +maven/mavencentral/org.springframework.boot/spring-boot-jpa/4.0.5, Apache-2.0, approved, #25783 +maven/mavencentral/org.springframework.boot/spring-boot-micrometer-metrics/4.0.5, Apache-2.0, approved, #26096 +maven/mavencentral/org.springframework.boot/spring-boot-micrometer-observation/4.0.5, Apache-2.0, approved, #26082 +maven/mavencentral/org.springframework.boot/spring-boot-persistence/4.0.5, Apache-2.0, approved, #25782 +maven/mavencentral/org.springframework.boot/spring-boot-reactor-netty/4.0.5, Apache-2.0, approved, #26121 +maven/mavencentral/org.springframework.boot/spring-boot-reactor/4.0.5, Apache-2.0, approved, #25618 +maven/mavencentral/org.springframework.boot/spring-boot-restclient/4.0.5, Apache-2.0, approved, #26124 +maven/mavencentral/org.springframework.boot/spring-boot-security-oauth2-client/4.0.5, Apache-2.0, approved, #26194 +maven/mavencentral/org.springframework.boot/spring-boot-security/4.0.5, Apache-2.0, approved, #26195 +maven/mavencentral/org.springframework.boot/spring-boot-servlet/4.0.5, Apache-2.0, approved, #26101 +maven/mavencentral/org.springframework.boot/spring-boot-sql/4.0.5, Apache-2.0, approved, #25605 +maven/mavencentral/org.springframework.boot/spring-boot-starter-actuator/4.0.5, Apache-2.0, approved, #25622 +maven/mavencentral/org.springframework.boot/spring-boot-starter-amqp/4.0.5, , restricted, clearlydefined +maven/mavencentral/org.springframework.boot/spring-boot-starter-cache/4.0.5, Apache-2.0, approved, #26077 +maven/mavencentral/org.springframework.boot/spring-boot-starter-data-jpa/4.0.5, Apache-2.0, approved, #25626 +maven/mavencentral/org.springframework.boot/spring-boot-starter-flyway/4.0.5, Apache-2.0, approved, #26186 +maven/mavencentral/org.springframework.boot/spring-boot-starter-hateoas/4.0.5, , restricted, clearlydefined +maven/mavencentral/org.springframework.boot/spring-boot-starter-jackson/4.0.5, Apache-2.0, approved, #26126 +maven/mavencentral/org.springframework.boot/spring-boot-starter-jdbc/4.0.5, Apache-2.0, approved, #25616 +maven/mavencentral/org.springframework.boot/spring-boot-starter-json/4.0.5, , restricted, clearlydefined +maven/mavencentral/org.springframework.boot/spring-boot-starter-logging/4.0.5, Apache-2.0, approved, #25602 +maven/mavencentral/org.springframework.boot/spring-boot-starter-micrometer-metrics/4.0.5, Apache-2.0, approved, #26120 +maven/mavencentral/org.springframework.boot/spring-boot-starter-reactor-netty/4.0.5, Apache-2.0, approved, #26130 +maven/mavencentral/org.springframework.boot/spring-boot-starter-security-oauth2-client/4.0.5, Apache-2.0, approved, #26192 +maven/mavencentral/org.springframework.boot/spring-boot-starter-security/4.0.5, Apache-2.0, approved, #25630 +maven/mavencentral/org.springframework.boot/spring-boot-starter-tomcat-runtime/4.0.5, Apache-2.0, approved, #25612 +maven/mavencentral/org.springframework.boot/spring-boot-starter-tomcat/4.0.5, Apache-2.0, approved, #26097 +maven/mavencentral/org.springframework.boot/spring-boot-starter-validation/4.0.5, Apache-2.0, approved, #25629 +maven/mavencentral/org.springframework.boot/spring-boot-starter-web/4.0.5, Apache-2.0, approved, #26075 +maven/mavencentral/org.springframework.boot/spring-boot-starter-webflux/4.0.5, Apache-2.0, approved, #26129 +maven/mavencentral/org.springframework.boot/spring-boot-starter-webmvc/4.0.5, Apache-2.0, approved, #26187 +maven/mavencentral/org.springframework.boot/spring-boot-starter/4.0.5, Apache-2.0, approved, #25636 +maven/mavencentral/org.springframework.boot/spring-boot-tomcat/4.0.5, Apache-2.0, approved, #26083 +maven/mavencentral/org.springframework.boot/spring-boot-transaction/4.0.5, Apache-2.0, approved, #25786 +maven/mavencentral/org.springframework.boot/spring-boot-validation/4.0.5, Apache-2.0, approved, #26084 +maven/mavencentral/org.springframework.boot/spring-boot-web-server/4.0.5, Apache-2.0, approved, #24984 +maven/mavencentral/org.springframework.boot/spring-boot-webflux/4.0.5, Apache-2.0, approved, #26135 +maven/mavencentral/org.springframework.boot/spring-boot-webmvc/4.0.5, Apache-2.0, approved, #26105 +maven/mavencentral/org.springframework.boot/spring-boot/4.0.5, Apache-2.0, approved, #24993 +maven/mavencentral/org.springframework.cloud/spring-cloud-commons/5.0.1, Apache-2.0, approved, #26106 +maven/mavencentral/org.springframework.cloud/spring-cloud-context/5.0.1, Apache-2.0, approved, #26094 +maven/mavencentral/org.springframework.cloud/spring-cloud-function-context/5.0.1, , restricted, clearlydefined +maven/mavencentral/org.springframework.cloud/spring-cloud-function-core/5.0.1, , restricted, clearlydefined +maven/mavencentral/org.springframework.cloud/spring-cloud-openfeign-core/5.0.1, , restricted, clearlydefined +maven/mavencentral/org.springframework.cloud/spring-cloud-starter-openfeign/5.0.1, , restricted, clearlydefined +maven/mavencentral/org.springframework.cloud/spring-cloud-starter-stream-rabbit/5.0.1, , restricted, clearlydefined +maven/mavencentral/org.springframework.cloud/spring-cloud-starter/5.0.1, Apache-2.0, approved, #26100 +maven/mavencentral/org.springframework.cloud/spring-cloud-stream-binder-rabbit-core/5.0.1, , restricted, clearlydefined +maven/mavencentral/org.springframework.cloud/spring-cloud-stream-binder-rabbit/5.0.1, , restricted, clearlydefined +maven/mavencentral/org.springframework.cloud/spring-cloud-stream/5.0.1, , restricted, clearlydefined +maven/mavencentral/org.springframework.data/spring-data-commons/4.0.4, Apache-2.0, approved, #25623 +maven/mavencentral/org.springframework.data/spring-data-jpa/4.0.4, Apache-2.0, approved, #25600 +maven/mavencentral/org.springframework.hateoas/spring-hateoas/3.0.3, , restricted, clearlydefined +maven/mavencentral/org.springframework.integration/spring-integration-amqp/7.0.4, , restricted, clearlydefined +maven/mavencentral/org.springframework.integration/spring-integration-core/7.0.4, , restricted, clearlydefined +maven/mavencentral/org.springframework.integration/spring-integration-jdbc/7.0.4, , restricted, clearlydefined +maven/mavencentral/org.springframework.integration/spring-integration-jmx/7.0.4, , restricted, clearlydefined +maven/mavencentral/org.springframework.plugin/spring-plugin-core/4.0.0, Apache-2.0, approved, #24785 +maven/mavencentral/org.springframework.security/spring-security-aspects/7.0.4, , restricted, clearlydefined +maven/mavencentral/org.springframework.security/spring-security-config/7.0.4, Apache-2.0, approved, #26189 +maven/mavencentral/org.springframework.security/spring-security-core/7.0.4, Apache-2.0, approved, #25609 +maven/mavencentral/org.springframework.security/spring-security-crypto/7.0.4, Apache-2.0 AND ISC, approved, #25599 +maven/mavencentral/org.springframework.security/spring-security-oauth2-client/7.0.4, Apache-2.0, approved, #25621 +maven/mavencentral/org.springframework.security/spring-security-oauth2-core/7.0.4, Apache-2.0, approved, #25634 +maven/mavencentral/org.springframework.security/spring-security-oauth2-jose/7.0.4, Apache-2.0, approved, #25601 +maven/mavencentral/org.springframework.security/spring-security-oauth2-resource-server/7.0.4, Apache-2.0, approved, #25624 +maven/mavencentral/org.springframework.security/spring-security-web/7.0.4, Apache-2.0, approved, #25617 +maven/mavencentral/org.springframework.shell/spring-shell-core-autoconfigure/4.0.0, , restricted, clearlydefined +maven/mavencentral/org.springframework.shell/spring-shell-core/4.0.0, , restricted, clearlydefined +maven/mavencentral/org.springframework.shell/spring-shell-jline/4.0.0, , restricted, clearlydefined +maven/mavencentral/org.springframework.shell/spring-shell-starter/4.0.0, , restricted, clearlydefined +maven/mavencentral/org.springframework/spring-aop/7.0.6, Apache-2.0, approved, #24985 +maven/mavencentral/org.springframework/spring-aspects/7.0.6, Apache-2.0, approved, #25619 +maven/mavencentral/org.springframework/spring-beans/7.0.6, Apache-2.0, approved, #24991 +maven/mavencentral/org.springframework/spring-context-support/7.0.6, Apache-2.0, approved, #26103 +maven/mavencentral/org.springframework/spring-context/7.0.6, Apache-2.0, approved, #24986 +maven/mavencentral/org.springframework/spring-core/7.0.6, Apache-2.0 AND BSD-3-Clause, approved, #24992 +maven/mavencentral/org.springframework/spring-expression/7.0.6, Apache-2.0, approved, #24988 +maven/mavencentral/org.springframework/spring-jdbc/7.0.6, Apache-2.0, approved, #25610 +maven/mavencentral/org.springframework/spring-messaging/7.0.6, , restricted, clearlydefined +maven/mavencentral/org.springframework/spring-orm/7.0.6, Apache-2.0, approved, #25628 +maven/mavencentral/org.springframework/spring-tx/7.0.6, Apache-2.0, approved, #25615 +maven/mavencentral/org.springframework/spring-web/7.0.6, Apache-2.0, approved, #24989 +maven/mavencentral/org.springframework/spring-webflux/7.0.6, Apache-2.0, approved, #25625 +maven/mavencentral/org.springframework/spring-webmvc/7.0.6, Apache-2.0, approved, #25606 +maven/mavencentral/org.springframework/spring-websocket/7.0.6, , restricted, clearlydefined +maven/mavencentral/org.webjars/swagger-ui/5.32.2, , restricted, clearlydefined maven/mavencentral/org.webjars/webjars-locator-lite/1.1.3, MIT, approved, #24484 -maven/mavencentral/org.xmlunit/xmlunit-core/2.10.4, Apache-2.0, approved, #14590 -maven/mavencentral/org.yaml/snakeyaml/2.4, Apache-2.0, approved, #19469 +maven/mavencentral/org.yaml/snakeyaml/2.5, Apache-2.0, approved, #23100 +maven/mavencentral/tools.jackson.core/jackson-core/3.0.3, Apache-2.0 AND BSD-2-Clause AND MIT, approved, clearlydefined +maven/mavencentral/tools.jackson.core/jackson-core/3.1.0, Apache-2.0 AND MIT, approved, #26415 +maven/mavencentral/tools.jackson.core/jackson-databind/3.0.3, Apache-2.0, approved, clearlydefined +maven/mavencentral/tools.jackson.core/jackson-databind/3.1.0, Apache-2.0, approved, #26439 +maven/mavencentral/tools.jackson.dataformat/jackson-dataformat-cbor/3.1.0, , restricted, clearlydefined +maven/mavencentral/tools.jackson.datatype/jackson-datatype-joda/3.1.0, , restricted, clearlydefined diff --git a/.3rd-party/README.md b/.3rd-party/README.md index 94a755e46..cca49f24f 100644 --- a/.3rd-party/README.md +++ b/.3rd-party/README.md @@ -12,5 +12,5 @@ $ cd .. && mvn license-tool:license-check -Ddash.fail=false -PcheckLicense Note: Some projects (e.g. test artifacts) could be excluded with *--projects* parameter, e.g: ```shell -$ cd .. && mvn license-tool:license-check -Ddash.fail=false -PcheckLicense \ --projects '!org.eclipse.hawkbit:hawkbit-repository-test,!org.eclipse.hawkbit:hawkbit-dmf-rabbitmq-test' +$ cd .. && mvn license-tool:license-check -Ddash.fail=false -PcheckLicense --projects '!org.eclipse.hawkbit:hawkbit-repository-test,!org.eclipse.hawkbit:hawkbit-dmf-rabbitmq-test' ``` diff --git a/hawkbit-core/src/main/java/org/eclipse/hawkbit/auth/StaticAuthenticationProvider.java b/hawkbit-core/src/main/java/org/eclipse/hawkbit/auth/StaticAuthenticationProvider.java index b400384c1..f4a404176 100644 --- a/hawkbit-core/src/main/java/org/eclipse/hawkbit/auth/StaticAuthenticationProvider.java +++ b/hawkbit-core/src/main/java/org/eclipse/hawkbit/auth/StaticAuthenticationProvider.java @@ -20,6 +20,7 @@ import java.util.regex.Pattern; import org.eclipse.hawkbit.tenancy.TenantAwareAuthenticationDetails; import org.eclipse.hawkbit.tenancy.TenantAwareUser; import org.eclipse.hawkbit.tenancy.TenantAwareUserProperties; +import org.jspecify.annotations.NonNull; import org.springframework.boot.security.autoconfigure.SecurityProperties; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.authentication.dao.DaoAuthenticationProvider; @@ -44,7 +45,8 @@ public class StaticAuthenticationProvider extends DaoAuthenticationProvider { } @Override - protected Authentication createSuccessAuthentication(final Object principal, final Authentication authentication, final UserDetails user) { + protected @NonNull Authentication createSuccessAuthentication( + @NonNull final Object principal, final Authentication authentication, final UserDetails user) { final UsernamePasswordAuthenticationToken result = new UsernamePasswordAuthenticationToken( principal, authentication.getCredentials(), user.getAuthorities()); result.setDetails(user instanceof TenantAwareUser tenantAwareUser @@ -58,15 +60,13 @@ public class StaticAuthenticationProvider extends DaoAuthenticationProvider { final List userPrincipals = new ArrayList<>(); tenantAwareUserProperties.getUser().forEach((username, user) -> { final String password = password(user.getPassword()); - - final List credentials = - createAuthorities(user.getRoles(), user.getPermissions(), Collections::emptyList); + final List credentials = createAuthorities(user.getRoles(), user.getPermissions(), Collections::emptyList); userPrincipals.add(ObjectUtils.isEmpty(user.getTenant()) ? new User(username, password, credentials) : new TenantAwareUser(username, password, credentials, user.getTenant())); }); - if (securityProperties != null && securityProperties.getUser() != null && !securityProperties.getUser().isPasswordGenerated()) { + if (securityProperties != null && !securityProperties.getUser().isPasswordGenerated()) { // explicitly setup system user - add is as a regular (non-tenant scoped) user userPrincipals.add(new User( securityProperties.getUser().getName(), @@ -119,7 +119,7 @@ public class StaticAuthenticationProvider extends DaoAuthenticationProvider { } @Override - public UserDetails loadUserByUsername(final String username) { + public @NonNull UserDetails loadUserByUsername(@NonNull final String username) { final User user = userMap.get(username); if (user == null) { throw new UsernameNotFoundException("No such user"); diff --git a/hawkbit-core/src/main/resources/hawkbit-jackson-defaults.properties b/hawkbit-core/src/main/resources/hawkbit-jackson-defaults.properties index 86c26c4fb..47dab8891 100644 --- a/hawkbit-core/src/main/resources/hawkbit-jackson-defaults.properties +++ b/hawkbit-core/src/main/resources/hawkbit-jackson-defaults.properties @@ -8,7 +8,7 @@ # SPDX-License-Identifier: EPL-2.0 # -# sets MapperFeature.ALLOW_FINAL_FIELDS_AS_MUTATORS to true +# sets MapperFeature.ALLOW_FINAL_FIELDS_AS_MUTATORS to true, jackson 3 doesn't override finals which we need spring.jackson.mapper.allow-final-fields-as-mutators=true # sets DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY to true # this feature allow sending single value instead of array of single value for array fields. diff --git a/hawkbit-ddi/hawkbit-ddi-api/pom.xml b/hawkbit-ddi/hawkbit-ddi-api/pom.xml index 06458461f..9a91761ac 100644 --- a/hawkbit-ddi/hawkbit-ddi-api/pom.xml +++ b/hawkbit-ddi/hawkbit-ddi-api/pom.xml @@ -35,6 +35,11 @@ + + tools.jackson.core + jackson-databind + test + io.github.classgraph classgraph diff --git a/hawkbit-ddi/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiActionFeedbackTest.java b/hawkbit-ddi/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiActionFeedbackTest.java index 62479f71d..bf4131074 100644 --- a/hawkbit-ddi/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiActionFeedbackTest.java +++ b/hawkbit-ddi/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiActionFeedbackTest.java @@ -16,10 +16,9 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import java.io.IOException; import java.util.Collections; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.exc.MismatchedInputException; import org.junit.jupiter.api.Test; +import tools.jackson.databind.ObjectMapper; +import tools.jackson.databind.exc.MismatchedInputException; /** * Test serialization of DDI api model 'DdiActionFeedback' @@ -74,15 +73,15 @@ class DdiActionFeedbackTest { void shouldFailForObjectWithWrongDataTypes() { // Setup final String serializedDdiActionFeedback = """ - { - "timestamp" : "1627997501890", - "status" : { - "execution" : "[closed]", - "result" : null, - "details" : [] - } - } - """; + { + "timestamp" : "1627997501890", + "status" : { + "execution" : "[closed]", + "result" : null, + "details" : [] + } + } + """; assertThatExceptionOfType(MismatchedInputException.class).isThrownBy( () -> mapper.readValue(serializedDdiActionFeedback, DdiActionFeedback.class)); } @@ -91,19 +90,19 @@ class DdiActionFeedbackTest { * Verify that deserialization works if optional fields are not parsed */ @Test - void shouldConvertItWithoutOptionalFieldTimestamp() throws JsonProcessingException { + void shouldConvertItWithoutOptionalFieldTimestamp() { // Setup final String serializedDdiActionFeedback = """ - { - "status" : { - "result" : { - "finished" : "none" - }, - "execution" : "download", - "details" : [ "Some message" ] - } - } - """; + { + "status" : { + "result" : { + "finished" : "none" + }, + "execution" : "download", + "details" : [ "Some message" ] + } + } + """; assertThat(mapper.readValue(serializedDdiActionFeedback, DdiActionFeedback.class)).satisfies(deserializedDdiActionFeedback -> { assertThat(deserializedDdiActionFeedback.getTimestamp()).isNotNull(); diff --git a/hawkbit-ddi/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiActionHistoryTest.java b/hawkbit-ddi/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiActionHistoryTest.java index 76ef5d318..7f81dcd57 100644 --- a/hawkbit-ddi/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiActionHistoryTest.java +++ b/hawkbit-ddi/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiActionHistoryTest.java @@ -17,9 +17,9 @@ import java.io.IOException; import java.util.Arrays; import java.util.List; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.exc.MismatchedInputException; import org.junit.jupiter.api.Test; +import tools.jackson.databind.ObjectMapper; +import tools.jackson.databind.exc.MismatchedInputException; /** * Test serializability of DDI api model 'DdiActionHistory' diff --git a/hawkbit-ddi/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiArtifactHashTest.java b/hawkbit-ddi/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiArtifactHashTest.java index 897bc66f4..c17e7ff10 100644 --- a/hawkbit-ddi/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiArtifactHashTest.java +++ b/hawkbit-ddi/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiArtifactHashTest.java @@ -14,10 +14,9 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import java.io.IOException; - -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.exc.MismatchedInputException; import org.junit.jupiter.api.Test; +import tools.jackson.databind.ObjectMapper; +import tools.jackson.databind.exc.MismatchedInputException; /** * Test serializability of DDI api model 'DdiArtifactHash' diff --git a/hawkbit-ddi/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiArtifactTest.java b/hawkbit-ddi/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiArtifactTest.java index 4924d2cc4..b74c88b55 100644 --- a/hawkbit-ddi/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiArtifactTest.java +++ b/hawkbit-ddi/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiArtifactTest.java @@ -15,9 +15,9 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import java.io.IOException; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.exc.MismatchedInputException; import org.junit.jupiter.api.Test; +import tools.jackson.databind.ObjectMapper; +import tools.jackson.databind.exc.MismatchedInputException; /** * Test serializability of DDI api model 'DdiArtifact' @@ -78,7 +78,6 @@ class DdiArtifactTest { final String serializedDdiArtifact = "{\"filename\": [\"test.file\"],\"hashes\":{\"sha1\":\"123\",\"md5\":\"456\",\"sha256\":\"789\"},\"size\":111,\"links\":[]}"; // Test - assertThatExceptionOfType(MismatchedInputException.class) - .isThrownBy(() -> OBJECT_MAPPER.readValue(serializedDdiArtifact, DdiArtifact.class)); + assertThatExceptionOfType(MismatchedInputException.class).isThrownBy(() -> OBJECT_MAPPER.readValue(serializedDdiArtifact, DdiArtifact.class)); } } \ No newline at end of file diff --git a/hawkbit-ddi/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiCancelActionToStopTest.java b/hawkbit-ddi/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiCancelActionToStopTest.java index 9566a25a8..6948f3654 100644 --- a/hawkbit-ddi/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiCancelActionToStopTest.java +++ b/hawkbit-ddi/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiCancelActionToStopTest.java @@ -15,9 +15,9 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import java.io.IOException; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.exc.MismatchedInputException; import org.junit.jupiter.api.Test; +import tools.jackson.databind.ObjectMapper; +import tools.jackson.databind.exc.MismatchedInputException; /** * Test serializability of DDI api model 'DdiCancelActionToStop' diff --git a/hawkbit-ddi/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiCancelTest.java b/hawkbit-ddi/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiCancelTest.java index 69e9501d6..4c5916ed9 100644 --- a/hawkbit-ddi/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiCancelTest.java +++ b/hawkbit-ddi/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiCancelTest.java @@ -15,9 +15,9 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import java.io.IOException; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.exc.MismatchedInputException; import org.junit.jupiter.api.Test; +import tools.jackson.databind.ObjectMapper; +import tools.jackson.databind.exc.MismatchedInputException; /** * Test serializability of DDI api model 'DdiArtifact' diff --git a/hawkbit-ddi/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiChunkTest.java b/hawkbit-ddi/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiChunkTest.java index b198ee4fe..30b3155be 100644 --- a/hawkbit-ddi/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiChunkTest.java +++ b/hawkbit-ddi/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiChunkTest.java @@ -17,9 +17,9 @@ import java.io.IOException; import java.util.Collections; import java.util.List; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.exc.MismatchedInputException; import org.junit.jupiter.api.Test; +import tools.jackson.databind.ObjectMapper; +import tools.jackson.databind.exc.MismatchedInputException; /** * Test serializability of DDI api model 'DdiChunk' diff --git a/hawkbit-ddi/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiConfigDataTest.java b/hawkbit-ddi/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiConfigDataTest.java index 901ff7594..97bfb7e19 100644 --- a/hawkbit-ddi/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiConfigDataTest.java +++ b/hawkbit-ddi/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiConfigDataTest.java @@ -17,9 +17,9 @@ import java.io.IOException; import java.util.HashMap; import java.util.Map; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.exc.MismatchedInputException; import org.junit.jupiter.api.Test; +import tools.jackson.databind.ObjectMapper; +import tools.jackson.databind.exc.MismatchedInputException; /** * Test serializability of DDI api model 'DdiConfigData' diff --git a/hawkbit-ddi/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiConfigTest.java b/hawkbit-ddi/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiConfigTest.java index 7b78488b8..ad931cad7 100644 --- a/hawkbit-ddi/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiConfigTest.java +++ b/hawkbit-ddi/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiConfigTest.java @@ -15,9 +15,9 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import java.io.IOException; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.exc.MismatchedInputException; import org.junit.jupiter.api.Test; +import tools.jackson.databind.ObjectMapper; +import tools.jackson.databind.exc.MismatchedInputException; /** * Test serializability of DDI api model 'DdiConfig' diff --git a/hawkbit-ddi/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiConfirmationBaseTest.java b/hawkbit-ddi/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiConfirmationBaseTest.java index 7feb1650b..0dbbfa71d 100644 --- a/hawkbit-ddi/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiConfirmationBaseTest.java +++ b/hawkbit-ddi/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiConfirmationBaseTest.java @@ -20,9 +20,9 @@ import java.io.IOException; import java.util.Collections; import java.util.List; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.exc.MismatchedInputException; import org.junit.jupiter.api.Test; +import tools.jackson.databind.ObjectMapper; +import tools.jackson.databind.exc.MismatchedInputException; /** * Test serializability of DDI api model 'DdiConfirmationBase' diff --git a/hawkbit-ddi/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiControllerBaseTest.java b/hawkbit-ddi/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiControllerBaseTest.java index c35d6c834..4e92b63f5 100644 --- a/hawkbit-ddi/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiControllerBaseTest.java +++ b/hawkbit-ddi/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiControllerBaseTest.java @@ -15,9 +15,9 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import java.io.IOException; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.exc.MismatchedInputException; import org.junit.jupiter.api.Test; +import tools.jackson.databind.ObjectMapper; +import tools.jackson.databind.exc.MismatchedInputException; /** * Test serializability of DDI api model 'DdiControllerBase' diff --git a/hawkbit-ddi/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiDeploymentBaseTest.java b/hawkbit-ddi/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiDeploymentBaseTest.java index e2ea4ba19..864825a6b 100644 --- a/hawkbit-ddi/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiDeploymentBaseTest.java +++ b/hawkbit-ddi/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiDeploymentBaseTest.java @@ -20,9 +20,9 @@ import java.io.IOException; import java.util.Collections; import java.util.List; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.exc.MismatchedInputException; import org.junit.jupiter.api.Test; +import tools.jackson.databind.ObjectMapper; +import tools.jackson.databind.exc.MismatchedInputException; /** * Test serializability of DDI api model 'DdiDeploymentBase' diff --git a/hawkbit-ddi/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiDeploymentTest.java b/hawkbit-ddi/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiDeploymentTest.java index 8cc8335ba..f612be598 100644 --- a/hawkbit-ddi/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiDeploymentTest.java +++ b/hawkbit-ddi/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiDeploymentTest.java @@ -19,9 +19,9 @@ import static org.eclipse.hawkbit.ddi.json.model.DdiDeployment.HandlingType.FORC import java.io.IOException; import java.util.Collections; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.exc.MismatchedInputException; import org.junit.jupiter.api.Test; +import tools.jackson.databind.ObjectMapper; +import tools.jackson.databind.exc.MismatchedInputException; /** * Test serializability of DDI api model 'DdiDeployment' diff --git a/hawkbit-ddi/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiMetadataTest.java b/hawkbit-ddi/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiMetadataTest.java index 44efce78e..ea377e28e 100644 --- a/hawkbit-ddi/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiMetadataTest.java +++ b/hawkbit-ddi/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiMetadataTest.java @@ -14,10 +14,9 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import java.io.IOException; - -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.exc.MismatchedInputException; import org.junit.jupiter.api.Test; +import tools.jackson.databind.ObjectMapper; +import tools.jackson.databind.exc.MismatchedInputException; /** * Test serializability of DDI api model 'DdiMetadata' diff --git a/hawkbit-ddi/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiPollingTest.java b/hawkbit-ddi/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiPollingTest.java index 0e878930e..2f1e140a9 100644 --- a/hawkbit-ddi/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiPollingTest.java +++ b/hawkbit-ddi/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiPollingTest.java @@ -15,9 +15,9 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import java.io.IOException; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.exc.MismatchedInputException; import org.junit.jupiter.api.Test; +import tools.jackson.databind.ObjectMapper; +import tools.jackson.databind.exc.MismatchedInputException; /** * Test serializability of DDI api model 'DdiPolling' diff --git a/hawkbit-ddi/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiProgressTest.java b/hawkbit-ddi/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiProgressTest.java index 1c8be63f9..62dc04331 100644 --- a/hawkbit-ddi/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiProgressTest.java +++ b/hawkbit-ddi/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiProgressTest.java @@ -15,9 +15,9 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import java.io.IOException; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.exc.MismatchedInputException; import org.junit.jupiter.api.Test; +import tools.jackson.databind.ObjectMapper; +import tools.jackson.databind.exc.MismatchedInputException; /** * Test serializability of DDI api model 'DdiProgress' diff --git a/hawkbit-ddi/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiResultTest.java b/hawkbit-ddi/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiResultTest.java index 90a187542..8ab271fec 100644 --- a/hawkbit-ddi/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiResultTest.java +++ b/hawkbit-ddi/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiResultTest.java @@ -16,9 +16,9 @@ import static org.eclipse.hawkbit.ddi.json.model.DdiResult.FinalResult.NONE; import java.io.IOException; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.exc.MismatchedInputException; import org.junit.jupiter.api.Test; +import tools.jackson.databind.ObjectMapper; +import tools.jackson.databind.exc.MismatchedInputException; /** * Test serializability of DDI api model 'DdiResult' diff --git a/hawkbit-ddi/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiStatusTest.java b/hawkbit-ddi/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiStatusTest.java index 20952e428..d0fc16b6b 100644 --- a/hawkbit-ddi/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiStatusTest.java +++ b/hawkbit-ddi/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiStatusTest.java @@ -19,12 +19,12 @@ import java.io.IOException; import java.util.Collections; import java.util.stream.Stream; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.exc.MismatchedInputException; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; +import tools.jackson.databind.ObjectMapper; +import tools.jackson.databind.exc.MismatchedInputException; /** * Test serializability of DDI api model 'DdiStatus' diff --git a/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/integration/AmqpMessageHandlerServiceIntegrationTest.java b/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/integration/AmqpMessageHandlerServiceIntegrationTest.java index c003a2e5a..bfc203d1b 100644 --- a/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/integration/AmqpMessageHandlerServiceIntegrationTest.java +++ b/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/integration/AmqpMessageHandlerServiceIntegrationTest.java @@ -25,8 +25,6 @@ import java.util.Objects; import java.util.Optional; import java.util.UUID; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.node.ObjectNode; import org.eclipse.hawkbit.amqp.AmqpMessageHandlerService; import org.eclipse.hawkbit.amqp.AmqpProperties; import org.eclipse.hawkbit.dmf.amqp.api.EventTopic; @@ -73,6 +71,8 @@ import org.mockito.Mockito; import org.springframework.amqp.core.Message; import org.springframework.amqp.rabbit.core.RabbitAdmin; import org.springframework.beans.factory.annotation.Autowired; +import tools.jackson.databind.ObjectMapper; +import tools.jackson.databind.node.ObjectNode; /** * Feature: Component Tests - Device Management Federation API
@@ -1103,7 +1103,7 @@ class AmqpMessageHandlerServiceIntegrationTest extends AbstractAmqpServiceIntegr assertActionStatusList(actionId, 2, Status.WAIT_FOR_CONFIRMATION); } - private static String getActionIdFromBody(final byte[] body) throws IOException { + private static String getActionIdFromBody(final byte[] body) { final ObjectMapper objectMapper = new ObjectMapper(); final ObjectNode node = objectMapper.readValue(new String(body, Charset.defaultCharset()), ObjectNode.class); assertThat(node.has("actionId")).isTrue(); @@ -1130,8 +1130,7 @@ class AmqpMessageHandlerServiceIntegrationTest extends AbstractAmqpServiceIntegr private void updateAttributesWithUpdateModeMerge() { // get the current attributes - final Map attributes = new HashMap<>( - targetManagement.getControllerAttributes(DMF_ATTR_TEST_CONTROLLER_ID)); + final Map attributes = new HashMap<>(targetManagement.getControllerAttributes(DMF_ATTR_TEST_CONTROLLER_ID)); // send an update message with update mode MERGE final Map mergeAttributes = new HashMap<>(); diff --git a/hawkbit-mgmt/hawkbit-mgmt-api/pom.xml b/hawkbit-mgmt/hawkbit-mgmt-api/pom.xml index cbdf6e3fb..6bf84f6fe 100644 --- a/hawkbit-mgmt/hawkbit-mgmt-api/pom.xml +++ b/hawkbit-mgmt/hawkbit-mgmt-api/pom.xml @@ -32,6 +32,11 @@ ${project.version}
+ + tools.jackson.core + jackson-databind + + org.springframework.boot spring-boot-starter-hateoas-test diff --git a/hawkbit-mgmt/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/target/MgmtDistributionSetAssignments.java b/hawkbit-mgmt/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/target/MgmtDistributionSetAssignments.java index 7aebe81ed..2c2f3977e 100644 --- a/hawkbit-mgmt/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/target/MgmtDistributionSetAssignments.java +++ b/hawkbit-mgmt/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/target/MgmtDistributionSetAssignments.java @@ -11,11 +11,10 @@ package org.eclipse.hawkbit.mgmt.json.model.target; import java.io.Serial; import java.util.ArrayList; -import java.util.List; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import lombok.NoArgsConstructor; +import tools.jackson.databind.annotation.JsonDeserialize; /** * Class to hold multiple distribution set assignments. A JSON object diff --git a/hawkbit-mgmt/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/target/MgmtDistributionSetAssignmentsDeserializer.java b/hawkbit-mgmt/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/target/MgmtDistributionSetAssignmentsDeserializer.java index 596f19250..6e56c4d16 100644 --- a/hawkbit-mgmt/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/target/MgmtDistributionSetAssignmentsDeserializer.java +++ b/hawkbit-mgmt/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/target/MgmtDistributionSetAssignmentsDeserializer.java @@ -9,46 +9,30 @@ */ package org.eclipse.hawkbit.mgmt.json.model.target; -import java.io.IOException; -import java.io.Serial; import java.util.Arrays; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.ObjectCodec; -import com.fasterxml.jackson.databind.DeserializationContext; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.deser.std.StdDeserializer; +import tools.jackson.core.JsonParser; +import tools.jackson.databind.DeserializationContext; +import tools.jackson.databind.JsonNode; +import tools.jackson.databind.deser.std.StdDeserializer; /** - * Deserializes a single object or a List of - * {@link MgmtDistributionSetAssignment}s + * Deserializes a single object or a List of {@link MgmtDistributionSetAssignment}s */ public class MgmtDistributionSetAssignmentsDeserializer extends StdDeserializer { - @Serial - private static final long serialVersionUID = 1L; - - /** - * Mandatory constructor - */ public MgmtDistributionSetAssignmentsDeserializer() { - this(null); - } - - protected MgmtDistributionSetAssignmentsDeserializer(final Class vc) { - super(vc); + super(MgmtDistributionSetAssignments.class); } @Override - public MgmtDistributionSetAssignments deserialize(final JsonParser jp, final DeserializationContext ctx) - throws IOException { + public MgmtDistributionSetAssignments deserialize(final JsonParser jp, final DeserializationContext ctx) { final MgmtDistributionSetAssignments assignments = new MgmtDistributionSetAssignments(); - final ObjectCodec codec = jp.getCodec(); - final JsonNode node = codec.readTree(jp); + final JsonNode node = jp.readValueAsTree(); if (node.isArray()) { - assignments.addAll(Arrays.asList(codec.treeToValue(node, MgmtDistributionSetAssignment[].class))); + assignments.addAll(Arrays.asList(ctx.readTreeAsValue(node, MgmtDistributionSetAssignment[].class))); } else { - assignments.add(codec.treeToValue(node, MgmtDistributionSetAssignment.class)); + assignments.add(ctx.readTreeAsValue(node, MgmtDistributionSetAssignment.class)); } return assignments; } diff --git a/hawkbit-mgmt/hawkbit-mgmt-api/src/test/java/org/eclipse/hawkbit/mgmt/json/model/AuditFieldSerializationTest.java b/hawkbit-mgmt/hawkbit-mgmt-api/src/test/java/org/eclipse/hawkbit/mgmt/json/model/AuditFieldSerializationTest.java index ca8c6fa8e..de543904a 100644 --- a/hawkbit-mgmt/hawkbit-mgmt-api/src/test/java/org/eclipse/hawkbit/mgmt/json/model/AuditFieldSerializationTest.java +++ b/hawkbit-mgmt/hawkbit-mgmt-api/src/test/java/org/eclipse/hawkbit/mgmt/json/model/AuditFieldSerializationTest.java @@ -11,10 +11,9 @@ package org.eclipse.hawkbit.mgmt.json.model; import static org.assertj.core.api.Assertions.assertThat; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; import org.eclipse.hawkbit.mgmt.json.model.target.MgmtTarget; import org.junit.jupiter.api.Test; +import tools.jackson.databind.ObjectMapper; /** * Feature: Unit Tests - Management API
@@ -23,7 +22,7 @@ import org.junit.jupiter.api.Test; class AuditFieldSerializationTest { @Test - void assertAuditingFields() throws JsonProcessingException { + void assertAuditingFields() { final MgmtTarget mgmtTarget = new MgmtTarget(); mgmtTarget.setCreatedBy("user"); mgmtTarget.setCreatedAt(System.currentTimeMillis() - 1_000_000); diff --git a/hawkbit-mgmt/hawkbit-mgmt-api/src/test/java/org/eclipse/hawkbit/mgmt/json/model/distributionset/MgmtTargetAssignmentResponseBodyTest.java b/hawkbit-mgmt/hawkbit-mgmt-api/src/test/java/org/eclipse/hawkbit/mgmt/json/model/distributionset/MgmtTargetAssignmentResponseBodyTest.java index a335662dc..2282bcc0a 100644 --- a/hawkbit-mgmt/hawkbit-mgmt-api/src/test/java/org/eclipse/hawkbit/mgmt/json/model/distributionset/MgmtTargetAssignmentResponseBodyTest.java +++ b/hawkbit-mgmt/hawkbit-mgmt-api/src/test/java/org/eclipse/hawkbit/mgmt/json/model/distributionset/MgmtTargetAssignmentResponseBodyTest.java @@ -11,13 +11,12 @@ package org.eclipse.hawkbit.mgmt.json.model.distributionset; import static org.assertj.core.api.Assertions.assertThat; -import java.io.IOException; import java.util.Arrays; import java.util.List; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.jupiter.api.Test; +import tools.jackson.databind.JsonNode; +import tools.jackson.databind.ObjectMapper; /** * Feature: Tests for the MgmtTargetAssignmentResponseBody
@@ -33,7 +32,7 @@ class MgmtTargetAssignmentResponseBodyTest { * Tests that the ActionIds are serialized correctly in MgmtTargetAssignmentResponseBody */ @Test - void testActionIdsSerialization() throws IOException { + void testActionIdsSerialization() { final MgmtTargetAssignmentResponseBody responseBody = generateResponseBody(); final ObjectMapper objectMapper = new ObjectMapper(); final String responseBodyAsString = objectMapper.writeValueAsString(responseBody); diff --git a/hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtOpenApiConfiguration.java b/hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtOpenApiConfiguration.java index 17eff71f9..a3f14c657 100644 --- a/hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtOpenApiConfiguration.java +++ b/hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtOpenApiConfiguration.java @@ -9,7 +9,10 @@ */ package org.eclipse.hawkbit.mgmt.rest.resource; +import java.util.Comparator; import java.util.List; +import java.util.Map; +import java.util.Optional; import io.swagger.v3.oas.models.info.Info; import io.swagger.v3.oas.models.security.SecurityRequirement; @@ -17,6 +20,7 @@ import io.swagger.v3.oas.models.security.SecurityScheme; import io.swagger.v3.oas.models.servers.Server; import io.swagger.v3.oas.models.servers.ServerVariable; import io.swagger.v3.oas.models.servers.ServerVariables; +import io.swagger.v3.oas.models.tags.Tag; import org.eclipse.hawkbit.rest.OpenApi; import org.springdoc.core.models.GroupedOpenApi; import org.springframework.beans.factory.annotation.Value; @@ -52,10 +56,10 @@ public class MgmtOpenApiConfiguration { """)) .servers(tenantEndpointEnabled ? List.of( - new Server() - .url("/{tenant}/") - .variables(new ServerVariables().addServerVariable("tenant", tenantSeverVariable())), - new Server().url("/")) + new Server() + .url("/{tenant}/") + .variables(new ServerVariables().addServerVariable("tenant", tenantSeverVariable())), + new Server().url("/")) : List.of(new Server().url("/"))) .addSecurityItem(new SecurityRequirement() .addList(BASIC_AUTH_SEC_SCHEME_NAME) @@ -74,7 +78,7 @@ public class MgmtOpenApiConfiguration { .type(SecurityScheme.Type.HTTP) .bearerFormat("JWT") .scheme("bearer"))) - .tags(OpenApi.sort(openApi.getTags()))) + .tags(sort(openApi.getTags()))) .build(); } @@ -84,4 +88,35 @@ public class MgmtOpenApiConfiguration { tenantServerVariable.setDefault("DEFAULT"); return tenantServerVariable; } + + private static final String ORDER = "order"; + private static final Comparator TAG_COMPARATOR = new Comparator<>() { + + @Override + public int compare(final Tag o1, final Tag o2) { + final int o1Order = order(o1); + final int o2Order = order(o2); + if (o1Order == o2Order) { + return o1.getName().compareTo(o2.getName()); + } else { + return Integer.compare(o1Order, o2Order); + } + } + + private static int order(final Tag tag) { + return Optional.ofNullable(tag.getExtensions()) + .map(extensions -> extensions.get(OpenApi.X_HAWKBIT)) + .filter(extension -> Map.class.isAssignableFrom(extension.getClass())) + .map(Map.class::cast) + .map(propertiesMap -> propertiesMap.get(ORDER)) + .map(String.class::cast) + .map(Integer::parseInt) + .orElse(0); + } + }; + + private static List sort(final List tags) { + tags.sort(TAG_COMPARATOR); + return tags; + } } \ No newline at end of file diff --git a/hawkbit-mgmt/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetResourceTest.java b/hawkbit-mgmt/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetResourceTest.java index 66308ae53..5531a4bf3 100644 --- a/hawkbit-mgmt/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetResourceTest.java +++ b/hawkbit-mgmt/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetResourceTest.java @@ -45,7 +45,6 @@ import java.util.stream.Stream; import jakarta.validation.ConstraintViolationException; -import com.fasterxml.jackson.databind.ObjectMapper; import com.jayway.jsonpath.JsonPath; import org.eclipse.hawkbit.auth.SpPermission; import org.eclipse.hawkbit.exception.SpServerError; @@ -115,7 +114,7 @@ class MgmtTargetResourceTest extends AbstractManagementApiIntegrationTest { private static final String JSON_PATH_ROOT = "$"; // fields, attributes private static final String JSON_PATH_FIELD_ID = ".id"; - private static final String JSON_PATH_FIELD_CONTROLLERID = ".controllerId"; + private static final String JSON_PATH_FIELD_CONTROLLER_ID = ".controllerId"; private static final String JSON_PATH_FIELD_NAME = ".name"; private static final String JSON_PATH_FIELD_DESCRIPTION = ".description"; private static final String JSON_PATH_FIELD_CONTENT = ".content"; @@ -133,7 +132,7 @@ class MgmtTargetResourceTest extends AbstractManagementApiIntegrationTest { private static final String JSON_PATH_FIELD_TARGET_TYPE = ".targetType"; private static final String JSON_PATH_NAME = JSON_PATH_ROOT + JSON_PATH_FIELD_NAME; private static final String JSON_PATH_ID = JSON_PATH_ROOT + JSON_PATH_FIELD_ID; - private static final String JSON_PATH_CONTROLLERID = JSON_PATH_ROOT + JSON_PATH_FIELD_CONTROLLERID; + private static final String JSON_PATH_CONTROLLER_ID = JSON_PATH_ROOT + JSON_PATH_FIELD_CONTROLLER_ID; private static final String JSON_PATH_DESCRIPTION = JSON_PATH_ROOT + JSON_PATH_FIELD_DESCRIPTION; private static final String JSON_PATH_LAST_REQUEST_AT = JSON_PATH_ROOT + JSON_PATH_FIELD_LAST_REQUEST_AT; private static final String JSON_PATH_TYPE = JSON_PATH_ROOT + JSON_PATH_FIELD_TARGET_TYPE; @@ -853,7 +852,7 @@ class MgmtTargetResourceTest extends AbstractManagementApiIntegrationTest { .andDo(MockMvcResultPrinter.print()) .andExpect(status().isOk()) .andExpect(jsonPath(JSON_PATH_NAME, equalTo(knownName))) - .andExpect(jsonPath(JSON_PATH_CONTROLLERID, equalTo(knownControllerId))) + .andExpect(jsonPath(JSON_PATH_CONTROLLER_ID, equalTo(knownControllerId))) .andExpect(jsonPath(JSON_PATH_DESCRIPTION, equalTo(TARGET_DESCRIPTION_TEST))) .andExpect(jsonPath(JSON_PATH_LAST_REQUEST_AT, equalTo(target.getLastTargetQuery()))) .andExpect(jsonPath("$.pollStatus", hasKey("lastRequestAt"))) @@ -2353,7 +2352,7 @@ class MgmtTargetResourceTest extends AbstractManagementApiIntegrationTest { .andDo(MockMvcResultPrinter.print()) .andExpect(status().isOk()) .andExpect(jsonPath(JSON_PATH_NAME, equalTo("targetOfType1"))) - .andExpect(jsonPath(JSON_PATH_CONTROLLERID, equalTo("id2"))) + .andExpect(jsonPath(JSON_PATH_CONTROLLER_ID, equalTo("id2"))) .andExpect(jsonPath(JSON_PATH_TYPE, equalTo(type1.getId().intValue()))) .andExpect(jsonPath(JSON_PATH_DESCRIPTION, equalTo("testid2"))) .andExpect(jsonPath("$._links.targetType.href", equalTo(hrefType1))) diff --git a/hawkbit-mgmt/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTenantManagementResourceTest.java b/hawkbit-mgmt/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTenantManagementResourceTest.java index 24b9051b1..9f7542b56 100644 --- a/hawkbit-mgmt/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTenantManagementResourceTest.java +++ b/hawkbit-mgmt/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTenantManagementResourceTest.java @@ -25,7 +25,6 @@ import static org.springframework.test.web.servlet.request.MockMvcRequestBuilder import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -import com.fasterxml.jackson.databind.ObjectMapper; import org.eclipse.hawkbit.auth.SpPermission; import org.eclipse.hawkbit.mgmt.json.model.system.MgmtSystemTenantConfigurationValueRequest; import org.eclipse.hawkbit.repository.DistributionSetTypeManagement; @@ -35,6 +34,7 @@ import org.json.JSONObject; import org.junit.jupiter.api.Test; import org.springframework.http.MediaType; import org.springframework.test.web.servlet.ResultMatcher; +import tools.jackson.databind.ObjectMapper; /** * Spring MVC Tests against the MgmtTenantManagementResource. diff --git a/hawkbit-mgmt/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/util/ResourceUtility.java b/hawkbit-mgmt/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/util/ResourceUtility.java index 8619f0bcb..afeefd0a1 100644 --- a/hawkbit-mgmt/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/util/ResourceUtility.java +++ b/hawkbit-mgmt/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/util/ResourceUtility.java @@ -9,11 +9,9 @@ */ package org.eclipse.hawkbit.mgmt.rest.resource.util; -import java.io.IOException; - -import com.fasterxml.jackson.databind.ObjectMapper; import org.eclipse.hawkbit.mgmt.json.model.artifact.MgmtArtifact; import org.eclipse.hawkbit.rest.json.model.ExceptionInfo; +import tools.jackson.databind.ObjectMapper; /** * Utility additions for the REST API tests. @@ -22,11 +20,11 @@ public final class ResourceUtility { private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper(); - public static ExceptionInfo convertException(final String jsonExceptionResponse) throws IOException { + public static ExceptionInfo convertException(final String jsonExceptionResponse) { return OBJECT_MAPPER.readValue(jsonExceptionResponse, ExceptionInfo.class); } - public static MgmtArtifact convertArtifactResponse(final String jsonResponse) throws IOException { + public static MgmtArtifact convertArtifactResponse(final String jsonResponse) { return OBJECT_MAPPER.readValue(jsonResponse, MgmtArtifact.class); } } \ No newline at end of file diff --git a/hawkbit-mgmt/hawkbit-mgmt-server/src/test/java/org/eclipse/hawkbit/app/mgmt/PreAuthorizeEnabledTest.java b/hawkbit-mgmt/hawkbit-mgmt-server/src/test/java/org/eclipse/hawkbit/app/mgmt/PreAuthorizeEnabledTest.java index 25d1e349f..d30c9db43 100644 --- a/hawkbit-mgmt/hawkbit-mgmt-server/src/test/java/org/eclipse/hawkbit/app/mgmt/PreAuthorizeEnabledTest.java +++ b/hawkbit-mgmt/hawkbit-mgmt-server/src/test/java/org/eclipse/hawkbit/app/mgmt/PreAuthorizeEnabledTest.java @@ -16,13 +16,13 @@ import static org.springframework.test.web.servlet.request.MockMvcRequestBuilder import java.util.HashMap; import java.util.Map; -import com.fasterxml.jackson.databind.ObjectMapper; import org.eclipse.hawkbit.auth.SpPermission; import org.eclipse.hawkbit.auth.SpRole; import org.eclipse.hawkbit.repository.test.util.WithUser; import org.junit.jupiter.api.Test; import org.springframework.http.HttpStatus; import org.springframework.test.context.TestPropertySource; +import tools.jackson.databind.ObjectMapper; /** * Feature: Integration Test - Security
@@ -96,7 +96,7 @@ class PreAuthorizeEnabledTest extends AbstractSecurityTest { mvc.perform(get("/rest/v1/system/configs")).andExpect(result -> { // returns default DS type because of READ_TARGET assertThat(result.getResponse().getStatus()).isEqualTo(HttpStatus.OK.value()); - assertThat((Map) new ObjectMapper().reader().readValue(result.getResponse().getContentAsString(), HashMap.class)).hasSize(1); + assertThat((Map) new ObjectMapper().readValue(result.getResponse().getContentAsString(), HashMap.class)).hasSize(1); }); } diff --git a/hawkbit-monolith/hawkbit-update-server/src/test/java/org/eclipse/hawkbit/app/PreAuthorizeEnabledTest.java b/hawkbit-monolith/hawkbit-update-server/src/test/java/org/eclipse/hawkbit/app/PreAuthorizeEnabledTest.java index 6919ed96e..1e780c211 100644 --- a/hawkbit-monolith/hawkbit-update-server/src/test/java/org/eclipse/hawkbit/app/PreAuthorizeEnabledTest.java +++ b/hawkbit-monolith/hawkbit-update-server/src/test/java/org/eclipse/hawkbit/app/PreAuthorizeEnabledTest.java @@ -16,13 +16,13 @@ import static org.springframework.test.web.servlet.request.MockMvcRequestBuilder import java.util.HashMap; import java.util.Map; -import com.fasterxml.jackson.databind.ObjectMapper; import org.eclipse.hawkbit.auth.SpPermission; import org.eclipse.hawkbit.auth.SpRole; import org.eclipse.hawkbit.repository.test.util.WithUser; import org.junit.jupiter.api.Test; import org.springframework.http.HttpStatus; import org.springframework.test.context.TestPropertySource; +import tools.jackson.databind.ObjectMapper; /** * Feature: Integration Test - Security
@@ -98,7 +98,7 @@ class PreAuthorizeEnabledTest extends AbstractSecurityTest { mvc.perform(get("/rest/v1/system/configs")).andExpect(result -> { // returns default DS type because of READ_TARGET assertThat(result.getResponse().getStatus()).isEqualTo(HttpStatus.OK.value()); - assertThat((Map) new ObjectMapper().reader().readValue(result.getResponse().getContentAsString(), HashMap.class)).hasSize(1); + assertThat((Map) new ObjectMapper().readValue(result.getResponse().getContentAsString(), HashMap.class)).hasSize(1); }); } diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/AbstractRemoteEvent.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/AbstractRemoteEvent.java index 0860cf1b6..7ec0567c0 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/AbstractRemoteEvent.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/AbstractRemoteEvent.java @@ -27,7 +27,7 @@ public abstract class AbstractRemoteEvent extends ApplicationEvent { @Serial private static final long serialVersionUID = 1L; - private String id; // not a final - jackson 3 doesn't override finals + private final String id; // for serialization libs like jackson protected AbstractRemoteEvent() { diff --git a/hawkbit-repository/hawkbit-repository-jpa-eclipselink/pom.xml b/hawkbit-repository/hawkbit-repository-jpa-eclipselink/pom.xml index ea8e22cea..f9be81db3 100644 --- a/hawkbit-repository/hawkbit-repository-jpa-eclipselink/pom.xml +++ b/hawkbit-repository/hawkbit-repository-jpa-eclipselink/pom.xml @@ -58,7 +58,7 @@ com.ethlo.persistence.tools eclipselink-maven-plugin - ${eclipselink.maven.plugin.version} + ${eclipselink-maven-plugin.version} process-classes diff --git a/hawkbit-repository/hawkbit-repository-jpa/pom.xml b/hawkbit-repository/hawkbit-repository-jpa/pom.xml index d751e278d..c8ed77ecd 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/pom.xml +++ b/hawkbit-repository/hawkbit-repository-jpa/pom.xml @@ -51,7 +51,7 @@ com.ethlo.persistence.tools eclipselink-maven-plugin - ${eclipselink.maven.plugin.version} + ${eclipselink-maven-plugin.version} process-classes diff --git a/hawkbit-rest/hawkbit-rest-api/pom.xml b/hawkbit-rest/hawkbit-rest-api/pom.xml index ac0fabb1f..91a9ab3e6 100644 --- a/hawkbit-rest/hawkbit-rest-api/pom.xml +++ b/hawkbit-rest/hawkbit-rest-api/pom.xml @@ -21,23 +21,19 @@ hawkbit-rest-api hawkBit :: REST :: API - - - - org.springdoc - springdoc-openapi - ${springdoc-openapi.version} - pom - import - - - - - + jakarta.validation + jakarta.validation-api + + + com.fasterxml.jackson.core + jackson-annotations + + io.swagger.core.v3 - swagger-core-jakarta + swagger-annotations-jakarta + ${swagger-annotations-jakarta.version} org.springframework.hateoas diff --git a/hawkbit-rest/hawkbit-rest-api/src/main/java/org/eclipse/hawkbit/rest/OpenApi.java b/hawkbit-rest/hawkbit-rest-api/src/main/java/org/eclipse/hawkbit/rest/OpenApi.java index a3a64ec50..59b56db1f 100644 --- a/hawkbit-rest/hawkbit-rest-api/src/main/java/org/eclipse/hawkbit/rest/OpenApi.java +++ b/hawkbit-rest/hawkbit-rest-api/src/main/java/org/eclipse/hawkbit/rest/OpenApi.java @@ -9,12 +9,6 @@ */ package org.eclipse.hawkbit.rest; -import java.util.Comparator; -import java.util.List; -import java.util.Map; -import java.util.Optional; - -import io.swagger.v3.oas.models.tags.Tag; import lombok.NoArgsConstructor; @NoArgsConstructor(access = lombok.AccessLevel.PRIVATE) @@ -23,35 +17,4 @@ public class OpenApi { public static final String HAWKBIT_SERVER_OPENAPI_ENABLED = "hawkbit.server.openapi.enabled"; public static final String X_HAWKBIT = "x-hawkbit"; - public static final String ORDER = "order"; - - public static List sort(final List tags) { - tags.sort(TAG_COMPARATOR); - return tags; - } - - private static final Comparator TAG_COMPARATOR = new Comparator<>() { - - @Override - public int compare(final Tag o1, final Tag o2) { - final int o1Order = order(o1); - final int o2Order = order(o2); - if (o1Order == o2Order) { - return o1.getName().compareTo(o2.getName()); - } else { - return Integer.compare(o1Order, o2Order); - } - } - - private static int order(final Tag tag) { - return Optional.ofNullable(tag.getExtensions()) - .map(extensions -> extensions.get(X_HAWKBIT)) - .filter(extension -> Map.class.isAssignableFrom(extension.getClass())) - .map(Map.class::cast) - .map(propertiesMap -> propertiesMap.get(ORDER)) - .map(String.class::cast) - .map(Integer::parseInt) - .orElse(0); - } - }; } \ No newline at end of file diff --git a/hawkbit-rest/hawkbit-rest-core/src/test/java/org/eclipse/hawkbit/rest/AbstractRestIntegrationTest.java b/hawkbit-rest/hawkbit-rest-core/src/test/java/org/eclipse/hawkbit/rest/AbstractRestIntegrationTest.java index 2454ec87c..3e4760a4a 100644 --- a/hawkbit-rest/hawkbit-rest-core/src/test/java/org/eclipse/hawkbit/rest/AbstractRestIntegrationTest.java +++ b/hawkbit-rest/hawkbit-rest-core/src/test/java/org/eclipse/hawkbit/rest/AbstractRestIntegrationTest.java @@ -9,8 +9,6 @@ */ package org.eclipse.hawkbit.rest; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; import org.eclipse.hawkbit.repository.jpa.JpaRepositoryConfiguration; import org.eclipse.hawkbit.repository.jpa.model.AbstractJpaBaseEntity_; import org.eclipse.hawkbit.repository.jpa.model.JpaAction; @@ -29,6 +27,7 @@ import org.springframework.test.web.servlet.setup.DefaultMockMvcBuilder; import org.springframework.test.web.servlet.setup.MockMvcBuilders; import org.springframework.web.context.WebApplicationContext; import org.springframework.web.filter.CharacterEncodingFilter; +import tools.jackson.databind.ObjectMapper; /** * Abstract Test for Rest tests. @@ -65,7 +64,7 @@ public abstract class AbstractRestIntegrationTest extends AbstractIntegrationTes return createMvcWebAppContext; } - protected static String toJson(final Object obj) throws JsonProcessingException { + protected static String toJson(final Object obj) { return OBJECT_MAPPER.writeValueAsString(obj); } diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/MainLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/MainLayout.java index 0abd0c40c..0d4749538 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/MainLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/MainLayout.java @@ -109,7 +109,7 @@ public class MainLayout extends AppLayout { final HorizontalLayout layout = new HorizontalLayout(); layout.setPadding(true); layout.setJustifyContentMode(FlexComponent.JustifyContentMode.CENTER); - final Image icon = new Image("images/header_icon.png", "hawkBit icon"); + final Image icon = new Image("images/hawkbit.png", "hawkBit icon"); icon.setMaxHeight(24, Unit.PIXELS); icon.setMaxWidth(24, Unit.PIXELS); appName.addClassNames(LumoUtility.AlignItems.BASELINE, LumoUtility.FontSize.LARGE, LumoUtility.Margin.NONE); @@ -141,9 +141,9 @@ public class MainLayout extends AppLayout { if (accessChecker.hasAccess(ConfigView.class)) { nav.addItem(new SideNavItem("Config", ConfigView.class, VaadinIcon.COG.create())); } -// if (accessChecker.hasAccess(AboutView.class)) { -// nav.addItem(new SideNavItem("About", AboutView.class, VaadinIcon.INFO_CIRCLE.create())); -// } + if (accessChecker.hasAccess(AboutView.class)) { + nav.addItem(new SideNavItem("About", AboutView.class, VaadinIcon.INFO_CIRCLE.create())); + } defaultView = DEFAULT_VIEW_PRIORITY.stream().filter(accessChecker::hasAccess).findFirst().orElse(null); return nav; } diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/AboutView.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/AboutView.java index 225c34b35..afcaf0972 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/AboutView.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/AboutView.java @@ -34,7 +34,7 @@ public final class AboutView extends VerticalLayout { public AboutView() { setSpacing(false); - final Image img = new Image("images/about_image.png", "hawkBit"); + final Image img = new Image("images/hawkbit_logo.png", "hawkBit"); img.setWidth("200px"); add(img); diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/TargetFilterQueryView.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/TargetFilterQueryView.java index 931a81580..8e34f75df 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/TargetFilterQueryView.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/TargetFilterQueryView.java @@ -9,7 +9,6 @@ */ package org.eclipse.hawkbit.ui.view; -import com.fasterxml.jackson.databind.ObjectMapper; import com.vaadin.flow.component.Component; import com.vaadin.flow.component.Key; import com.vaadin.flow.component.Unit; @@ -49,6 +48,7 @@ import org.eclipse.hawkbit.ui.view.util.Filter; import org.eclipse.hawkbit.ui.view.util.SelectionGrid; import org.eclipse.hawkbit.ui.view.util.TableView; import org.eclipse.hawkbit.ui.view.util.Utils; +import tools.jackson.databind.ObjectMapper; import java.io.Serial; import java.util.List; @@ -374,7 +374,7 @@ public class TargetFilterQueryView extends TableView ds; - static ObjectMapper objectMapper = new ObjectMapper(); + private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper(); public static TargetFilterQueryGridItem from(final HawkbitMgmtClient hawkbitClient, MgmtTargetFilterQuery filter) { - TargetFilterQueryGridItem filterGridItem = objectMapper.convertValue(filter, TargetFilterQueryGridItem.class); + TargetFilterQueryGridItem filterGridItem = OBJECT_MAPPER.convertValue(filter, TargetFilterQueryGridItem.class); if (filterGridItem.getAutoAssignDistributionSet() != null) { filterGridItem.ds = Optional.ofNullable( diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/TargetView.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/TargetView.java index 6a0af2b53..82111ac18 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/TargetView.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/TargetView.java @@ -28,7 +28,6 @@ import java.util.stream.Stream; import jakarta.annotation.security.RolesAllowed; -import com.fasterxml.jackson.databind.ObjectMapper; import com.vaadin.flow.component.AttachEvent; import com.vaadin.flow.component.ClickEvent; import com.vaadin.flow.component.Component; @@ -86,6 +85,7 @@ import org.eclipse.hawkbit.ui.view.util.TableView; import org.eclipse.hawkbit.ui.view.util.Utils; import org.springframework.http.ResponseEntity; import org.springframework.util.ObjectUtils; +import tools.jackson.databind.ObjectMapper; @PageTitle("Targets") @Route(value = "targets", layout = MainLayout.class) diff --git a/hawkbit-ui/src/main/resources/META-INF/resources/images/about_image.png b/hawkbit-ui/src/main/resources/META-INF/resources/images/about_image.png deleted file mode 100644 index 1158488c1..000000000 Binary files a/hawkbit-ui/src/main/resources/META-INF/resources/images/about_image.png and /dev/null differ diff --git a/hawkbit-ui/src/main/resources/META-INF/resources/images/hawkbit.png b/hawkbit-ui/src/main/resources/META-INF/resources/images/hawkbit.png new file mode 100644 index 000000000..503c40dcd Binary files /dev/null and b/hawkbit-ui/src/main/resources/META-INF/resources/images/hawkbit.png differ diff --git a/hawkbit-ui/src/main/resources/META-INF/resources/images/hawkbit_logo.png b/hawkbit-ui/src/main/resources/META-INF/resources/images/hawkbit_logo.png new file mode 100644 index 000000000..e67acf6dc Binary files /dev/null and b/hawkbit-ui/src/main/resources/META-INF/resources/images/hawkbit_logo.png differ diff --git a/hawkbit-ui/src/main/resources/META-INF/resources/images/header_icon.png b/hawkbit-ui/src/main/resources/META-INF/resources/images/header_icon.png deleted file mode 100644 index cb867393a..000000000 Binary files a/hawkbit-ui/src/main/resources/META-INF/resources/images/header_icon.png and /dev/null differ diff --git a/pom.xml b/pom.xml index c1b9d62f3..fa3ff394f 100644 --- a/pom.xml +++ b/pom.xml @@ -56,8 +56,9 @@ 17 - 4.0.5 - 2025.1.1 + 4.0.5 + 2025.1.1 + 1.1.4 3.0.3 @@ -74,12 +75,9 @@ Ethlo plugin uses 4.x dependencies - since it only does static weaving - it should be fine - but should eventually upgrade its dependencies. --> 5.0.0 - 3.0.2 + 3.0.2 - - 1.1.4 - 9.2.1 1.22.1 @@ -87,24 +85,26 @@ 2.21.0 4.5.0 1.8.0 + + 2.2.47 - 5.5.0 + 5.5.0 4.8.184 4.3.0 - 3.6.2 - 1.7.3 + 3.6.2 + 1.7.3 - 3.5.5 - 0.8.14 + 3.5.5 + 0.8.14 - 1.1.0 - 5.0.0 - 0.10.0 - 3.2.8 + 1.1.0 + 5.0.0 + 0.10.0 + 3.2.8 3.4.0 @@ -238,7 +238,7 @@ com.rabbitmq http-client - ${rabbitmq.http-client.version} + ${rabbitmq-http-client.version} com.cronutils @@ -255,7 +255,7 @@ org.springframework.cloud spring-cloud-dependencies - ${spring.cloud.version} + ${spring-cloud.version} pom import @@ -270,7 +270,7 @@ org.springframework.boot spring-boot-starter - ${spring.boot.version} + ${spring-boot.version} org.apache.logging.log4j @@ -281,7 +281,7 @@ org.springframework.boot spring-boot-starter-data-jpa - ${spring.boot.version} + ${spring-boot.version} org.hibernate.orm @@ -430,7 +430,7 @@ org.apache.maven.plugins maven-enforcer-plugin - ${maven.enforcer.plugin.version} + ${maven-enforcer-plugin.version} enforce-maven-and-java @@ -476,7 +476,7 @@ org.codehaus.mojo flatten-maven-plugin - ${flatten.maven.plugin.version} + ${flatten-maven-plugin.version} resolveCiFriendliesOnly true @@ -533,7 +533,7 @@ org.jacoco jacoco-maven-plugin - ${jacoco.maven.plugin.version} + ${jacoco-maven-plugin.version} prepare-ut-agent @@ -574,7 +574,7 @@ org.apache.maven.plugins maven-surefire-plugin - ${maven.surefire.plugin.version} + ${maven-surefire-plugin.version} true ${surefire.forkcount} @@ -596,7 +596,7 @@ com.mycila license-maven-plugin - ${license.maven.plugin.version} + ${license-maven-plugin.version} @@ -653,7 +653,7 @@ org.eclipse.dash license-tool-plugin - ${license.tool.plugin.version} + ${license-tool-plugin.version} license-check @@ -693,7 +693,7 @@ org.apache.maven.plugins maven-gpg-plugin - ${maven.gpg.plugin.version} + ${maven-gpg-plugin.version} sign-artifacts @@ -707,7 +707,7 @@ org.sonatype.central central-publishing-maven-plugin - ${central.publishing.maven.plugin.version} + ${central-publishing-maven-plugin.version} true central @@ -738,7 +738,7 @@ org.apache.maven.plugins maven-surefire-report-plugin - ${maven.surefire.plugin.version} + ${maven-surefire-plugin.version} generate-surefire-report