From e993087ad095f6242780847926b1eed5c116ea93 Mon Sep 17 00:00:00 2001 From: vempo Date: Sun, 15 Jul 2018 16:53:59 +0300 Subject: [PATCH] Removed dependency on snapshot if same version Dependencies that are part of the same project must be referenced using ${project.version} instead of 1.3.0-SNAPSHOT. Change-Id: I1e6563052a762b9b6fc7103279d77fb76a85265e Issue-ID: SDC-1065 Signed-off-by: vempo --- .../onap-configuration-management-core/pom.xml | 2 +- .../healthcheck-rest/healthcheck-rest-services/pom.xml | 3 --- .../healthcheck-rest/healthcheck-rest-types/pom.xml | 2 -- .../api/openecomp-sdc-rest-webapp/healthcheck-rest/pom.xml | 3 --- .../openecomp-sdc-rest-webapp/item-permissions-rest/pom.xml | 3 --- .../backend/openecomp-sdc-healthcheck-manager/pom.xml | 1 - .../backend/openecomp-sdc-item-permissions-manager/pom.xml | 1 - .../backend/openecomp-sdc-vendor-license-manager/pom.xml | 4 +--- .../openecomp-sdc-vendor-software-product-manager/pom.xml | 4 ++-- .../openecomp-nosqldb-lib/openecomp-nosqldb-core/pom.xml | 2 +- .../lib/openecomp-core-lib/openecomp-zusammen-lib/pom.xml | 1 - .../openecomp-sdc-model-lib/openecomp-sdc-model-impl/pom.xml | 2 +- .../openecomp-tosca-converter-api/pom.xml | 9 +++------ .../openecomp-tosca-converter-core/pom.xml | 11 ++++------- openecomp-be/lib/openecomp-tosca-converter-lib/pom.xml | 1 - openecomp-be/tools/zusammen-tools/pom.xml | 4 +--- 16 files changed, 14 insertions(+), 39 deletions(-) diff --git a/common/onap-common-configuration-management/onap-configuration-management-core/pom.xml b/common/onap-common-configuration-management/onap-configuration-management-core/pom.xml index c4b896f1e3..c610307494 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-core/pom.xml +++ b/common/onap-common-configuration-management/onap-configuration-management-core/pom.xml @@ -87,7 +87,7 @@ org.onap.sdc.common onap-configuration-management-api - 1.3.0-SNAPSHOT + ${project.version} javax.servlet diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/healthcheck-rest/healthcheck-rest-services/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/healthcheck-rest/healthcheck-rest-services/pom.xml index 5da8f9077e..53aed46977 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/healthcheck-rest/healthcheck-rest-services/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/healthcheck-rest/healthcheck-rest-services/pom.xml @@ -11,12 +11,9 @@ healthcheck-rest-services - 1.3.0-SNAPSHOT - - javax.ws.rs javax.ws.rs-api diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/healthcheck-rest/healthcheck-rest-types/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/healthcheck-rest/healthcheck-rest-types/pom.xml index 399606fa75..f829043ee1 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/healthcheck-rest/healthcheck-rest-types/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/healthcheck-rest/healthcheck-rest-types/pom.xml @@ -11,7 +11,5 @@ healthcheck-rest-types - 1.3.0-SNAPSHOT - \ No newline at end of file diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/healthcheck-rest/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/healthcheck-rest/pom.xml index fb2d510a1a..0cb776817e 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/healthcheck-rest/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/healthcheck-rest/pom.xml @@ -10,12 +10,9 @@ 1.3.0-SNAPSHOT - org.openecomp.sdc healthcheck-rest - 1.3.0-SNAPSHOT pom - healthcheck-rest-types healthcheck-rest-services diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/item-permissions-rest/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/item-permissions-rest/pom.xml index b8a5a49904..e52ac1b917 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/item-permissions-rest/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/item-permissions-rest/pom.xml @@ -10,12 +10,9 @@ 1.3.0-SNAPSHOT - org.openecomp.sdc item-permissions-rest - pom - item-permissions-rest-types item-permissions-rest-services diff --git a/openecomp-be/backend/openecomp-sdc-healthcheck-manager/pom.xml b/openecomp-be/backend/openecomp-sdc-healthcheck-manager/pom.xml index f2db4d382d..aa0e062d41 100644 --- a/openecomp-be/backend/openecomp-sdc-healthcheck-manager/pom.xml +++ b/openecomp-be/backend/openecomp-sdc-healthcheck-manager/pom.xml @@ -11,7 +11,6 @@ openecomp-sdc-healthcheck-manager - 1.3.0-SNAPSHOT diff --git a/openecomp-be/backend/openecomp-sdc-item-permissions-manager/pom.xml b/openecomp-be/backend/openecomp-sdc-item-permissions-manager/pom.xml index 8cf113dc32..b119bdf7e2 100644 --- a/openecomp-be/backend/openecomp-sdc-item-permissions-manager/pom.xml +++ b/openecomp-be/backend/openecomp-sdc-item-permissions-manager/pom.xml @@ -9,7 +9,6 @@ org.openecomp.sdc backend 1.3.0-SNAPSHOT - openecomp-sdc-item-permissions-manager diff --git a/openecomp-be/backend/openecomp-sdc-vendor-license-manager/pom.xml b/openecomp-be/backend/openecomp-sdc-vendor-license-manager/pom.xml index 7d16e82dff..8c21128c74 100644 --- a/openecomp-be/backend/openecomp-sdc-vendor-license-manager/pom.xml +++ b/openecomp-be/backend/openecomp-sdc-vendor-license-manager/pom.xml @@ -11,8 +11,6 @@ 1.3.0-SNAPSHOT - - org.openecomp.sdc @@ -55,7 +53,7 @@ org.openecomp.sdc openecomp-sdc-vendor-software-product-manager - 1.3.0-SNAPSHOT + ${project.version} com.fasterxml.jackson.dataformat diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/pom.xml b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/pom.xml index f0d2753bec..c74ee9b457 100644 --- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/pom.xml +++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/pom.xml @@ -201,12 +201,12 @@ org.openecomp.sdc openecomp-tosca-converter-api - 1.3.0-SNAPSHOT + ${project.version} org.openecomp.sdc openecomp-tosca-converter-core - 1.3.0-SNAPSHOT + ${project.version} diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-core/pom.xml b/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-core/pom.xml index aea348f47d..de49308a70 100644 --- a/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-core/pom.xml +++ b/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-core/pom.xml @@ -53,7 +53,7 @@ org.openecomp.sdc.core openecomp-session-lib - 1.3.0-SNAPSHOT + ${project.version} diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/pom.xml b/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/pom.xml index f8af0246c9..99546b1617 100644 --- a/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/pom.xml +++ b/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/pom.xml @@ -10,7 +10,6 @@ org.openecomp.sdc.core openecomp-core-lib 1.3.0-SNAPSHOT - diff --git a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/pom.xml b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/pom.xml index 52d4c88b41..8c4ae8fcd0 100644 --- a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/pom.xml @@ -59,7 +59,7 @@ org.openecomp.sdc openecomp-tosca-converter-api - 1.3.0-SNAPSHOT + ${project.version} diff --git a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-api/pom.xml b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-api/pom.xml index e2a68475fd..3f37663881 100644 --- a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-api/pom.xml +++ b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-api/pom.xml @@ -7,17 +7,17 @@ org.onap.sdc.common onap-tosca-datatype - 1.3.0-SNAPSHOT + ${project.version} org.openecomp.sdc.core openecomp-tosca-lib - 1.3.0-SNAPSHOT + ${project.version} org.openecomp.sdc.core openecomp-facade-core - 1.3.0-SNAPSHOT + ${project.version} @@ -27,9 +27,6 @@ 1.3.0-SNAPSHOT - org.openecomp.sdc openecomp-tosca-converter-api - 1.3.0-SNAPSHOT - \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/pom.xml b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/pom.xml index 0968b1ac2b..33757ecbaa 100644 --- a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/pom.xml +++ b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/pom.xml @@ -7,22 +7,22 @@ org.openecomp.sdc openecomp-tosca-converter-api - 1.3.0-SNAPSHOT + ${project.version} org.openecomp.sdc.core openecomp-tosca-lib - 1.3.0-SNAPSHOT + ${project.version} org.openecomp.sdc.core openecomp-facade-core - 1.3.0-SNAPSHOT + ${project.version} org.openecomp.sdc openecomp-sdc-translator-core - 1.3.0-SNAPSHOT + ${project.version} junit @@ -38,9 +38,6 @@ 1.3.0-SNAPSHOT - org.openecomp.sdc openecomp-tosca-converter-core - 1.3.0-SNAPSHOT - \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-tosca-converter-lib/pom.xml b/openecomp-be/lib/openecomp-tosca-converter-lib/pom.xml index 80de07eed3..47909c24d9 100644 --- a/openecomp-be/lib/openecomp-tosca-converter-lib/pom.xml +++ b/openecomp-be/lib/openecomp-tosca-converter-lib/pom.xml @@ -11,7 +11,6 @@ openecomp-tosca-converter-lib - 1.3.0-SNAPSHOT pom diff --git a/openecomp-be/tools/zusammen-tools/pom.xml b/openecomp-be/tools/zusammen-tools/pom.xml index 9e11c53806..406e7bf5f0 100644 --- a/openecomp-be/tools/zusammen-tools/pom.xml +++ b/openecomp-be/tools/zusammen-tools/pom.xml @@ -6,7 +6,6 @@ openecomp-zusammen-tools org.openecomp.sdc.core.tools openecomp-zusammen-tools - 1.3.0-SNAPSHOT org.openecomp.sdc @@ -83,9 +82,9 @@ test + - org.codehaus.mojo license-maven-plugin @@ -204,7 +203,6 @@ openecomp-zusammen-tools-lib - -- 2.16.6