diff options
61 files changed, 77 insertions, 72 deletions
diff --git a/admportal/pom.xml b/admportal/pom.xml index 2fa4a338..1c1c0452 100644 --- a/admportal/pom.xml +++ b/admportal/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.openecomp.sdnc.oam</groupId> <artifactId>sdnc-oam</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -13,7 +13,7 @@ <groupId>org.openecomp.sdnc.oam</groupId> <artifactId>admportal</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> <name>Admin Portal</name> <description>Admin Portal</description> diff --git a/admportal/server/router/routes/dbRoutes.js b/admportal/server/router/routes/dbRoutes.js index d2f40b52..34a90c7b 100644 --- a/admportal/server/router/routes/dbRoutes.js +++ b/admportal/server/router/routes/dbRoutes.js @@ -275,11 +275,13 @@ exports.saveUser = function(req,res){ connection.query(sql, function(err,result){ if(err){ + connection.release(); res.render("pages/signup", {result:{code:'error', msg:"Unable to get database connection. " + String(err)},header:process.env.MAIN_MENU}); return; } if (result.length == 1 || result.length > 1) { + connection.release(); res.render("pages/signup", {result:{code:'error', msg:'User Information already exists.'},header:process.env.MAIN_MENU}); return; } diff --git a/admportal/src/assembly/assemble_zip.xml b/admportal/src/assembly/assemble_zip.xml index 46763c81..2c96aa32 100644 --- a/admportal/src/assembly/assemble_zip.xml +++ b/admportal/src/assembly/assemble_zip.xml @@ -3,7 +3,7 @@ openECOMP : SDN-C ================================================================================ Copyright (C) 2017 AT&T Intellectual Property. All rights - reserved. + reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/installation/admportal/pom.xml b/installation/admportal/pom.xml index 5f5d221d..03ebdfd6 100644 --- a/installation/admportal/pom.xml +++ b/installation/admportal/pom.xml @@ -5,14 +5,14 @@ <parent> <groupId>org.openecomp.sdnc.oam</groupId> <artifactId>installation</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>pom</packaging> <groupId>org.openecomp.sdnc.oam</groupId> <artifactId>installation-admportal</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> <name>Installation - admportal</name> <description>Creates admportal Docker container</description> @@ -116,6 +116,7 @@ <plugin> <artifactId>exec-maven-plugin</artifactId> <groupId>org.codehaus.mojo</groupId> + <version>1.5.0</version> <executions> <execution> <id>Unzip admportal</id> diff --git a/installation/dgbuilder/pom.xml b/installation/dgbuilder/pom.xml index 6df37691..daef9865 100644 --- a/installation/dgbuilder/pom.xml +++ b/installation/dgbuilder/pom.xml @@ -5,14 +5,14 @@ <parent> <groupId>org.openecomp.sdnc.oam</groupId> <artifactId>installation</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>pom</packaging> <groupId>org.openecomp.sdnc.oam</groupId> <artifactId>installation-dgbuilder</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> <name>Installation - dgbuilder</name> <description>Creates docker container for dgbuilder</description> @@ -96,6 +96,7 @@ <plugin> <artifactId>exec-maven-plugin</artifactId> <groupId>org.codehaus.mojo</groupId> + <version>1.5.0</version> <executions> <execution> <id>make-path</id> diff --git a/installation/pom.xml b/installation/pom.xml index 20c1dba9..c239fd38 100644 --- a/installation/pom.xml +++ b/installation/pom.xml @@ -5,14 +5,14 @@ <parent> <groupId>org.openecomp.sdnc.oam</groupId> <artifactId>sdnc-oam</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>pom</packaging> <groupId>org.openecomp.sdnc.oam</groupId> <artifactId>installation</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> <name>Installation</name> <description>Installs SDN-C on local file system</description> diff --git a/installation/sdnc/pom.xml b/installation/sdnc/pom.xml index 90977fd3..51f49751 100644 --- a/installation/sdnc/pom.xml +++ b/installation/sdnc/pom.xml @@ -5,14 +5,14 @@ <parent> <groupId>org.openecomp.sdnc.oam</groupId> <artifactId>installation</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>pom</packaging> <groupId>org.openecomp.sdnc.oam</groupId> <artifactId>installation-sdnc</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> <name>Installation - sdnc</name> <description>Creates SDN Controller Docker container</description> @@ -198,6 +198,7 @@ <plugin> <artifactId>exec-maven-plugin</artifactId> <groupId>org.codehaus.mojo</groupId> + <version>1.5.0</version> <executions> <execution> diff --git a/installation/src/main/properties/aaiclient.properties b/installation/src/main/properties/aaiclient.properties index 485be8fe..b26ed010 100644 --- a/installation/src/main/properties/aaiclient.properties +++ b/installation/src/main/properties/aaiclient.properties @@ -3,7 +3,7 @@ # openECOMP : SDN-C # ================================================================================ # Copyright (C) 2017 AT&T Intellectual Property. All rights -# reserved. +# reserved. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/installation/src/main/properties/dblib.properties b/installation/src/main/properties/dblib.properties index fa81866f..0e79befd 100644 --- a/installation/src/main/properties/dblib.properties +++ b/installation/src/main/properties/dblib.properties @@ -3,7 +3,7 @@ # openECOMP : SDN-C # ================================================================================ # Copyright (C) 2017 AT&T Intellectual Property. All rights -# reserved. +# reserved. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/installation/src/main/properties/mdsal-resource.properties b/installation/src/main/properties/mdsal-resource.properties index 62ad3757..e4a585ff 100644 --- a/installation/src/main/properties/mdsal-resource.properties +++ b/installation/src/main/properties/mdsal-resource.properties @@ -3,7 +3,7 @@ # openECOMP : SDN-C # ================================================================================ # Copyright (C) 2017 AT&T Intellectual Property. All rights -# reserved. +# reserved. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/installation/src/main/properties/sql-resource.properties b/installation/src/main/properties/sql-resource.properties index 3a08ebf9..ac32f773 100644 --- a/installation/src/main/properties/sql-resource.properties +++ b/installation/src/main/properties/sql-resource.properties @@ -3,7 +3,7 @@ # openECOMP : SDN-C # ================================================================================ # Copyright (C) 2017 AT&T Intellectual Property. All rights -# reserved. +# reserved. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/installation/src/main/properties/svclogic.properties b/installation/src/main/properties/svclogic.properties index 8f7c16e8..efc1cb34 100644 --- a/installation/src/main/properties/svclogic.properties +++ b/installation/src/main/properties/svclogic.properties @@ -3,7 +3,7 @@ # openECOMP : SDN-C # ================================================================================ # Copyright (C) 2017 AT&T Intellectual Property. All rights -# reserved. +# reserved. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/installation/ubuntu/pom.xml b/installation/ubuntu/pom.xml index e8233782..321c58ed 100644 --- a/installation/ubuntu/pom.xml +++ b/installation/ubuntu/pom.xml @@ -5,14 +5,14 @@ <parent> <groupId>org.openecomp.sdnc.oam</groupId> <artifactId>installation</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>pom</packaging> <groupId>org.openecomp.sdnc.oam</groupId> <artifactId>installation-ubuntu</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> <name>Installation - ubuntu</name> <description>Creates base ubuntu Docker container</description> diff --git a/platform-logic/asdc-api/pom.xml b/platform-logic/asdc-api/pom.xml index 0db8032c..cc060a55 100644 --- a/platform-logic/asdc-api/pom.xml +++ b/platform-logic/asdc-api/pom.xml @@ -5,14 +5,14 @@ <parent> <groupId>org.openecomp.sdnc.oam</groupId> <artifactId>platform-logic</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>pom</packaging> <groupId>org.openecomp.sdnc.oam</groupId> <artifactId>platform-logic-asdcapi</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> <name>Platform Logic : ASDC-API</name> <description>Contains platform-level service logic for the ASDC-API</description> diff --git a/platform-logic/asdc-api/src/main/xml/dg-vf-license-model-update.xml b/platform-logic/asdc-api/src/main/xml/dg-vf-license-model-update.xml index 1dc8b52c..cdc1efb9 100644 --- a/platform-logic/asdc-api/src/main/xml/dg-vf-license-model-update.xml +++ b/platform-logic/asdc-api/src/main/xml/dg-vf-license-model-update.xml @@ -3,7 +3,7 @@ openECOMP : SDN-C ================================================================================ Copyright (C) 2017 AT&T Intellectual Property. All rights - reserved. + reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform-logic/installer/pom.xml b/platform-logic/installer/pom.xml index 6278dc56..95fa8c98 100644 --- a/platform-logic/installer/pom.xml +++ b/platform-logic/installer/pom.xml @@ -5,14 +5,14 @@ <parent> <groupId>org.openecomp.sdnc.oam</groupId> <artifactId>platform-logic</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>pom</packaging> <groupId>org.openecomp.sdnc.oam</groupId> <artifactId>platform-logic-installer</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> <name>Platform Logic Installer</name> <description>Contains platform-level service logic installer</description> diff --git a/platform-logic/installer/src/assembly/assemble_zip.xml b/platform-logic/installer/src/assembly/assemble_zip.xml index bfaa217d..b704ac1c 100644 --- a/platform-logic/installer/src/assembly/assemble_zip.xml +++ b/platform-logic/installer/src/assembly/assemble_zip.xml @@ -3,7 +3,7 @@ openECOMP : SDN-C ================================================================================ Copyright (C) 2017 AT&T Intellectual Property. All rights - reserved. + reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform-logic/installer/src/main/resources/svclogic.properties b/platform-logic/installer/src/main/resources/svclogic.properties index b7385522..ec4f8889 100644 --- a/platform-logic/installer/src/main/resources/svclogic.properties +++ b/platform-logic/installer/src/main/resources/svclogic.properties @@ -3,7 +3,7 @@ # openECOMP : SDN-C # ================================================================================ # Copyright (C) 2017 AT&T Intellectual Property. All rights -# reserved. +# reserved. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/platform-logic/installer/src/main/scripts/install.sh b/platform-logic/installer/src/main/scripts/install.sh index c8d47cdc..efea2286 100644 --- a/platform-logic/installer/src/main/scripts/install.sh +++ b/platform-logic/installer/src/main/scripts/install.sh @@ -5,7 +5,7 @@ # openECOMP : SDN-C # ================================================================================ # Copyright (C) 2017 AT&T Intellectual Property. All rights -# reserved. +# reserved. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/platform-logic/installer/src/main/scripts/setenv.sh b/platform-logic/installer/src/main/scripts/setenv.sh index f55ed8d9..aac4e578 100644 --- a/platform-logic/installer/src/main/scripts/setenv.sh +++ b/platform-logic/installer/src/main/scripts/setenv.sh @@ -5,7 +5,7 @@ # openECOMP : SDN-C # ================================================================================ # Copyright (C) 2017 AT&T Intellectual Property. All rights -# reserved. +# reserved. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/platform-logic/installer/src/main/scripts/showActiveGraphs.sh b/platform-logic/installer/src/main/scripts/showActiveGraphs.sh index 8735f2f3..80cb4aae 100644 --- a/platform-logic/installer/src/main/scripts/showActiveGraphs.sh +++ b/platform-logic/installer/src/main/scripts/showActiveGraphs.sh @@ -3,7 +3,7 @@ # openECOMP : SDN-C # ================================================================================ # Copyright (C) 2017 AT&T Intellectual Property. All rights -# reserved. +# reserved. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/platform-logic/installer/src/main/scripts/svclogic.sh b/platform-logic/installer/src/main/scripts/svclogic.sh index aca6bf1f..464a71cf 100644 --- a/platform-logic/installer/src/main/scripts/svclogic.sh +++ b/platform-logic/installer/src/main/scripts/svclogic.sh @@ -5,7 +5,7 @@ # openECOMP : SDN-C # ================================================================================ # Copyright (C) 2017 AT&T Intellectual Property. All rights -# reserved. +# reserved. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/platform-logic/pom.xml b/platform-logic/pom.xml index 00d88b03..6317b443 100644 --- a/platform-logic/pom.xml +++ b/platform-logic/pom.xml @@ -5,14 +5,14 @@ <parent> <groupId>org.openecomp.sdnc.oam</groupId> <artifactId>sdnc-oam</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>pom</packaging> <groupId>org.openecomp.sdnc.oam</groupId> <artifactId>platform-logic</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> <name>Platform Logic </name> <description>Contains platform-level service logic</description> diff --git a/platform-logic/sliapi/pom.xml b/platform-logic/sliapi/pom.xml index 18338ffc..0d83cb24 100644 --- a/platform-logic/sliapi/pom.xml +++ b/platform-logic/sliapi/pom.xml @@ -5,14 +5,14 @@ <parent> <groupId>org.openecomp.sdnc.oam</groupId> <artifactId>platform-logic</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>pom</packaging> <groupId>org.openecomp.sdnc.oam</groupId> <artifactId>platform-logic-sliapi</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> <name>Platform Logic : SLI-API</name> <description>Contains platform-level service logic for the SLI-API</description> diff --git a/platform-logic/sliapi/src/main/xml/sli_method_healthcheck.xml b/platform-logic/sliapi/src/main/xml/sli_method_healthcheck.xml index 67eb0197..bc57ee98 100644 --- a/platform-logic/sliapi/src/main/xml/sli_method_healthcheck.xml +++ b/platform-logic/sliapi/src/main/xml/sli_method_healthcheck.xml @@ -3,7 +3,7 @@ openECOMP : SDN-C ================================================================================ Copyright (C) 2017 AT&T Intellectual Property. All rights - reserved. + reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform-logic/vnfapi/pom.xml b/platform-logic/vnfapi/pom.xml index 47589e6a..2d0e7c0c 100644 --- a/platform-logic/vnfapi/pom.xml +++ b/platform-logic/vnfapi/pom.xml @@ -5,14 +5,14 @@ <parent> <groupId>org.openecomp.sdnc.oam</groupId> <artifactId>platform-logic</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>pom</packaging> <groupId>org.openecomp.sdnc.oam</groupId> <artifactId>platform-logic-vnfapi</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> <name>Platform Logic : VNF-API</name> <description>Contains platform-level service logic for the VNF-API</description> diff --git a/platform-logic/vnfapi/src/main/xml/dg-generate-l3network-network-id.xml b/platform-logic/vnfapi/src/main/xml/dg-generate-l3network-network-id.xml index 443be5b4..a08a7a26 100644 --- a/platform-logic/vnfapi/src/main/xml/dg-generate-l3network-network-id.xml +++ b/platform-logic/vnfapi/src/main/xml/dg-generate-l3network-network-id.xml @@ -3,7 +3,7 @@ openECOMP : SDN-C ================================================================================ Copyright (C) 2017 AT&T Intellectual Property. All rights - reserved. + reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform-logic/vnfapi/src/main/xml/dg-generate-subnets-subnet-id.xml b/platform-logic/vnfapi/src/main/xml/dg-generate-subnets-subnet-id.xml index c33fe9ad..5903707d 100644 --- a/platform-logic/vnfapi/src/main/xml/dg-generate-subnets-subnet-id.xml +++ b/platform-logic/vnfapi/src/main/xml/dg-generate-subnets-subnet-id.xml @@ -3,7 +3,7 @@ openECOMP : SDN-C ================================================================================ Copyright (C) 2017 AT&T Intellectual Property. All rights - reserved. + reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform-logic/vnfapi/src/main/xml/dg-network-topology-assign.xml b/platform-logic/vnfapi/src/main/xml/dg-network-topology-assign.xml index 650f0240..5e787c7c 100644 --- a/platform-logic/vnfapi/src/main/xml/dg-network-topology-assign.xml +++ b/platform-logic/vnfapi/src/main/xml/dg-network-topology-assign.xml @@ -3,7 +3,7 @@ openECOMP : SDN-C ================================================================================ Copyright (C) 2017 AT&T Intellectual Property. All rights - reserved. + reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform-logic/vnfapi/src/main/xml/dg-network-topology-changeassign.xml b/platform-logic/vnfapi/src/main/xml/dg-network-topology-changeassign.xml index 8b16c83a..006c65d6 100644 --- a/platform-logic/vnfapi/src/main/xml/dg-network-topology-changeassign.xml +++ b/platform-logic/vnfapi/src/main/xml/dg-network-topology-changeassign.xml @@ -3,7 +3,7 @@ openECOMP : SDN-C ================================================================================ Copyright (C) 2017 AT&T Intellectual Property. All rights - reserved. + reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform-logic/vnfapi/src/main/xml/dg-network-topology-delete.xml b/platform-logic/vnfapi/src/main/xml/dg-network-topology-delete.xml index 83be0602..fd31513d 100644 --- a/platform-logic/vnfapi/src/main/xml/dg-network-topology-delete.xml +++ b/platform-logic/vnfapi/src/main/xml/dg-network-topology-delete.xml @@ -3,7 +3,7 @@ openECOMP : SDN-C ================================================================================ Copyright (C) 2017 AT&T Intellectual Property. All rights - reserved. + reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform-logic/vnfapi/src/main/xml/dg-network-topology-operation.xml b/platform-logic/vnfapi/src/main/xml/dg-network-topology-operation.xml index 70c59946..7352d888 100644 --- a/platform-logic/vnfapi/src/main/xml/dg-network-topology-operation.xml +++ b/platform-logic/vnfapi/src/main/xml/dg-network-topology-operation.xml @@ -3,7 +3,7 @@ openECOMP : SDN-C ================================================================================ Copyright (C) 2017 AT&T Intellectual Property. All rights - reserved. + reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform-logic/vnfapi/src/main/xml/dg-network-topology-rollback.xml b/platform-logic/vnfapi/src/main/xml/dg-network-topology-rollback.xml index 925cac88..83c181a9 100644 --- a/platform-logic/vnfapi/src/main/xml/dg-network-topology-rollback.xml +++ b/platform-logic/vnfapi/src/main/xml/dg-network-topology-rollback.xml @@ -3,7 +3,7 @@ openECOMP : SDN-C ================================================================================ Copyright (C) 2017 AT&T Intellectual Property. All rights - reserved. + reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform-logic/vnfapi/src/main/xml/dg-preload-network-topology-operation.xml b/platform-logic/vnfapi/src/main/xml/dg-preload-network-topology-operation.xml index 52b68e26..2652e033 100644 --- a/platform-logic/vnfapi/src/main/xml/dg-preload-network-topology-operation.xml +++ b/platform-logic/vnfapi/src/main/xml/dg-preload-network-topology-operation.xml @@ -3,7 +3,7 @@ openECOMP : SDN-C ================================================================================ Copyright (C) 2017 AT&T Intellectual Property. All rights - reserved. + reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform-logic/vnfapi/src/main/xml/dg-preload-vf-module-topology-operation.xml b/platform-logic/vnfapi/src/main/xml/dg-preload-vf-module-topology-operation.xml index 345b5801..3fb8483d 100644 --- a/platform-logic/vnfapi/src/main/xml/dg-preload-vf-module-topology-operation.xml +++ b/platform-logic/vnfapi/src/main/xml/dg-preload-vf-module-topology-operation.xml @@ -3,7 +3,7 @@ openECOMP : SDN-C ================================================================================ Copyright (C) 2017 AT&T Intellectual Property. All rights - reserved. + reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform-logic/vnfapi/src/main/xml/dg-preload-vnf-instance-topology-operation.xml b/platform-logic/vnfapi/src/main/xml/dg-preload-vnf-instance-topology-operation.xml index cec38480..b9ed2a27 100644 --- a/platform-logic/vnfapi/src/main/xml/dg-preload-vnf-instance-topology-operation.xml +++ b/platform-logic/vnfapi/src/main/xml/dg-preload-vnf-instance-topology-operation.xml @@ -3,7 +3,7 @@ openECOMP : SDN-C ================================================================================ Copyright (C) 2017 AT&T Intellectual Property. All rights - reserved. + reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform-logic/vnfapi/src/main/xml/dg-preload-vnf-topology-operation.xml b/platform-logic/vnfapi/src/main/xml/dg-preload-vnf-topology-operation.xml index f4274520..7908deca 100644 --- a/platform-logic/vnfapi/src/main/xml/dg-preload-vnf-topology-operation.xml +++ b/platform-logic/vnfapi/src/main/xml/dg-preload-vnf-topology-operation.xml @@ -3,7 +3,7 @@ openECOMP : SDN-C ================================================================================ Copyright (C) 2017 AT&T Intellectual Property. All rights - reserved. + reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform-logic/vnfapi/src/main/xml/dg-vf-module-topology-activate.xml b/platform-logic/vnfapi/src/main/xml/dg-vf-module-topology-activate.xml index 16d92529..388939f2 100644 --- a/platform-logic/vnfapi/src/main/xml/dg-vf-module-topology-activate.xml +++ b/platform-logic/vnfapi/src/main/xml/dg-vf-module-topology-activate.xml @@ -3,7 +3,7 @@ openECOMP : SDN-C ================================================================================ Copyright (C) 2017 AT&T Intellectual Property. All rights - reserved. + reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform-logic/vnfapi/src/main/xml/dg-vf-module-topology-assign-vnf-networks.xml b/platform-logic/vnfapi/src/main/xml/dg-vf-module-topology-assign-vnf-networks.xml index dd2bf239..808fffd8 100644 --- a/platform-logic/vnfapi/src/main/xml/dg-vf-module-topology-assign-vnf-networks.xml +++ b/platform-logic/vnfapi/src/main/xml/dg-vf-module-topology-assign-vnf-networks.xml @@ -3,7 +3,7 @@ openECOMP : SDN-C ================================================================================ Copyright (C) 2017 AT&T Intellectual Property. All rights - reserved. + reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform-logic/vnfapi/src/main/xml/dg-vf-module-topology-assign.xml b/platform-logic/vnfapi/src/main/xml/dg-vf-module-topology-assign.xml index abbb56ad..99d52408 100644 --- a/platform-logic/vnfapi/src/main/xml/dg-vf-module-topology-assign.xml +++ b/platform-logic/vnfapi/src/main/xml/dg-vf-module-topology-assign.xml @@ -3,7 +3,7 @@ openECOMP : SDN-C ================================================================================ Copyright (C) 2017 AT&T Intellectual Property. All rights - reserved. + reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform-logic/vnfapi/src/main/xml/dg-vf-module-topology-changeassign.xml b/platform-logic/vnfapi/src/main/xml/dg-vf-module-topology-changeassign.xml index bef4a8db..5461fa54 100644 --- a/platform-logic/vnfapi/src/main/xml/dg-vf-module-topology-changeassign.xml +++ b/platform-logic/vnfapi/src/main/xml/dg-vf-module-topology-changeassign.xml @@ -3,7 +3,7 @@ openECOMP : SDN-C ================================================================================ Copyright (C) 2017 AT&T Intellectual Property. All rights - reserved. + reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform-logic/vnfapi/src/main/xml/dg-vf-module-topology-delete.xml b/platform-logic/vnfapi/src/main/xml/dg-vf-module-topology-delete.xml index e8c1f431..10a265aa 100644 --- a/platform-logic/vnfapi/src/main/xml/dg-vf-module-topology-delete.xml +++ b/platform-logic/vnfapi/src/main/xml/dg-vf-module-topology-delete.xml @@ -3,7 +3,7 @@ openECOMP : SDN-C ================================================================================ Copyright (C) 2017 AT&T Intellectual Property. All rights - reserved. + reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform-logic/vnfapi/src/main/xml/dg-vf-module-topology-operation.xml b/platform-logic/vnfapi/src/main/xml/dg-vf-module-topology-operation.xml index e0c32468..c0359f45 100644 --- a/platform-logic/vnfapi/src/main/xml/dg-vf-module-topology-operation.xml +++ b/platform-logic/vnfapi/src/main/xml/dg-vf-module-topology-operation.xml @@ -3,7 +3,7 @@ openECOMP : SDN-C ================================================================================ Copyright (C) 2017 AT&T Intellectual Property. All rights - reserved. + reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform-logic/vnfapi/src/main/xml/dg-vf-module-topology-rollback.xml b/platform-logic/vnfapi/src/main/xml/dg-vf-module-topology-rollback.xml index d0d80da6..d5e27b1f 100644 --- a/platform-logic/vnfapi/src/main/xml/dg-vf-module-topology-rollback.xml +++ b/platform-logic/vnfapi/src/main/xml/dg-vf-module-topology-rollback.xml @@ -3,7 +3,7 @@ openECOMP : SDN-C ================================================================================ Copyright (C) 2017 AT&T Intellectual Property. All rights - reserved. + reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform-logic/vnfapi/src/main/xml/dg-vnf-instance-topology-activate.xml b/platform-logic/vnfapi/src/main/xml/dg-vnf-instance-topology-activate.xml index 0f07fcf9..88a2c634 100644 --- a/platform-logic/vnfapi/src/main/xml/dg-vnf-instance-topology-activate.xml +++ b/platform-logic/vnfapi/src/main/xml/dg-vnf-instance-topology-activate.xml @@ -3,7 +3,7 @@ openECOMP : SDN-C ================================================================================ Copyright (C) 2017 AT&T Intellectual Property. All rights - reserved. + reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform-logic/vnfapi/src/main/xml/dg-vnf-instance-topology-assign-vnf-networks.xml b/platform-logic/vnfapi/src/main/xml/dg-vnf-instance-topology-assign-vnf-networks.xml index 40e84291..acee4ff1 100644 --- a/platform-logic/vnfapi/src/main/xml/dg-vnf-instance-topology-assign-vnf-networks.xml +++ b/platform-logic/vnfapi/src/main/xml/dg-vnf-instance-topology-assign-vnf-networks.xml @@ -3,7 +3,7 @@ openECOMP : SDN-C ================================================================================ Copyright (C) 2017 AT&T Intellectual Property. All rights - reserved. + reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform-logic/vnfapi/src/main/xml/dg-vnf-instance-topology-assign.xml b/platform-logic/vnfapi/src/main/xml/dg-vnf-instance-topology-assign.xml index ca5ff845..047f9cb5 100644 --- a/platform-logic/vnfapi/src/main/xml/dg-vnf-instance-topology-assign.xml +++ b/platform-logic/vnfapi/src/main/xml/dg-vnf-instance-topology-assign.xml @@ -3,7 +3,7 @@ openECOMP : SDN-C ================================================================================ Copyright (C) 2017 AT&T Intellectual Property. All rights - reserved. + reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform-logic/vnfapi/src/main/xml/dg-vnf-instance-topology-changeassign.xml b/platform-logic/vnfapi/src/main/xml/dg-vnf-instance-topology-changeassign.xml index 6b1c1f21..ff828b7b 100644 --- a/platform-logic/vnfapi/src/main/xml/dg-vnf-instance-topology-changeassign.xml +++ b/platform-logic/vnfapi/src/main/xml/dg-vnf-instance-topology-changeassign.xml @@ -3,7 +3,7 @@ openECOMP : SDN-C ================================================================================ Copyright (C) 2017 AT&T Intellectual Property. All rights - reserved. + reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform-logic/vnfapi/src/main/xml/dg-vnf-instance-topology-delete.xml b/platform-logic/vnfapi/src/main/xml/dg-vnf-instance-topology-delete.xml index 1c683bea..a7fc602f 100644 --- a/platform-logic/vnfapi/src/main/xml/dg-vnf-instance-topology-delete.xml +++ b/platform-logic/vnfapi/src/main/xml/dg-vnf-instance-topology-delete.xml @@ -3,7 +3,7 @@ openECOMP : SDN-C ================================================================================ Copyright (C) 2017 AT&T Intellectual Property. All rights - reserved. + reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform-logic/vnfapi/src/main/xml/dg-vnf-instance-topology-operation.xml b/platform-logic/vnfapi/src/main/xml/dg-vnf-instance-topology-operation.xml index 322819b7..23e915c1 100644 --- a/platform-logic/vnfapi/src/main/xml/dg-vnf-instance-topology-operation.xml +++ b/platform-logic/vnfapi/src/main/xml/dg-vnf-instance-topology-operation.xml @@ -3,7 +3,7 @@ openECOMP : SDN-C ================================================================================ Copyright (C) 2017 AT&T Intellectual Property. All rights - reserved. + reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform-logic/vnfapi/src/main/xml/dg-vnf-instance-topology-rollback.xml b/platform-logic/vnfapi/src/main/xml/dg-vnf-instance-topology-rollback.xml index 2ef20414..9b185f90 100644 --- a/platform-logic/vnfapi/src/main/xml/dg-vnf-instance-topology-rollback.xml +++ b/platform-logic/vnfapi/src/main/xml/dg-vnf-instance-topology-rollback.xml @@ -3,7 +3,7 @@ openECOMP : SDN-C ================================================================================ Copyright (C) 2017 AT&T Intellectual Property. All rights - reserved. + reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform-logic/vnfapi/src/main/xml/dg-vnf-topology-activate.xml b/platform-logic/vnfapi/src/main/xml/dg-vnf-topology-activate.xml index 81ad5bf5..1b5ad0c8 100644 --- a/platform-logic/vnfapi/src/main/xml/dg-vnf-topology-activate.xml +++ b/platform-logic/vnfapi/src/main/xml/dg-vnf-topology-activate.xml @@ -3,7 +3,7 @@ openECOMP : SDN-C ================================================================================ Copyright (C) 2017 AT&T Intellectual Property. All rights - reserved. + reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform-logic/vnfapi/src/main/xml/dg-vnf-topology-assign-vfmodule.xml b/platform-logic/vnfapi/src/main/xml/dg-vnf-topology-assign-vfmodule.xml index e297a90d..d8c211fd 100644 --- a/platform-logic/vnfapi/src/main/xml/dg-vnf-topology-assign-vfmodule.xml +++ b/platform-logic/vnfapi/src/main/xml/dg-vnf-topology-assign-vfmodule.xml @@ -3,7 +3,7 @@ openECOMP : SDN-C ================================================================================ Copyright (C) 2017 AT&T Intellectual Property. All rights - reserved. + reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform-logic/vnfapi/src/main/xml/dg-vnf-topology-assign.xml b/platform-logic/vnfapi/src/main/xml/dg-vnf-topology-assign.xml index 50c2f0c2..7510eb67 100644 --- a/platform-logic/vnfapi/src/main/xml/dg-vnf-topology-assign.xml +++ b/platform-logic/vnfapi/src/main/xml/dg-vnf-topology-assign.xml @@ -3,7 +3,7 @@ openECOMP : SDN-C ================================================================================ Copyright (C) 2017 AT&T Intellectual Property. All rights - reserved. + reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform-logic/vnfapi/src/main/xml/dg-vnf-topology-changeassign.xml b/platform-logic/vnfapi/src/main/xml/dg-vnf-topology-changeassign.xml index 68f1162f..10aaaf98 100644 --- a/platform-logic/vnfapi/src/main/xml/dg-vnf-topology-changeassign.xml +++ b/platform-logic/vnfapi/src/main/xml/dg-vnf-topology-changeassign.xml @@ -3,7 +3,7 @@ openECOMP : SDN-C ================================================================================ Copyright (C) 2017 AT&T Intellectual Property. All rights - reserved. + reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform-logic/vnfapi/src/main/xml/dg-vnf-topology-changedelete.xml b/platform-logic/vnfapi/src/main/xml/dg-vnf-topology-changedelete.xml index 6bb6392c..515b7d3f 100644 --- a/platform-logic/vnfapi/src/main/xml/dg-vnf-topology-changedelete.xml +++ b/platform-logic/vnfapi/src/main/xml/dg-vnf-topology-changedelete.xml @@ -3,7 +3,7 @@ openECOMP : SDN-C ================================================================================ Copyright (C) 2017 AT&T Intellectual Property. All rights - reserved. + reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform-logic/vnfapi/src/main/xml/dg-vnf-topology-delete.xml b/platform-logic/vnfapi/src/main/xml/dg-vnf-topology-delete.xml index 31e61868..582c5133 100644 --- a/platform-logic/vnfapi/src/main/xml/dg-vnf-topology-delete.xml +++ b/platform-logic/vnfapi/src/main/xml/dg-vnf-topology-delete.xml @@ -3,7 +3,7 @@ openECOMP : SDN-C ================================================================================ Copyright (C) 2017 AT&T Intellectual Property. All rights - reserved. + reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform-logic/vnfapi/src/main/xml/dg-vnf-topology-operation.xml b/platform-logic/vnfapi/src/main/xml/dg-vnf-topology-operation.xml index 8eea2a15..fcd44d00 100644 --- a/platform-logic/vnfapi/src/main/xml/dg-vnf-topology-operation.xml +++ b/platform-logic/vnfapi/src/main/xml/dg-vnf-topology-operation.xml @@ -3,7 +3,7 @@ openECOMP : SDN-C ================================================================================ Copyright (C) 2017 AT&T Intellectual Property. All rights - reserved. + reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform-logic/vnfapi/src/main/xml/dg-vnf-topology-rollback.xml b/platform-logic/vnfapi/src/main/xml/dg-vnf-topology-rollback.xml index 17245028..3533e238 100644 --- a/platform-logic/vnfapi/src/main/xml/dg-vnf-topology-rollback.xml +++ b/platform-logic/vnfapi/src/main/xml/dg-vnf-topology-rollback.xml @@ -3,7 +3,7 @@ openECOMP : SDN-C ================================================================================ Copyright (C) 2017 AT&T Intellectual Property. All rights - reserved. + reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -5,13 +5,14 @@ <parent> <groupId>org.openecomp.sdnc.core</groupId> <artifactId>root</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>pom</packaging> <groupId>org.openecomp.sdnc.oam</groupId> <artifactId>sdnc-oam</artifactId> + <version>1.1.0-SNAPSHOT</version> <name>SDN-C OAM</name> <url>https://wiki.openecomp.org</url> @@ -119,7 +120,6 @@ <organization> <name>AT&T</name> </organization> - <version>1.0.0-SNAPSHOT</version> </project> diff --git a/version.properties b/version.properties index feea7088..60b87d41 100644 --- a/version.properties +++ b/version.properties @@ -4,7 +4,7 @@ # because they are used in Jenkins, whose plug-in doesn't support release_name=1 -sprint_number=0 +sprint_number=1 feature_revision=0 base_version=${release_name}.${sprint_number}.${feature_revision} |