diff options
| author | thegeorg <thegeorg@yandex-team.com> | 2023-09-11 14:41:03 +0300 |
|---|---|---|
| committer | thegeorg <thegeorg@yandex-team.com> | 2023-09-11 15:09:55 +0300 |
| commit | 146230cadbb63d7fbea2feaff519ac3dd6fae75e (patch) | |
| tree | 4d3c81fa5dbedc060337675e13449dcaefbd37ad | |
| parent | b8ead035bef3feaa5353f08b78eee067981f5d85 (diff) | |
| download | ydb-146230cadbb63d7fbea2feaff519ac3dd6fae75e.tar.gz | |
Remove PROTESTWARE license property
| -rw-r--r-- | build/conf/license.conf | 5 | ||||
| -rw-r--r-- | ydb/opensource.inc | 6 | ||||
| -rw-r--r-- | yt/opensource.inc | 5 | ||||
| -rw-r--r-- | yt/opensource_tests.inc | 3 |
4 files changed, 4 insertions, 15 deletions
diff --git a/build/conf/license.conf b/build/conf/license.conf index 8dba2085146..eb8b7dbcf11 100644 --- a/build/conf/license.conf +++ b/build/conf/license.conf @@ -20,7 +20,7 @@ EXPLICIT_LICENSE_EXCEPTIONS= # one of them. Putting some license into this list is equivalent to putting it into both # LICENSES_<PROP_NAME>_STATIC and LICENSES_<PROP_NAME>_DYNAMIC lists. LICENSE_PROPERTIES= \ - FORBIDDEN NDA REQUIRE_DISCLOSURE PERMISSIVE REQUIRE_CITATION SERVICE PROTESTWARE + FORBIDDEN NDA REQUIRE_DISCLOSURE PERMISSIVE REQUIRE_CITATION SERVICE # NB: Licenses lists below are sorted case-insensitively. Please, keep the list sorted. @@ -417,9 +417,6 @@ LICENSES_SERVICE= \ Service-Prebuilt-Tool \ Service-Py23-Proxy -LICENSES_PROTESTWARE= \ - Protestware - macro _REQUIRE_EXPLICIT_LICENSE(PREFIXES...) { SET(EXPLICIT_LICENSE_PREFIXES ${PREFIXES}) } diff --git a/ydb/opensource.inc b/ydb/opensource.inc index fe49cdd8c32..43024684583 100644 --- a/ydb/opensource.inc +++ b/ydb/opensource.inc @@ -1,10 +1,6 @@ IF (OPENSOURCE) LICENSE_RESTRICTION( - DENY REQUIRE_DISCLOSURE FORBIDDEN PROTESTWARE - ) - LICENSE_RESTRICTION_EXCEPTIONS( - contrib/libs/fmt # - contrib/libs/t1ha # KIKIMR-16412 + DENY REQUIRE_DISCLOSURE FORBIDDEN ) ENDIF() diff --git a/yt/opensource.inc b/yt/opensource.inc index 89bb5a403d8..c6b44eadcdd 100644 --- a/yt/opensource.inc +++ b/yt/opensource.inc @@ -12,9 +12,6 @@ IF (OPENSOURCE) ENDIF() LICENSE_RESTRICTION( - DENY REQUIRE_DISCLOSURE FORBIDDEN PROTESTWARE - ) - LICENSE_RESTRICTION_EXCEPTIONS( - contrib/libs/fmt # DTCC-1317 + DENY REQUIRE_DISCLOSURE FORBIDDEN ) ENDIF() diff --git a/yt/opensource_tests.inc b/yt/opensource_tests.inc index ceaefc7e0aa..5224ef580f4 100644 --- a/yt/opensource_tests.inc +++ b/yt/opensource_tests.inc @@ -12,11 +12,10 @@ IF (OPENSOURCE) ENDIF() LICENSE_RESTRICTION( - DENY REQUIRE_DISCLOSURE FORBIDDEN PROTESTWARE + DENY REQUIRE_DISCLOSURE FORBIDDEN ) LICENSE_RESTRICTION_EXCEPTIONS( - contrib/libs/fmt # DTCC-1317 # Java tests contrib/java/junit/junit/4.13 contrib/java/javax/persistence/persistence-api/1.0 |