diff options
-rw-r--r-- | boot/aai_vm_init.sh | 2 | ||||
-rwxr-xr-x | pom.xml | 30 | ||||
-rw-r--r-- | version.properties | 2 | ||||
-rw-r--r-- | vnfs/VES/pom.xml | 37 | ||||
-rw-r--r-- | vnfs/VESreporting_vFW/pom.xml | 40 | ||||
-rw-r--r-- | vnfs/VESreporting_vLB/pom.xml | 38 | ||||
-rw-r--r-- | vnfs/honeycomb_plugin/sample_plugin/parent-pom/.DS_Store | bin | 6148 -> 6148 bytes | |||
-rw-r--r-- | vnfs/honeycomb_plugin/sample_plugin/parent-pom/pom.xml | 9 | ||||
-rwxr-xr-x | vnfs/honeycomb_plugin/sample_plugin/sample-distribution/pom.xml | 12 | ||||
-rwxr-xr-x | vnfs/honeycomb_plugin/sample_plugin/sample-plugin-api/pom.xml | 10 | ||||
-rwxr-xr-x | vnfs/honeycomb_plugin/sample_plugin/sample-plugin-impl/pom.xml | 10 | ||||
-rw-r--r-- | vnfs/vFW/pg_streams/pom.xml | 37 | ||||
-rw-r--r-- | vnfs/vLB/DNSClient/pom.xml | 44 | ||||
-rw-r--r-- | vnfs/vLB/DNSManager/pom.xml | 44 | ||||
-rw-r--r-- | vnfs/vLB/dns_streams/pom.xml | 38 |
15 files changed, 242 insertions, 111 deletions
diff --git a/boot/aai_vm_init.sh b/boot/aai_vm_init.sh index 5c0773fe..b4e01dd9 100644 --- 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 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 @@ -1,7 +1,29 @@ <?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> @@ -61,17 +83,17 @@ </configuration> </plugin> - <!--plugin> + <plugin> <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> - </plugin--> + </plugin> </plugins> </build> diff --git a/version.properties b/version.properties index 82edb1bb..d2812bbb 100644 --- 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} -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 1dbbce02..12a22e19 100644 --- 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> @@ -56,15 +80,6 @@ </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> diff --git a/vnfs/VESreporting_vFW/pom.xml b/vnfs/VESreporting_vFW/pom.xml index a62e48fd..16f0115d 100644 --- 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> @@ -55,16 +80,7 @@ </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> -</project> +</project>
\ No newline at end of file diff --git a/vnfs/VESreporting_vLB/pom.xml b/vnfs/VESreporting_vLB/pom.xml index c31c0619..76e79aae 100644 --- 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> @@ -55,15 +80,6 @@ </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> diff --git a/vnfs/honeycomb_plugin/sample_plugin/parent-pom/.DS_Store b/vnfs/honeycomb_plugin/sample_plugin/parent-pom/.DS_Store Binary files differindex 5d56db6b..6ee7724a 100644 --- a/vnfs/honeycomb_plugin/sample_plugin/parent-pom/.DS_Store +++ b/vnfs/honeycomb_plugin/sample_plugin/parent-pom/.DS_Store diff --git a/vnfs/honeycomb_plugin/sample_plugin/parent-pom/pom.xml b/vnfs/honeycomb_plugin/sample_plugin/parent-pom/pom.xml index b80f8ef3..5492aeb6 100644 --- 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. --> + +<!-- + 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"> @@ -58,10 +63,6 @@ done <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> diff --git a/vnfs/honeycomb_plugin/sample_plugin/sample-distribution/pom.xml b/vnfs/honeycomb_plugin/sample_plugin/sample-distribution/pom.xml index 4b1fedb9..da25cc7e 100755 --- 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"?> -<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> 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 c89f3118..6f357321 100755 --- 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. ---><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> 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 ab0b03e6..84f48b42 100755 --- 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. ---><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> diff --git a/vnfs/vFW/pg_streams/pom.xml b/vnfs/vFW/pg_streams/pom.xml index 6a8c097a..072a97e5 100644 --- 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> @@ -56,15 +80,6 @@ </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> diff --git a/vnfs/vLB/DNSClient/pom.xml b/vnfs/vLB/DNSClient/pom.xml index 78f2a4db..ec500699 100644 --- 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> @@ -41,23 +66,6 @@ </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> diff --git a/vnfs/vLB/DNSManager/pom.xml b/vnfs/vLB/DNSManager/pom.xml index 81e8cfac..1af3c1d5 100644 --- 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> @@ -41,23 +66,6 @@ </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> diff --git a/vnfs/vLB/dns_streams/pom.xml b/vnfs/vLB/dns_streams/pom.xml index 728370d9..5812c5b0 100644 --- 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> @@ -56,16 +80,6 @@ </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> |