aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorarcadia-devtools <arcadia-devtools@yandex-team.ru>2022-02-16 21:54:53 +0300
committerarcadia-devtools <arcadia-devtools@yandex-team.ru>2022-02-16 21:54:53 +0300
commit7fee503c0806bc0651616ffab3da70a8b12b7ff5 (patch)
tree427deb411b12d421f8773534a297470d98a2eb7d
parent2e15627de28081a12f2f26f36998dd51efe52213 (diff)
downloadydb-7fee503c0806bc0651616ffab3da70a8b12b7ff5.tar.gz
intermediate changes
ref:faaf61ce03f6705b0cb8c6ae61d2200ae1d6e707
-rw-r--r--contrib/libs/poco/Crypto/.yandex_meta/licenses.list.txt4
-rw-r--r--contrib/libs/poco/Crypto/ya.make5
-rw-r--r--contrib/libs/poco/Foundation/.yandex_meta/licenses.list.txt4
-rw-r--r--contrib/libs/poco/JSON/.yandex_meta/licenses.list.txt4
-rw-r--r--contrib/libs/poco/JSON/ya.make5
-rw-r--r--contrib/libs/poco/Net/.yandex_meta/licenses.list.txt4
-rw-r--r--contrib/libs/poco/Net/ya.make1
-rw-r--r--contrib/libs/poco/NetSSL_OpenSSL/.yandex_meta/licenses.list.txt4
-rw-r--r--contrib/libs/poco/NetSSL_OpenSSL/ya.make5
-rw-r--r--contrib/libs/poco/Util/.yandex_meta/licenses.list.txt4
-rw-r--r--contrib/libs/poco/Util/ya.make5
-rw-r--r--contrib/libs/poco/XML/.yandex_meta/licenses.list.txt4
-rw-r--r--contrib/libs/poco/XML/ya.make5
13 files changed, 5 insertions, 49 deletions
diff --git a/contrib/libs/poco/Crypto/.yandex_meta/licenses.list.txt b/contrib/libs/poco/Crypto/.yandex_meta/licenses.list.txt
index 3c8c0d35e3d..f97b3613c75 100644
--- a/contrib/libs/poco/Crypto/.yandex_meta/licenses.list.txt
+++ b/contrib/libs/poco/Crypto/.yandex_meta/licenses.list.txt
@@ -1,7 +1,3 @@
-====================BSD-3-Clause====================
- remove advertising from BSD licensed parts
-
-
====================BSL-1.0====================
// SPDX-License-Identifier: BSL-1.0
diff --git a/contrib/libs/poco/Crypto/ya.make b/contrib/libs/poco/Crypto/ya.make
index cf58950785a..cb1da751241 100644
--- a/contrib/libs/poco/Crypto/ya.make
+++ b/contrib/libs/poco/Crypto/ya.make
@@ -7,10 +7,7 @@ OWNER(
g:cpp-contrib
)
-LICENSE(
- BSD-3-Clause AND
- BSL-1.0
-)
+LICENSE(BSL-1.0)
LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
diff --git a/contrib/libs/poco/Foundation/.yandex_meta/licenses.list.txt b/contrib/libs/poco/Foundation/.yandex_meta/licenses.list.txt
index 93ee825c6e8..e7a072fd1fc 100644
--- a/contrib/libs/poco/Foundation/.yandex_meta/licenses.list.txt
+++ b/contrib/libs/poco/Foundation/.yandex_meta/licenses.list.txt
@@ -3,10 +3,6 @@
====================BSD-3-Clause====================
- remove advertising from BSD licensed parts
-
-
-====================BSD-3-Clause====================
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions
// are met:
diff --git a/contrib/libs/poco/JSON/.yandex_meta/licenses.list.txt b/contrib/libs/poco/JSON/.yandex_meta/licenses.list.txt
index d54b9f03a51..bf0303893ec 100644
--- a/contrib/libs/poco/JSON/.yandex_meta/licenses.list.txt
+++ b/contrib/libs/poco/JSON/.yandex_meta/licenses.list.txt
@@ -1,7 +1,3 @@
-====================BSD-3-Clause====================
- remove advertising from BSD licensed parts
-
-
====================BSL-1.0====================
// SPDX-License-Identifier: BSL-1.0
diff --git a/contrib/libs/poco/JSON/ya.make b/contrib/libs/poco/JSON/ya.make
index 11e0ff72b1d..d68fd44d16d 100644
--- a/contrib/libs/poco/JSON/ya.make
+++ b/contrib/libs/poco/JSON/ya.make
@@ -7,10 +7,7 @@ OWNER(
g:cpp-contrib
)
-LICENSE(
- BSD-3-Clause AND
- BSL-1.0
-)
+LICENSE(BSL-1.0)
LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
diff --git a/contrib/libs/poco/Net/.yandex_meta/licenses.list.txt b/contrib/libs/poco/Net/.yandex_meta/licenses.list.txt
index 601503367d1..66ce1e81df6 100644
--- a/contrib/libs/poco/Net/.yandex_meta/licenses.list.txt
+++ b/contrib/libs/poco/Net/.yandex_meta/licenses.list.txt
@@ -1,7 +1,3 @@
-====================BSD-3-Clause====================
- remove advertising from BSD licensed parts
-
-
====================BSL-1.0====================
// SPDX-License-Identifier: BSL-1.0
diff --git a/contrib/libs/poco/Net/ya.make b/contrib/libs/poco/Net/ya.make
index 9feadc70270..7f68fe530a1 100644
--- a/contrib/libs/poco/Net/ya.make
+++ b/contrib/libs/poco/Net/ya.make
@@ -8,7 +8,6 @@ OWNER(
)
LICENSE(
- BSD-3-Clause AND
BSL-1.0 AND
Custom-Punycode
)
diff --git a/contrib/libs/poco/NetSSL_OpenSSL/.yandex_meta/licenses.list.txt b/contrib/libs/poco/NetSSL_OpenSSL/.yandex_meta/licenses.list.txt
index 6b9be1e667d..849884083ef 100644
--- a/contrib/libs/poco/NetSSL_OpenSSL/.yandex_meta/licenses.list.txt
+++ b/contrib/libs/poco/NetSSL_OpenSSL/.yandex_meta/licenses.list.txt
@@ -1,7 +1,3 @@
-====================BSD-3-Clause====================
- remove advertising from BSD licensed parts
-
-
====================BSL-1.0====================
// SPDX-License-Identifier: BSL-1.0
diff --git a/contrib/libs/poco/NetSSL_OpenSSL/ya.make b/contrib/libs/poco/NetSSL_OpenSSL/ya.make
index ba6f99d872b..b68bde24e35 100644
--- a/contrib/libs/poco/NetSSL_OpenSSL/ya.make
+++ b/contrib/libs/poco/NetSSL_OpenSSL/ya.make
@@ -7,10 +7,7 @@ OWNER(
g:cpp-contrib
)
-LICENSE(
- BSD-3-Clause AND
- BSL-1.0
-)
+LICENSE(BSL-1.0)
LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
diff --git a/contrib/libs/poco/Util/.yandex_meta/licenses.list.txt b/contrib/libs/poco/Util/.yandex_meta/licenses.list.txt
index 0f680aedd4f..59e80621f75 100644
--- a/contrib/libs/poco/Util/.yandex_meta/licenses.list.txt
+++ b/contrib/libs/poco/Util/.yandex_meta/licenses.list.txt
@@ -1,7 +1,3 @@
-====================BSD-3-Clause====================
- remove advertising from BSD licensed parts
-
-
====================BSL-1.0====================
// SPDX-License-Identifier: BSL-1.0
diff --git a/contrib/libs/poco/Util/ya.make b/contrib/libs/poco/Util/ya.make
index 3a295763c66..c5d6227e099 100644
--- a/contrib/libs/poco/Util/ya.make
+++ b/contrib/libs/poco/Util/ya.make
@@ -7,10 +7,7 @@ OWNER(
g:cpp-contrib
)
-LICENSE(
- BSD-3-Clause AND
- BSL-1.0
-)
+LICENSE(BSL-1.0)
LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
diff --git a/contrib/libs/poco/XML/.yandex_meta/licenses.list.txt b/contrib/libs/poco/XML/.yandex_meta/licenses.list.txt
index be276d6bf61..264a647cef4 100644
--- a/contrib/libs/poco/XML/.yandex_meta/licenses.list.txt
+++ b/contrib/libs/poco/XML/.yandex_meta/licenses.list.txt
@@ -1,7 +1,3 @@
-====================BSD-3-Clause====================
- remove advertising from BSD licensed parts
-
-
====================BSL-1.0====================
// SPDX-License-Identifier: BSL-1.0
diff --git a/contrib/libs/poco/XML/ya.make b/contrib/libs/poco/XML/ya.make
index ffa0227a187..0bdc7f7c5aa 100644
--- a/contrib/libs/poco/XML/ya.make
+++ b/contrib/libs/poco/XML/ya.make
@@ -7,10 +7,7 @@ OWNER(
g:cpp-contrib
)
-LICENSE(
- BSD-3-Clause AND
- BSL-1.0
-)
+LICENSE(BSL-1.0)
LICENSE_TEXTS(.yandex_meta/licenses.list.txt)