java.conf cleanup

build/conf/java.conf

@@ -928,6 +928,8 @@ module _JAR_RUNNABLE: _COMPILABLE_JAR_BASE {
     .SEM=IGNORED
     .ALIASES=JAVA_SRCS=_MARK_JAVA_PROG_WITH_SOURCES GENERATE_SCRIPT=_YMAKE_GENERATE_SCRIPT
     .ALLOWED=WITH_JDK
+    .PEERDIR_POLICY=as_build_from
+
     MODULE_SUFFIX=.run.cp.jar
     CONSUME_NON_MANAGEABLE_PEERS=yes
 
@@ -959,23 +961,6 @@ module _JAR_RUNNABLE: _COMPILABLE_JAR_BASE {
     CHECK_PROVIDES()
 }
 
-# tag:java-specific
-multimodule JAR_PROGRAM {
-    module JAR_RUNNABLE: _JAR_RUNNABLE {
-        .ALLOWED=JAVA_RUNTIME_PEERDIR JAVA_RUNTIME_EXCLUDE
-        .IGNORED=JAVA_SRCS RUN_JAVA_PROGRAM
-        .ALIASES=EXCLUDE=_NOOP_MACRO PEERDIR=_NOOP_MACRO DEPENDENCY_MANAGEMENT=_NOOP_MACRO JAVA_RUNTIME_PEERDIR=PEERDIR JAVA_RUNTIME_EXCLUDE=EXCLUDE
-        .PEERDIRSELF=JAR_COMPILATION
-
-        SET(MODULE_TYPE JAVA_PROGRAM)
-    }
-    module JAR_COMPILATION: JAR_LIBRARY {
-        .ALIASES=JAVA_RUNTIME_PEERDIR=_NOOP_MACRO JAVA_RUNTIME_EXCLUDE=_NOOP_MACRO
-        .FINAL_TARGET=no
-        SET(MODULE_TYPE JAVA_PROGRAM)
-    }
-}
-
 # tag:java-specific
 LINK_JAR_TEST=${hide:JAVA_FAKEID} ${WRITER_PY} --file ${BINDIR}/run-bf.txt -Q -m --ya-start-command-file ${ext=.jar:MANAGED_PEERS_CLOSURE} --ya-end-command-file && ${YMAKE_PYTHON} ${input:"build/scripts/make_manifest_from_bf.py"} ${BINDIR}/run-bf.txt ${TARGET} ${kv;hide:"p JT"}
 YMAKE_JAVA_TEST=