X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=cb4fea1f0392b59ff0297ade55f039e37ffb1f94;hb=refs%2Fheads%2Fmaster;hp=f623964a817c5a9803c88440b8fb1cf237db4828;hpb=db9b2dca1c6ab7a899280248c1219addb6323f68;p=aai%2Fbabel.git diff --git a/pom.xml b/pom.xml index f623964..61c4d0a 100644 --- a/pom.xml +++ b/pom.xml @@ -28,12 +28,12 @@ org.onap.aai.aai-common aai-parent - 1.9.2 + 1.13.3 org.onap.aai babel - 1.9.1-SNAPSHOT + 1.13.1-SNAPSHOT jar aai-babel @@ -79,34 +79,36 @@ 0.28.0 1.0.0 ${project.build.directory}/${project.artifactId}-${project.version}-build/ - + onap alpine 1.9.0 - 1.5.1 + 1.6.5 - 1.9.2 - 2.1.21 - 1.2.2 + 1.9.4 + 1.2.11 + 3.0.13 + 2020.0.2 - 1.19 + 1.22 + 1.15 - 2.1 - 0.13.3 + 2.1.1 + 0.15.1 org.onap.aai.schema-service - 1.9.1 - 3.7 - 1.2.1 + 1.12.4 + 3.12.0 + 1.6.4 - 1.4.1 + 1.4.5 + 1.6 - 1.8 - - 1.1.1 + 3.1.0 + 1.2.2 yyyyMMdd'T'HHmmss'Z' @@ -114,7 +116,6 @@ - docker @@ -122,7 +123,7 @@ org.codehaus.mojo build-helper-maven-plugin - 3.0.0 + 3.3.0 pre-clean @@ -134,31 +135,33 @@ - org.codehaus.groovy.maven - gmaven-plugin - 1.0 + org.codehaus.gmavenplus + gmavenplus-plugin + 1.13.1 pre-clean execute - - - def userAaiBaseImage = session.userProperties['aai.base.image']; - def userAaiCommonVersion = session.userProperties['aai.base.image.version']; - if (userAaiCommonVersion != null) { - project.properties['aai.base.image.version'] = userAaiCommonVersion; - } - if (userAaiBaseImage != null) { - project.properties['aai.base.image'] = userAaiBaseImage; - } - log.info 'Base image flavour: ' + project.properties['aai.base.image']; - log.info 'Base image version: ' + project.properties['aai.base.image.version']; - - + + + + + io.fabric8 @@ -169,8 +172,7 @@ 1.23 - ${docker.push.registry}/${aai.docker.namespace}/${project.artifactId}:%l - + ${docker.push.registry}/${aai.docker.namespace}/${project.artifactId}:%l @ @@ -227,158 +229,130 @@ - - - org.springframework.boot - spring-boot-starter-jetty - - - org.springframework.boot - spring-boot-starter-jersey - - - org.springframework.boot - spring-boot-starter-jetty - - - org.springframework.boot - spring-boot-starter-tomcat - - - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-jetty - - - org.springframework.boot - spring-boot-starter-tomcat - - - - - org.springframework.boot - spring-boot-starter-aop - - - org.springframework.boot - spring-boot-starter-tomcat - - - - - org.onap.aai.logging-service - common-logging - - - ch.qos.logback - logback-classic - - - ch.qos.logback - logback-core - - - commons-codec - commons-codec - - - org.apache.commons - commons-compress - - - org.apache.commons - commons-lang3 - - - javax.ws.rs - javax.ws.rs-api - 2.1 - - - org.codehaus.groovy - groovy - - - org.onap.sdc.sdc-tosca - sdc-tosca - ${sdc.tosca.version} - - - org.onap.aai - rest-client - - - org.onap.aai.aai-common - aai-aaf-auth - ${aai.common.version} - - - org.springframework.boot - spring-boot-starter-web - - - - - org.onap.aaf.authz - aaf-cadi-core - ${aaf.version} - compile - - - org.onap.aaf.authz - aaf-cadi-aaf - ${aaf.version} - compile - - - org.onap.aaf.authz - aaf-auth-client - ${aaf.version} - - - org.onap.aaf.authz - aaf-cadi-client - ${aaf.version} - - - org.onap.aaf.authz - aaf-misc-env - ${aaf.version} - - - org.onap.aaf.authz - aaf-misc-rosetta - ${aaf.version} - - - - - org.springframework.boot - spring-boot-starter-test - test - - - org.onap.sdc.sdc-distribution-client - sdc-distribution-client - ${sdc.distribution.client.version} - test - - - junit - junit - 4.12 - test - + + + org.springframework.boot + spring-boot-starter-jetty + + + org.springframework.boot + spring-boot-starter-jersey + + + org.springframework.boot + spring-boot-starter-jetty + + + org.springframework.boot + spring-boot-starter-tomcat + + + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-jetty + + + org.springframework.boot + spring-boot-starter-tomcat + + + + + org.springframework.boot + spring-boot-starter-aop + + + org.springframework.boot + spring-boot-starter-tomcat + + + + + org.onap.aai.logging-service + common-logging + + + ch.qos.logback + logback-classic + + + ch.qos.logback + logback-core + ${logback.core.version} + + + commons-codec + commons-codec + ${commons.codec.version} + + + org.apache.commons + commons-compress + ${commons.compress.version} + + + org.apache.commons + commons-lang3 + ${commons.lang3.version} + + + javax.ws.rs + javax.ws.rs-api + ${javax.ws.rs.version} + + + org.codehaus.groovy + groovy + ${groovy.version} + + + org.onap.sdc.sdc-tosca + sdc-tosca + ${sdc.tosca.version} + + + org.onap.aai + rest-client + + + + + org.springframework.boot + spring-boot-starter-test + test + + + org.onap.sdc.sdc-distribution-client + sdc-distribution-client + ${sdc.distribution.client.version} + test + + + org.hamcrest + hamcrest + 2.2 + test + + + org.junit.jupiter + junit-jupiter + 5.10.2 + test + + + org.junit.jupiter + junit-jupiter-api + test + - xmlunit - xmlunit - ${xmlunit.version} + org.xmlunit + xmlunit-legacy test @@ -398,12 +372,36 @@ jaxb-impl - javax.activation - activation - ${javax.activation.version} + jakarta.activation + jakarta.activation-api + ${jakarta.activation.version} + + + org.springframework.cloud + spring-cloud-starter-sleuth + + + org.springframework.cloud + spring-cloud-sleuth-zipkin + + + org.projectlombok + lombok + 1.18.32 + provided - + + + + org.springframework.cloud + spring-cloud-dependencies + ${spring-cloud.version} + pom + import + + + @@ -517,7 +515,8 @@ org.codehaus.mojo 1.5.0 - + + Get latest xsd version generate-sources @@ -612,7 +611,7 @@ + whole section --> org.jacoco @@ -760,9 +759,8 @@ sonar-maven-plugin ${sonar.scanner.version} - + - + \ No newline at end of file