Update POM structure for staging

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

diff --git a/boot/aai_vm_init.sh b/boot/aai_vm_init.sh
index 5c0773f..b4e01dd 100644 (file)
--- a/boot/aai_vm_init.sh
+++ b/boot/aai_vm_init.sh
@@ -24,5 +24,5 @@ docker run --name=aai-service --net=host -v /etc/ssl/certs/ca-certificates.crt:/
 docker pull $NEXUS_DOCKER_REPO/openecomp/model-loader:latest
 docker rm -f model-loader-service
 
 docker pull $NEXUS_DOCKER_REPO/openecomp/model-loader:latest
 docker rm -f model-loader-service
 

-docker run --name=model-loader-service -it -d -e DISTR_CLIENT_ASDC_ADDRESS=c2.vm1.asdc.simpledemo.openecomp.org:8443 -e DISTR_CLIENT_ENVIRONMENT_NAME=$DMAAP_TOPIC -e DISTR_CLIENT_USER=aai -e DISTR_CLIENT_PASSWORD=OBF:1ks51l8d1o3i1pcc1r2r1e211r391kls1pyj1z7u1njf1lx51go21hnj1y0k1mli1sop1k8o1j651vu91mxw1vun1mze1vv11j8x1k5i1sp11mjc1y161hlr1gm41m111nkj1z781pw31kku1r4p1e391r571pbm1o741l4x1ksp -e APP_SERVER_BASE_URL=https://c1.vm1.aai.simpledemo.openecomp.org:8443 -e APP_SERVER_KEYSTORE_PASSWORD=OBF:1i9a1u2a1unz1lr61wn51wn11lss1unz1u301i6o -e APP_SERVER_AUTH_USER=ModelLoader -e APP_SERVER_AUTH_PASSWORD=OBF:1qvu1v2h1sov1sar1wfw1j7j1wg21saj1sov1v1x1qxw $NEXUS_DOCKER_REPO/openecomp/model-loader:latest
+docker run --name=model-loader-service -it -d -e DISTR_CLIENT_ASDC_ADDRESS=c2.vm1.sdc.simpledemo.openecomp.org:8443 -e DISTR_CLIENT_ENVIRONMENT_NAME=$DMAAP_TOPIC -e DISTR_CLIENT_USER=aai -e DISTR_CLIENT_PASSWORD=OBF:1ks51l8d1o3i1pcc1r2r1e211r391kls1pyj1z7u1njf1lx51go21hnj1y0k1mli1sop1k8o1j651vu91mxw1vun1mze1vv11j8x1k5i1sp11mjc1y161hlr1gm41m111nkj1z781pw31kku1r4p1e391r571pbm1o741l4x1ksp -e APP_SERVER_BASE_URL=https://c1.vm1.aai.simpledemo.openecomp.org:8443 -e APP_SERVER_KEYSTORE_PASSWORD=OBF:1i9a1u2a1unz1lr61wn51wn11lss1unz1u301i6o -e APP_SERVER_AUTH_USER=ModelLoader -e APP_SERVER_AUTH_PASSWORD=OBF:1qvu1v2h1sov1sar1wfw1j7j1wg21saj1sov1v1x1qxw $NEXUS_DOCKER_REPO/openecomp/model-loader:latest

 
 

diff --git a/pom.xml b/pom.xml
index ce49d4d..3ce014a 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -1,7 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <?xml version="1.0" encoding="UTF-8"?>
 

-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<!--
+ ============LICENSE_START==========================================
+ ===================================================================
+ Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ ===================================================================
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at

 
 

+         http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ ============LICENSE_END============================================
+
+ ECOMP and OpenECOMP are trademarks
+ and service marks of AT&T Intellectual Property.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

 
   <groupId>org.openecomp.demo.vnf</groupId>
   <artifactId>demo-aggregator</artifactId>
 
   <groupId>org.openecomp.demo.vnf</groupId>
   <artifactId>demo-aggregator</artifactId>


@@ -61,17 +83,17 @@
         </configuration>
       </plugin>
 
         </configuration>
       </plugin>
 

-      <!--plugin>
+      <plugin>

         <groupId>org.sonatype.plugins</groupId>
         <artifactId>nexus-staging-maven-plugin</artifactId>
         <version>1.6.7</version>
         <extensions>true</extensions>
         <configuration>
         <groupId>org.sonatype.plugins</groupId>
         <artifactId>nexus-staging-maven-plugin</artifactId>
         <version>1.6.7</version>
         <extensions>true</extensions>
         <configuration>

