X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=00e1c77627c034be58b1a14c5764b3a3a7c46eb7;hb=430c366d549457f8510045dbaae94b54e12d8d39;hp=0c9da6ef09feba0e89e45a849fab21abf4c40bb4;hpb=578368fce559ad28eb3bc62064e4c39858fa3339;p=aai%2Fmodel-loader.git

diff --git a/pom.xml b/pom.xml
index 0c9da6e..00e1c77 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,18 +25,19 @@
 	<parent>
 		<artifactId>ajsc-archetype-parent</artifactId>
 		<groupId>com.att.ajsc</groupId>
-		<version>2.0.0</version>
+		<version>2.1.0</version>
 	</parent>
 	
-	<groupId>org.openecomp.aai.model-loader</groupId>
+	<groupId>org.onap.aai.model-loader</groupId>
 	<artifactId>model-loader</artifactId>
 	<version>1.1.0-SNAPSHOT</version>
+	<name>aai-model-loader</name>
 	
 	<properties>
 		<docker.location>${basedir}/target</docker.location>
 		<module.ajsc.namespace.name>model-loader</module.ajsc.namespace.name>
 		<module.ajsc.namespace.version>v1</module.ajsc.namespace.version>
-		<ajscRuntimeVersion>2.0.0</ajscRuntimeVersion>
+		<ajscRuntimeVersion>2.1.0</ajscRuntimeVersion>
 		<absoluteDistFilesRoot>/appl/${project.artifactId}</absoluteDistFilesRoot>
 		<distFilesRoot>/appl/${project.artifactId}/${project.version}</distFilesRoot>
 		<runAjscHome>${basedir}/target/swm/package/nix/dist_files${distFilesRoot}</runAjscHome>
@@ -56,9 +57,6 @@
 		<testRouteOffer>workstation</testRouteOffer>
 		<testEnv>DEV</testEnv>
 
-		<!-- Ecomp Version -->
-		<ecomp.version>1.0.0</ecomp.version>
-
 		<dependency.scope>provided</dependency.scope>
 		<checkstyle.config.location>google_checks.xml</checkstyle.config.location>
 		<maven.compiler.source>1.8</maven.compiler.source>
@@ -149,9 +147,9 @@
 		</dependency>
 		<!-- Common logging framework -->
 		<dependency>
-			<groupId>org.openecomp.aai.logging-service</groupId>
+			<groupId>org.onap.aai.logging-service</groupId>
 			<artifactId>common-logging</artifactId>
-			<version>${ecomp.version}</version>
+			<version>1.1.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>ch.qos.logback</groupId>
@@ -160,9 +158,14 @@
 		</dependency>
 
 		<dependency>
-			<groupId>org.openecomp.sdc</groupId>
+			<groupId>org.openecomp.sdc.sdc-distribution-client</groupId>
 		    <artifactId>sdc-distribution-client</artifactId>
-		    <version>${ecomp.version}</version>
+		    <version>1.1.32-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpclient</artifactId>
+			<version>4.5</version>
 		</dependency>
 		<dependency>
 			<groupId>org.json</groupId>
@@ -377,7 +380,7 @@
 				<configuration>		
 					<verbose>true</verbose>
 					<serverId>docker-hub</serverId>
-					<imageName>${docker.push.registry}/openecomp/${project.artifactId}</imageName>					
+					<imageName>${docker.push.registry}/onap/${project.artifactId}</imageName>					
 					<dockerDirectory>${docker.location}</dockerDirectory>
 					<imageTags>
 						<imageTag>latest</imageTag>
@@ -388,7 +391,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-dependency-plugin</artifactId>
-				<version>2.5.1</version>
+				<version>2.8</version>
 				<executions>
 					<execution>
 						<id>copy-agent</id>