diff options
18 files changed, 25 insertions, 76 deletions
diff --git a/onboarding/pom.xml b/onboarding/pom.xml index 90f5e5c443..1cdefc22bc 100644 --- a/onboarding/pom.xml +++ b/onboarding/pom.xml @@ -46,9 +46,6 @@ <maven-plugin-annotations.version>3.5.1</maven-plugin-annotations.version> <mvn.antrun.version>1.8</mvn.antrun.version> - <!-- Onboarding artifacts version --> - <openecomp.sdc.common.version>${project.version}</openecomp.sdc.common.version> - <!-- Onboarding 3rd party versions --> <aspectj.version>1.8.9</aspectj.version> <bsh.version>2.0b5</bsh.version> 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 c74ee9b457..cdc0a53f8c 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 @@ -17,19 +17,13 @@ <dependency> <groupId>org.onap.sdc.common</groupId> <artifactId>onap-configuration-management-core</artifactId> - <version>${openecomp.sdc.common.version}</version> + <version>${project.version}</version> <scope>runtime</scope> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.onap.sdc.common</groupId> <artifactId>onap-tosca-datatype</artifactId> - <version>${openecomp.sdc.common.version}</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.openecomp.sdc.core</groupId> 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 de49308a70..d91f79e98e 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 @@ -19,7 +19,7 @@ <dependency> <groupId>org.onap.sdc.common</groupId> <artifactId>onap-tosca-datatype</artifactId> - <version>${openecomp.sdc.common.version}</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.openecomp.sdc.core</groupId> diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/pom.xml b/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/pom.xml index 9d621b4323..a5507e69f5 100644 --- a/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/pom.xml +++ b/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/pom.xml @@ -16,7 +16,7 @@ <dependency> <groupId>org.onap.sdc.common</groupId> <artifactId>onap-tosca-datatype</artifactId> - <version>${openecomp.sdc.common.version}</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.yaml</groupId> diff --git a/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-api/pom.xml b/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-api/pom.xml index efd2da0fc7..5e78a1bbb7 100644 --- a/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-api/pom.xml +++ b/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-api/pom.xml @@ -16,19 +16,13 @@ <dependency> <groupId>org.onap.sdc.common</groupId> <artifactId>onap-configuration-management-core</artifactId> - <version>${openecomp.sdc.common.version}</version> + <version>${project.version}</version> <scope>runtime</scope> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.onap.sdc.common</groupId> <artifactId>onap-configuration-management-api</artifactId> - <version>${openecomp.sdc.common.version}</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.openecomp.sdc.core</groupId> diff --git a/openecomp-be/lib/openecomp-heat-lib/pom.xml b/openecomp-be/lib/openecomp-heat-lib/pom.xml index 7f48864a7b..2d6ed0810b 100644 --- a/openecomp-be/lib/openecomp-heat-lib/pom.xml +++ b/openecomp-be/lib/openecomp-heat-lib/pom.xml @@ -17,19 +17,13 @@ <dependency> <groupId>org.onap.sdc.common</groupId> <artifactId>onap-configuration-management-core</artifactId> - <version>${openecomp.sdc.common.version}</version> + <version>${project.version}</version> <scope>runtime</scope> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.onap.sdc.common</groupId> <artifactId>onap-tosca-datatype</artifactId> - <version>${openecomp.sdc.common.version}</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.openecomp.sdc.core</groupId> diff --git a/openecomp-be/lib/openecomp-sdc-datatypes-lib/pom.xml b/openecomp-be/lib/openecomp-sdc-datatypes-lib/pom.xml index ae9de3b560..068cfdad8f 100644 --- a/openecomp-be/lib/openecomp-sdc-datatypes-lib/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-datatypes-lib/pom.xml @@ -36,7 +36,7 @@ <dependency> <groupId>org.onap.sdc.common</groupId> <artifactId>onap-configuration-management-api</artifactId> - <version>${openecomp.sdc.common.version}</version> + <version>${project.version}</version> </dependency> </dependencies> </project> diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/pom.xml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/pom.xml index 9ec80418e0..d316a7f6ec 100644 --- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/pom.xml @@ -22,7 +22,7 @@ <dependency> <groupId>org.onap.sdc.common</groupId> <artifactId>onap-tosca-datatype</artifactId> - <version>${openecomp.sdc.common.version}</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.testng</groupId> diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/pom.xml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/pom.xml index 1a4c06e466..b91348330b 100644 --- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/pom.xml @@ -22,7 +22,7 @@ <dependency> <groupId>org.onap.sdc.common</groupId> <artifactId>onap-tosca-datatype</artifactId> - <version>${openecomp.sdc.common.version}</version> + <version>${project.version}</version> </dependency> <dependency> diff --git a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-core/pom.xml b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-core/pom.xml index 485ddb32e9..7e7fdff094 100644 --- a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-core/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-core/pom.xml @@ -23,7 +23,7 @@ <dependency> <groupId>org.onap.sdc.common</groupId> <artifactId>onap-tosca-datatype</artifactId> - <version>${openecomp.sdc.common.version}</version> + <version>${project.version}</version> </dependency> <dependency> 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 8c4ae8fcd0..6c32694a77 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 @@ -18,7 +18,7 @@ <dependency> <groupId>org.onap.sdc.common</groupId> <artifactId>onap-tosca-datatype</artifactId> - <version>${openecomp.sdc.common.version}</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>ch.qos.logback</groupId> diff --git a/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-api/pom.xml b/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-api/pom.xml index b50ef7af3a..d00b966dcd 100644 --- a/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-api/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-api/pom.xml @@ -44,14 +44,8 @@ <dependency> <groupId>org.onap.sdc.common</groupId> <artifactId>onap-configuration-management-core</artifactId> - <version>${openecomp.sdc.common.version}</version> + <version>${project.version}</version> <scope>runtime</scope> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.onap.sdc.common</groupId> diff --git a/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-core/pom.xml b/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-core/pom.xml index 1338f8900c..52333169ba 100644 --- a/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-core/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-core/pom.xml @@ -18,7 +18,7 @@ <dependency> <groupId>org.onap.sdc.common</groupId> <artifactId>onap-tosca-datatype</artifactId> - <version>${openecomp.sdc.common.version}</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>ch.qos.logback</groupId> diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-api/pom.xml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-api/pom.xml index e2596d1723..e2259957e5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-api/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-api/pom.xml @@ -49,19 +49,13 @@ <dependency> <groupId>org.onap.sdc.common</groupId> <artifactId>onap-configuration-management-core</artifactId> - <version>${openecomp.sdc.common.version}</version> + <version>${project.version}</version> <scope>runtime</scope> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.onap.sdc.common</groupId> <artifactId>onap-configuration-management-api</artifactId> - <version>${openecomp.sdc.common.version}</version> + <version>${project.version}</version> </dependency> </dependencies> diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/pom.xml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/pom.xml index bc6d5ed42b..cb870df987 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/pom.xml @@ -18,7 +18,7 @@ <dependency> <groupId>org.onap.sdc.common</groupId> <artifactId>onap-tosca-datatype</artifactId> - <version>${openecomp.sdc.common.version}</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>ch.qos.logback</groupId> diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-core/pom.xml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-core/pom.xml index a05fb01bd7..16c081dd5e 100644 --- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-core/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-core/pom.xml @@ -56,14 +56,8 @@ <dependency> <groupId>org.onap.sdc.common</groupId> <artifactId>onap-configuration-management-core</artifactId> - <version>${openecomp.sdc.common.version}</version> + <version>${project.version}</version> <scope>runtime</scope> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.openecomp.sdc.core</groupId> diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/pom.xml b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/pom.xml index 4beda3bcbc..1715b184d8 100644 --- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/pom.xml @@ -16,7 +16,7 @@ <dependency> <groupId>org.onap.sdc.common</groupId> <artifactId>onap-tosca-datatype</artifactId> - <version>${openecomp.sdc.common.version}</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.openecomp.sdc</groupId> @@ -70,19 +70,13 @@ <dependency> <groupId>org.onap.sdc.common</groupId> <artifactId>onap-configuration-management-core</artifactId> - <version>${openecomp.sdc.common.version}</version> + <version>${project.version}</version> <scope>runtime</scope> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.onap.sdc.common</groupId> <artifactId>onap-configuration-management-api</artifactId> - <version>${openecomp.sdc.common.version}</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.openecomp.sdc.core</groupId> diff --git a/openecomp-be/lib/openecomp-tosca-lib/pom.xml b/openecomp-be/lib/openecomp-tosca-lib/pom.xml index 7102f95a96..c2c65380f7 100644 --- a/openecomp-be/lib/openecomp-tosca-lib/pom.xml +++ b/openecomp-be/lib/openecomp-tosca-lib/pom.xml @@ -18,7 +18,7 @@ <dependency> <groupId>org.onap.sdc.common</groupId> <artifactId>onap-tosca-datatype</artifactId> - <version>${openecomp.sdc.common.version}</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.openecomp.sdc.core</groupId> @@ -66,19 +66,13 @@ <dependency> <groupId>org.onap.sdc.common</groupId> <artifactId>onap-configuration-management-core</artifactId> - <version>${openecomp.sdc.common.version}</version> + <version>${project.version}</version> <scope>runtime</scope> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.onap.sdc.common</groupId> <artifactId>onap-configuration-management-api</artifactId> - <version>${openecomp.sdc.common.version}</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.openecomp.sdc.sdc-tosca</groupId> |