-          <nexusUrl>https://nexus.openecomp.org/</nexusUrl>
+          <nexusUrl>https://nexus.openecomp.org/content/repositories/staging/</nexusUrl>

           <stagingProfileId>176c31dfe190a</stagingProfileId>
           <serverId>ecomp-staging</serverId>
         </configuration>
           <stagingProfileId>176c31dfe190a</stagingProfileId>
           <serverId>ecomp-staging</serverId>
         </configuration>

-      </plugin-->
+      </plugin>

 
     </plugins>
   </build>
 
     </plugins>
   </build>

diff --git a/version.properties b/version.properties
index 82edb1b..d2812bb 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -9,4 +9,4 @@ base_version=${major}.${minor}.${patch}
 
 # Release must be completed with git revision # in Jenkins
 release_version=${base_version}
 
 # Release must be completed with git revision # in Jenkins
 release_version=${base_version}

-snapshot_version=${base_version}-SNAPSHOT
\ No newline at end of file
+snapshot_version=${base_version}-SNAPSHOT

diff --git a/vnfs/VES/pom.xml b/vnfs/VES/pom.xml
index 1dbbce0..12a22e1 100644 (file)
--- a/vnfs/VES/pom.xml
+++ b/vnfs/VES/pom.xml
@@ -1,5 +1,29 @@
-<!--<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">-->
-<project>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ============LICENSE_START==========================================
+ ===================================================================
+ Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ ===================================================================
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ ============LICENSE_END============================================
+
+ ECOMP and OpenECOMP are trademarks
+ and service marks of AT&T Intellectual Property.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

 
   <parent>
     <groupId>org.openecomp.demo.vnf</groupId>
 
   <parent>
     <groupId>org.openecomp.demo.vnf</groupId>


@@ -56,15 +80,6 @@
         </configuration>
       </plugin>
 
         </configuration>
       </plugin>
 

-<!--plugin>
-  <groupId>org.apache.maven.plugins</groupId>
-  <artifactId>maven-deploy-plugin</artifactId>
-  <version>2.8.1</version>
-  <configuration>
-    <skip>false</skip>
-  </configuration>
-</plugin-->
-

     </plugins>
   </build>
 
     </plugins>
   </build>
 

diff --git a/vnfs/VESreporting_vFW/pom.xml b/vnfs/VESreporting_vFW/pom.xml
index a62e48f..16f0115 100644 (file)
--- a/vnfs/VESreporting_vFW/pom.xml
+++ b/vnfs/VESreporting_vFW/pom.xml
@@ -1,5 +1,30 @@
-<!--<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">-->
-<project>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ============LICENSE_START==========================================
+ ===================================================================
+ Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ ===================================================================
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ ============LICENSE_END============================================
+
+ ECOMP and OpenECOMP are trademarks
+ and service marks of AT&T Intellectual Property.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+

 <parent>
     <groupId>org.openecomp.demo.vnf</groupId>
     <artifactId>demo-aggregator</artifactId>
 <parent>
     <groupId>org.openecomp.demo.vnf</groupId>
     <artifactId>demo-aggregator</artifactId>


@@ -55,16 +80,7 @@
             </configuration>
         </plugin>
 
             </configuration>
         </plugin>
 

-<!--plugin>
-  <groupId>org.apache.maven.plugins</groupId>
-  <artifactId>maven-deploy-plugin</artifactId>
-  <version>2.8.1</version>
-  <configuration>
-    <skip>false</skip>
-  </configuration>
-</plugin-->
-

     </plugins>
   </build>
 
     </plugins>
   </build>
 

-</project>
+</project>
\ No newline at end of file

diff --git a/vnfs/VESreporting_vLB/pom.xml b/vnfs/VESreporting_vLB/pom.xml
index c31c061..76e79aa 100644 (file)
--- a/vnfs/VESreporting_vLB/pom.xml
+++ b/vnfs/VESreporting_vLB/pom.xml
@@ -1,5 +1,30 @@
-<!--<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">-->
-<project>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ============LICENSE_START==========================================
+ ===================================================================
+ Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ ===================================================================
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ ============LICENSE_END============================================
+
+ ECOMP and OpenECOMP are trademarks
+ and service marks of AT&T Intellectual Property.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+

   <parent>
     <groupId>org.openecomp.demo.vnf</groupId>
     <artifactId>demo-aggregator</artifactId>
   <parent>
     <groupId>org.openecomp.demo.vnf</groupId>
     <artifactId>demo-aggregator</artifactId>


@@ -55,15 +80,6 @@
         </configuration>
       </plugin>
 
         </configuration>
       </plugin>
 

-<!--plugin>
-  <groupId>org.apache.maven.plugins</groupId>
-  <artifactId>maven-deploy-plugin</artifactId>
-  <version>2.8.1</version>
-  <configuration>
-    <skip>false</skip>
-  </configuration>
-</plugin-->
-

     </plugins>
   </build>
 
     </plugins>
   </build>
 

