diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala index 1395ec843..769c5d131 100644 --- a/main/src/main/scala/sbt/Defaults.scala +++ b/main/src/main/scala/sbt/Defaults.scala @@ -2042,20 +2042,6 @@ object Defaults extends BuildCommon with DefExtra { s.log.debug(s"javaOptions: $options") new ForkRun(opts) } else { - if (options.nonEmpty) { - val mask = ScopeMask(project = false) - val showJavaOptions = Scope.displayMasked( - (resolvedScope / javaOptions).scopedKey.scope, - (resolvedScope / javaOptions).key.label, - mask - ) - val showFork = Scope.displayMasked( - (resolvedScope / fork).scopedKey.scope, - (resolvedScope / fork).key.label, - mask - ) - s.log.warn(s"$showJavaOptions will be ignored, $showFork is set to false") - } new Run(si, trap, tmp) } } diff --git a/main/src/main/scala/sbt/internal/ClassLoaders.scala b/main/src/main/scala/sbt/internal/ClassLoaders.scala index 0f12775ff..ae5a3afac 100644 --- a/main/src/main/scala/sbt/internal/ClassLoaders.scala +++ b/main/src/main/scala/sbt/internal/ClassLoaders.scala @@ -95,21 +95,6 @@ private[sbt] object ClassLoaders { val s = streams.value val opts = forkOptions.value val options = javaOptions.value - - if options.nonEmpty then - val mask = ScopeMask(project = false) - val showJavaOptions = Scope.displayMasked( - (resolvedScope / javaOptions).scopedKey.scope, - (resolvedScope / javaOptions).key.label, - mask - ) - val showFork = Scope.displayMasked( - (resolvedScope / fork).scopedKey.scope, - (resolvedScope / fork).key.label, - mask - ) - s.log.warn(s"$showJavaOptions will be ignored, $showFork is set to false") - val exclude = dependencyJars(exportedProducts).value .map(converter.toPath) .map(_.toFile) diff --git a/main/src/main/scala/sbt/internal/RunUtil.scala b/main/src/main/scala/sbt/internal/RunUtil.scala index e3c1bc712..afbd0a5a1 100644 --- a/main/src/main/scala/sbt/internal/RunUtil.scala +++ b/main/src/main/scala/sbt/internal/RunUtil.scala @@ -44,9 +44,6 @@ object RunUtil: val newFo = fo.withRunJVMOptions(fo.runJVMOptions ++ jvmArgs) (new ForkRun(newFo), newFo) case _ => - log.warn( - s"JVM options (${jvmArgs.mkString(" ")}) will be ignored, fork is set to false" - ) (scalaRun, fo) private def setWindowTitle(title: String): Unit =