From e4a8f92f825d28ec3f03834ec293ef12c57419dc Mon Sep 17 00:00:00 2001
From: platania <platania@research.att.com>
Date: Mon, 20 Feb 2017 09:46:34 -0500
Subject: [PATCH] Add deploy and install plugin versions

Change-Id: If1efa47f7bb5ff70ce22e3d2c4bb54db08c39780
Signed-off-by: platania <platania@research.att.com>
---
 .DS_Store                                           | Bin 6148 -> 6148 bytes
 pom.xml                                             |   4 +++-
 scripts/deploy.sh                                   |  12 ++++--------
 vnfs/.DS_Store                                      | Bin 10244 -> 10244 bytes
 vnfs/VES/pom.xml                                    |  15 ++-------------
 vnfs/VESreporting_vFW/pom.xml                       |  15 ++-------------
 vnfs/VESreporting_vLB/pom.xml                       |  15 ++-------------
 vnfs/honeycomb_plugin/.DS_Store                     | Bin 6148 -> 6148 bytes
 vnfs/honeycomb_plugin/sample_plugin/.DS_Store       | Bin 8196 -> 10244 bytes
 .../sample_plugin/parent-pom/.DS_Store              | Bin 0 -> 6148 bytes
 .../sample_plugin/parent-pom/pom.xml                |  15 ---------------
 vnfs/honeycomb_plugin/sample_plugin/pom.xml         |  12 ------------
 vnfs/vFW/.DS_Store                                  | Bin 8196 -> 8196 bytes
 vnfs/vFW/pg_streams/pom.xml                         |  15 ++-------------
 vnfs/vLB/.DS_Store                                  | Bin 10244 -> 10244 bytes
 vnfs/vLB/DNSClient/pom.xml                          |  18 +++---------------
 vnfs/vLB/DNSManager/pom.xml                         |  18 +++---------------
 vnfs/vLB/dns_streams/pom.xml                        |  14 ++------------
 18 files changed, 23 insertions(+), 130 deletions(-)
 create mode 100644 vnfs/honeycomb_plugin/sample_plugin/parent-pom/.DS_Store

