X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=catalog-fe%2Fpom.xml;h=3848d2e8b5d3c70bd5ac3b6bdef1bc391243ef77;hb=eb7d16f50c59ca2979ec2a79fe57edafafc97e96;hp=85b93c5228194e1ac42c423906aa3f8f2a6fac1a;hpb=e9171113772c0c7dc3f7514ffd0660d1e0f8ef02;p=sdc.git

diff --git a/catalog-fe/pom.xml b/catalog-fe/pom.xml
index 85b93c5228..3848d2e8b5 100644
--- a/catalog-fe/pom.xml
+++ b/catalog-fe/pom.xml
@@ -35,6 +35,12 @@
             <groupId>org.openecomp.sdc</groupId>
             <artifactId>common-app-api</artifactId>
             <version>${project.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.httpcomponents</groupId>
+                    <artifactId>httpcore</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <!-- File changes listener -->
@@ -151,7 +157,12 @@
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
             <version>${httpclient.version}</version>
-            <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.httpcomponents</groupId>
+                    <artifactId>httpcore</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -165,7 +176,12 @@
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpmime</artifactId>
             <version>${httpclient.version}</version>
-            <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.httpcomponents</groupId>
+                    <artifactId>httpcore</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -583,10 +599,6 @@
             <activation>
                 <activeByDefault>false</activeByDefault>
             </activation>
-            <properties>
-                <docker.username>docker</docker.username>
-                <docker.password>docker</docker.password>
-            </properties>
             <build>
                 <plugins>
                     <plugin>
@@ -625,7 +637,7 @@
                         <configuration>
                             <verbose>${verbose}</verbose>
                             <apiVersion>${docker.api.version}</apiVersion>
-                            <registry>nexus3.onap.org:10001</registry>
+                            <registry>${docker.registry}</registry>
                             <authConfig>
                                 <pull>
                                     <username>${docker.username}</username>
@@ -636,7 +648,7 @@
 
                                 <!-- Build frontend image -->
                                 <image>
-                                    <name>onap/sdc-frontend</name>
+                                    <name>${docker.namespace}/sdc-frontend</name>
                                     <alias>sdc-frontend</alias>
                                     <build>
                                         <cleanup>try</cleanup>
@@ -663,7 +675,7 @@
                                 </goals>
                                 <configuration>
                                     <removeAll>true</removeAll>
-                                    <image>onap/sdc-frontend</image>
+                                    <image>${docker.namespace}/sdc-frontend</image>
                                 </configuration>
                             </execution>
 
@@ -682,7 +694,7 @@
                                     <goal>push</goal>
                                 </goals>
                                 <configuration>
-                                    <image>onap/sdc-frontend</image>
+                                    <image>${docker.namespace}/sdc-frontend</image>
                                 </configuration>
                             </execution>
                         </executions>