Merge branch 'rightlib' into mergelibs-240423-0906

Author: alexv-smirnov

build/conf/go.conf

@@ -709,11 +709,11 @@ module _GO_BASE_UNIT: _BASE_UNIT {
             _GO_VET=yes
             PEERDIR+=build/external_resources/yolint
             _GO_VET_TOOL=${YOLINT_RESOURCE_GLOBAL}/yolint
-            _GO_VET_FLAGS=-migration.config=${input:"${ARCADIA_ROOT}/build/rules/go/migrations.yaml"} -scopelint.config=${input:"${ARCADIA_ROOT}/build/rules/go/extended_lint.yaml"}
+            _GO_VET_FLAGS=-migration.config=${input:"${ARCADIA_ROOT}/build/rules/go/migrations.yaml"} -scopelint.config=${input:"${ARCADIA_ROOT}/build/rules/go/extended_lint.yaml"} -riskyimports.config=${input:"${ARCADIA_ROOT}/build/rules/go/risky_imports.yaml"}
         }
         "local" ? {
             _GO_VET=yes
-            _GO_VET_FLAGS=-migration.config=${input:"${ARCADIA_ROOT}/build/rules/go/migrations.yaml"} -scopelint.config=${input:"${ARCADIA_ROOT}/build/rules/go/extended_lint.yaml"}
+            _GO_VET_FLAGS=-migration.config=${input:"${ARCADIA_ROOT}/build/rules/go/migrations.yaml"} -scopelint.config=${input:"${ARCADIA_ROOT}/build/rules/go/extended_lint.yaml"} -riskyimports.config=${input:"${ARCADIA_ROOT}/build/rules/go/risky_imports.yaml"}
         }
         default ? {
             _GO_VET=no

build/conf/java.conf

@@ -1042,11 +1042,6 @@ module JAR_LIBRARY: _COMPILABLE_JAR_BASE {
         JAVAC_OPTS+=$ERROR_PRONE_JDK16_ADD_OPENS
     }
 
-    when($ERROR_PRONE_VALUE && $JDK_REAL_VERSION == "18") {
-        JAVAC_FLAGS_VALUE+=$ERROR_PRONE_JDK16_ADD_OPENS
-        JAVAC_OPTS+=$ERROR_PRONE_JDK16_ADD_OPENS
-    }
-
     when($ERROR_PRONE_VALUE && $JDK_REAL_VERSION == "20") {
         JAVAC_FLAGS_VALUE+=$ERROR_PRONE_JDK16_ADD_OPENS
         JAVAC_OPTS+=$ERROR_PRONE_JDK16_ADD_OPENS
@@ -1204,9 +1199,6 @@ when ($JDK_VERSION == "21") {
 elsewhen ($JDK_VERSION == "20") {
     JDK_REAL_VERSION=20
 }
-elsewhen ($JDK_VERSION == "18") {
-    JDK_REAL_VERSION=18
-}
 elsewhen ($JDK_VERSION == "17") {
     JDK_REAL_VERSION=17
 }
@@ -1238,9 +1230,6 @@ otherwise {
     when ($JDK_REAL_VERSION == "20") {
         JDK_RESOURCE_PEERDIR=build/platform/java/jdk/jdk20 build/platform/java/jdk/jdk17
     }
-    when ($JDK_REAL_VERSION == "18") {
-        JDK_RESOURCE_PEERDIR=build/platform/java/jdk/jdk18 build/platform/java/jdk/jdk17
-    }
     when ($JDK_REAL_VERSION == "17") {
         # need jdk11 for spare parts in "host" platform
         JDK_RESOURCE_PEERDIR=build/platform/java/jdk/jdk17 build/platform/java/jdk/jdk11
@@ -1263,9 +1252,6 @@ when ($JDK_REAL_VERSION == "21") {
 when ($JDK_REAL_VERSION == "20") {
     UBERJAR_RESOURCE_PEERDIR=build/platform/java/uberjar/uberjar20
 }
-when ($JDK_REAL_VERSION == "18") {
-    UBERJAR_RESOURCE_PEERDIR=build/platform/java/uberjar/uberjar18
-}
 when ($JDK_REAL_VERSION == "17") {
     UBERJAR_RESOURCE_PEERDIR=build/platform/java/uberjar/uberjar17
 }
@@ -1291,9 +1277,6 @@ otherwise {
     when ($JDK_REAL_VERSION == "20") {
         JDK_RESOURCE=$JDK20_RESOURCE_GLOBAL
     }
-    when ($JDK_REAL_VERSION == "18") {
-        JDK_RESOURCE=$JDK18_RESOURCE_GLOBAL
-    }
     when ($JDK_REAL_VERSION == "17") {
         JDK_RESOURCE=$JDK17_RESOURCE_GLOBAL
     }
@@ -1318,11 +1301,6 @@ when (!$USE_SYSTEM_ERROR_PRONE) {
         ERROR_PRONE_PEERDIR=build/platform/java/error_prone/2.10.0
         ERROR_PRONE_RESOURCE=$ERROR_PRONE_2_10_0_RESOURCE_GLOBAL
     }
-    elsewhen ($JDK_REAL_VERSION == "18") {
-        ERROR_PRONE_VERSION=2.14.0
-        ERROR_PRONE_PEERDIR=build/platform/java/error_prone/2.14.0
-        ERROR_PRONE_RESOURCE=$ERROR_PRONE_2_14_0_RESOURCE_GLOBAL
-    }
     elsewhen ($JDK_REAL_VERSION == "20") {
         ERROR_PRONE_VERSION=2.18.0
         ERROR_PRONE_PEERDIR=build/platform/java/error_prone/2.18.0
@@ -1364,9 +1342,6 @@ otherwise {
     when ($JDK_REAL_VERSION == "20") {
         UBERJAR_RESOURCE=$UBERJAR20_RESOURCE_GLOBAL
     }
-    when ($JDK_REAL_VERSION == "18") {
-        UBERJAR_RESOURCE=$UBERJAR18_RESOURCE_GLOBAL
-    }
     when ($JDK_REAL_VERSION == "17") {
         UBERJAR_RESOURCE=$UBERJAR17_RESOURCE_GLOBAL
     }
@@ -1388,9 +1363,6 @@ when ($JDK_REAL_VERSION == "21") {
 when ($JDK_REAL_VERSION == "20") {
     WITH_JDK_RESOURCE=$WITH_JDK20_RESOURCE_GLOBAL
 }
-when ($JDK_REAL_VERSION == "18") {
-    WITH_JDK_RESOURCE=$WITH_JDK18_RESOURCE_GLOBAL
-}
 when ($JDK_REAL_VERSION == "17") {
     WITH_JDK_RESOURCE=$WITH_JDK17_RESOURCE_GLOBAL
 }

build/conf/license.conf

@@ -10,6 +10,9 @@ DEFAULT_MODULE_LICENSE=Service-Default-License
 EXPLICIT_LICENSE_PREFIXES=
 EXPLICIT_LICENSE_EXCEPTIONS=
 
+LICENSES=
+LICENSES+=build/conf/licenses.json
+
 # List of license properties which can be used to restrict transitive dependencies. There are three variables checked for each
 # property:
 # * LICENSES_<PROP_NAME>_STATIC: list of licenses which propagates this property when linking with code published by one of