From cc7a734ffb1a8c38bbcbea6a7a5aead3d25b713b Mon Sep 17 00:00:00 2001 From: Pawel Date: Mon, 20 Apr 2020 12:52:39 +0200 Subject: Extract versions to properties Issue-ID: INT-1517 Signed-off-by: Pawel Change-Id: If966e5f755fc22ad428141bc9d3fdbeb756fa6f8 --- netconfsimulator/pom.xml | 96 ++++++++++++++++--------------- pnfsimulator/pom.xml | 146 +++++++++++++++++++++++++++++------------------ pom.xml | 6 +- 3 files changed, 143 insertions(+), 105 deletions(-) diff --git a/netconfsimulator/pom.xml b/netconfsimulator/pom.xml index b000f1c..915a045 100644 --- a/netconfsimulator/pom.xml +++ b/netconfsimulator/pom.xml @@ -55,9 +55,27 @@ true false ${project.basedir}/src/it/java + 1.18.2 + 1.0 + 1.1 + 3.9.1 + 2.18.3 + 5.3.1 + 5.3.1 + 4.12 + 0.1.0 + 0.29.1 + 4.5.6 + 4.5.6 + 2.9.2 + 2.9.2 + 3.1.0 + + + org.springframework.boot spring-boot-starter @@ -71,13 +89,13 @@ org.projectlombok lombok - 1.18.2 + ${lombok.version} provided org.onosproject jnc - 1.0 + ${jnc.version} org.springframework.boot @@ -87,10 +105,30 @@ javax.websocket javax.websocket-api - 1.1 + ${javax.websocket-api.version} + + + org.apache.httpcomponents + httpclient + ${apache.httpclient.version} + + + org.apache.httpcomponents + httpmime + ${apache.httpclient.version} + + + io.springfox + springfox-swagger2 + ${springfox-swagger2.version} + + + io.springfox + springfox-swagger-ui + ${springfox-swagger-ui.version} - + org.springframework.kafka @@ -103,31 +141,31 @@ org.assertj assertj-core - 3.9.1 + ${assertj-core.version} test org.mockito mockito-core - 2.18.3 + ${mockito-core.version} test org.junit.jupiter junit-jupiter-engine - 5.3.1 + ${junit-jupiter-engine.version} test org.junit.vintage junit-vintage-engine - 5.3.1 + ${junit-vintage-engine.version} test junit junit - 4.12 + ${junit.version} test @@ -145,49 +183,15 @@ org.bitbucket.radistao.test before-after-spring-test-runner - 0.1.0 + ${before-after-spring-test-runner.version} test com.palantir.docker.compose docker-compose-rule-junit4 - 0.29.1 - test - - - org.apache.httpcomponents - httpclient - 4.5.6 + ${docker-compose-rule-junit4.version} test - - org.apache.httpcomponents - httpmime - 4.5.6 - test - - - org.apache.httpcomponents - httpclient - ${apache.httpclient.version} - - - org.apache.httpcomponents - httpmime - ${apache.httpclient.version} - - - - io.springfox - springfox-swagger2 - 2.9.2 - - - io.springfox - springfox-swagger-ui - 2.9.2 - - @@ -230,7 +234,7 @@ org.codehaus.mojo build-helper-maven-plugin - 3.1.0 + ${build-helper-maven-plugin.version} add-integration-test-source-as-test-sources diff --git a/pnfsimulator/pom.xml b/pnfsimulator/pom.xml index 320805e..bae33f5 100644 --- a/pnfsimulator/pom.xml +++ b/pnfsimulator/pom.xml @@ -54,11 +54,42 @@ nexus3.onap.org:10003 http://nexus3.onap.org + 2.1.4.RELEASE + 1.2.3 + 1.2.3 + 1.7.25 + 2.6 + 20180130 + 2.8.2 + 4.5.5 + 21.0 + 1.4 + 3.7 + 1.18.2 + 2.9.7 + 2.9.7 + 0.9.2 + 0.9.2 + 3.9.1 + 2.18.3 + 5.0.4.RELEASE + 2.9.2 + 2.9.2 + 2.2.1 + 2.2.1 + 3.7.0 + 3.0.2 + 2.2.4 + 2.19 + 1.1.1 - - org.springframework.boot + + + + + org.springframework.boot spring-boot-starter ${spring.boot.version} @@ -74,9 +105,9 @@ ${spring.boot.version} - org.springframework.boot - spring-boot-starter-data-mongodb - ${spring.boot.version} + org.springframework.boot + spring-boot-starter-data-mongodb + ${spring.boot.version} org.springframework.boot @@ -86,87 +117,108 @@ org.springframework.cloud spring-cloud-config-client - 2.1.4.RELEASE + ${spring-cloud-config-client.version} ch.qos.logback logback-classic - 1.2.3 + ${logback-classic.version} ch.qos.logback logback-core - 1.2.3 + ${logback-core.version} org.slf4j slf4j-api - 1.7.25 + ${slf4j-api.version} commons-io commons-io - 2.6 + ${commons-io.version} org.json json - 20180130 + ${json.version} com.google.code.gson gson - 2.8.2 + ${gson.version} org.apache.httpcomponents httpclient - 4.5.5 + ${httpclient.version} com.google.guava guava - 21.0 + ${guava.version} commons-cli commons-cli - 1.4 + ${commons-cli.version} org.apache.commons commons-lang3 - 3.7 + ${commons-lang3.version} org.projectlombok lombok - 1.18.2 + ${lombok.version} provided com.fasterxml.jackson.datatype jackson-datatype-jdk8 - 2.9.7 + ${jackson-datatype-jdk8.version} com.fasterxml.jackson.datatype jackson-datatype-jsr310 - 2.9.7 + ${jackson-datatype-jsr310.version} - io.vavr - vavr-match - 0.9.2 + io.vavr + vavr-match + ${vavr-match.version} + + + io.vavr + vavr + ${vavr.version} + + + io.springfox + springfox-swagger2 + ${springfox-swagger2.version} + + + io.springfox + springfox-swagger-ui + ${springfox-swagger-ui.version} + + + org.quartz-scheduler + quartz + ${quartz.version} + + + org.quartz-scheduler + quartz-jobs + ${quartz-jobs.version} - - io.vavr - vavr - 0.9.2 - + - + org.junit.jupiter junit-jupiter-engine ${junit.jupiter.version} @@ -181,19 +233,19 @@ org.assertj assertj-core - 3.9.1 + ${assertj-core.version} test org.mockito mockito-core - 2.18.3 + ${mockito-core.version} test org.springframework spring-test - 5.0.4.RELEASE + ${spring-test.version} test @@ -202,27 +254,7 @@ ${spring.boot.version} test - - io.springfox - springfox-swagger2 - 2.9.2 - - - io.springfox - springfox-swagger-ui - 2.9.2 - - - org.quartz-scheduler - quartz - 2.2.1 - - - org.quartz-scheduler - quartz-jobs - 2.2.1 - - + @@ -244,7 +276,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.7.0 + ${maven-compiler-plugin.version} ${maven.compiler.source} ${maven.compiler.target} @@ -255,7 +287,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.0.2 + ${maven-jar-plugin.version} @@ -268,7 +300,7 @@ pl.project13.maven git-commit-id-plugin - 2.2.4 + ${git-commit-id-plugin.version} get-commit-info @@ -285,12 +317,12 @@ maven-surefire-plugin - 2.19 + ${maven-surefire-plugin.version} org.junit.platform junit-platform-surefire-provider - 1.1.1 + ${junit-platform-surefire-provider.version} diff --git a/pom.xml b/pom.xml index fe9d8c3..c29363f 100644 --- a/pom.xml +++ b/pom.xml @@ -50,6 +50,8 @@ 0.31.0 true ${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml + 2.17 + 0.31.0 @@ -68,7 +70,7 @@ maven-checkstyle-plugin - 2.17 + ${maven-checkstyle-plugin.version} checkstyle-suppressions.xml checkstyle.suppressions.file @@ -77,7 +79,7 @@ io.fabric8 docker-maven-plugin - 0.31.0 + ${docker-maven-plugin-io-fabric.version} -- cgit 1.2.3-korg