From 4cb50e0699c33d834cce944841cb933bb97cbffe Mon Sep 17 00:00:00 2001 From: Pawel Date: Tue, 21 Apr 2020 09:50:12 +0200 Subject: Remove unused/duplicated dependencies and group them in scope groups Issue-ID: INT-1517 Signed-off-by: Pawel Change-Id: Ied46b2a6f33711aa5cde3328353f33011ff0c3cd --- netconfsimulator/pom.xml | 65 +++--------- pnfsimulator/pom.xml | 70 ++----------- pom.xml | 266 ++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 282 insertions(+), 119 deletions(-) diff --git a/netconfsimulator/pom.xml b/netconfsimulator/pom.xml index 915a045..86f3ecd 100644 --- a/netconfsimulator/pom.xml +++ b/netconfsimulator/pom.xml @@ -41,9 +41,6 @@ nexus3.onap.org:10003 latest onap/${project.artifactId} - 2.1.6.RELEASE - 2.2.7.RELEASE - 4.5.6 libs ${project.build.directory}/${dependency.directory.name} @@ -55,20 +52,6 @@ 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 @@ -79,53 +62,43 @@ org.springframework.boot spring-boot-starter - ${spring.boot.version} org.springframework.boot spring-boot-starter-web - ${spring.boot.version} + + + org.springframework.boot + spring-boot-starter-websocket org.projectlombok lombok - ${lombok.version} - provided + provided org.onosproject jnc - ${jnc.version} - - - org.springframework.boot - spring-boot-starter-websocket - ${spring.boot.version} javax.websocket javax.websocket-api - ${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} @@ -133,7 +106,6 @@ org.springframework.kafka spring-kafka - ${spring.kafka.version} @@ -141,56 +113,47 @@ org.assertj assertj-core - ${assertj-core.version} - test + test org.mockito mockito-core - ${mockito-core.version} - test + test org.junit.jupiter junit-jupiter-engine - ${junit-jupiter-engine.version} - test + test org.junit.vintage junit-vintage-engine - ${junit-vintage-engine.version} - test + test junit junit - ${junit.version} - test + test org.springframework.boot spring-boot-starter-test - ${spring.boot.version} - test + test org.springframework.kafka spring-kafka-test - ${spring.kafka.version} - test + test org.bitbucket.radistao.test before-after-spring-test-runner - ${before-after-spring-test-runner.version} - test + test com.palantir.docker.compose docker-compose-rule-junit4 - ${docker-compose-rule-junit4.version} - test + test diff --git a/pnfsimulator/pom.xml b/pnfsimulator/pom.xml index bae33f5..251feb2 100644 --- a/pnfsimulator/pom.xml +++ b/pnfsimulator/pom.xml @@ -40,43 +40,14 @@ 1.8 1.8 yyyyMMdd'T'HHmmss - org.onap.pnfsimulator.Main latest - 5.1.0 - 5.1.0 - 2.1.0.RELEASE onap/${project.artifactId} - libs ${project.build.directory}/${dependency.directory.name} - 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 @@ -91,7 +62,6 @@ org.springframework.boot spring-boot-starter - ${spring.boot.version} org.springframework.boot @@ -102,118 +72,96 @@ org.springframework.boot spring-boot-starter-web - ${spring.boot.version} org.springframework.boot spring-boot-starter-data-mongodb - ${spring.boot.version} org.springframework.boot spring-boot-starter-actuator - ${spring.boot.version} org.springframework.cloud spring-cloud-config-client - ${spring-cloud-config-client.version} + + + org.projectlombok + lombok + provided ch.qos.logback logback-classic - ${logback-classic.version} ch.qos.logback logback-core - ${logback-core.version} org.slf4j slf4j-api - ${slf4j-api.version} commons-io commons-io - ${commons-io.version} org.json json - ${json.version} com.google.code.gson gson - ${gson.version} org.apache.httpcomponents httpclient - ${httpclient.version} com.google.guava guava - ${guava.version} commons-cli commons-cli - ${commons-cli.version} org.apache.commons commons-lang3 - ${commons-lang3.version} - - - org.projectlombok - lombok - ${lombok.version} - provided + com.fasterxml.jackson.datatype jackson-datatype-jdk8 - ${jackson-datatype-jdk8.version} com.fasterxml.jackson.datatype jackson-datatype-jsr310 - ${jackson-datatype-jsr310.version} 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} @@ -221,37 +169,31 @@ org.junit.jupiter junit-jupiter-engine - ${junit.jupiter.version} test org.junit.jupiter junit-jupiter-migrationsupport - ${junit.jupiter.version} test org.assertj assertj-core - ${assertj-core.version} test org.mockito mockito-core - ${mockito-core.version} test org.springframework spring-test - ${spring-test.version} test org.springframework.boot spring-boot-starter-test - ${spring.boot.version} test diff --git a/pom.xml b/pom.xml index c29363f..dffec7d 100644 --- a/pom.xml +++ b/pom.xml @@ -36,9 +36,10 @@ 1.0.0-SNAPSHOT pnfsimulator - netconfsimulator - deployment + netconfsimulator + deployment + https://nexus.onap.org /content/repositories/snapshots/ @@ -49,11 +50,269 @@ 1.8 0.31.0 true - ${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml + ${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml + + + + 2.17 0.31.0 + 2.1.6.RELEASE + 2.1.6.RELEASE + 2.1.6.RELEASE + 2.1.0.RELEASE + 2.1.0.RELEASE + 2.1.4.RELEASE + 1.18.2 + 1.0 + 2.2.7.RELEASE + 1.4 + 1.1 + 4.5.6 + 4.5.6 + 2.9.2 + 2.9.2 + 1.2.3 + 1.7.25 + 2.6 + 20180130 + 2.8.2 + 3.7 + 2.9.7 + 2.9.7 + 0.9.2 + 0.9.2 + 2.2.1 + 2.2.1 + 21.0 + 1.2.3 + + + + 3.9.1 + 2.18.3 + 5.3.1 + 5.3.1 + 4.12 + 2.1.6.RELEASE + 2.2.7.RELEASE + 0.1.0 + 0.29.1 + 5.0.4.RELEASE + 5.1.0 + + + + + + + org.springframework.boot + spring-boot-starter + ${spring-boot-starter.version} + + + org.springframework.boot + spring-boot-starter-web + ${spring-boot-starter-web.version} + + + org.springframework.boot + spring-boot-starter-websocket + ${spring-boot-starter-websocket.version} + + + org.springframework.boot + spring-boot-starter-data-mongodb + ${spring-boot-starter-data-mongodb.version} + + + org.springframework.boot + spring-boot-starter-actuator + ${spring-boot-starter-actuator.version} + + + org.springframework.cloud + spring-cloud-config-client + ${spring-cloud-config-client.version} + + + org.projectlombok + lombok + ${lombok.version} + + + org.onosproject + jnc + ${jnc.version} + + + javax.websocket + javax.websocket-api + ${javax.websocket-api.version} + + + org.apache.httpcomponents + httpclient + ${apache.httpclient.version} + + + org.apache.httpcomponents + httpmime + ${httpmime.version} + + + io.springfox + springfox-swagger2 + ${springfox-swagger2.version} + + + io.springfox + springfox-swagger-ui + ${springfox-swagger-ui.version} + + + org.springframework.kafka + spring-kafka + ${spring-kafka.version} + + + commons-cli + commons-cli + ${commons-cli.version} + + + ch.qos.logback + logback-core + ${logback-core.version} + + + org.slf4j + slf4j-api + ${slf4j-api.version} + + + commons-io + commons-io + ${commons-io.version} + + + org.json + json + ${json.version} + + + com.google.code.gson + gson + ${gson.version} + + + org.apache.commons + commons-lang3 + ${commons-lang3.version} + + + com.fasterxml.jackson.datatype + jackson-datatype-jdk8 + ${jackson-datatype-jdk8.version} + + + com.fasterxml.jackson.datatype + jackson-datatype-jsr310 + ${jackson-datatype-jsr310.version} + + + io.vavr + vavr-match + ${vavr-match.version} + + + io.vavr + vavr + ${vavr.version} + + + org.quartz-scheduler + quartz + ${quartz.version} + + + org.quartz-scheduler + quartz-jobs + ${quartz-jobs.version} + + + com.google.guava + guava + ${guava.version} + + + ch.qos.logback + logback-classic + ${logback-classic.version} + + + + + + org.assertj + assertj-core + ${assertj-core.version} + + + org.mockito + mockito-core + ${mockito-core.version} + + + org.junit.jupiter + junit-jupiter-engine + ${junit-jupiter-engine.version} + + + org.junit.vintage + junit-vintage-engine + ${junit-vintage-engine.version} + + + junit + junit + ${junit.version} + + + org.springframework.boot + spring-boot-starter-test + ${spring.boot.version} + + + org.springframework.kafka + spring-kafka-test + ${spring.kafka.version} + + + org.bitbucket.radistao.test + before-after-spring-test-runner + ${before-after-spring-test-runner.version} + + + com.palantir.docker.compose + docker-compose-rule-junit4 + ${docker-compose-rule-junit4.version} + + + org.springframework + spring-test + ${spring-test.version} + + + org.junit.jupiter + junit-jupiter-migrationsupport + ${junit-jupiter-migrationsupport.version} + + + + tests @@ -84,7 +343,6 @@ - ecomp-releases -- cgit 1.2.3-korg