X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=integration%2Fpom.xml;h=7f5b1932a604f333f777ef96d1aba3524496a0c8;hb=refs%2Fheads%2Fmaster;hp=a77814441e11f91e3b19484c0b5cdcbaf86f83ba;hpb=9603a70bec0f57dbf546ddcf1872cb7d3fa7ab4a;p=policy%2Fparent.git diff --git a/integration/pom.xml b/integration/pom.xml index a7781444..12656e2c 100644 --- a/integration/pom.xml +++ b/integration/pom.xml @@ -2,7 +2,7 @@ ============LICENSE_START======================================================= Copyright (C) 2018 Ericsson. All rights reserved. Modifications Copyright (C) 2018-2023 AT&T. All rights reserved. - Modifications Copyright (C) 2019-2023 Nordix Foundation. + Modifications Copyright (C) 2019-2024 Nordix Foundation. Modifications Copyright (C) 2020-2022 Bell Canada. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); @@ -29,84 +29,74 @@ org.onap.policy.parent policy-parent - 3.7.2-SNAPSHOT + 5.0.0-SNAPSHOT integration pom Policy Integration POM Policy Integration POM - 11 + 17 - 3.7.2 - ${project.basedir}/../target/code-coverage/jacoco-ut.exec + 5.0.0-SNAPSHOT + [4.1.2,) + ${project.build.directory}/code-coverage/jacoco-ut.exec + + jacoco + ${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml + + + org/drools/**/*,**/gen/**,**/generated-sources/** https://nexus3.onap.org/repository/npm.public/npm/-/ nexus3.onap.org:10001 nexus3.onap.org:10003 - 2.1.21 - 3.24.2 - 4.2.0 - 1.4.0 - 1.5.0 - 1.15 - 4.4 - 1.5 - 2.11.0 - 3.12.0 - 3.6.1 - 1.10.0 - 7.11.0 - 1.1.12 - 3.2.14 - 8.33.0.Final - 2.3.8 - 1.7 - 2.10.1 - 2.1.214 - 5.6.15.Final - 1.0.2.Final - 4.4.16 - 1.10.4 + 1.9.4 + 1.14.13 + 1.5.3 + 7.15.0 + 3.3.2 + 8.40.1.Final + 1.13.4 + 33.0.0-jre + 5.3.1 0.16.0 - 2.14.2 - 2.0.2 - 2.3.1 - 4.0.1 - 2.1.1 - 2.0.2-Final - 2.39 - 10.0.13 - 20230227 - 4.13.2 - 5.9.2 - 5.9.2 - 3.4.0 - 2.19.0 - 1.2.11 - 1.18.26 - 3.1.2 - 1.1.1 - 1.10.19 - 5.1.1 + 2.16.1 + 0.8.11 + 4.0.5 + 3.1.5 + 11.0.20 + 5.10.2 + 3.6.1 + 1.9.23 + 2.23.1 + 1.4.14 + 3.3.1 + 3.1.0 + 1.1.1 + 1.11.10 + 5.5.0 5.15.0 - 4.1.89.Final + 4.1.100.Final 1.2.1-oss 1.3.0-oss - 0.9.1 + 1.25.0 3.5.0 - 42.5.3 - 2.0.1 - 1.7.36 - 1.33 - 5.3.25 - 5.8.1 - 2.7.8 - 1.6.14 - 2.2.8 - 1.6.9 - 9.0.71 - 1.5.3 + 2.1.1 + 1.9.0 + 2.0.12 + 6.0.18 + 3.1.10 + 6.1.8 + 3.11.0.3922 + 3.0.52 + 2.2.20 + 10.1.19 + + --add-opens java.base/java.time=ALL-UNNAMED + --add-opens java.base/java.util=ALL-UNNAMED + --add-opens java.sql/java.sql=ALL-UNNAMED + @@ -122,180 +112,191 @@ ${version.parent.resources} - jakarta.validation - jakarta.validation-api - ${version.jakarta.validation-api} + com.fasterxml.jackson + jackson-bom + ${version.jackson} + pom + import - com.fasterxml.jackson.core - jackson-annotations + jackson-core ${version.jackson} - com.fasterxml.jackson.module - jackson-module-jaxb-annotations - ${version.jackson} + org.glassfish.jersey.containers + jersey-container-servlet + ${version.jersey} - com.fasterxml.jackson.module - jackson-module-jsonSchema - ${version.jackson} + org.glassfish.jersey.inject + jersey-hk2 + ${version.jersey} - com.fasterxml.jackson.module - jackson-module-parameter-names - ${version.jackson} + org.eclipse.jetty + jetty-server + ${version.jetty} - com.fasterxml.jackson.module - jackson-module-scala_2.12 - ${version.jackson} + org.eclipse.jetty + jetty-security + ${version.jetty} - com.fasterxml.jackson.dataformat - jackson-dataformat-yaml - ${version.jackson} + org.eclipse.jetty + jetty-util + ${version.jetty} - com.fasterxml.jackson.dataformat - jackson-dataformat-xml - ${version.jackson} + org.eclipse.jetty + jetty-http + ${version.jetty} - com.fasterxml.jackson.dataformat - jackson-dataformat-csv - ${version.jackson} + org.eclipse.jetty + jetty-servlet + ${version.jetty} + + - com.fasterxml.jackson.datatype - jackson-datatype-jdk8 - ${version.jackson} + io.prometheus + simpleclient + ${version.io.prometheus} - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 - ${version.jackson} + io.prometheus + simpleclient_hotspot + ${version.io.prometheus} - com.fasterxml.jackson.datatype - jackson-datatype-joda - ${version.jackson} + io.prometheus + simpleclient_servlet_jakarta + ${version.io.prometheus} - com.fasterxml.jackson.jaxrs - jackson-jaxrs-base - ${version.jackson} + io.prometheus + simpleclient_logback + ${version.io.prometheus} - com.fasterxml.jackson.jaxrs - jackson-jaxrs-json-provider - ${version.jackson} + io.prometheus + simpleclient_httpserver + ${version.io.prometheus} - - org.glassfish.jersey.core - jersey-server - ${version.jersey} + com.google.re2j + re2j + 1.7 - org.glassfish.jersey.containers - jersey-container-servlet-core - ${version.jersey} + com.google.guava + guava + ${version.guava} + + - org.glassfish.jersey.containers - jersey-container-jetty-http - ${version.jersey} + jakarta.xml.bind + jakarta.xml.bind-api + 4.0.2 - org.glassfish.jersey.core - jersey-client - ${version.jersey} + com.sun.xml.bind + jaxb-impl + ${version.jaxb} - org.glassfish.jersey.core - jersey-common - ${version.jersey} + com.sun.xml.bind + jaxb-core + ${version.jaxb} - org.glassfish.jersey.inject - jersey-hk2 - ${version.jersey} + org.glassfish.jaxb + jaxb-core + ${version.jaxb} - org.glassfish.jersey.containers - jersey-container-grizzly2-http - ${version.jersey} + org.glassfish.jaxb + jaxb-runtime + ${version.jaxb} + compile - org.glassfish.jersey.media - jersey-media-moxy - ${version.jersey} + com.sun.xml.bind + jaxb-xjc + ${version.jaxb} - org.glassfish.jersey.media - jersey-media-json-jackson - ${version.jersey} + jakarta.servlet + jakarta.servlet-api + 6.0.0 - org.glassfish.jersey.test-framework - jersey-test-framework-core - ${version.jersey} + jakarta.validation + jakarta.validation-api + 3.0.2 - org.glassfish.jersey.test-framework.providers - jersey-test-framework-provider-grizzly2 - ${version.jersey} + jakarta.ws.rs + jakarta.ws.rs-api + 3.1.0 - org.glassfish.jersey.media - jersey-media-multipart - ${version.jersey} + jakarta.activation + jakarta.activation-api + 2.1.2 - - org.eclipse.jetty - jetty-http - ${version.jetty} + jakarta.inject + jakarta.inject-api + 2.0.1 - org.eclipse.jetty - jetty-servlet - ${version.jetty} + jakarta.persistence + jakarta.persistence-api + 3.1.0 - org.eclipse.jetty - jetty-servlets - ${version.jetty} + jakarta.transaction + jakarta.transaction-api + 2.0.1 + - org.eclipse.jetty - jetty-server - ${version.jetty} + io.swagger.core.v3 + swagger-annotations + ${version.swagger.core.v3} - org.eclipse.jetty - jetty-security - ${version.jetty} + io.swagger.core.v3 + swagger-jaxrs2-jakarta + ${version.swagger.core.v3} - - com.google.re2j - re2j - ${version.google-re2j} + io.swagger.core.v3 + swagger-jaxrs2-servlet-initializer-v2-jakarta + ${version.swagger.core.v3} + + io.swagger.parser.v3 + swagger-parser + 2.1.16 + + + org.mariadb.jdbc mariadb-java-client - ${version.mariadb} + 3.3.3 org.postgresql postgresql - ${version.postgresql} + 42.7.2 @@ -303,88 +304,59 @@ kafka-clients ${version.kafka} - - - io.prometheus - simpleclient - ${version.io.prometheus} - - - io.prometheus - simpleclient_hotspot - ${version.io.prometheus} - - - io.prometheus - simpleclient_servlet - ${version.io.prometheus} - - - io.prometheus - simpleclient_logback - ${version.io.prometheus} - - - - io.swagger - swagger-jersey2-jaxrs - ${version.swagger-jersey2-jaxrs} - - - - io.swagger.core.v3 - swagger-annotations - ${version.swagger.core.v3} - - - - javax.servlet - javax.servlet-api - ${version.javax.servlet-api} - + - javax.ws.rs - javax.ws.rs-api - ${version.javax.ws.rs-api} + org.apache.httpcomponents.core5 + httpcore5 + 5.2.4 - - javax.xml.bind - jaxb-api - ${version.javax.bind-jaxb-api} + org.apache.httpcomponents.client5 + httpclient5 + ${version.httpclient} - org.glassfish.jaxb - jaxb-runtime - ${version.glassfish.jaxb-runtime} + org.apache.httpcomponents + httpcore + 4.4.16 - org.apache.httpcomponents - httpcore - ${version.httpcore} + httpclient + 4.5.14 + com.google.code.gson gson - ${version.gson} + 2.10.1 org.json json - ${version.json} + 20240303 com.worldturner.medeia medeia-validator-gson - ${version.medeia} + ${version.medeia.validator} + + + com.worldturner.medeia + medeia-validator-core + ${version.medeia.validator} + + + com.jayway.jsonpath + json-path + 2.9.0 org.projectlombok lombok - ${version.lombok} + 1.18.30 @@ -397,6 +369,11 @@ slf4j-ext ${version.slf4j} + + org.slf4j + jcl-over-slf4j + ${version.slf4j} + ch.qos.logback logback-core @@ -417,26 +394,6 @@ log4j-to-slf4j ${version.log4j} - - - org.onap.dmaap.messagerouter.dmaapclient - dmaapClient - ${version.dmaap} - - - org.slf4j - slf4j-log4j12 - - - log4j - log4j - - - apache-log4j-extras - log4j - - - org.onap.ccsdk.cds.blueprintsprocessor.modules @@ -457,18 +414,6 @@ - - - org.onap.aaf.authz - aaf-cadi-aaf - ${version.aaf} - - - log4j - log4j - - - com.att.nsa @@ -480,17 +425,11 @@ saClientLibrary ${version.nsa-sa-client} - - - org.java-websocket - Java-WebSocket - ${version.websocket} - org.yaml snakeyaml - ${version.snakeyaml} + 2.2 org.springdoc - springdoc-openapi-ui - ${version.springdoc} + springdoc-openapi-starter-webmvc-ui + 2.1.0 org.onap.sdc.sdc-distribution-client sdc-distribution-client - ${version.sdc} + ${version.sdc-dist} org.onap.sdc.sdc-tosca sdc-tosca - ${version.sdc} - - - org.jboss.spec.javax.ws.rs - jboss-jaxrs-api_2.0_spec - ${version.jboss-jaxrs-api} + ${version.sdc-tosca} + com.h2database h2 - ${version.h2} + 2.2.224 test junit junit - ${version.junit} + 4.13.2 + test + + + org.junit.jupiter + junit-jupiter-engine + ${version.jupiter} test org.junit.vintage junit-vintage-engine - ${version.junit-vintage} + ${version.jupiter} test @@ -640,33 +581,33 @@ org.assertj assertj-core - ${version.assertj} + 3.25.3 test com.openpojo openpojo - ${version.openpojo} + 0.9.1 test org.mockito - mockito-all - ${version.mockito-all} + mockito-core + ${version.mockito} test org.mockito - mockito-core - ${version.mockito-core} + mockito-junit-jupiter + ${version.mockito} test org.awaitility awaitility - ${version.awaitility} + 4.2.0 test @@ -690,46 +631,82 @@ netty-handler-proxy ${version.netty} + + io.netty + netty-buffer + ${version.netty} + + + io.netty + netty-codec + ${version.netty} + + + io.netty + netty-handler + ${version.netty} + + commons-cli commons-cli - ${version.commons-cli} + 1.5.0 commons-codec commons-codec - ${version.commons-codec} + 1.16.0 commons-fileupload commons-fileupload - ${version.commons-fileupload} + 1.5 org.apache.commons commons-collections4 - ${version.commons-collections4} + 4.4 commons-io commons-io - ${version.commons-io} + 2.13.0 org.apache.commons commons-lang3 - ${version.commons-lang3} + 3.14.0 org.apache.commons commons-math3 - ${version.commons-math3} + 3.6.1 org.apache.commons commons-text - ${version.commons-text} + 1.10.0 + + + commons-logging + commons-logging + 1.2 + + + commons-net + commons-net + 3.9.0 + + + org.apache.commons + commons-jexl3 + 3.2.1 + + + commons-beanutils + commons-beanutils + ${version.beanutils} @@ -744,12 +721,39 @@ ${version.docker-java} test + + + org.hibernate.orm + hibernate-core + 6.3.2.Final + + + org.hibernate + hibernate-core-jakarta + 5.6.15.Final + + + org.hibernate.common + hibernate-commons-annotations + 6.0.6.Final + + + org.hibernate.validator + hibernate-validator + 8.0.1.Final + + org.springframework spring-core ${version.spring} + + org.springframework + spring-context + ${version.spring} + org.springframework spring-beans @@ -757,7 +761,7 @@ org.springframework - spring-expression + spring-jcl ${version.spring} @@ -765,6 +769,11 @@ spring-web ${version.spring} + + org.springframework + spring-expression + ${version.spring} + org.springframework spring-webmvc @@ -782,21 +791,35 @@ org.springframework - spring-test + spring-aspects ${version.spring} - test - org.springframework.security - spring-security-test - ${version.spring-security} - test + org.springframework + spring-orm + ${version.spring} + + + org.springframework + spring-tx + ${version.spring} + + + org.springframework + spring-aop + ${version.spring} - org.springframework.boot spring-boot-starter-web ${version.springboot} + + + + org.springframework.boot + spring-boot-starter-json + + org.springframework.boot @@ -805,23 +828,37 @@ org.springframework.boot - spring-boot-starter-validation + spring-boot-starter-tomcat ${version.springboot} org.springframework.boot - spring-boot-starter-aop + spring-boot-starter-security ${version.springboot} + + org.springframework.security + spring-security-web + ${version.spring-security} + + + org.springframework.security + spring-security-config + ${version.spring-security} + + + org.springframework.security + spring-security-test + ${version.spring-security} + org.springframework.boot - spring-boot-starter-test + spring-boot-starter-validation ${version.springboot} - test org.springframework.boot - spring-boot-starter-security + spring-boot-starter-actuator ${version.springboot} @@ -831,55 +868,147 @@ org.springframework.boot - spring-boot-starter-tomcat + spring-boot-autoconfigure ${version.springboot} org.springframework.boot - spring-boot-starter-actuator + spring-boot-starter-aop ${version.springboot} org.springframework.boot - spring-boot-autoconfigure + spring-boot-starter-test ${version.springboot} + test + + + com.vaadin.external.google + android-json + + - - org.hibernate - hibernate-core - ${version.hibernate} + org.apache.tomcat.embed + tomcat-embed-core + 10.1.19 - org.hibernate - hibernate-entitymanager - ${version.hibernate} + org.springframework + spring-test + ${version.spring} + test - org.hibernate.javax.persistence - hibernate-jpa-2.1-api - ${version.hibernate.persistence} + io.micrometer + micrometer-registry-prometheus + ${version.micrometer} + runtime - - org.apache.tomcat.embed - tomcat-embed-core - ${version.tomcat} + io.micrometer + micrometer-observation + ${version.micrometer} - org.apache.tomcat - tomcat-annotations-api - ${version.tomcat} + io.micrometer + micrometer-core + ${version.micrometer} - org.apache.tomcat.embed - tomcat-embed-el - ${version.tomcat} + org.bouncycastle + bcpkix-fips + 1.0.7 - org.apache.tomcat.embed - tomcat-embed-websocket - ${version.tomcat} + io.micrometer + micrometer-tracing-bridge-otel + 1.1.8 + + + io.opentelemetry.instrumentation + opentelemetry-kafka-clients-2.6 + ${version.opentel}-alpha + + + io.opentelemetry + opentelemetry-exporter-otlp + ${version.opentel} + + + io.opentelemetry + opentelemetry-sdk-extension-autoconfigure + ${version.opentel}-alpha + + + io.opentelemetry + opentelemetry-sdk-extension-jaeger-remote-sampler + ${version.opentel} + + + io.opentelemetry + opentelemetry-context + ${version.opentel} + + + io.opentelemetry + opentelemetry-api + ${version.opentel} + + + + + org.jetbrains.kotlin + kotlin-stdlib + ${version.kotlin} + + + org.jetbrains.kotlin + kotlin-stdlib-jdk8 + ${version.kotlin} + + + org.jetbrains.kotlin + kotlin-stdlib-jdk7 + ${version.kotlin} + + + org.jetbrains.kotlin + kotlin-reflect + ${version.kotlin} + + + org.jetbrains.kotlin + kotlin-stdlib-common + ${version.kotlin} + + + + + com.squareup.okhttp3 + okhttp + 4.12.0 + + + io.projectreactor + reactor-core + 3.6.5 + + + net.bytebuddy + byte-buddy + ${version.bytebuddy} + + + net.bytebuddy + byte-buddy-agent + ${version.bytebuddy} + + + org.jboss.logging + jboss-logging + 3.5.3.Final + runtime @@ -913,66 +1042,66 @@ org.apache.maven.plugins maven-checkstyle-plugin - 2.17,) + ${version.maven-checkstyle-plugin} check - + org.apache.maven.plugins maven-remote-resources-plugin - 3.0.0,) + ${version.maven-remote-resources-plugin},) bundle process - + org.jacoco jacoco-maven-plugin - [0.7.1.201405082137,) + ${version.jacoco} prepare-agent - + de.jpdigital - hibernate52-ddl-maven-plugin - [2.2.0,) + hibernate56-ddl-maven-plugin + [2.5.0,) gen-ddl - + org.codehaus.groovy.maven gmaven-plugin - [1.0,) + [1.5,) execute - + @@ -985,46 +1114,46 @@ - + org.codehaus.mojo keytool-maven-plugin - [1.5.0,) + [1.7.0,) generateKeyPair - + com.github.eirslett frontend-maven-plugin - [1.11.0,) + ${version.frontend.maven} npm - + io.swagger.codegen.v3 swagger-codegen-maven-plugin - [3.0.0,) + [${version.swagger.codegen.v3},) generate - + @@ -1035,13 +1164,32 @@ + + cve + + + + org.owasp + dependency-check-maven + 9.1.0 + + + + aggregate + + + + + + + org.apache.maven.archetype archetype-packaging - 3.2.0 + 3.2.1 @@ -1054,17 +1202,17 @@ com.github.eirslett frontend-maven-plugin - 1.12.1 + ${version.frontend.maven} io.fabric8 docker-maven-plugin - 0.41.0 + 0.43.4 io.github.git-commit-id git-commit-id-maven-plugin - 5.0.0 + 6.0.0 @@ -1087,7 +1235,7 @@ io.swagger.codegen.v3 swagger-codegen-maven-plugin - 3.0.36 + ${version.swagger.codegen.v3} org.apache.maven.plugins @@ -1097,17 +1245,17 @@ org.apache.maven.plugins maven-assembly-plugin - 3.4.2 + 3.6.0 org.apache.maven.plugins maven-clean-plugin - 3.2.0 + 3.3.1 org.apache.maven.plugins maven-compiler-plugin - 3.10.1 + 3.11.0 ${project.build.sourceEncoding} ${java.version} @@ -1116,7 +1264,7 @@ org.apache.maven.plugins maven-dependency-plugin - 3.5.0 + 3.6.0 org.apache.maven.plugins @@ -1126,7 +1274,7 @@ org.apache.maven.plugins maven-install-plugin - 3.1.0 + 3.1.1 org.apache.maven.plugins @@ -1136,42 +1284,42 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.4.1 + 3.6.3 org.apache.maven.plugins maven-pmd-plugin - 3.20.0 + 3.21.0 org.apache.maven.plugins maven-release-plugin - 3.0.0-M7 + 3.0.1 org.apache.maven.plugins maven-remote-resources-plugin - 3.0.0 + ${version.maven-remote-resources-plugin} org.apache.maven.plugins maven-resources-plugin - 3.3.0 + 3.3.1 org.apache.maven.plugins maven-source-plugin - 3.2.1 + 3.3.0 org.apache.maven.plugins maven-shade-plugin - 3.4.1 + 3.5.0 org.apache.maven.plugins maven-war-plugin - 3.3.2 + 3.4.0 org.codehaus.gmaven @@ -1181,7 +1329,7 @@ org.codehaus.mojo versions-maven-plugin - 2.14.2 + 2.16.0 org.codehaus.mojo @@ -1199,6 +1347,31 @@ spring-boot-maven-plugin ${version.springboot} + + org.apache.maven.plugins + maven-surefire-plugin + 3.1.2 + + + org.sonarsource.scanner.maven + sonar-maven-plugin + ${version.sonar} + + + org.apache.maven.plugins + maven-site-plugin + 4.0.0-M13 + + + org.apache.maven.plugins + maven-deploy-plugin + 3.1.1 + + + org.apache.maven.plugins + maven-failsafe-plugin + 3.2.5 + @@ -1207,13 +1380,28 @@ maven-compiler-plugin ${project.build.sourceEncoding} - ${java.version} - ${java.version} + ${java.version} + + + + org.apache.maven.plugins + maven-surefire-plugin + + @{surefireArgLine} org.jacoco jacoco-maven-plugin + ${version.jacoco} + + + org/drools/**/* + **/gen/** + **/generated-sources/** + + file + pre-unit-test @@ -1221,8 +1409,9 @@ prepare-agent - ${jacoco.dataFile} + ${jacoco.destFile} true + surefireArgLine @@ -1232,40 +1421,26 @@ report - ${jacoco.dataFile} - - - - pre-integration-test - pre-integration-test - - prepare-agent - - - true - - - - post-integration-test - post-integration-test - - report - - - true + ${jacoco.destFile} + ${project.reporting.outputDirectory}/jacoco-ut report-aggregate - prepare-package + verify report-aggregate + + true + + org.apache.maven.plugins maven-checkstyle-plugin + ${version.maven-checkstyle-plugin} onap-license @@ -1303,7 +1478,6 @@ true true true - true true warning @@ -1312,13 +1486,30 @@ - org.onap.oparent + org.onap.policy.parent checkstyle - ${oparent.version} + ${version.parent.checkstyle} compile + + org.apache.maven.plugins + maven-failsafe-plugin + + + integration-tests + + integration-test + verify + + + + ${failsafeArgLine} + + + +