diff --git a/NOTICE b/NOTICE index 76c2954e8bb..7c84f3812c3 100644 --- a/NOTICE +++ b/NOTICE @@ -1,6 +1,6 @@ TimescaleDB (TM) -Copyright (c) 2017-2021 Timescale, Inc. All Rights Reserved. +Copyright (c) 2017-2022 Timescale, Inc. All Rights Reserved. Copyright (c) 2016-2017 440 Labs, Inc. dba Timescale. All Rights Reserved. Source code in this repository is variously licensed under the Apache License @@ -32,7 +32,7 @@ The PostgreSQL License PostgreSQL Database Management System (formerly known as Postgres, then as Postgres95) -Portions Copyright (c) 1996-2018, The PostgreSQL Global Development Group +Portions Copyright (c) 1996-2022, The PostgreSQL Global Development Group Portions Copyright (c) 1994, The Regents of the University of California Permission to use, copy, modify, and distribute this software and its diff --git a/scripts/dump_meta_data.sql b/scripts/dump_meta_data.sql index 841e730f248..366a27fb0f3 100644 --- a/scripts/dump_meta_data.sql +++ b/scripts/dump_meta_data.sql @@ -1,4 +1,3 @@ --- Copyright (c) 2016-2018 Timescale, Inc. All Rights Reserved. -- -- This file is licensed under the Apache License, see LICENSE-APACHE -- at the top level directory of the TimescaleDB distribution. diff --git a/scripts/gh_matrix_builder.py b/scripts/gh_matrix_builder.py index d4919be6534..ae866c4469b 100644 --- a/scripts/gh_matrix_builder.py +++ b/scripts/gh_matrix_builder.py @@ -1,7 +1,8 @@ -# Copyright (c) 2016-2021 Timescale, Inc. All Rights Reserved. -# -# This file is licensed under the Apache License, see LICENSE-APACHE -# at the top level directory of the timescaledb distribution. +#!/usr/bin/env python + +# This file and its contents are licensed under the Apache License 2.0. +# Please see the included NOTICE for copyright information and +# LICENSE-APACHE for a copy of the license. # Python script to dynamically generate matrix for github action diff --git a/scripts/out_of_order_random_direct.sql b/scripts/out_of_order_random_direct.sql index d04af902df0..c18d8dd7799 100644 --- a/scripts/out_of_order_random_direct.sql +++ b/scripts/out_of_order_random_direct.sql @@ -1,7 +1,6 @@ --- Copyright (c) 2016-2018 Timescale, Inc. All Rights Reserved. --- --- This file is licensed under the Apache License, see LICENSE-APACHE --- at the top level directory of the TimescaleDB distribution. +-- This file and its contents are licensed under the Apache License 2.0. +-- Please see the included NOTICE for copyright information and +-- LICENSE-APACHE for a copy of the license. DROP DATABASE IF EXISTS test; CREATE DATABASE test; diff --git a/scripts/test_memory_spikes.py b/scripts/test_memory_spikes.py index 72997fd2d09..cc6e3cd97a2 100644 --- a/scripts/test_memory_spikes.py +++ b/scripts/test_memory_spikes.py @@ -1,7 +1,8 @@ -# Copyright (c) 2016-2018 Timescale, Inc. All Rights Reserved. -# -# This file is licensed under the Apache License, see LICENSE-APACHE -# at the top level directory of the timescaledb distribution. +#!/usr/bin/env python + +# This file and its contents are licensed under the Apache License 2.0. +# Please see the included NOTICE for copyright information and +# LICENSE-APACHE for a copy of the license. # Python script to check if there are memory spikes when running # out of order random inserts to TimescaleDB database diff --git a/scripts/ts_dump.sh b/scripts/ts_dump.sh index fc3fda86889..5b605e3188a 100755 --- a/scripts/ts_dump.sh +++ b/scripts/ts_dump.sh @@ -1,9 +1,8 @@ #!/usr/bin/env bash -# Copyright (c) 2016-2018 Timescale, Inc. All Rights Reserved. -# -# This file is licensed under the Apache License, see LICENSE-APACHE -# at the top level directory of the timescaledb distribution. +# This file and its contents are licensed under the Apache License 2.0. +# Please see the included NOTICE for copyright information and +# LICENSE-APACHE for a copy of the license. # This script is used for backing up a single hypertable into an easy-to-restore # tarball. The tarball contains two files: (1) a .sql file for recreating the diff --git a/scripts/ts_restore.sh b/scripts/ts_restore.sh index 0d3f9db5419..37fed5c280c 100755 --- a/scripts/ts_restore.sh +++ b/scripts/ts_restore.sh @@ -1,9 +1,8 @@ #!/usr/bin/env bash -# Copyright (c) 2016-2018 Timescale, Inc. All Rights Reserved. -# -# This file is licensed under the Apache License, see LICENSE-APACHE -# at the top level directory of the timescaledb distribution. +# This file and its contents are licensed under the Apache License 2.0. +# Please see the included NOTICE for copyright information and +# LICENSE-APACHE for a copy of the license. # This script is used for restoring a hypertable from a tarball made with # ts_dump.sh. It unarchives the tarball, producing a schema file and data file, diff --git a/sql/updates/pre-update.sql b/sql/updates/pre-update.sql index 320ce830bad..d3b3432ba98 100644 --- a/sql/updates/pre-update.sql +++ b/sql/updates/pre-update.sql @@ -1,7 +1,6 @@ --- Copyright (c) 2016-2018 Timescale, Inc. All Rights Reserved. --- --- This file is licensed under the Apache License, see LICENSE-APACHE --- at the top level directory of the TimescaleDB distribution. +-- This file and its contents are licensed under the Apache License 2.0. +-- Please see the included NOTICE for copyright information and +-- LICENSE-APACHE for a copy of the license. -- This file is always prepended to all upgrade scripts. diff --git a/test/expected/dump_meta.out b/test/expected/dump_meta.out index ea6f41c470e..40439bd8284 100644 --- a/test/expected/dump_meta.out +++ b/test/expected/dump_meta.out @@ -43,7 +43,6 @@ INSERT INTO "two_Partitions"("timeCustom", device_id, series_0, series_1) VALUES INSERT 0 1 \set QUIET on \ir ../../scripts/dump_meta_data.sql --- Copyright (c) 2016-2018 Timescale, Inc. All Rights Reserved. -- -- This file is licensed under the Apache License, see LICENSE-APACHE -- at the top level directory of the TimescaleDB distribution. diff --git a/test/expected/utils.out b/test/expected/utils.out deleted file mode 100644 index d60ed5217c6..00000000000 --- a/test/expected/utils.out +++ /dev/null @@ -1,14 +0,0 @@ --- Copyright (c) 2016-2018 Timescale, Inc. All Rights Reserved. --- --- This file is licensed under the Apache License, --- see LICENSE-APACHE at the top level directory. -\c :TEST_DBNAME :ROLE_SUPERUSER -CREATE OR REPLACE FUNCTION _timescaledb_internal.utils_test_list_cell_detach() RETURNS BOOL - AS :MODULE_PATHNAME, 'ts_test_list_cell_detach' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE; -\c :TEST_DBNAME :ROLE_DEFAULT_PERM_USER -SELECT _timescaledb_internal.utils_test_list_cell_detach(); - utils_test_list_cell_detach ------------------------------ - t -(1 row) -