Browse Source

Remove PROTESTWARE license property

thegeorg 1 year ago
parent
commit
146230cadb
4 changed files with 4 additions and 15 deletions
  1. 1 4
      build/conf/license.conf
  2. 1 5
      ydb/opensource.inc
  3. 1 4
      yt/opensource.inc
  4. 1 2
      yt/opensource_tests.inc

+ 1 - 4
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
 #                         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.
 #                         LICENSES_<PROP_NAME>_STATIC and LICENSES_<PROP_NAME>_DYNAMIC lists.
 LICENSE_PROPERTIES= \
 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.
 # NB: Licenses lists below are sorted case-insensitively. Please, keep the list sorted.
@@ -417,9 +417,6 @@ LICENSES_SERVICE= \
     Service-Prebuilt-Tool \
     Service-Prebuilt-Tool \
     Service-Py23-Proxy
     Service-Py23-Proxy
 
 
-LICENSES_PROTESTWARE= \
-    Protestware
-
 macro _REQUIRE_EXPLICIT_LICENSE(PREFIXES...) {
 macro _REQUIRE_EXPLICIT_LICENSE(PREFIXES...) {
     SET(EXPLICIT_LICENSE_PREFIXES ${PREFIXES})
     SET(EXPLICIT_LICENSE_PREFIXES ${PREFIXES})
 }
 }

+ 1 - 5
ydb/opensource.inc

@@ -1,10 +1,6 @@
 IF (OPENSOURCE)
 IF (OPENSOURCE)
     LICENSE_RESTRICTION(
     LICENSE_RESTRICTION(
-        DENY REQUIRE_DISCLOSURE FORBIDDEN PROTESTWARE
-    )
-    LICENSE_RESTRICTION_EXCEPTIONS(
-        contrib/libs/fmt            #
-        contrib/libs/t1ha           # KIKIMR-16412
+        DENY REQUIRE_DISCLOSURE FORBIDDEN
     )
     )
 ENDIF()
 ENDIF()
 
 

+ 1 - 4
yt/opensource.inc

@@ -12,9 +12,6 @@ IF (OPENSOURCE)
     ENDIF()
     ENDIF()
 
 
     LICENSE_RESTRICTION(
     LICENSE_RESTRICTION(
-        DENY REQUIRE_DISCLOSURE FORBIDDEN PROTESTWARE
-    )
-    LICENSE_RESTRICTION_EXCEPTIONS(
-        contrib/libs/fmt                # DTCC-1317
+        DENY REQUIRE_DISCLOSURE FORBIDDEN
     )
     )
 ENDIF()
 ENDIF()

+ 1 - 2
yt/opensource_tests.inc

@@ -12,11 +12,10 @@ IF (OPENSOURCE)
     ENDIF()
     ENDIF()
 
 
     LICENSE_RESTRICTION(
     LICENSE_RESTRICTION(
-        DENY REQUIRE_DISCLOSURE FORBIDDEN PROTESTWARE
+        DENY REQUIRE_DISCLOSURE FORBIDDEN
     )
     )
 
 
     LICENSE_RESTRICTION_EXCEPTIONS(
     LICENSE_RESTRICTION_EXCEPTIONS(
-        contrib/libs/fmt                 # DTCC-1317
         # Java tests
         # Java tests
         contrib/java/junit/junit/4.13
         contrib/java/junit/junit/4.13
         contrib/java/javax/persistence/persistence-api/1.0
         contrib/java/javax/persistence/persistence-api/1.0