Add deploy and install plugin versions

Change-Id: If1efa47f7bb5ff70ce22e3d2c4bb54db08c39780
Signed-off-by: platania <platania@research.att.com>

diff --git a/.DS_Store b/.DS_Store
index 4627795..e43f329 100644 (file)
Binary files a/.DS_Store and b/.DS_Store differ

diff --git a/pom.xml b/pom.xml
index 4b361ca..533f06d 100755 (executable)
--- 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 94a9896..0dd0524 100755 (executable)
--- 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 2f3daaf..c4de131 100644 (file)
Binary files a/vnfs/.DS_Store and b/vnfs/.DS_Store differ

diff --git a/vnfs/VES/pom.xml b/vnfs/VES/pom.xml
index da8d0ea..2c103a3 100644 (file)
--- 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 c1fb551..9e712e5 100644 (file)
--- 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 51e9397..69c9178 100644 (file)
--- 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 5bdc9e5..6febf68 100644 (file)
Binary files a/vnfs/honeycomb_plugin/.DS_Store and b/vnfs/honeycomb_plugin/.DS_Store differ

diff --git a/vnfs/honeycomb_plugin/sample_plugin/.DS_Store b/vnfs/honeycomb_plugin/sample_plugin/.DS_Store
index 0c92e6f..3c79254 100644 (file)
Binary files a/vnfs/honeycomb_plugin/sample_plugin/.DS_Store and b/vnfs/honeycomb_plugin/sample_plugin/.DS_Store differ

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 (file)
index 0000000..5d56db6
Binary files /dev/null and b/vnfs/honeycomb_plugin/sample_plugin/parent-pom/.DS_Store differ

diff --git a/vnfs/honeycomb_plugin/sample_plugin/parent-pom/pom.xml b/vnfs/honeycomb_plugin/sample_plugin/parent-pom/pom.xml
index cb3903a..352d447 100644 (file)
--- 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 8702d24..40a792b 100755 (executable)
--- 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 7ada677..97cfa33 100644 (file)
Binary files a/vnfs/vFW/.DS_Store and b/vnfs/vFW/.DS_Store differ

diff --git a/vnfs/vFW/pg_streams/pom.xml b/vnfs/vFW/pg_streams/pom.xml
index 9c505ab..e3f707c 100644 (file)
--- 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 6f9c5d5..1763803 100644 (file)
Binary files a/vnfs/vLB/.DS_Store and b/vnfs/vLB/.DS_Store differ

diff --git a/vnfs/vLB/DNSClient/pom.xml b/vnfs/vLB/DNSClient/pom.xml
index 3084f9c..6c31f4c 100644 (file)
--- 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 17f3b14..be2c52d 100644 (file)
--- 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 86a1878..5df7763 100644 (file)
--- 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>