diff --git a/.DS_Store b/.DS_Store
index 4627795c3f4c435da8536c5f3ddc3670c435f3cb..e43f3293d95266f46bb8bf52988ce6b204ab9124 100644
GIT binary patch
delta 70
zcmZoMXffCj!OHk;vKGrK4$<mr6CDLh%gOgyl#~t}VgLh1MhMLy45eYz;mtv8TNxL#
Ha0mbZOY{wK

delta 21
dcmZoMXffCj!8%!!<?rSowoQzi**X650{~Yp2fqLS

diff --git a/pom.xml b/pom.xml
index 4b361cab..533f06d1 100755
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
   </prerequisites>
 
   <modules>
-    <!--module>vnfs/honeycomb_plugin/sample_plugin</module-->
+    <module>vnfs/honeycomb_plugin/sample_plugin</module>
     <module>vnfs/vFW/pg_streams</module>
     <module>vnfs/vLB/dns_streams</module>
     <module>vnfs/vLB/DNSClient</module>
@@ -29,6 +29,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-deploy-plugin</artifactId>
+        <version>2.8.1</version>
         <configuration>
           <skip>true</skip>
         </configuration>
@@ -36,6 +37,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-install-plugin</artifactId>
+        <version>2.5.2</version>
         <configuration>
           <skip>true</skip>
         </configuration>
diff --git a/scripts/deploy.sh b/scripts/deploy.sh
index 94a98965..0dd0524e 100755
--- a/scripts/deploy.sh
+++ b/scripts/deploy.sh
@@ -24,20 +24,16 @@ echo "machine nexus.openecomp.org login ${USER} password ${PASS}" > "${NETRC}"
 
 ##### Upload scripts into Nexus raw repository #####
 cd $PATH_TO_BOOT
-#ls | xargs -I{} curl -vk --netrc-file "${NETRC}" --upload-file {} $REPO_URL/$BOOT_GROUP_ID/$VERSION/{}
-ls | xargs -I{} curl -k -v -u $USER:$PASS --upload-file {} $REPO_URL/$BOOT_GROUP_ID/$VERSION/{}
+ls | xargs -I{} curl -vk --netrc-file "${NETRC}" --upload-file {} $REPO_URL/$BOOT_GROUP_ID/$VERSION/{}
 
 cd $PATH_TO_HEAT
-#ls | xargs -I{} curl -vk --netrc-file "${NETRC}" --upload-file {} $REPO_URL/$HEAT_GROUP_ID/$VERSION/{}
-ls | xargs -I{} curl -k -v -u $USER:$PASS --upload-file {} $REPO_URL/$HEAT_GROUP_ID/$VERSION/{}
+ls | xargs -I{} curl -vk --netrc-file "${NETRC}" --upload-file {} $REPO_URL/$HEAT_GROUP_ID/$VERSION/{}
 
 cd $PATH_TO_VFW
-#ls | xargs -I{} curl -vk --netrc-file "${NETRC}" --upload-file {} $REPO_URL/$VFW_GROUP_ID/$VERSION/{}
-ls | xargs -I{} curl -k -v -u $USER:$PASS --upload-file {} $REPO_URL/$VFW_GROUP_ID/$VERSION/{}
+ls | xargs -I{} curl -vk --netrc-file "${NETRC}" --upload-file {} $REPO_URL/$VFW_GROUP_ID/$VERSION/{}
 
 cd $PATH_TO_VLB
-#ls | xargs -I{} curl -vk --netrc-file "${NETRC}" --upload-file {} $REPO_URL/$VLB_GROUP_ID/$VERSION/{}
-ls | xargs -I{} curl -k -v -u $USER:$PASS --upload-file {} $REPO_URL/$VLB_GROUP_ID/$VERSION/{}
+ls | xargs -I{} curl -vk --netrc-file "${NETRC}" --upload-file {} $REPO_URL/$VLB_GROUP_ID/$VERSION/{}
 ####################################################
 
 ########## Clean up ##########
diff --git a/vnfs/.DS_Store b/vnfs/.DS_Store
index 2f3daafeeaafd3d4e5fe2a0050ad18292fde9e5e..c4de1313b6510f13d8d0bed2dc3da55313a6c449 100644
GIT binary patch
delta 258
zcmZn(XbIR*Ex`C~@<+*49HQ0LCOQh1mXi$ym6#43n!G?np7HQx9s!lfGX>Y<RpTVw
zidX)C$b7u=A4F6(*NAB`;Z-zWG7z8q=2ud(tP>mfH?u4JVwub-8ir5tWQdKE7y%|b
BT%iB}

delta 287
zcmZn(XbIR*Ex`D5@?42k+!EE*M#jcE3dR;jll>)?m<}JEtS2VVcx*C{fXd`)g6jz>
zvk`7(`~fnFOB`sDnT~>?p#j*SLr1^{9i40_p*Z=bNF6~{DwCf|t=udv-pEKm>14@3
k0<PM8TS}I7GrPhsmdQ>M!jpMKy$Kj;C;_&8vb6Yp0GPyI761SM

diff --git a/vnfs/VES/pom.xml b/vnfs/VES/pom.xml
index da8d0ea4..2c103a30 100644
--- a/vnfs/VES/pom.xml
+++ b/vnfs/VES/pom.xml
@@ -17,6 +17,7 @@
 
        <plugin>
         <artifactId>maven-jar-plugin</artifactId>
+        <version>2.3.2</version>
         <executions>
           <execution>
             <id>default-jar</id>
@@ -45,24 +46,12 @@
 <plugin>
   <groupId>org.apache.maven.plugins</groupId>
   <artifactId>maven-deploy-plugin</artifactId>
+  <version>2.8.1</version>
   <configuration>
     <skip>false</skip>
   </configuration>
 </plugin>
 
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>exec-maven-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-        <executions>
-          <execution>
-            <phase>none</phase>
-          </execution>
-        </executions>
-      </plugin>
-
     </plugins>
   </build>
 
diff --git a/vnfs/VESreporting_vFW/pom.xml b/vnfs/VESreporting_vFW/pom.xml
index c1fb551f..9e712e5d 100644
--- a/vnfs/VESreporting_vFW/pom.xml
+++ b/vnfs/VESreporting_vFW/pom.xml
@@ -16,6 +16,7 @@
 
        <plugin>
         <artifactId>maven-jar-plugin</artifactId>
+        <version>2.3.2</version>
         <executions>
           <execution>
             <id>default-jar</id>
@@ -43,24 +44,12 @@
 <plugin>
   <groupId>org.apache.maven.plugins</groupId>
   <artifactId>maven-deploy-plugin</artifactId>
+  <version>2.8.1</version>
   <configuration>
     <skip>false</skip>
   </configuration>
 </plugin>
 
-        <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>exec-maven-plugin</artifactId>
-            <configuration>
-                <skip>true</skip>
-            </configuration>
-            <executions>
-                <execution>
-                    <phase>none</phase>
-                </execution>
-            </executions>
-        </plugin>
-
     </plugins>
   </build>
 
diff --git a/vnfs/VESreporting_vLB/pom.xml b/vnfs/VESreporting_vLB/pom.xml
index 51e93976..69c91789 100644
--- a/vnfs/VESreporting_vLB/pom.xml
+++ b/vnfs/VESreporting_vLB/pom.xml
@@ -16,6 +16,7 @@
 
        <plugin>
         <artifactId>maven-jar-plugin</artifactId>
+        <version>2.3.2</version>
         <executions>
           <execution>
             <id>default-jar</id>
@@ -43,24 +44,12 @@
 <plugin>
   <groupId>org.apache.maven.plugins</groupId>
   <artifactId>maven-deploy-plugin</artifactId>
+  <version>2.8.1</version>
   <configuration>
     <skip>false</skip>
   </configuration>
 </plugin>
 
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>exec-maven-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-        <executions>
-          <execution>
-            <phase>none</phase>
-          </execution>
-        </executions>
-      </plugin>
-
     </plugins>
   </build>
 
diff --git a/vnfs/honeycomb_plugin/.DS_Store b/vnfs/honeycomb_plugin/.DS_Store
index 5bdc9e5a48c9df89e703c4a7693818c9ec2b9c50..6febf681e328cd7bfd41bfbe80b9f32b0facf32a 100644
GIT binary patch
delta 44
zcmZoMXffDe%Eb6>vKiAV4$<mr6CDLh%gL{ql$Z`2n#|8E&v<yVKJyKh#Vi~G07w)K
A?*IS*

delta 48
zcmZoMXffDe%Eb6{vKiAVZi(t@BV%J71!D`N$uF3cm<}JE%)>0tcx<x{^9`2G>>Pjj
E0ejRBmH+?%

diff --git a/vnfs/honeycomb_plugin/sample_plugin/.DS_Store b/vnfs/honeycomb_plugin/sample_plugin/.DS_Store
index 0c92e6f3d369865be00576384d8fda279b883896..3c79254d37592cea7dc50f65dab92974ba00ee98 100644
GIT binary patch
delta 669
zcmZp1XbF&DU|?W$DortDU{C-uIe-{M3-C-V6q~50C@KKtFar4u41Ns346Y1%3?U2=
z8w;ngPi)}b%+A5WVGdHk&EUh}$>0o>M^eQQ;+d15oRpKF1Tqka-GEr*KNv7DOy&`g
zkU>*$22Fu7<G0BM0;@PgtE)|P6f7+#n+Yi~9XK>ON=TmZFvx((4ubr#><k4A`3$*0
zr&R#S98@!z^nmVXfmsSPpOYa7=uAfj7Y1LjcXAn0P<1fgKyihSpcc9_LH?KlGjg(z
zpebHw0u7kFM92u;5RhLHhHMZr#B0a~A+<>&CTM0b2BDZCFRsCpR9;*F4RL%y2UNN_
zL3BCO#)cv`L1v&SK%l@4BwRsJzp?N;^JIRRKoKTLg3tg-0~3J(h@M;^)62SS`3iV6
J(8OtCi~yWHx>o=I

delta 315
zcmZn(XmOBWU|?W$DortDU;r^WfEYvza8E20o2aKK$_bJO@);QN7)ls)844Kk8FDuk
zPGg_gz`L29gN1{UbMgd1iOGEe+>AdaPY_zgC0<=^WTvBFXlO9mM^K6B(2>ang7S<<
zfvVIe#|jw{P!%PlHF<-u5l>QiaY0f}eiG1n{KozhR-5c2YC^n*wGtYe--#_}5@ZIN
r4FnS0K*AN|<&A~knJ4qB1abg93<?N_$?-f>CwmJ^B0K@nyo3n=jb>Hk

diff --git a/vnfs/honeycomb_plugin/sample_plugin/parent-pom/.DS_Store b/vnfs/honeycomb_plugin/sample_plugin/parent-pom/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..5d56db6b27ea3419ec46be91928027c556a8b055
GIT binary patch
literal 6148
zcmeHKJ8l9o5S<Atfs}@l(kF<N8(0X6)VTlx%0-(7iE^um^W+4%8F}+jl+{9!f(E^j
z#?Kzlv*lOp?1+dikNa1Vxrof*hVp5{*lgc?WKS7UARK3$<RI-^+wHdPDEoTAxKsI%
z4$POo{BDaK9I0pE*TwDn5sXp+DnJFO02QDD|4_hcFKqT4$dL+A0V?pTfPEhd+^{D0
zf&S^h;4J{KLD&s*?<Ii60>GNs2O<K~paO%c*<xtW5igln6Z^oRi~7wtCvVp5P}FZn
zym-234dh4#sK8KxNi649|JU#v{r`}}6&0WY52b)MtM}CsPs-XldYskT0^h(b=NoQ@
pxl=HBIR<(;#=^?+!jmGe*c|&cu@7`Q;!X$hXTWr!QGt6a@B?>n9B}{u

literal 0
HcmV?d00001

diff --git a/vnfs/honeycomb_plugin/sample_plugin/parent-pom/pom.xml b/vnfs/honeycomb_plugin/sample_plugin/parent-pom/pom.xml
index cb3903a9..352d4476 100644
--- a/vnfs/honeycomb_plugin/sample_plugin/parent-pom/pom.xml
+++ b/vnfs/honeycomb_plugin/sample_plugin/parent-pom/pom.xml
@@ -226,21 +226,6 @@ done
                         </execution>
                     </executions>
                 </plugin>
-
-                <!-- Disable exec-maven-plugin -->
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>exec-maven-plugin</artifactId>
-                    <configuration>
-                        <skip>true</skip>
-                    </configuration>
-                    <executions>
-                        <execution>
-                            <phase>none</phase>
-                        </execution>
-                    </executions>
-                </plugin>
-
             </plugins>
         </pluginManagement>
     </build>
diff --git a/vnfs/honeycomb_plugin/sample_plugin/pom.xml b/vnfs/honeycomb_plugin/sample_plugin/pom.xml
index 8702d240..40a792b4 100755
--- a/vnfs/honeycomb_plugin/sample_plugin/pom.xml
+++ b/vnfs/honeycomb_plugin/sample_plugin/pom.xml
@@ -53,18 +53,6 @@
           <skip>true</skip>
         </configuration>
       </plugin>
-        <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>exec-maven-plugin</artifactId>
-            <configuration>
-                <skip>true</skip>
-            </configuration>
-            <executions>
-                <execution>
-                    <phase>none</phase>
-                </execution>
-            </executions>
-        </plugin>
     </plugins>
   </build>
 
diff --git a/vnfs/vFW/.DS_Store b/vnfs/vFW/.DS_Store
index 7ada677ebdc29f8913e3984d40fb5d57a3f56785..97cfa332b25b372fe2156f5d95761fbb9f8ebcca 100644
GIT binary patch
delta 54
zcmV-60LlM^K!iZBFAxFtlQ0mf2o-yKG%O%FIg{iNA_Bm|lL!$X0mGC35*V{U5yu9z
M1sM1Qv;Pza0|WvR)&Kwi

delta 56
zcmV-80LTA?K!iZBFAxFvlQ0mf3Kx5OGBzwAF)=Wc;t(PN!o-sX5g!4?ll>AHvpx~W
O2D1kk_5`#06bAzx#uF+4

diff --git a/vnfs/vFW/pg_streams/pom.xml b/vnfs/vFW/pg_streams/pom.xml
index 9c505ab8..e3f707cd 100644
--- a/vnfs/vFW/pg_streams/pom.xml
+++ b/vnfs/vFW/pg_streams/pom.xml
@@ -17,6 +17,7 @@
 
        <plugin>
         <artifactId>maven-jar-plugin</artifactId>
+        <version>2.3.2</version>
         <executions>
           <execution>
             <id>default-jar</id>
@@ -44,24 +45,12 @@
 <plugin>
   <groupId>org.apache.maven.plugins</groupId>
   <artifactId>maven-deploy-plugin</artifactId>
+  <version>2.8.1</version>
   <configuration>
     <skip>false</skip>
   </configuration>
 </plugin>
 
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>exec-maven-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-        <executions>
-          <execution>
-            <phase>none</phase>
-          </execution>
-        </executions>
-      </plugin>
-
     </plugins>
   </build>
 
diff --git a/vnfs/vLB/.DS_Store b/vnfs/vLB/.DS_Store
index 6f9c5d55ffc9e3ebbb803b81dd34a79e31103b65..17638039b8d170f8b3795b7ef2505b9d02dc4bd5 100644
GIT binary patch
delta 302
zcmZn(XbIS0D8Tq_vbXRm4$<mr6CDLh%Sj?iOa~54J}oBCcz808fYfFeK{h6QYFtEI
z@kuv{=HruoE#}T7B{{iTuxRo!@hs_x%;fyM;LNJjcme+6jQny>AUB{WwJbBWe6qHL
zK9{mX00S6sPEL_f6c=DrV$^0dVYFqmXY^q7Wb|eXU<_o8+B`=hn|)#f*JgHwUo4Z?
N3Fu+>9Vt%B000xHUjP6A

delta 267
zcmZn(XbIS0D8Tq*@@vsmT;kQ$MrJw+hK2@{=ZYyY9Xc}kpqM=4(aDU$Qj<T6nQkr@
zyvWG-6Qq<|0;ts3SVzIw!U(MP@KLbZW0UPgTnU(#C?YX=vS>IVgC2^xPc9cMnLI~4
mYjUVi`s7>*zR9PAtTu0z@L=D}uJDUx@&RFEoK7a$k~jbm&|k#>

diff --git a/vnfs/vLB/DNSClient/pom.xml b/vnfs/vLB/DNSClient/pom.xml
index 3084f9c3..6c31f4c8 100644
--- a/vnfs/vLB/DNSClient/pom.xml
+++ b/vnfs/vLB/DNSClient/pom.xml
@@ -8,7 +8,7 @@
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.openecomp.demo.vnf.vlb</groupId>
+  <groupId>org.openecomp.demo.vnf.lb</groupId>
   <artifactId>dns-client</artifactId>
   <name>DNS Client</name>
   <packaging>jar</packaging>
@@ -31,6 +31,7 @@
     <plugin>
       <groupId>org.apache.maven.plugins</groupId>
       <artifactId>maven-deploy-plugin</artifactId>
+      <version>2.8.1</version>
         <configuration>
           <skip>false</skip>
         </configuration>
@@ -39,24 +40,11 @@
     <plugin>
       <groupId>org.apache.maven.plugins</groupId>
       <artifactId>maven-install-plugin</artifactId>
+      <version>2.5.2</version>
       <configuration>
         <skip>false</skip>
       </configuration>
      </plugin>
-
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>exec-maven-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-        <executions>
-          <execution>
-            <phase>none</phase>
-          </execution>
-        </executions>
-      </plugin>
-
     </plugins>
   </build>
 
diff --git a/vnfs/vLB/DNSManager/pom.xml b/vnfs/vLB/DNSManager/pom.xml
index 17f3b143..be2c52d0 100644
--- a/vnfs/vLB/DNSManager/pom.xml
+++ b/vnfs/vLB/DNSManager/pom.xml
@@ -8,7 +8,7 @@
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.openecomp.demo.vnf.vlb</groupId>
+  <groupId>org.openecomp.demo.vnf.lb</groupId>
   <artifactId>dns-manager</artifactId>
   <name>DNS Manager</name>
   <packaging>jar</packaging>
@@ -31,6 +31,7 @@
     <plugin>
       <groupId>org.apache.maven.plugins</groupId>
       <artifactId>maven-deploy-plugin</artifactId>
+      <version>2.8.1</version>
         <configuration>
           <skip>false</skip>
         </configuration>
@@ -39,24 +40,11 @@
     <plugin>
       <groupId>org.apache.maven.plugins</groupId>
       <artifactId>maven-install-plugin</artifactId>
+      <version>2.5.2</version>
       <configuration>
         <skip>false</skip>
       </configuration>
      </plugin>
-
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>exec-maven-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-        <executions>
-          <execution>
-            <phase>none</phase>
-          </execution>
-        </executions>
-      </plugin>
-
     </plugins>
   </build>
 
diff --git a/vnfs/vLB/dns_streams/pom.xml b/vnfs/vLB/dns_streams/pom.xml
index 86a18781..5df7763e 100644
--- a/vnfs/vLB/dns_streams/pom.xml
+++ b/vnfs/vLB/dns_streams/pom.xml
@@ -17,6 +17,7 @@
 
        <plugin>
         <artifactId>maven-jar-plugin</artifactId>
+        <version>2.3.2</version>
         <executions>
           <execution>
             <id>default-jar</id>
@@ -45,23 +46,12 @@
 <plugin>
   <groupId>org.apache.maven.plugins</groupId>
   <artifactId>maven-deploy-plugin</artifactId>
+  <version>2.8.1</version>
   <configuration>
     <skip>false</skip>
   </configuration>
 </plugin>
 
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>exec-maven-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-        <executions>
-          <execution>
-            <phase>none</phase>
-          </execution>
-        </executions>
-      </plugin>
 
     </plugins>
   </build>
-- 
2.16.6