diff --git a/vnfs/honeycomb_plugin/sample_plugin/parent-pom/.DS_Store b/vnfs/honeycomb_plugin/sample_plugin/parent-pom/.DS_Store
index 5d56db6..6ee7724 100644 (file)
Binary files a/vnfs/honeycomb_plugin/sample_plugin/parent-pom/.DS_Store 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 b80f8ef..5492aeb 100644 (file)
--- a/vnfs/honeycomb_plugin/sample_plugin/parent-pom/pom.xml
+++ b/vnfs/honeycomb_plugin/sample_plugin/parent-pom/pom.xml
@@ -14,6 +14,11 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->

+
+<!--
+    Modifications copyright © 2017 AT&T Intellectual Property
+-->
+

 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 


@@ -58,10 +63,6 @@ done
         <osgi.core.version>5.0.0</osgi.core.version>
     </properties>
 
         <osgi.core.version>5.0.0</osgi.core.version>
     </properties>
 

-    <!--groupId>io.fd.honeycomb.common</groupId-->
-    <!--artifactId>minimal-distribution-parent</artifactId-->
-    <!--version>1.16.9</version-->
-

     <modelVersion>4.0.0</modelVersion>
     <artifactId>hc-openecomp</artifactId>
     <packaging>pom</packaging>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>hc-openecomp</artifactId>
     <packaging>pom</packaging>

diff --git a/vnfs/honeycomb_plugin/sample_plugin/sample-distribution/pom.xml b/vnfs/honeycomb_plugin/sample_plugin/sample-distribution/pom.xml
index 4b1fedb..da25cc7 100755 (executable)
--- a/vnfs/honeycomb_plugin/sample_plugin/sample-distribution/pom.xml
+++ b/vnfs/honeycomb_plugin/sample_plugin/sample-distribution/pom.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>

-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

 
 

-<!--parent>
-<groupId>io.fd.honeycomb.common</groupId>
-    <artifactId>minimal-distribution-parent</artifactId>
-    <version>1.16.9</version>
-</parent-->
+<!--
+    Modifications copyright © 2017 AT&T Intellectual Property
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

 
 <parent>
     <groupId>org.openecomp.demo.vnf</groupId>
 
 <parent>
     <groupId>org.openecomp.demo.vnf</groupId>

diff --git a/vnfs/honeycomb_plugin/sample_plugin/sample-plugin-api/pom.xml b/vnfs/honeycomb_plugin/sample_plugin/sample-plugin-api/pom.xml
index c89f311..6f35732 100755 (executable)
--- a/vnfs/honeycomb_plugin/sample_plugin/sample-plugin-api/pom.xml
+++ b/vnfs/honeycomb_plugin/sample_plugin/sample-plugin-api/pom.xml
@@ -12,7 +12,15 @@
  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  See the License for the specific language governing permissions and
  limitations under the License.
  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  See the License for the specific language governing permissions and
  limitations under the License.

---><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+-->
+
+<!--
+    Modifications copyright © 2017 AT&T Intellectual Property
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+

   <parent>
     <groupId>io.fd.honeycomb.common</groupId>
     <artifactId>api-parent</artifactId>
   <parent>
     <groupId>io.fd.honeycomb.common</groupId>
     <artifactId>api-parent</artifactId>

diff --git a/vnfs/honeycomb_plugin/sample_plugin/sample-plugin-impl/pom.xml b/vnfs/honeycomb_plugin/sample_plugin/sample-plugin-impl/pom.xml
index ab0b03e..84f48b4 100755 (executable)
--- a/vnfs/honeycomb_plugin/sample_plugin/sample-plugin-impl/pom.xml
+++ b/vnfs/honeycomb_plugin/sample_plugin/sample-plugin-impl/pom.xml
@@ -12,7 +12,15 @@
  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  See the License for the specific language governing permissions and
  limitations under the License.
  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  See the License for the specific language governing permissions and
  limitations under the License.

---><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+-->
+
+<!--
+    Modifications copyright © 2017 AT&T Intellectual Property
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+

     <parent>
         <groupId>io.fd.honeycomb.common</groupId>
         <artifactId>impl-parent</artifactId>
     <parent>
         <groupId>io.fd.honeycomb.common</groupId>
         <artifactId>impl-parent</artifactId>

