aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Lando <ml636r@att.com>2018-04-30 21:54:40 +0300
committerMichael Lando <ml636r@att.com>2018-04-30 21:54:40 +0300
commita6c79101b3ae522b83f9bef17deec3e543bf42ca (patch)
tree044603ad1cf8ceb98b5c56768e8fc7fee3babafc
parent025a1e762676144b055d2f090386d66620096ac8 (diff)
fix compilation at marge
update depandency used to new name space. update the model order to allow use of the common app. Change-Id: I8351afcbf0a91f18207eb725644020669563e453 Issue-ID: SDC-1279 Signed-off-by: Michael Lando <ml636r@att.com>
-rw-r--r--openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vnf-repository-rest-services/pom.xml8
-rw-r--r--openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vnf-repository-rest-services/src/main/java/org/openecomp/sdcrests/vsp/rest/services/VnfPackageRepositoryImpl.java4
-rw-r--r--pom.xml4
3 files changed, 8 insertions, 8 deletions
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vnf-repository-rest-services/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vnf-repository-rest-services/pom.xml
index 1829ceb542..0cb3f7501c 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vnf-repository-rest-services/pom.xml
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vnf-repository-rest-services/pom.xml
@@ -69,13 +69,13 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.openecomp.sdc.common</groupId>
- <artifactId>openecomp-configuration-management-api</artifactId>
+ <groupId>org.onap.sdc.common</groupId>
+ <artifactId>onap-configuration-management-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.openecomp.sdc.common</groupId>
- <artifactId>openecomp-configuration-management-core</artifactId>
+ <groupId>org.onap.sdc.common</groupId>
+ <artifactId>onap-configuration-management-core</artifactId>
<version>${project.version}</version>
<scope>runtime</scope>
</dependency>
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vnf-repository-rest-services/src/main/java/org/openecomp/sdcrests/vsp/rest/services/VnfPackageRepositoryImpl.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vnf-repository-rest-services/src/main/java/org/openecomp/sdcrests/vsp/rest/services/VnfPackageRepositoryImpl.java
index 439fd1475f..30432008de 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vnf-repository-rest-services/src/main/java/org/openecomp/sdcrests/vsp/rest/services/VnfPackageRepositoryImpl.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vnf-repository-rest-services/src/main/java/org/openecomp/sdcrests/vsp/rest/services/VnfPackageRepositoryImpl.java
@@ -29,8 +29,8 @@ import javax.inject.Named;
import javax.ws.rs.core.Response;
import org.apache.http.HttpStatus;
-import org.openecomp.config.api.Configuration;
-import org.openecomp.config.api.ConfigurationManager;
+import org.onap.config.api.Configuration;
+import org.onap.config.api.ConfigurationManager;
import org.openecomp.sdc.common.http.client.api.HttpRequest;
import org.openecomp.sdc.common.http.client.api.HttpResponse;
import org.openecomp.sdc.logging.api.Logger;
diff --git a/pom.xml b/pom.xml
index 1f66bfacfd..79ac505210 100644
--- a/pom.xml
+++ b/pom.xml
@@ -390,10 +390,10 @@
</activation>
<modules>
<module>build-tools</module>
- <module>onboarding</module>
- <module>services/activity-spec</module>
<module>security-utils</module>
<module>common-app-api</module>
+ <module>onboarding</module>
+ <module>services/activity-spec</module>
<module>common-be</module>
<module>catalog-dao</module>
<module>catalog-model</module>