From 603a5a4aa9ee8c00a3ca081b98e9f19c0606b0da Mon Sep 17 00:00:00 2001 From: Kanagaraj M Date: Fri, 2 Aug 2019 12:53:15 +0530 Subject: [PATCH] Set SNAPSHOT versioning Issue-ID: CLI-169 Change-Id: I37930d594df46a9cf306d66db3ba212237041e0c Signed-off-by: Kanagaraj Manickam k00365106 --- deployment/docker/pom.xml | 4 +- deployment/pom.xml | 2 +- deployment/zip/pom.xml | 8 +++- framework/pom.xml | 42 ++++++++++++--------- grpc/grpc-client/pom.xml | 2 +- grpc/grpc-server/pom.xml | 4 +- grpc/grpc-stub/pom.xml | 2 +- grpc/pom.xml | 4 +- main/pom.xml | 20 ++++++---- pom.xml | 2 +- products/onap-amsterdam/auth/pom.xml | 2 +- products/onap-amsterdam/catalog/pom.xml | 2 +- products/onap-amsterdam/features/aai/pom.xml | 2 +- products/onap-amsterdam/features/msb/pom.xml | 2 +- products/onap-amsterdam/features/pom.xml | 2 +- products/onap-amsterdam/features/sdc/pom.xml | 2 +- products/onap-amsterdam/features/so/pom.xml | 2 +- products/onap-amsterdam/pom.xml | 2 +- products/onap-beijing/auth/pom.xml | 2 +- products/onap-beijing/catalog/pom.xml | 2 +- products/onap-beijing/features/aai/pom.xml | 2 +- products/onap-beijing/features/appc/pom.xml | 2 +- products/onap-beijing/features/msb/pom.xml | 2 +- products/onap-beijing/features/policy/pom.xml | 2 +- products/onap-beijing/features/pom.xml | 2 +- products/onap-beijing/features/sdc/pom.xml | 2 +- products/onap-beijing/features/so/pom.xml | 2 +- products/onap-beijing/pom.xml | 2 +- products/onap-casablanca/auth/pom.xml | 2 +- products/onap-casablanca/catalog/pom.xml | 2 +- products/onap-casablanca/features/aai/pom.xml | 2 +- products/onap-casablanca/features/msb/pom.xml | 2 +- products/onap-casablanca/features/pom.xml | 2 +- products/onap-casablanca/features/sdc/pom.xml | 2 +- products/onap-casablanca/features/vnfsdk/pom.xml | 2 +- products/onap-casablanca/pom.xml | 2 +- products/onap-dublin/auth/pom.xml | 2 +- products/onap-dublin/catalog/pom.xml | 2 +- products/onap-dublin/features/aai/pom.xml | 2 +- products/onap-dublin/features/msb/pom.xml | 2 +- products/onap-dublin/features/multicloud/pom.xml | 2 +- products/onap-dublin/features/policy/pom.xml | 2 +- products/onap-dublin/features/pom.xml | 47 +++++++++++++++++++++++- products/onap-dublin/features/sdc/pom.xml | 2 +- products/onap-dublin/features/sdnc/pom.xml | 2 +- products/onap-dublin/features/so/pom.xml | 2 +- products/onap-dublin/features/vfc/pom.xml | 2 +- products/onap-dublin/features/vnfsdk/pom.xml | 2 +- products/onap-dublin/pom.xml | 2 +- products/openecomp/auth/pom.xml | 2 +- products/openecomp/catalog/pom.xml | 2 +- products/openecomp/features/aai/pom.xml | 2 +- products/openecomp/features/pom.xml | 2 +- products/openecomp/features/sdc/pom.xml | 2 +- products/openecomp/pom.xml | 2 +- products/pom.xml | 2 +- products/sample/pom.xml | 2 +- profiles/command/pom.xml | 6 ++- profiles/http/pom.xml | 46 ++++++++++++----------- profiles/pom.xml | 29 ++++++++++++++- profiles/snmp/pom.xml | 6 ++- validate/pom.xml | 2 +- validate/sample-mock-generator/pom.xml | 14 ++++++- validate/sample-yaml-generator/pom.xml | 14 ++++++- validate/validation/pom.xml | 14 ++++++- 65 files changed, 250 insertions(+), 110 deletions(-) diff --git a/deployment/docker/pom.xml b/deployment/docker/pom.xml index 40240f9b..4a5837a8 100644 --- a/deployment/docker/pom.xml +++ b/deployment/docker/pom.xml @@ -23,12 +23,12 @@ org.onap.cli cli-deployment - 3.0.0 + 4.0.0-SNAPSHOT cli-docker cli/deployment/docker - 3.0.0 + 4.0.0-SNAPSHOT pom diff --git a/deployment/pom.xml b/deployment/pom.xml index c3f70458..58793d82 100644 --- a/deployment/pom.xml +++ b/deployment/pom.xml @@ -23,7 +23,7 @@ org.onap.cli cli - 3.0.0 + 4.0.0-SNAPSHOT cli-deployment diff --git a/deployment/zip/pom.xml b/deployment/zip/pom.xml index 454e259e..cb34efe1 100644 --- a/deployment/zip/pom.xml +++ b/deployment/zip/pom.xml @@ -23,7 +23,7 @@ org.onap.cli cli-deployment - 3.0.0 + 4.0.0-SNAPSHOT cli-zip @@ -71,6 +71,12 @@ ant.delete(dir: "${deployUnzip}/data") ant.mkdir(dir: "${deployUnzip}/data") + ant.delete(dir: "${deployUnzip}/data/tmp") + ant.mkdir(dir: "${deployUnzip}/data/tmp") + + ant.delete(dir: "${deployUnzip}/script") + ant.mkdir(dir: "${deployUnzip}/script") + ant.copy(todir: "${deployUnzip}") { fileset(dir: "${basedir}/src/main/release"){ exclude(name: "**/.gitignore") diff --git a/framework/pom.xml b/framework/pom.xml index 60193e73..75d94ee7 100644 --- a/framework/pom.xml +++ b/framework/pom.xml @@ -24,17 +24,20 @@ org.onap.cli cli - 3.0.0 + 4.0.0-SNAPSHOT cli-framework + cli/framework + jar + org.onap.cli oclip-grpc-client - 3.0.0 + 4.0.0-SNAPSHOT org.yaml @@ -51,6 +54,11 @@ commons-csv 1.3 + + commons-codec + commons-codec + 1.9 + org.apache.commons commons-io @@ -61,6 +69,21 @@ spring-core 3.2.9.RELEASE + + com.jayway.jsonpath + json-path + 2.2.0 + + + com.fasterxml.jackson.core + jackson-databind + 2.9.4 + + + com.fasterxml.jackson.dataformat + jackson-dataformat-yaml + 2.9.4 + junit junit @@ -79,20 +102,5 @@ 1.19 test - - com.jayway.jsonpath - json-path - 2.2.0 - - - com.fasterxml.jackson.core - jackson-databind - 2.9.4 - - - com.fasterxml.jackson.dataformat - jackson-dataformat-yaml - 2.9.4 - diff --git a/grpc/grpc-client/pom.xml b/grpc/grpc-client/pom.xml index 813e8e72..3b7ad6d5 100644 --- a/grpc/grpc-client/pom.xml +++ b/grpc/grpc-client/pom.xml @@ -18,7 +18,7 @@ org.onap.cli oclip-grpc - 3.0.0 + 4.0.0-SNAPSHOT oclip-grpc-client oclip/grpc/client diff --git a/grpc/grpc-server/pom.xml b/grpc/grpc-server/pom.xml index be038ad5..c894e67b 100644 --- a/grpc/grpc-server/pom.xml +++ b/grpc/grpc-server/pom.xml @@ -18,7 +18,7 @@ org.onap.cli oclip-grpc - 3.0.0 + 4.0.0-SNAPSHOT oclip-grpc-server oclip/grpc/server @@ -32,7 +32,7 @@ org.onap.cli cli-main - 3.0.0 + 4.0.0-SNAPSHOT diff --git a/grpc/grpc-stub/pom.xml b/grpc/grpc-stub/pom.xml index 0b8007d8..28703a43 100644 --- a/grpc/grpc-stub/pom.xml +++ b/grpc/grpc-stub/pom.xml @@ -18,7 +18,7 @@ org.onap.cli oclip-grpc - 3.0.0 + 4.0.0-SNAPSHOT oclip-grpc-stub oclip/grpc/stub diff --git a/grpc/pom.xml b/grpc/pom.xml index 1023e629..75721607 100644 --- a/grpc/pom.xml +++ b/grpc/pom.xml @@ -18,9 +18,9 @@ org.onap.cli cli - 3.0.0 + 4.0.0-SNAPSHOT - 3.0.0 + 4.0.0-SNAPSHOT oclip-grpc pom oclip/grpc diff --git a/main/pom.xml b/main/pom.xml index 3fb4288f..9a5465c2 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -24,7 +24,7 @@ org.onap.cli cli - 3.0.0 + 4.0.0-SNAPSHOT cli-main @@ -36,12 +36,6 @@ cli-sample-yaml-generator ${project.version} - - junit - junit - 4.11 - test - org.onap.cli cli-framework @@ -51,6 +45,12 @@ jline jline 2.6 + + + junit + junit + 4.11 + test org.jmockit @@ -58,6 +58,12 @@ 1.19 test + + org.jmockit + jmockit-coverage + 1.19 + test + diff --git a/pom.xml b/pom.xml index ee9d27b9..234ba699 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ org.onap.cli cli - 3.0.0 + 4.0.0-SNAPSHOT pom cli diff --git a/products/onap-amsterdam/auth/pom.xml b/products/onap-amsterdam/auth/pom.xml index d6b1c43e..c80fc71f 100644 --- a/products/onap-amsterdam/auth/pom.xml +++ b/products/onap-amsterdam/auth/pom.xml @@ -24,7 +24,7 @@ org.onap.cli cli-products-onap-amsterdam - 2.0.3 + 4.0.0-SNAPSHOT cli-products-onap-amsterdam-auth diff --git a/products/onap-amsterdam/catalog/pom.xml b/products/onap-amsterdam/catalog/pom.xml index a7afa9bb..9fb5262f 100644 --- a/products/onap-amsterdam/catalog/pom.xml +++ b/products/onap-amsterdam/catalog/pom.xml @@ -24,7 +24,7 @@ org.onap.cli cli-products-onap-amsterdam - 2.0.3 + 4.0.0-SNAPSHOT cli-products-onap-amsterdam-catalog diff --git a/products/onap-amsterdam/features/aai/pom.xml b/products/onap-amsterdam/features/aai/pom.xml index b68499e7..37f6e7df 100644 --- a/products/onap-amsterdam/features/aai/pom.xml +++ b/products/onap-amsterdam/features/aai/pom.xml @@ -24,7 +24,7 @@ org.onap.cli cli-products-onap-amsterdam-features - 2.0.3 + 4.0.0-SNAPSHOT cli-products-onap-amsterdam-features-aai diff --git a/products/onap-amsterdam/features/msb/pom.xml b/products/onap-amsterdam/features/msb/pom.xml index 7e9f7ce9..f8e4d5fa 100644 --- a/products/onap-amsterdam/features/msb/pom.xml +++ b/products/onap-amsterdam/features/msb/pom.xml @@ -24,7 +24,7 @@ org.onap.cli cli-products-onap-amsterdam-features - 2.0.3 + 4.0.0-SNAPSHOT cli-products-onap-amsterdam-features-msb diff --git a/products/onap-amsterdam/features/pom.xml b/products/onap-amsterdam/features/pom.xml index f2f4f6ae..b0362073 100644 --- a/products/onap-amsterdam/features/pom.xml +++ b/products/onap-amsterdam/features/pom.xml @@ -24,7 +24,7 @@ org.onap.cli cli-products-onap-amsterdam - 2.0.3 + 4.0.0-SNAPSHOT cli-products-onap-amsterdam-features diff --git a/products/onap-amsterdam/features/sdc/pom.xml b/products/onap-amsterdam/features/sdc/pom.xml index ae0cab77..8fb70059 100644 --- a/products/onap-amsterdam/features/sdc/pom.xml +++ b/products/onap-amsterdam/features/sdc/pom.xml @@ -22,7 +22,7 @@ org.onap.cli cli-products-onap-amsterdam-features - 2.0.3 + 4.0.0-SNAPSHOT cli-products-onap-amsterdam-features-sdc diff --git a/products/onap-amsterdam/features/so/pom.xml b/products/onap-amsterdam/features/so/pom.xml index 5beb19ec..51d572f4 100644 --- a/products/onap-amsterdam/features/so/pom.xml +++ b/products/onap-amsterdam/features/so/pom.xml @@ -24,7 +24,7 @@ org.onap.cli cli-products-onap-amsterdam-features - 2.0.3 + 4.0.0-SNAPSHOT cli-products-onap-amsterdam-features-so diff --git a/products/onap-amsterdam/pom.xml b/products/onap-amsterdam/pom.xml index f30a2c4a..e4c26d99 100644 --- a/products/onap-amsterdam/pom.xml +++ b/products/onap-amsterdam/pom.xml @@ -24,7 +24,7 @@ org.onap.cli cli-products - 2.0.3 + 4.0.0-SNAPSHOT cli-products-onap-amsterdam diff --git a/products/onap-beijing/auth/pom.xml b/products/onap-beijing/auth/pom.xml index 3f7d5d63..5c6de139 100644 --- a/products/onap-beijing/auth/pom.xml +++ b/products/onap-beijing/auth/pom.xml @@ -24,7 +24,7 @@ org.onap.cli cli-products-onap-beijing - 2.0.3 + 4.0.0-SNAPSHOT cli-products-onap-beijing-auth diff --git a/products/onap-beijing/catalog/pom.xml b/products/onap-beijing/catalog/pom.xml index 0215fbbe..9919ba6f 100644 --- a/products/onap-beijing/catalog/pom.xml +++ b/products/onap-beijing/catalog/pom.xml @@ -24,7 +24,7 @@ org.onap.cli cli-products-onap-beijing - 2.0.3 + 4.0.0-SNAPSHOT cli-products-onap-beijing-catalog diff --git a/products/onap-beijing/features/aai/pom.xml b/products/onap-beijing/features/aai/pom.xml index 95e2aa1d..04c83f98 100644 --- a/products/onap-beijing/features/aai/pom.xml +++ b/products/onap-beijing/features/aai/pom.xml @@ -24,7 +24,7 @@ org.onap.cli cli-products-onap-beijing-features - 2.0.3 + 4.0.0-SNAPSHOT cli-products-onap-beijing-features-aai diff --git a/products/onap-beijing/features/appc/pom.xml b/products/onap-beijing/features/appc/pom.xml index 6b157c29..4370a54c 100644 --- a/products/onap-beijing/features/appc/pom.xml +++ b/products/onap-beijing/features/appc/pom.xml @@ -24,7 +24,7 @@ org.onap.cli cli-products-onap-beijing-features - 2.0.3 + 4.0.0-SNAPSHOT cli-products-onap-beijing-features-appc diff --git a/products/onap-beijing/features/msb/pom.xml b/products/onap-beijing/features/msb/pom.xml index 130cac07..c330f809 100644 --- a/products/onap-beijing/features/msb/pom.xml +++ b/products/onap-beijing/features/msb/pom.xml @@ -24,7 +24,7 @@ org.onap.cli cli-products-onap-beijing-features - 2.0.3 + 4.0.0-SNAPSHOT cli-products-onap-beijing-features-msb diff --git a/products/onap-beijing/features/policy/pom.xml b/products/onap-beijing/features/policy/pom.xml index d6b25b1a..1c277557 100644 --- a/products/onap-beijing/features/policy/pom.xml +++ b/products/onap-beijing/features/policy/pom.xml @@ -24,7 +24,7 @@ org.onap.cli cli-products-onap-beijing-features - 2.0.3 + 4.0.0-SNAPSHOT cli-products-onap-beijing-features-policy diff --git a/products/onap-beijing/features/pom.xml b/products/onap-beijing/features/pom.xml index 3c9ac625..7aee7bf6 100644 --- a/products/onap-beijing/features/pom.xml +++ b/products/onap-beijing/features/pom.xml @@ -24,7 +24,7 @@ org.onap.cli cli-products-onap-beijing - 2.0.3 + 4.0.0-SNAPSHOT cli-products-onap-beijing-features diff --git a/products/onap-beijing/features/sdc/pom.xml b/products/onap-beijing/features/sdc/pom.xml index e81e4e04..36b95b56 100644 --- a/products/onap-beijing/features/sdc/pom.xml +++ b/products/onap-beijing/features/sdc/pom.xml @@ -22,7 +22,7 @@ org.onap.cli cli-products-onap-beijing-features - 2.0.3 + 4.0.0-SNAPSHOT cli-products-onap-beijing-features-sdc diff --git a/products/onap-beijing/features/so/pom.xml b/products/onap-beijing/features/so/pom.xml index c2fcb77b..26240c54 100644 --- a/products/onap-beijing/features/so/pom.xml +++ b/products/onap-beijing/features/so/pom.xml @@ -24,7 +24,7 @@ org.onap.cli cli-products-onap-beijing-features - 2.0.3 + 4.0.0-SNAPSHOT cli-products-onap-beijing-features-so diff --git a/products/onap-beijing/pom.xml b/products/onap-beijing/pom.xml index c0d38844..05a30b55 100644 --- a/products/onap-beijing/pom.xml +++ b/products/onap-beijing/pom.xml @@ -24,7 +24,7 @@ org.onap.cli cli-products - 2.0.3 + 4.0.0-SNAPSHOT cli-products-onap-beijing diff --git a/products/onap-casablanca/auth/pom.xml b/products/onap-casablanca/auth/pom.xml index c764aa93..2ac24941 100644 --- a/products/onap-casablanca/auth/pom.xml +++ b/products/onap-casablanca/auth/pom.xml @@ -24,7 +24,7 @@ org.onap.cli cli-products-onap-casablanca - 3.0.0 + 4.0.0-SNAPSHOT cli-products-onap-casablanca-auth diff --git a/products/onap-casablanca/catalog/pom.xml b/products/onap-casablanca/catalog/pom.xml index a436d8b0..68e73bb7 100644 --- a/products/onap-casablanca/catalog/pom.xml +++ b/products/onap-casablanca/catalog/pom.xml @@ -24,7 +24,7 @@ org.onap.cli cli-products-onap-casablanca - 3.0.0 + 4.0.0-SNAPSHOT cli-products-onap-casablanca-catalog diff --git a/products/onap-casablanca/features/aai/pom.xml b/products/onap-casablanca/features/aai/pom.xml index 19371b61..543cf177 100644 --- a/products/onap-casablanca/features/aai/pom.xml +++ b/products/onap-casablanca/features/aai/pom.xml @@ -24,7 +24,7 @@ org.onap.cli cli-products-onap-casablanca-features - 3.0.0 + 4.0.0-SNAPSHOT cli-products-onap-casablanca-features-aai diff --git a/products/onap-casablanca/features/msb/pom.xml b/products/onap-casablanca/features/msb/pom.xml index 1cebb35e..047a17db 100644 --- a/products/onap-casablanca/features/msb/pom.xml +++ b/products/onap-casablanca/features/msb/pom.xml @@ -24,7 +24,7 @@ org.onap.cli cli-products-onap-casablanca-features - 3.0.0 + 4.0.0-SNAPSHOT cli-products-onap-casablanca-features-msb diff --git a/products/onap-casablanca/features/pom.xml b/products/onap-casablanca/features/pom.xml index c9a77c9f..637d5fe0 100644 --- a/products/onap-casablanca/features/pom.xml +++ b/products/onap-casablanca/features/pom.xml @@ -24,7 +24,7 @@ org.onap.cli cli-products-onap-casablanca - 3.0.0 + 4.0.0-SNAPSHOT cli-products-onap-casablanca-features diff --git a/products/onap-casablanca/features/sdc/pom.xml b/products/onap-casablanca/features/sdc/pom.xml index 71485a25..94c057b5 100644 --- a/products/onap-casablanca/features/sdc/pom.xml +++ b/products/onap-casablanca/features/sdc/pom.xml @@ -22,7 +22,7 @@ org.onap.cli cli-products-onap-casablanca-features - 3.0.0 + 4.0.0-SNAPSHOT cli-products-onap-casablanca-features-sdc diff --git a/products/onap-casablanca/features/vnfsdk/pom.xml b/products/onap-casablanca/features/vnfsdk/pom.xml index 26563fbb..b0ea6602 100644 --- a/products/onap-casablanca/features/vnfsdk/pom.xml +++ b/products/onap-casablanca/features/vnfsdk/pom.xml @@ -24,7 +24,7 @@ org.onap.cli cli-products-onap-casablanca-features - 3.0.0 + 4.0.0-SNAPSHOT cli-products-onap-casablanca-features-vnfsdk diff --git a/products/onap-casablanca/pom.xml b/products/onap-casablanca/pom.xml index 48ff1c88..d812427b 100644 --- a/products/onap-casablanca/pom.xml +++ b/products/onap-casablanca/pom.xml @@ -24,7 +24,7 @@ org.onap.cli cli-products - 3.0.0 + 4.0.0-SNAPSHOT cli-products-onap-casablanca diff --git a/products/onap-dublin/auth/pom.xml b/products/onap-dublin/auth/pom.xml index e3dd7f81..42892c9a 100644 --- a/products/onap-dublin/auth/pom.xml +++ b/products/onap-dublin/auth/pom.xml @@ -24,7 +24,7 @@ org.onap.cli cli-products-onap-dublin - 3.0.0 + 4.0.0-SNAPSHOT cli-products-onap-dublin-auth diff --git a/products/onap-dublin/catalog/pom.xml b/products/onap-dublin/catalog/pom.xml index 55e35337..d5bff21d 100644 --- a/products/onap-dublin/catalog/pom.xml +++ b/products/onap-dublin/catalog/pom.xml @@ -24,7 +24,7 @@ org.onap.cli cli-products-onap-dublin - 3.0.0 + 4.0.0-SNAPSHOT cli-products-onap-dublin-catalog diff --git a/products/onap-dublin/features/aai/pom.xml b/products/onap-dublin/features/aai/pom.xml index 0383c0bc..f774302c 100644 --- a/products/onap-dublin/features/aai/pom.xml +++ b/products/onap-dublin/features/aai/pom.xml @@ -24,7 +24,7 @@ org.onap.cli cli-products-onap-dublin-features - 3.0.0 + 4.0.0-SNAPSHOT cli-products-onap-dublin-features-aai diff --git a/products/onap-dublin/features/msb/pom.xml b/products/onap-dublin/features/msb/pom.xml index 57f9eae2..ae8e044a 100644 --- a/products/onap-dublin/features/msb/pom.xml +++ b/products/onap-dublin/features/msb/pom.xml @@ -24,7 +24,7 @@ org.onap.cli cli-products-onap-dublin-features - 3.0.0 + 4.0.0-SNAPSHOT cli-products-onap-dublin-features-msb diff --git a/products/onap-dublin/features/multicloud/pom.xml b/products/onap-dublin/features/multicloud/pom.xml index aadb0814..06d2ee91 100644 --- a/products/onap-dublin/features/multicloud/pom.xml +++ b/products/onap-dublin/features/multicloud/pom.xml @@ -24,7 +24,7 @@ org.onap.cli cli-products-onap-dublin-features - 3.0.0 + 4.0.0-SNAPSHOT cli-products-onap-dublin-features-multicloud diff --git a/products/onap-dublin/features/policy/pom.xml b/products/onap-dublin/features/policy/pom.xml index aeca79ea..f7a885e8 100644 --- a/products/onap-dublin/features/policy/pom.xml +++ b/products/onap-dublin/features/policy/pom.xml @@ -24,7 +24,7 @@ org.onap.cli cli-products-onap-dublin-features - 3.0.0 + 4.0.0-SNAPSHOT cli-products-onap-dublin-features-policy diff --git a/products/onap-dublin/features/pom.xml b/products/onap-dublin/features/pom.xml index 23a2d640..4fa428b5 100644 --- a/products/onap-dublin/features/pom.xml +++ b/products/onap-dublin/features/pom.xml @@ -24,7 +24,7 @@ org.onap.cli cli-products-onap-dublin - 3.0.0 + 4.0.0-SNAPSHOT cli-products-onap-dublin-features @@ -46,6 +46,51 @@ + + org.apache.maven.plugins + maven-resources-plugin + 3.1.0 + + + copy-resource-script + install + + copy-resources + + + + ../../../../products/target/script + + + ${project.basedir}/src/main/resources/script + + *.* + + + + + + + copy-resource-conf + install + + copy-resources + + + + ../../../../products/target/conf + + + ${project.basedir}/src/main/resources/conf + + *.* + + + + + + + org.apache.maven.plugins maven-dependency-plugin diff --git a/products/onap-dublin/features/sdc/pom.xml b/products/onap-dublin/features/sdc/pom.xml index 8a91f7b4..b0cded4a 100644 --- a/products/onap-dublin/features/sdc/pom.xml +++ b/products/onap-dublin/features/sdc/pom.xml @@ -24,7 +24,7 @@ org.onap.cli cli-products-onap-dublin-features - 3.0.0 + 4.0.0-SNAPSHOT cli-products-onap-dublin-features-sdc diff --git a/products/onap-dublin/features/sdnc/pom.xml b/products/onap-dublin/features/sdnc/pom.xml index 14d30bee..48fdfcd7 100644 --- a/products/onap-dublin/features/sdnc/pom.xml +++ b/products/onap-dublin/features/sdnc/pom.xml @@ -24,7 +24,7 @@ org.onap.cli cli-products-onap-dublin-features - 3.0.0 + 4.0.0-SNAPSHOT cli-products-onap-dublin-features-sdnc diff --git a/products/onap-dublin/features/so/pom.xml b/products/onap-dublin/features/so/pom.xml index d2774d60..00f99c77 100644 --- a/products/onap-dublin/features/so/pom.xml +++ b/products/onap-dublin/features/so/pom.xml @@ -24,7 +24,7 @@ org.onap.cli cli-products-onap-dublin-features - 3.0.0 + 4.0.0-SNAPSHOT cli-products-onap-dublin-features-so diff --git a/products/onap-dublin/features/vfc/pom.xml b/products/onap-dublin/features/vfc/pom.xml index f7cc3c3d..28fd7fb3 100644 --- a/products/onap-dublin/features/vfc/pom.xml +++ b/products/onap-dublin/features/vfc/pom.xml @@ -24,7 +24,7 @@ org.onap.cli cli-products-onap-dublin-features - 3.0.0 + 4.0.0-SNAPSHOT cli-products-onap-dublin-features-vfc diff --git a/products/onap-dublin/features/vnfsdk/pom.xml b/products/onap-dublin/features/vnfsdk/pom.xml index 0117c3f7..dd5ae244 100644 --- a/products/onap-dublin/features/vnfsdk/pom.xml +++ b/products/onap-dublin/features/vnfsdk/pom.xml @@ -24,7 +24,7 @@ org.onap.cli cli-products-onap-dublin-features - 3.0.0 + 4.0.0-SNAPSHOT cli-products-onap-dublin-features-vnfsdk diff --git a/products/onap-dublin/pom.xml b/products/onap-dublin/pom.xml index 25c42165..596ee9be 100644 --- a/products/onap-dublin/pom.xml +++ b/products/onap-dublin/pom.xml @@ -24,7 +24,7 @@ org.onap.cli cli-products - 3.0.0 + 4.0.0-SNAPSHOT cli-products-onap-dublin diff --git a/products/openecomp/auth/pom.xml b/products/openecomp/auth/pom.xml index ae4564a1..ed2429ad 100644 --- a/products/openecomp/auth/pom.xml +++ b/products/openecomp/auth/pom.xml @@ -24,7 +24,7 @@ org.onap.cli cli-products-openecomp - 2.0.4 + 4.0.0-SNAPSHOT cli-products-openecomp-auth diff --git a/products/openecomp/catalog/pom.xml b/products/openecomp/catalog/pom.xml index 0c55a8c5..ee62cfee 100644 --- a/products/openecomp/catalog/pom.xml +++ b/products/openecomp/catalog/pom.xml @@ -24,7 +24,7 @@ org.onap.cli cli-products-openecomp - 2.0.4 + 4.0.0-SNAPSHOT cli-products-openecomp-catalog diff --git a/products/openecomp/features/aai/pom.xml b/products/openecomp/features/aai/pom.xml index 5f86fcb2..d09e24eb 100644 --- a/products/openecomp/features/aai/pom.xml +++ b/products/openecomp/features/aai/pom.xml @@ -24,7 +24,7 @@ org.onap.cli cli-products-openecomp-features - 2.0.4 + 4.0.0-SNAPSHOT cli-products-openecomp-features-aai diff --git a/products/openecomp/features/pom.xml b/products/openecomp/features/pom.xml index 9a175543..a4ebec72 100644 --- a/products/openecomp/features/pom.xml +++ b/products/openecomp/features/pom.xml @@ -24,7 +24,7 @@ org.onap.cli cli-products-openecomp - 2.0.4 + 4.0.0-SNAPSHOT cli-products-openecomp-features diff --git a/products/openecomp/features/sdc/pom.xml b/products/openecomp/features/sdc/pom.xml index 86c0b92b..769d07a0 100644 --- a/products/openecomp/features/sdc/pom.xml +++ b/products/openecomp/features/sdc/pom.xml @@ -22,7 +22,7 @@ org.onap.cli cli-products-openecomp-features - 2.0.4 + 4.0.0-SNAPSHOT cli-products-openecomp-features-sdc diff --git a/products/openecomp/pom.xml b/products/openecomp/pom.xml index 98b725a9..96b65c3e 100644 --- a/products/openecomp/pom.xml +++ b/products/openecomp/pom.xml @@ -24,7 +24,7 @@ org.onap.cli cli-products - 2.0.4 + 4.0.0-SNAPSHOT cli-products-openecomp diff --git a/products/pom.xml b/products/pom.xml index 4469dcb9..b7e8f651 100644 --- a/products/pom.xml +++ b/products/pom.xml @@ -19,7 +19,7 @@ org.onap.cli cli - 3.0.0 + 4.0.0-SNAPSHOT cli-products diff --git a/products/sample/pom.xml b/products/sample/pom.xml index 86d9f22b..831f9328 100644 --- a/products/sample/pom.xml +++ b/products/sample/pom.xml @@ -24,7 +24,7 @@ org.onap.cli cli-products - 3.0.0 + 4.0.0-SNAPSHOT cli-products-sample diff --git a/profiles/command/pom.xml b/profiles/command/pom.xml index 2379eb68..70eec137 100644 --- a/profiles/command/pom.xml +++ b/profiles/command/pom.xml @@ -22,7 +22,7 @@ org.onap.cli cli-profiles - 3.0.0 + 4.0.0-SNAPSHOT cli-profiles-command @@ -62,6 +62,10 @@ org.apache.maven.plugins maven-dependency-plugin + + org.apache.maven.plugins + maven-resources-plugin + diff --git a/profiles/http/pom.xml b/profiles/http/pom.xml index 1103f2f4..b8563e48 100644 --- a/profiles/http/pom.xml +++ b/profiles/http/pom.xml @@ -22,7 +22,7 @@ org.onap.cli cli-profiles - 3.0.0 + 4.0.0-SNAPSHOT cli-profiles-http @@ -58,18 +58,6 @@ jackson-databind 2.9.4 - - junit - junit - 4.11 - test - - - org.jmockit - jmockit - 1.19 - test - org.onap.cli cli-main @@ -77,12 +65,6 @@ test - org.jmockit - jmockit-coverage - 1.19 - test - - com.github.dreamhead moco-runner 0.12.0 @@ -96,14 +78,36 @@ logback-classic - - + + + junit + junit + 4.11 + test + + + org.jmockit + jmockit + 1.19 + test + + + org.jmockit + jmockit-coverage + 1.19 + test + + org.apache.maven.plugins maven-dependency-plugin + + org.apache.maven.plugins + maven-resources-plugin + diff --git a/profiles/pom.xml b/profiles/pom.xml index 20abad3f..94f71c51 100644 --- a/profiles/pom.xml +++ b/profiles/pom.xml @@ -24,7 +24,7 @@ org.onap.cli cli - 3.0.0 + 4.0.0-SNAPSHOT cli-profiles @@ -35,6 +35,7 @@ http snmp command + @@ -52,6 +53,32 @@ + + org.apache.maven.plugins + maven-resources-plugin + 3.1.0 + + + copy-resource-conf + install + + copy-resources + + + + ../../profiles/target/conf + + + ${project.basedir}/src/main/resources + + *.properties + + + + + + + org.apache.maven.plugins maven-dependency-plugin diff --git a/profiles/snmp/pom.xml b/profiles/snmp/pom.xml index 4b9884d6..1dcaa59a 100644 --- a/profiles/snmp/pom.xml +++ b/profiles/snmp/pom.xml @@ -22,7 +22,7 @@ org.onap.cli cli-profiles - 3.0.0 + 4.0.0-SNAPSHOT cli-profiles-snmp @@ -62,6 +62,10 @@ org.apache.maven.plugins maven-dependency-plugin + + org.apache.maven.plugins + maven-resources-plugin + diff --git a/validate/pom.xml b/validate/pom.xml index 46a899cc..5c9b9ee2 100644 --- a/validate/pom.xml +++ b/validate/pom.xml @@ -24,7 +24,7 @@ org.onap.cli cli - 3.0.0 + 4.0.0-SNAPSHOT cli-validate diff --git a/validate/sample-mock-generator/pom.xml b/validate/sample-mock-generator/pom.xml index 6b3eb54c..dfa5b9b7 100644 --- a/validate/sample-mock-generator/pom.xml +++ b/validate/sample-mock-generator/pom.xml @@ -24,7 +24,7 @@ org.onap.cli cli-validate - 3.0.0 + 4.0.0-SNAPSHOT cli-sample-mock-generator @@ -38,6 +38,18 @@ 4.11 test + + org.jmockit + jmockit + 1.19 + test + + + org.jmockit + jmockit-coverage + 1.19 + test + com.fasterxml.jackson.core jackson-databind diff --git a/validate/sample-yaml-generator/pom.xml b/validate/sample-yaml-generator/pom.xml index 400d72f1..c9503c5e 100644 --- a/validate/sample-yaml-generator/pom.xml +++ b/validate/sample-yaml-generator/pom.xml @@ -24,7 +24,7 @@ org.onap.cli cli-validate - 3.0.0 + 4.0.0-SNAPSHOT cli-sample-yaml-generator @@ -38,6 +38,18 @@ 4.11 test + + org.jmockit + jmockit + 1.19 + test + + + org.jmockit + jmockit-coverage + 1.19 + test + diff --git a/validate/validation/pom.xml b/validate/validation/pom.xml index 7767913c..526aa0f6 100644 --- a/validate/validation/pom.xml +++ b/validate/validation/pom.xml @@ -24,7 +24,7 @@ org.onap.cli cli-validate - 3.0.0 + 4.0.0-SNAPSHOT cli-validation @@ -37,6 +37,18 @@ 4.11 test + + org.jmockit + jmockit + 1.19 + test + + + org.jmockit + jmockit-coverage + 1.19 + test + org.onap.cli cli-main -- 2.16.6