From a36531c38fe1a9234b8dbeaed5505cf3ca48de26 Mon Sep 17 00:00:00 2001 From: vasraz Date: Wed, 29 Apr 2020 18:39:35 +0100 Subject: Prepare for Junit5 Remove unused/duplicated dependencies Change-Id: Iee0d9510ffbe3e2e14574e22ba965d6829fd568b Signed-off-by: Vasyl Razinkov Issue-ID: SDC-2844 Issue-ID: SDC-2983 --- utils/DmaapPublisher/pom.xml | 254 ++++++++++---------- utils/webseal-simulator/pom.xml | 508 ++++++++++++++++++++-------------------- 2 files changed, 387 insertions(+), 375 deletions(-) (limited to 'utils') diff --git a/utils/DmaapPublisher/pom.xml b/utils/DmaapPublisher/pom.xml index 6152fdff83..45db7443f5 100644 --- a/utils/DmaapPublisher/pom.xml +++ b/utils/DmaapPublisher/pom.xml @@ -1,131 +1,139 @@ - - 4.0.0 - org.openecomp.sdc - dmaap-publisher - 1.0.0 + + 4.0.0 + org.openecomp.sdc + dmaap-publisher + 1.0.0 - - 2.8.6 - + + 2.8.6 + - - - - org.spockframework - spock-core - 1.1-groovy-2.4 - test - - - - org.codehaus.groovy - groovy - 2.4.11 - + + + + org.junit.jupiter + junit-jupiter-engine + ${junitJupiter.version} + test + + + + org.junit.vintage + junit-vintage-engine + ${junitJupiter.version} + - - org.apache.commons - commons-lang3 - 3.7 - - - com.att.nsa - dmaapClient - 0.2.16 - - - org.slf4j - slf4j-api - 1.7.25 - - - args4j - args4j - 2.33 - - - com.google.guava - guava - 22.0 - - - - org.yaml - snakeyaml - 1.18 - + + + org.spockframework + spock-core + 1.1-groovy-2.4 + test + + + + org.codehaus.groovy + groovy + 2.4.11 + + + org.apache.commons + commons-lang3 + 3.7 + + + com.att.nsa + dmaapClient + 0.2.16 + + + org.slf4j + slf4j-api + 1.7.25 + + + args4j + args4j + 2.33 + + + com.google.guava + guava + 22.0 + + + + org.yaml + snakeyaml + 1.18 + - - junit - junit - 4.12 - test - - - org.mockito - mockito-core - 2.8.47 - test - - - org.assertj - assertj-core - 3.8.0 - test - - + + org.mockito + mockito-core + ${mockito.version} + test + + + org.assertj + assertj-core + 3.8.0 + test + + - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.6.1 - - 1.8 - 1.8 - - - - org.apache.maven.plugins - maven-shade-plugin - 3.0.0 - - true - - - *:* - - META-INF/*.SF - META-INF/*.DSA - META-INF/*.RSA - - - - - - - package - - shade - - - - - - org.openecomp.sdc.dmaap.DmaapPublisher - - - - - - + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.6.1 + + 1.8 + 1.8 + + + + org.apache.maven.plugins + maven-shade-plugin + 3.0.0 + + true + + + *:* + + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA + + + + + + + package + + shade + + + + + + org.openecomp.sdc.dmaap.DmaapPublisher + + + + + + - - - \ No newline at end of file + + + diff --git a/utils/webseal-simulator/pom.xml b/utils/webseal-simulator/pom.xml index ed38278b7f..f446e28afe 100644 --- a/utils/webseal-simulator/pom.xml +++ b/utils/webseal-simulator/pom.xml @@ -1,273 +1,277 @@ - + - 4.0.0 - webseal-simulator - war + 4.0.0 + webseal-simulator + war - - org.openecomp.sdc - sdc-main - 1.7.0-SNAPSHOT - ../../ - + + org.openecomp.sdc + sdc-main + 1.7.0-SNAPSHOT + ../../ + - - yyyyMMdd'T'HHmmss'Z' - https://nexus.onap.org - UTF-8 - ${project.version}-${maven.build.timestamp} - ${project.version}-latest - true - + + yyyyMMdd'T'HHmmss'Z' + https://nexus.onap.org + UTF-8 + ${project.version}-${maven.build.timestamp} + ${project.version}-latest + true + - - - junit - junit - 4.12 - test - + + + + org.junit.jupiter + junit-jupiter-engine + ${junitJupiter.version} + test + + + + org.junit.vintage + junit-vintage-engine + ${junitJupiter.version} + - - javax.servlet - servlet-api - 2.5 - compile - + + javax.servlet + servlet-api + 2.5 + compile + - - - - - - - org.apache.httpcomponents - httpclient - 4.5.3 - + + org.apache.httpcomponents + httpclient + 4.5.3 + - - commons-logging - commons-logging-api - 1.0.4 - + + commons-logging + commons-logging-api + 1.0.4 + - - commons-io - commons-io - 2.4 - + + commons-io + commons-io + 2.4 + - - commons-codec - commons-codec - 1.9 - compile - + + commons-codec + commons-codec + 1.9 + compile + - - org.eclipse.jetty - jetty-proxy - ${jetty.version} - compile - + + org.eclipse.jetty + jetty-proxy + ${jetty.version} + compile + - - org.eclipse.jetty - jetty-servlets - ${jetty.version} - compile - + + org.eclipse.jetty + jetty-servlets + ${jetty.version} + compile + - - - com.typesafe - config - 1.0.2 - compile - + + + com.typesafe + config + 1.0.2 + compile + - - log4j - log4j - 1.2.17 - compile - + + log4j + log4j + 1.2.17 + compile + - - - WSSimulator-${project.version} - - - com.github.sylvainlaurent.maven - yaml-json-validator-maven-plugin - - - validate - validate - - validate - - - - - - src/main/resources/**/*.y*ml - src/test/resources/**/*.y*ml - - - - - src/main/resources/**/*.json - src/test/resources/**/*.json - - - - - - - - - - - - - - ecomp-releases - Release Repository - ${nexus.proxy}/content/repositories/releases/ - - - ecomp-snapshots - Snapshots Repository - ${nexus.proxy}/content/repositories/snapshots/ - - - ecomp-public - Public Repository - ${nexus.proxy}/content/repositories/public/ - - - - - - - docker - - false - - - - - - maven-clean-plugin - 3.0.0 - - - clean-static-files - clean - - clean - - - - - ${project.basedir}/sdc-simulator - - *.war - - false - - - - - - - - - maven-resources-plugin - - - copy-resources-simulator - verify - - copy-resources - - - ${project.basedir}/sdc-simulator - - - ${project.basedir}/target - - WSSimulator*.war - - - - - - - + + + WSSimulator-${project.version} + + + com.github.sylvainlaurent.maven + yaml-json-validator-maven-plugin + + + validate + validate + + validate + + + + + + src/main/resources/**/*.y*ml + src/test/resources/**/*.y*ml + + + + + src/main/resources/**/*.json + src/test/resources/**/*.json + + + + + + + + + + + + + ecomp-releases + Release Repository + ${nexus.proxy}/content/repositories/releases/ + + + ecomp-snapshots + Snapshots Repository + ${nexus.proxy}/content/repositories/snapshots/ + + + ecomp-public + Public Repository + ${nexus.proxy}/content/repositories/public/ + + + + + + docker + + false + + + - - io.fabric8 - docker-maven-plugin - - 1.23 - nexus3.onap.org:10001 - - - docker - docker - - - - - - onap/sdc-simulator - sdc-simulator - - try - ${basedir}${file.separator}sdc-simulator - - ${docker.tag} - ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest - - - - - - - - clean-images - pre-clean - - remove - - - - generate-images - install - - build - - - - push-images - deploy - - push - - - - - - - - + + maven-clean-plugin + 3.0.0 + + + clean-static-files + clean + + clean + + + + + ${project.basedir}/sdc-simulator + + *.war + + false + + + + + + + + + maven-resources-plugin + + + copy-resources-simulator + verify + + copy-resources + + + ${project.basedir}/sdc-simulator + + + ${project.basedir}/target + + WSSimulator*.war + + + + + + + + + + + io.fabric8 + docker-maven-plugin + + 1.23 + nexus3.onap.org:10001 + + + docker + docker + + + + + + onap/sdc-simulator + sdc-simulator + + try + ${basedir}${file.separator}sdc-simulator + + ${docker.tag} + + ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest + + + + + + + + + clean-images + pre-clean + + remove + + + + generate-images + install + + build + + + + push-images + deploy + + push + + + + + + + + -- cgit 1.2.3-korg