From: E. Scott Daniels <daniels@research.att.com>
Date: Fri, 22 Jan 2021 13:16:05 +0000 (-0500)
Subject: Fix copyright statements
X-Git-Tag: 1.1.0~1
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=d846166903e6508eed9848aaa47e6e563ecdf436;p=ric-app%2Fts.git

Fix copyright statements

Issue-ID: RIC-736

Signed-off-by: E. Scott Daniels <daniels@research.att.com>
Change-Id: I7f04ad5d9b1eaf8c21ff8f095fdac0e2232067fe
Signed-off-by: E. Scott Daniels <daniels@research.att.com>
---

diff --git a/Dockerfile b/Dockerfile
index 3259306..a1cc537 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -31,7 +31,7 @@
 
 # the builder has: git, wget, cmake, gcc/g++, make, python2/3. v7 dropped nng support
 #
-FROM nexus3.o-ran-sc.org:10004/o-ran-sc/bldr-ubuntu18-c-go:9-u18.04 as buildenv
+FROM nexus3.o-ran-sc.org:10004/o-ran-sc/bldr-ubuntu18-c-go:1.9.0 as buildenv
 
 # spaces to save things in the build image to copy to final image
 RUN mkdir -p /playpen/assets /playpen/src /playpen/bin
diff --git a/src/ts_xapp/Makefile b/src/ts_xapp/Makefile
index 08a350b..750559e 100644
--- a/src/ts_xapp/Makefile
+++ b/src/ts_xapp/Makefile
@@ -1,7 +1,6 @@
 # vim: ts=4 sw=4 noet:
 
 #==================================================================================
-#	Copyright (c) 2020 Nokia
 #	Copyright (c) 2020 AT&T Intellectual Property.
 #
 #   Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/ts_xapp/ts_xapp.cpp b/src/ts_xapp/ts_xapp.cpp
index ca0cd6c..b32e71e 100644
--- a/src/ts_xapp/ts_xapp.cpp
+++ b/src/ts_xapp/ts_xapp.cpp
@@ -1,7 +1,6 @@
 // vi: ts=4 sw=4 noet:
 /*
 ==================================================================================
-	Copyright (c) 2020 Nokia
 	Copyright (c) 2020 AT&T Intellectual Property.
 
    Licensed under the Apache License, Version 2.0 (the "License");
@@ -29,7 +28,7 @@
 
 	Date:		22 April 2020
 	Author:		Ron Shacham
-		
+
 */
 
 #include <stdio.h>
diff --git a/test/parse_gcov.sh b/test/parse_gcov.sh
index d69a88b..8d83c38 100755
--- a/test/parse_gcov.sh
+++ b/test/parse_gcov.sh
@@ -18,6 +18,12 @@
 #   limitations under the License.
 #==================================================================================
 
+# LICENSE NOTE:
+# this code is based on the unit test code in the o-ran-sc RMR repositiory which
+# is covered by the original license above, and thus that license governs this
+# extension as well.
+# ---------------------------------------------------------------------------------
+
 #
 #	Parse the .gcov file and discount any unexecuted lines which are in if()
 #	blocks which are testing the result of alloc/malloc calls, or testing for
diff --git a/test/scrub_gcov.sh b/test/scrub_gcov.sh
index 349fca2..57ebb57 100755
--- a/test/scrub_gcov.sh
+++ b/test/scrub_gcov.sh
@@ -18,6 +18,12 @@
 #   limitations under the License.
 #==================================================================================
 
+# LICENSE NOTE:
+# this code is based on the unit test code in the o-ran-sc RMR repositiory which
+# is covered by the original license above, and thus that license governs this
+# extension as well.
+# ---------------------------------------------------------------------------------
+
 #
 #	Mnemonic:	scrub_gcov.sh
 #	Abstract:	Gcov (sadly) outputs for any header file that we pull.
diff --git a/test/unit_test.sh b/test/unit_test.sh
index d361fb7..54fc2e7 100755
--- a/test/unit_test.sh
+++ b/test/unit_test.sh
@@ -18,6 +18,12 @@
 #   limitations under the License.
 #==================================================================================
 
+# LICENSE NOTE:
+# this code is based on the unit test code in the o-ran-sc RMR repositiory which
+# is covered by the original license above, and thus that license governs this
+# extension as well.
+# ---------------------------------------------------------------------------------
+
 #
 #	Mnemonic:	unit_test.sh
 #	Abstract:	This drives the unit tests and combs out the needed .gcov