diff options
| author | Alexander Smirnov <alex@ydb.tech> | 2024-09-03 11:05:27 +0000 |
|---|---|---|
| committer | Alexander Smirnov <alex@ydb.tech> | 2024-09-03 11:05:27 +0000 |
| commit | 8f71d7ed87007ace129f647b242a09d01773d3c5 (patch) | |
| tree | 2c46ca9d89eb0ce5eea79ba1febb79e56efedb0f /build/plugins/java.py | |
| parent | 78242bd5894abd6548e45731b464822da55a0796 (diff) | |
| parent | 3da5a68ec3c329240e89bd0ed8c1c39e4359a693 (diff) | |
| download | ydb-8f71d7ed87007ace129f647b242a09d01773d3c5.tar.gz | |
Merge branch 'rightlib' into mergelibs-240903-1104
Diffstat (limited to 'build/plugins/java.py')
| -rw-r--r-- | build/plugins/java.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/build/plugins/java.py b/build/plugins/java.py index 571de73260..c0771722ec 100644 --- a/build/plugins/java.py +++ b/build/plugins/java.py @@ -75,7 +75,7 @@ def onjava_module(unit, *args): 'ANNOTATION_PROCESSOR': extract_macro_calls(unit, 'ANNOTATION_PROCESSOR_VALUE', args_delim), 'EXTERNAL_JAR': extract_macro_calls(unit, 'EXTERNAL_JAR_VALUE', args_delim), 'RUN_JAVA_PROGRAM': [], - 'RUN_JAVA_PROGRAM_MANAGED': '${RUN_JAVA_PROGRAM_MANAGED}', + 'RUN_JAVA_PROGRAM_MANAGED': '', 'MAVEN_GROUP_ID': extract_macro_calls(unit, 'MAVEN_GROUP_ID_VALUE', args_delim), 'JAR_INCLUDE_FILTER': extract_macro_calls(unit, 'JAR_INCLUDE_FILTER_VALUE', args_delim), 'JAR_EXCLUDE_FILTER': extract_macro_calls(unit, 'JAR_EXCLUDE_FILTER_VALUE', args_delim), @@ -100,7 +100,6 @@ def onjava_module(unit, *args): 'JDK_RESOURCE': 'JDK' + (unit.get('JDK_VERSION') or unit.get('JDK_REAL_VERSION') or '_DEFAULT'), } if unit.get('ENABLE_PREVIEW_VALUE') == 'yes' and (unit.get('JDK_VERSION') or unit.get('JDK_REAL_VERSION')) in ( - '15', '17', '20', '21', @@ -372,7 +371,6 @@ def on_jdk_version_macro_check(unit, *args): jdk_version = args[0] available_versions = ( '11', - '15', '17', '20', '21', |