9 files changed, 107 insertions, 14 deletions
diff --git a/LICENSE.txt b/LICENSE.txt
index c72f76e..9536f0b 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -5,7 +5,7 @@
 * ===================================================================
 *
 * Unless otherwise specified, all software contained herein is licensed
-* under the Apache License, Version 2.0 (the “License”);
+* under the Apache License, Version 2.0 (the "License");
 * you may not use this software except in compliance with the License.
 * You may obtain a copy of the License at
 *
@@ -20,7 +20,7 @@
 *
 *
 * Unless otherwise specified, all documentation contained herein is licensed
-* under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+* under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 * you may not use this documentation except in compliance with the License.
 * You may obtain a copy of the License at
 *
diff --git a/bin/build_and_check.sh b/bin/build_and_check.sh
index 7d8b4e1..f34ffb4 100755
--- a/bin/build_and_check.sh
+++ b/bin/build_and_check.sh
@@ -1,5 +1,24 @@
 #!/usr/local/bin/fish
-rm -rf _build/; 
-rebar3 upgrade; 
-rebar3 release; 
+
+# ================================================================================
+# Copyright (c) 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 is a trademark and service mark of AT&T Intellectual Property.
+
+rm -rf _build/;
+rebar3 upgrade;
+rebar3 release;
 dialyzer -r _build/default/lib/cdapbroker/ebin/
diff --git a/bin/build_and_run.sh b/bin/build_and_run.sh
index 5273cee..7024c44 100755
--- a/bin/build_and_run.sh
+++ b/bin/build_and_run.sh
@@ -1,10 +1,29 @@
 #!/usr/local/bin/fish
+
+# ================================================================================
+# Copyright (c) 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 is a trademark and service mark of AT&T Intellectual Property.
+
 rm -rf /tmp/log/cdapbroker/*;
 rm -rf _build/;
 rebar3 upgrade;
 rebar3 release;
 set -x CDAP_CLUSTER_TO_MANAGE "cdap";
 set -x CONSUL_HOST "XXXX";
-set -x CONFIG_BINDING_SERVICE "config_binding_service"; 
+set -x CONFIG_BINDING_SERVICE "config_binding_service";
 set -x HOSTNAME "cdap_broker";
 ./_build/default/rel/cdapbroker/bin/cdapbroker
diff --git a/bin/build_and_test.sh b/bin/build_and_test.sh
index d5bbf6c..56a3dcd 100755
--- a/bin/build_and_test.sh
+++ b/bin/build_and_test.sh
@@ -1,8 +1,27 @@
 #!/usr/local/bin/fish
+
+# ================================================================================
+# Copyright (c) 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 is a trademark and service mark of AT&T Intellectual Property.
+
 rm -rf /tmp/log/cdapbroker/*;
 rm -rf _build/*
 rebar3 upgrade;
-rebar3 release; 
+rebar3 release;
 set -x NEXUS_RAW_ROOT "XXXX";
 set -x CDAP_CLUSTER_TO_MANAGE "cdap";
 set -x CONSUL_HOST "XXXX";
diff --git a/bin/build_and_unit_test.sh b/bin/build_and_unit_test.sh
index 9c3e3a4..33dbe3c 100755
--- a/bin/build_and_unit_test.sh
+++ b/bin/build_and_unit_test.sh
@@ -1,4 +1,23 @@
 #!/usr/local/bin/fish
+
+# ================================================================================
+# Copyright (c) 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 is a trademark and service mark of AT&T Intellectual Property.
+
 rm -rf _build/;
 rebar3 upgrade;
 rebar3 release;
diff --git a/mvn-phase-script.sh b/mvn-phase-script.sh
index 9e687c9..391ac0a 100755
--- a/mvn-phase-script.sh
+++ b/mvn-phase-script.sh
@@ -132,7 +132,7 @@ build_and_push_docker()
   VERSION="${MVN_PROJECT_VERSION//[^0-9.]/}"
   VERSION2=$(echo "$VERSION" | cut -f1-2 -d'.')
 
-  LFQI="${IMAGENAME}:${VERSION}-${TIMESTAMP}"
+  LFQI="${IMAGENAME}:${VERSION}-${TIMESTAMP}"Z
   BUILD_PATH="${WORKSPACE}"
   # build a docker image
   docker build --rm -f "${WORKSPACE}"/Dockerfile -t "${LFQI}" "${BUILD_PATH}"
@@ -175,7 +175,7 @@ build_and_push_docker()
     fi
 
     OLDTAG="${LFQI}"
-    PUSHTAGS="${REPO}/${IMAGENAME}:${VERSION2}-${TIMESTAMP} ${REPO}/${IMAGENAME}:${VERSION2} ${REPO}/${IMAGENAME}:${VERSION2}-latest"
+    PUSHTAGS="${REPO}/${IMAGENAME}:${VERSION}-SNAPSHOT-${TIMESTAMP}Z ${REPO}/${IMAGENAME}:${VERSION} ${REPO}/${IMAGENAME}:latest"
     for NEWTAG in ${PUSHTAGS}
     do
       echo "tagging ${OLDTAG} to ${NEWTAG}"
diff --git a/pom.xml b/pom.xml
index 2fef4ac..98b8ab8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,16 +21,16 @@ ECOMP is a trademark and service mark 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">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.onap.dcaegen2</groupId>
+    <groupId>org.onap</groupId>
     <artifactId>dcaegen2</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <!--- CHANGE THE FOLLOWING 3 OBJECTS for your own repo -->
   <groupId>org.onap.dcaegen2.platform</groupId>
   <artifactId>cdapbroker</artifactId>
   <name>dcaegen2-platform-cdapbroker</name>
-  <version>4.0.10</version>
+  <version>4.1.0</version>
   <url>http://maven.apache.org</url>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/swagger/swagger.yaml b/swagger/swagger.yaml
index 41ba163..37a17ee 100644
--- a/swagger/swagger.yaml
+++ b/swagger/swagger.yaml
@@ -1,3 +1,20 @@
+# ================================================================================
+# Copyright (c) 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 is a trademark and service mark of AT&T Intellectual Property.
 # Example YAML to get you started quickly.
 # Be aware that YAML has indentation based scoping.
 # Code completion support is available so start typing for available options.
diff --git a/version.properties b/version.properties
index 26af12a..63f7e0d 100644
--- a/version.properties
+++ b/version.properties
@@ -1,6 +1,6 @@
 major=4
-minor=0
-patch=10
+minor=1
+patch=0
 base_version=${major}.${minor}.${patch}
 release_version=${base_version}
 snapshot_version=${base_version}-SNAPSHOT