diff --git a/vnfs/vFW/pg_streams/pom.xml b/vnfs/vFW/pg_streams/pom.xml
index 6a8c097..072a97e 100644 (file)
--- a/vnfs/vFW/pg_streams/pom.xml
+++ b/vnfs/vFW/pg_streams/pom.xml
@@ -1,5 +1,29 @@
-<!--<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">-->
-<project>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ============LICENSE_START==========================================
+ ===================================================================
+ Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ ===================================================================
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ ============LICENSE_END============================================
+
+ ECOMP and OpenECOMP are trademarks
+ and service marks of AT&T Intellectual Property.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

 
   <parent>
     <groupId>org.openecomp.demo.vnf</groupId>
 
   <parent>
     <groupId>org.openecomp.demo.vnf</groupId>


@@ -56,15 +80,6 @@
         </configuration>
       </plugin>
 
         </configuration>
       </plugin>
 

-<!--plugin>
-  <groupId>org.apache.maven.plugins</groupId>
-  <artifactId>maven-deploy-plugin</artifactId>
-  <version>2.8.1</version>
-  <configuration>
-    <skip>false</skip>
-  </configuration>
-</plugin-->
-

     </plugins>
   </build>
 
     </plugins>
   </build>
 

diff --git a/vnfs/vLB/DNSClient/pom.xml b/vnfs/vLB/DNSClient/pom.xml
index 78f2a4d..ec50069 100644 (file)
--- a/vnfs/vLB/DNSClient/pom.xml
+++ b/vnfs/vLB/DNSClient/pom.xml
@@ -1,4 +1,29 @@
-<project>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ============LICENSE_START==========================================
+ ===================================================================
+ Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ ===================================================================
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ ============LICENSE_END============================================
+
+ ECOMP and OpenECOMP are trademarks
+ and service marks of AT&T Intellectual Property.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

 
   <parent>
     <groupId>org.openecomp.demo.vnf</groupId>
 
   <parent>
     <groupId>org.openecomp.demo.vnf</groupId>


@@ -41,23 +66,6 @@
         </configuration>
       </plugin>
 
         </configuration>
       </plugin>
 

-    <!--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.apache.maven.plugins</groupId>
-      <artifactId>maven-install-plugin</artifactId>
-      <version>2.5.2</version>
-      <configuration>
-        <skip>false</skip>
-      </configuration>
-     </plugin-->

     </plugins>
   </build>
 
     </plugins>
   </build>
 

diff --git a/vnfs/vLB/DNSManager/pom.xml b/vnfs/vLB/DNSManager/pom.xml
index 81e8cfa..1af3c1d 100644 (file)
--- a/vnfs/vLB/DNSManager/pom.xml
+++ b/vnfs/vLB/DNSManager/pom.xml
@@ -1,4 +1,29 @@
-<project>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ============LICENSE_START==========================================
+ ===================================================================
+ Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ ===================================================================
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ ============LICENSE_END============================================
+
+ ECOMP and OpenECOMP are trademarks
+ and service marks of AT&T Intellectual Property.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

 
   <parent>
     <groupId>org.openecomp.demo.vnf</groupId>
 
   <parent>
     <groupId>org.openecomp.demo.vnf</groupId>


@@ -41,23 +66,6 @@
         </configuration>
       </plugin>
 
         </configuration>
       </plugin>
 

-    <!--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.apache.maven.plugins</groupId>
-      <artifactId>maven-install-plugin</artifactId>
-      <version>2.5.2</version>
-      <configuration>
-        <skip>false</skip>
-      </configuration>
-     </plugin-->

     </plugins>
   </build>
 
     </plugins>
   </build>
 

diff --git a/vnfs/vLB/dns_streams/pom.xml b/vnfs/vLB/dns_streams/pom.xml
index 728370d..5812c5b 100644 (file)
--- a/vnfs/vLB/dns_streams/pom.xml
+++ b/vnfs/vLB/dns_streams/pom.xml
@@ -1,5 +1,29 @@
-<!--<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">-->
-<project>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ============LICENSE_START==========================================
+ ===================================================================
+ Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ ===================================================================
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ ============LICENSE_END============================================
+
+ ECOMP and OpenECOMP are trademarks
+ and service marks of AT&T Intellectual Property.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

 
   <parent>
     <groupId>org.openecomp.demo.vnf</groupId>
 
   <parent>
     <groupId>org.openecomp.demo.vnf</groupId>


@@ -56,16 +80,6 @@
         </configuration>
       </plugin>
 
         </configuration>
       </plugin>
 

-<!--plugin>
-  <groupId>org.apache.maven.plugins</groupId>
-  <artifactId>maven-deploy-plugin</artifactId>
-  <version>2.8.1</version>
-  <configuration>
-    <skip>false</skip>
-  </configuration>
-</plugin-->
-
-

     </plugins>
   </build>
 
     </plugins>
   </build>