X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=integration%2Fpom.xml;h=952b993b4622c7c0423dce02923736872c6d64fb;hb=2aba4493688e3dcd4a4b78de1092eac8ae287b74;hp=6126bfccfea29dcacf65d59d14a789af58bc0437;hpb=fef1eb098f95392239b9f27d073d27408e3f08c0;p=policy%2Fparent.git diff --git a/integration/pom.xml b/integration/pom.xml index 6126bfcc..952b993b 100644 --- a/integration/pom.xml +++ b/integration/pom.xml @@ -1,8 +1,8 @@ - - + 4.0.0 org.onap.policy.parent policy-parent - 3.6.1-SNAPSHOT + 4.0.3-SNAPSHOT integration pom Policy Integration POM Policy Integration POM - - 11 + 17 - 3.6.1-SNAPSHOT - 1.2.11 - 1.1.12 - 2.0.9 - 2.7.8 - 7.73.0.Final - 2.37 - 2.14.0-rc1 - 1.4.0 - 1.6.6 - 2.3.1 - 1.1.4 - 4.1.84.Final - 2.5.14 - 5.4.31.Final - 1.0.0 - 3.7.3 - 9.0.62 - 5.13.2 - 2.8.8 - 3.0.0 - 2.0.2 - 1.7.3 - 0.11.0 - 42.5.0 - 3.3.1 + 4.0.3-SNAPSHOT ${project.basedir}/../target/code-coverage/jacoco-ut.exec https://nexus3.onap.org/repository/npm.public/npm/-/ nexus3.onap.org:10001 nexus3.onap.org:10003 + + 2.7.4 + 1.5.1 + 7.13.0 + 1.1.12 + 3.3.2 + 8.44.0.Final + 1.13.4 + 0.16.0 + 2.15.2 + 0.8.10 + 3.1.3 + 11.0.16 + 5.10.0 + 2.20.0 + 1.4.8 + 3.1.0 + 1.1.1 + 5.5.0 + 5.15.0 + 4.1.95.Final + 1.2.1-oss + 1.3.0-oss + 3.5.0 + 2.0.1 + 2.0.7 + 6.0.12 + 3.1.4 + 6.1.4 + 3.0.46 + 2.2.15 + + --add-opens java.base/java.time=ALL-UNNAMED + --add-opens java.base/java.util=ALL-UNNAMED + --add-opens java.sql/java.sql=ALL-UNNAMED + - ecomp-site dav:${onap.nexus.url}${sitePath} - @@ -83,345 +93,190 @@ policy-parent-resources ${version.parent.resources} - - - jakarta.validation - jakarta.validation-api - ${version.jakarta-api} - - - com.fasterxml.jackson.core jackson-core ${version.jackson} - - - com.fasterxml.jackson.core - jackson-databind - ${version.jackson} - - - - com.fasterxml.jackson.core - jackson-annotations - ${version.jackson} - - - - com.fasterxml.jackson.module - jackson-module-jaxb-annotations - ${version.jackson} - - - - com.fasterxml.jackson.module - jackson-module-jsonSchema - ${version.jackson} - - - com.fasterxml.jackson.module - jackson-module-parameter-names - ${version.jackson} - - - - com.fasterxml.jackson.module - jackson-module-scala_2.12 - ${version.jackson} + org.glassfish.jersey.containers + jersey-container-servlet + ${version.jersey} - - com.fasterxml.jackson.dataformat - jackson-dataformat-yaml - ${version.jackson} + org.eclipse.jetty + jetty-server + ${version.jetty} - - com.fasterxml.jackson.dataformat - jackson-dataformat-xml - ${version.jackson} + org.eclipse.jetty + jetty-security + ${version.jetty} - - com.fasterxml.jackson.dataformat - jackson-dataformat-csv - ${version.jackson} + org.eclipse.jetty + jetty-util + ${version.jetty} - - com.fasterxml.jackson.datatype - jackson-datatype-jdk8 - ${version.jackson} - - - - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 - ${version.jackson} + org.eclipse.jetty + jetty-http + ${version.jetty} + - com.fasterxml.jackson.datatype - jackson-datatype-joda - ${version.jackson} + io.prometheus + simpleclient + ${version.io.prometheus} - - com.fasterxml.jackson.jaxrs - jackson-jaxrs-base - ${version.jackson} + io.prometheus + simpleclient_hotspot + ${version.io.prometheus} - - com.fasterxml.jackson.jaxrs - jackson-jaxrs-json-provider - ${version.jackson} + io.prometheus + simpleclient_servlet_jakarta + ${version.io.prometheus} - - - org.glassfish.jersey.core - jersey-server - ${version.jersey} - - - org.glassfish.jersey.media - jersey-media-jaxb - - + io.prometheus + simpleclient_logback + ${version.io.prometheus} - - org.glassfish.jersey.containers - jersey-container-servlet-core - ${version.jersey} + com.google.re2j + re2j + 1.7 - - org.glassfish.jersey.containers - jersey-container-jetty-http - ${version.jersey} - - - org.eclipse.jetty - jetty-util - - + com.google.guava + guava + 32.1.1-jre + - org.glassfish.jersey.core - jersey-client - ${version.jersey} + jakarta.xml.bind + jakarta.xml.bind-api + 4.0.0 - - org.glassfish.jersey.core - jersey-common - ${version.jersey} + jakarta.servlet + jakarta.servlet-api + 6.0.0 - - org.glassfish.jersey.inject - jersey-hk2 - ${version.jersey} + jakarta.validation + jakarta.validation-api + 3.0.2 - - org.glassfish.jersey.containers - jersey-container-grizzly2-http - ${version.jersey} + jakarta.ws.rs + jakarta.ws.rs-api + 3.1.0 - - org.glassfish.jersey.media - jersey-media-moxy - ${version.jersey} + jakarta.activation + jakarta.activation-api + 2.1.2 - - org.glassfish.jersey.media - jersey-media-json-jackson - ${version.jersey} + jakarta.inject + jakarta.inject-api + 2.0.1.MR - + - org.glassfish.jersey.test-framework - jersey-test-framework-core - ${version.jersey} + io.swagger.core.v3 + swagger-annotations + ${version.swagger.core.v3} - - org.glassfish.jersey.test-framework.providers - jersey-test-framework-provider-grizzly2 - ${version.jersey} + io.swagger.core.v3 + swagger-jaxrs2-jakarta + ${version.swagger.core.v3} - - org.glassfish.jersey.media - jersey-media-multipart - ${version.jersey} + io.swagger.core.v3 + swagger-jaxrs2-servlet-initializer-v2-jakarta + ${version.swagger.core.v3} - - - com.google.re2j - re2j - 1.5 + io.swagger.parser.v3 + swagger-parser + 2.1.16 + org.mariadb.jdbc mariadb-java-client - 2.7.6 + 3.1.4 - org.postgresql postgresql - ${version.postgres} + 42.6.0 - org.apache.kafka kafka-clients - ${version.kafka} - - - - org.apache.zookeeper - zookeeper - - - - - - - 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} - - - org.glassfish.jersey.containers - jersey-container-servlet-core - - - javax.validation - validation-api - - - - - - - io.swagger - swagger-models - ${version.swagger} - - - - - commons-codec - commons-codec - 1.15 + 3.6.0 - - - com.thoughtworks.xstream - xstream - 1.4.17 - - - - - org.eclipse.persistence - org.eclipse.persistence.jpa - ${version.eclipselink} - - - - - org.eclipse.persistence - eclipselink - ${version.eclipselink} - - - + - javax.servlet - javax.servlet-api - 4.0.1 + org.apache.httpcomponents.core5 + httpcore5 + 5.2.2 - - - org.apache.httpcomponents - httpcore - 4.4.14 + org.apache.httpcomponents.client5 + httpclient5 + 5.2.1 com.google.code.gson gson - 2.9.0 + 2.10.1 org.json json - 20201115 + 20231013 + + + com.worldturner.medeia + medeia-validator-gson + ${version.medeia.validator} + + + com.worldturner.medeia + medeia-validator-core + ${version.medeia.validator} - - com.worldturner.medeia - medeia-validator-gson - 1.1.1 - - org.projectlombok lombok - 1.18.16 + 1.18.28 - org.slf4j slf4j-api - 1.7.30 + ${version.slf4j} org.slf4j slf4j-ext - 1.7.30 + ${version.slf4j} ch.qos.logback @@ -433,7 +288,16 @@ logback-classic ${version.logback} - + + org.apache.logging.log4j + log4j-api + ${version.log4j} + + + org.apache.logging.log4j + log4j-to-slf4j + ${version.log4j} + org.onap.dmaap.messagerouter.dmaapclient @@ -454,7 +318,6 @@ - org.onap.ccsdk.cds.blueprintsprocessor.modules @@ -475,27 +338,11 @@ - - net.minidev - json-smart - 2.4.7 - - - org.apache.logging.log4j - log4j-api - 2.17.1 - - - org.apache.logging.log4j - log4j-to-slf4j - 2.17.1 - - org.onap.aaf.authz aaf-cadi-aaf - 2.1.21 + ${version.aaf} log4j @@ -503,73 +350,50 @@ - com.att.nsa cambriaClient - 1.2.1-oss + ${version.nsa-cambria} com.att.nsa saClientLibrary - 1.3.0-oss - - - - - commons-cli - commons-cli - 1.4 - - - - - org.java-websocket - Java-WebSocket - 1.5.1 + ${version.nsa-sa-client} - org.yaml snakeyaml - 1.33 + 2.0 - - - org.codehaus.plexus plexus-utils - 3.3.0 + ${version.plexus} - org.kie kie-api ${version.drools} - org.kie kie-ci ${version.drools} - - org.codehaus.plexus @@ -577,49 +401,46 @@ - org.drools drools-core ${version.drools} - + + org.drools + drools-engine + ${version.drools} + + + org.drools + drools-xml-support + ${version.drools} + org.drools drools-persistence-jpa ${version.drools} - org.drools drools-compiler ${version.drools} - org.drools drools-verifier-drl ${version.drools} - org.drools drools-verifier-api ${version.drools} - org.drools drools-verifier-core ${version.drools} - - - org.dom4j - dom4j - 2.1.3 - - org.mock-server @@ -627,201 +448,104 @@ ${version.mockserver} test - org.mock-server mockserver-client-java ${version.mockserver} test - - - - org.immutables - value - ${version.immutable} - provided - - + - org.immutables - gson - ${version.immutable} + org.springdoc + springdoc-openapi-starter-webmvc-ui + 2.1.0 - - - - io.springfox - springfox-swagger2 - ${version.springfox} - - - - io.springfox - springfox-swagger-ui - ${version.springfox} - runtime - - - - - commons-fileupload - commons-fileupload - 1.4 - - - - - org.codehaus.janino - janino - 3.0.8 - - - - - javax.xml.ws - jaxws-api - 2.3.1 - - + org.onap.sdc.sdc-distribution-client sdc-distribution-client - 1.4.1 + ${version.sdc} - org.onap.sdc.sdc-tosca sdc-tosca - 1.5.1 - - - - org.jboss.spec.javax.ws.rs - jboss-jaxrs-api_2.0_spec - 1.0.1.Final - - - - - javax.transaction - jta - 1.1 - - - - - com.google.protobuf - protobuf-java - 3.21.7 - - - - org.jetbrains.kotlin - kotlin-daemon-client - 1.7.20 - - - - org.jetbrains.kotlin - kotlin-scripting-jvm - 1.7.20 + ${version.sdc} - com.h2database h2 - 1.4.200 + 2.2.220 test - junit junit - 4.13.1 + 4.13.2 + test + + + org.junit.jupiter + junit-jupiter-engine + ${version.jupiter} test - org.junit.vintage junit-vintage-engine - 5.7.1 + ${version.jupiter} test - io.cucumber cucumber-java - 6.9.1 + ${version.cucumber} test io.cucumber cucumber-junit - 6.9.1 + ${version.cucumber} test - org.assertj assertj-core - 3.18.1 + 3.24.2 test - com.openpojo openpojo - 0.8.13 + 0.9.1 test org.mockito - mockito-all - 1.10.19 - test - - - org.powermock - powermock-core - ${version.powermock} - test - - - org.powermock - powermock-api-mockito2 - ${version.powermock} - test - - - org.powermock - powermock-module-junit4 - ${version.powermock} + mockito-core + ${version.mockito} test org.mockito - mockito-core - 3.7.7 + mockito-junit-jupiter + ${version.mockito} test - org.awaitility awaitility - 4.0.3 + 4.2.0 test - io.netty @@ -843,52 +567,134 @@ netty-handler-proxy ${version.netty} - - + + + commons-cli + commons-cli + 1.5.0 + + + commons-codec + commons-codec + 1.16.0 + + + commons-fileupload + commons-fileupload + 1.5 + org.apache.commons - commons-lang3 - 3.12.0 + commons-collections4 + 4.4 - - commons-io commons-io - 2.8.0 + 2.13.0 - org.apache.commons - commons-vfs2 - 2.8.0 + commons-lang3 + 3.13.0 - - com.googlecode.json-simple - json-simple - 1.1.1 + org.apache.commons + commons-math3 + 3.6.1 - + + org.apache.commons + commons-text + 1.10.0 + + + commons-logging + commons-logging + 1.2 + + + commons-net + commons-net + 3.9.0 + + com.github.docker-java docker-java-core - 3.2.7 + ${version.docker-java} test - com.github.docker-java docker-java - 3.2.7 + ${version.docker-java} test + + + org.hibernate.orm + hibernate-core + 6.3.0.CR1 + + + org.hibernate + hibernate-core-jakarta + 5.6.15.Final + - + + + org.springframework + spring-core + ${version.spring} + + + org.springframework + spring-beans + ${version.spring} + + + org.springframework + spring-jcl + ${version.spring} + + + org.springframework + spring-web + ${version.spring} + + + org.springframework + spring-expression + ${version.spring} + + + org.springframework + spring-webmvc + ${version.spring} + + + org.springframework + spring-jdbc + ${version.spring} + + + org.springframework + spring-webflux + ${version.spring} + org.springframework.boot spring-boot-starter-web ${version.springboot} + + + + org.springframework.boot + spring-boot-starter-json + + org.springframework.boot @@ -897,23 +703,22 @@ 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.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} @@ -923,67 +728,45 @@ 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} - - - - - org.hibernate - hibernate-core - ${version.hibernate.core} - - - - - io.github.classgraph - classgraph - 4.8.146 - - - - - org.apache.tomcat - tomcat-annotations-api - ${version.tomcat} + test org.apache.tomcat.embed tomcat-embed-core - ${version.tomcat} + 10.1.13 - org.apache.tomcat.embed - tomcat-embed-el - ${version.tomcat} + org.springframework + spring-test + ${version.spring} + test - org.apache.tomcat.embed - tomcat-embed-websocket - ${version.tomcat} + io.micrometer + micrometer-registry-prometheus + 1.11.4 + runtime - - - scm:git:ssh://git.onap.org:29418/${project.groupId} scm:git:ssh://git.onap.org:29418/${project.groupId} HEAD https://wiki.onap.org/display/DW/Integration+Project - m2e @@ -1008,66 +791,66 @@ org.apache.maven.plugins maven-checkstyle-plugin - 2.17,) + 3.3.0 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 - + @@ -1080,33 +863,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 + [${version.swagger.codegen.v3},) + + generate + + + + @@ -1117,270 +913,158 @@ - - generateSwaggerDocs - - - !skipTests - - - - - - - io.github.swagger2markup - swagger2markup-maven-plugin - 1.3.3 - - - io.github.swagger2markup - swagger2markup-import-files-ext - 1.3.3 - - - io.github.swagger2markup - swagger2markup-spring-restdocs-ext - 1.3.3 - - - - ${project.build.directory}/swagger/swagger.json - ${project.build.directory}/asciidoc/generated - - ASCIIDOC - - - - - ${swagger.generation.phase} - - convertSwagger2markup - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - unpack-swagger-asciidoc - ${swagger.generation.phase} - - unpack - - - - - org.onap.policy.parent - policy-parent-resources - jar - true - ${project.build.directory} - - - asciidoc/** - ${project.build.directory} - - - - - - - - org.asciidoctor - asciidoctor-maven-plugin - 1.5.7.1 - - - org.asciidoctor - asciidoctorj-pdf - 1.5.0-alpha.10.1 - - - - ${project.build.directory}/asciidoc - swagger.adoc - - book - left - 3 - - - - - ${project.build.directory}/asciidoc/generated - - - - - - output-html - ${swagger.generation.phase} - - process-asciidoc - - - html5 - ${project.build.directory}/swagger - - - - output-pdf - ${swagger.generation.phase} - - process-asciidoc - - - pdf - ${project.build.directory}/swagger - - - - - - - - org.apache.maven.plugins - maven-assembly-plugin - - - org.onap.policy.parent - policy-parent-resources - ${version.parent.resources} - - - - - generate-swagger-tar - ${swagger.generation.phase} - - single - - - - swagger-docs - - ${project.artifactId} - - - - - - - - - org.apache.maven.archetype archetype-packaging - 3.2.0 + 3.2.1 - org.codehaus.mojo - versions-maven-plugin - 2.8.1 + com.coderplus.maven.plugins + copy-rename-maven-plugin + 1.0.1 - org.apache.maven.plugins - maven-dependency-plugin - 3.1.2 + com.github.eirslett + frontend-maven-plugin + ${version.frontend.maven} + + + io.fabric8 + docker-maven-plugin + 0.43.4 + + + io.github.git-commit-id + git-commit-id-maven-plugin + 6.0.0 + + + + revision + + + + + false + false + + ^git.build.(time|version)$ + ^git.commit.id.(abbrev|full)$ + + full + yyyy-MM-dd'T'HH:mm:ss.SSS'Z' + UTC + + + + io.swagger.codegen.v3 + swagger-codegen-maven-plugin + ${version.swagger.codegen.v3} - org.apache.maven.plugins - maven-reactor-plugin - 1.1 + maven-archetype-plugin + 3.2.1 - - org.apache.maven.plugins - maven-eclipse-plugin - 2.10 + maven-assembly-plugin + 3.6.0 org.apache.maven.plugins - maven-install-plugin - 3.0.0-M1 + maven-clean-plugin + 3.3.1 org.apache.maven.plugins - maven-resources-plugin - 3.2.0 + maven-compiler-plugin + 3.11.0 + + ${project.build.sourceEncoding} + ${java.version} + org.apache.maven.plugins - maven-source-plugin - 3.2.1 + maven-dependency-plugin + 3.6.0 org.apache.maven.plugins - maven-release-plugin - 3.0.0-M1 + maven-eclipse-plugin + 2.10 org.apache.maven.plugins - maven-assembly-plugin - 3.3.0 + maven-install-plugin + 3.1.1 org.apache.maven.plugins maven-jar-plugin - 3.2.0 + 3.3.0 org.apache.maven.plugins maven-javadoc-plugin - 3.2.0 + 3.6.0 org.apache.maven.plugins - maven-shade-plugin - 3.2.4 + maven-pmd-plugin + 3.21.0 org.apache.maven.plugins - maven-archetype-plugin - 3.2.0 + maven-release-plugin + 3.0.1 - com.coderplus.maven.plugins - copy-rename-maven-plugin - 1.0.1 + org.apache.maven.plugins + maven-remote-resources-plugin + ${version.maven-remote-resources-plugin} org.apache.maven.plugins - maven-compiler-plugin - 3.8.1 - - ${project.build.sourceEncoding} - ${java.version} - + maven-resources-plugin + 3.3.1 - org.codehaus.mojo - exec-maven-plugin - 3.0.0 + org.apache.maven.plugins + maven-source-plugin + 3.3.0 + + + org.apache.maven.plugins + maven-shade-plugin + 3.5.0 org.apache.maven.plugins maven-war-plugin - 3.3.1 + 3.4.0 - io.fabric8 - docker-maven-plugin - 0.40.1 + org.codehaus.gmaven + groovy-maven-plugin + 2.1.1 + + + org.codehaus.mojo + versions-maven-plugin + 2.16.0 + + + org.codehaus.mojo + exec-maven-plugin + 3.1.0 org.kie @@ -1393,22 +1077,38 @@ spring-boot-maven-plugin ${version.springboot} + + org.apache.maven.plugins + maven-surefire-plugin + 3.1.2 + - org.apache.maven.plugins 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/**/* + + pre-unit-test @@ -1460,6 +1160,7 @@ + org.apache.maven.plugins maven-checkstyle-plugin @@ -1498,8 +1199,6 @@ true true true - - true true warning