from: software
to: utils
evidence:
 - file: "software/winrm/src/main/java/org/apache/brooklyn/core/sensor/windows/WinRmCommandSensor.java"
   contains "import org.apache.brooklyn.util.guava.Maybe;"

from: software
to: utils
evidence:
 - file: "software/winrm/src/main/java/org/apache/brooklyn/core/sensor/windows/WindowsPerformanceCounterSensors.java"
   contains "import org.apache.brooklyn.util.time.Duration;"

from: software
to: utils
evidence:
 - file: "software/winrm/src/main/java/org/apache/brooklyn/util/core/internal/winrm/WinRmTool.java"
   contains "import org.apache.brooklyn.util.time.Duration;"

from: software
to: utils
evidence:
 - file: "software/winrm/src/main/java/org/apache/brooklyn/util/core/internal/winrm/winrm4j/Winrm4jTool.java"
   contains "import org.apache.brooklyn.util.exceptions.Exceptions;"

from: software
to: utils
evidence:
 - file: "software/winrm/src/main/java/org/apache/brooklyn/location/winrm/WinRmTasks.java"
   contains "import org.apache.brooklyn.util.net.Urls;"

from: software
to: utils
evidence:
 - file: "software/winrm/src/main/java/org/apache/brooklyn/location/winrm/WinRmMachineLocation.java"
   contains "import org.apache.brooklyn.util.guava.Maybe;"

from: software
to: utils
evidence:
 - file: "software/winrm/src/main/java/org/apache/brooklyn/location/winrm/WinRmPutTaskFactory.java"
   contains "import org.apache.brooklyn.util.stream.KnownSizeInputStream;"

from: software
to: utils
evidence:
 - file: "software/winrm/src/main/java/org/apache/brooklyn/location/winrm/WinrmWorkflowStep.java"
   contains "import org.apache.brooklyn.util.text.Strings;"

from: software
to: utils
evidence:
 - file: "software/winrm/src/main/java/org/apache/brooklyn/feed/windows/WindowsPerformanceCounterFeed.java"
   contains "import org.apache.brooklyn.util.guava.Maybe;"

from: software
to: utils
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/tasks/kubectl/ContainerSensor.java"
   contains "import org.apache.brooklyn.util.guava.Maybe;"

from: software
to: utils
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/tasks/kubectl/ContainerTaskFactory.java"
   contains "import org.apache.brooklyn.util.exceptions.Exceptions;"

from: software
to: utils
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/tasks/kubectl/ContainerCommons.java"
   contains "import org.apache.brooklyn.util.time.Duration;"

from: software
to: utils
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/tasks/kubectl/KubeJobFileCreator.java"
   contains "import org.apache.brooklyn.util.text.Strings;"

from: software
to: utils
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/tasks/kubectl/ContainerWorkflowStep.java"
   contains "import org.apache.brooklyn.util.text.Strings;"

from: software
to: utils
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/java/JmxSupport.java"
   contains "import org.apache.brooklyn.util.jmx.jmxrmi.JmxRmiAgent;"

from: software
to: utils
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/java/JmxmpSslSupport.java"
   contains "import org.apache.brooklyn.util.jmx.jmxmp.JmxmpAgent;"

from: software
to: utils
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/java/JavaSoftwareProcessSshDriver.java"
   contains "import static org.apache.brooklyn.util.JavaGroovyEquivalents.groovyTruth;"

from: software
to: utils
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/java/JavaAppUtils.java"
   contains "import static org.apache.brooklyn.util.JavaGroovyEquivalents.groovyTruth;"

from: software
to: utils
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/java/VanillaJavaAppSshDriver.java"
   contains "import org.apache.brooklyn.util.net.Urls;"

from: software
to: utils
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/java/JmxAttributeSensor.java"
   contains "import org.apache.brooklyn.util.time.Duration;"

from: software
to: utils
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/java/VanillaJavaApp.java"
   contains "import org.apache.brooklyn.util.collections.MutableList;"

from: software
to: utils
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/java/UsesJmx.java"
   contains "import org.apache.brooklyn.config.ConfigKey;"

from: software
to: utils
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/java/UsesJava.java"
   contains "import org.apache.brooklyn.config.ConfigKey;"

from: software
to: utils
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/java/JavaEntityMethods.java"
   contains "import org.apache.brooklyn.config.ConfigKey;"

from: software
to: utils
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/java/UsesJavaMXBeans.java"
   contains "import org.apache.brooklyn.config.ConfigKey;"

from: software
to: utils
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/system_service/SystemServiceEnricher.java"
   contains "import org.apache.brooklyn.util.net.Urls;"

from: software
to: utils
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/system_service/InitdServiceInstaller.java"
   contains "import org.apache.brooklyn.util.ssh.BashCommandsConfigurable;"

from: software
to: utils
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/software/base/AbstractSoftwareProcessWinRmDriver.java"
   contains "import org.apache.brooklyn.util.repeat.Repeater;"

from: software
to: utils
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/software/base/AbstractSoftwareProcessSshDriver.java"
   contains "import static org.apache.brooklyn.util.JavaGroovyEquivalents.elvis;"

from: software
to: utils
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/software/base/VanillaWindowsProcessWinRmDriver.java"
   contains "import static org.apache.brooklyn.util.JavaGroovyEquivalents.elvis;"

from: software
to: utils
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/software/base/VanillaSoftwareProcessSshDriver.java"
   contains "import org.apache.brooklyn.util.net.Urls;"

from: software
to: utils
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/software/base/EmptyWindowsProcessWinRmDriver.java"
   contains "import org.apache.brooklyn.util.net.UserAndHostAndPort;"

from: software
to: utils
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/software/base/WorkflowSoftwareProcessImpl.java"
   contains "import org.apache.brooklyn.util.guava.Maybe;"

from: software
to: utils
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/software/base/VanillaSoftwareProcessImpl.java"
   contains "import org.apache.brooklyn.util.guava.Maybe;"

from: software
to: utils
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/software/base/InboundPortsUtils.java"
   contains "import org.apache.brooklyn.util.guava.Maybe;"

from: software
to: utils
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/software/base/WorkflowSoftwareProcessSshDriver.java"
   contains "import org.apache.brooklyn.util.guava.Maybe;"

from: software
to: utils
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/software/base/SoftwareProcessImpl.java"
   contains "import org.apache.brooklyn.util.guava.Maybe;"

from: software
to: utils
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/software/base/AbstractSoftwareProcessDriver.java"
   contains "import org.apache.brooklyn.util.stream.ReaderInputStream;"

from: software
to: utils
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/software/base/VanillaWindowsProcess.java"
   contains "import org.apache.brooklyn.util.time.Duration;"

from: software
to: utils
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/software/base/SoftwareProcess.java"
   contains "import org.apache.brooklyn.util.time.Duration;"

from: software
to: utils
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/software/base/SoftwareProcessDriverLifecycleEffectorTasks.java"
   contains "import org.apache.brooklyn.util.text.Strings;"

from: software
to: utils
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/software/base/SameServerEntityImpl.java"
   contains "import org.apache.brooklyn.util.collections.QuorumCheck;"

from: software
to: utils
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/software/base/SameServerEntity.java"
   contains "import org.apache.brooklyn.util.collections.MutableMap;"

from: software
to: utils
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/software/base/SameServerDriverLifecycleEffectorTasks.java"
   contains "import org.apache.brooklyn.util.collections.MutableSet;"

from: software
to: utils
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/software/base/EmptySoftwareProcess.java"
   contains "import org.apache.brooklyn.config.ConfigKey;"

from: software
to: utils
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/software/base/WorkflowSoftwareProcess.java"
   contains "import org.apache.brooklyn.config.ConfigInheritance;"

from: software
to: utils
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/software/base/VanillaSoftwareProcess.java"
   contains "import org.apache.brooklyn.config.ConfigKey;"

from: software
to: utils
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/software/base/AbstractVanillaProcess.java"
   contains "import org.apache.brooklyn.config.ConfigInheritance;"

from: software
to: utils
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/software/base/EmptyWindowsProcess.java"
   contains "import org.apache.brooklyn.config.ConfigKey;"

from: software
to: utils
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/software/base/lifecycle/MachineLifecycleEffectorTasks.java"
   contains "import org.apache.brooklyn.util.repeat.Repeater;"

from: software
to: utils
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/software/base/lifecycle/WinRmExecuteHelper.java"
   contains "import org.apache.brooklyn.util.stream.Streams;"

from: software
to: utils
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/software/base/lifecycle/ScriptHelper.java"
   contains "import org.apache.brooklyn.util.stream.Streams;"

from: software
to: utils
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeImpl.java"
   contains "import org.apache.brooklyn.util.repeat.Repeater;"

from: software
to: utils
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNode.java"
   contains "import org.apache.brooklyn.util.net.Networking;"

from: software
to: utils
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/BrooklynEntityMirrorImpl.java"
   contains "import org.apache.brooklyn.util.net.Urls;"

from: software
to: utils
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/EntityHttpClientImpl.java"
   contains "import org.apache.brooklyn.util.net.Urls;"

from: software
to: utils
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeSshDriver.java"
   contains "import org.apache.brooklyn.util.net.Networking;"

from: software
to: utils
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/BrooklynEntityMirror.java"
   contains "import org.apache.brooklyn.util.time.Duration;"

from: software
to: utils
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/BrooklynClusterImpl.java"
   contains "import org.apache.brooklyn.util.time.Duration;"

from: software
to: utils
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/EntityHttpClient.java"
   contains "import org.apache.brooklyn.util.http.HttpTool;"

from: software
to: utils
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/RemoteEffectorBuilder.java"
   contains "import org.apache.brooklyn.util.http.HttpToolResponse;"

from: software
to: utils
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/LocalBrooklynNodeImpl.java"
   contains "import org.apache.brooklyn.util.text.Strings;"

from: software
to: utils
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/BrooklynCluster.java"
   contains "import org.apache.brooklyn.config.ConfigKey;"

from: software
to: utils
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/effector/SelectMasterEffectorBody.java"
   contains "import org.apache.brooklyn.util.repeat.Repeater;"

from: software
to: utils
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/effector/BrooklynNodeUpgradeEffectorBody.java"
   contains "import org.apache.brooklyn.util.net.Urls;"

from: software
to: utils
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/effector/BrooklynClusterUpgradeEffectorBody.java"
   contains "import org.apache.brooklyn.util.net.Urls;"

from: software
to: utils
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/effector/SetHighAvailabilityModeEffectorBody.java"
   contains "import org.apache.brooklyn.util.guava.Functionals;"

from: software
to: utils
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/effector/SetHighAvailabilityPriorityEffectorBody.java"
   contains "import org.apache.brooklyn.util.http.HttpToolResponse;"

from: software
to: utils
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/machine/SetHostnameCustomizer.java"
   contains "import org.apache.brooklyn.util.net.Networking;"

from: software
to: utils
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/machine/MachineInitTasks.java"
   contains "import org.apache.brooklyn.util.net.Protocol;"

from: software
to: utils
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/machine/MachineEntityImpl.java"
   contains "import org.apache.brooklyn.util.guava.Maybe;"

from: software
to: utils
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/machine/MachineAttributes.java"
   contains "import org.apache.brooklyn.util.guava.Functionals;"

from: software
to: utils
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/machine/MachineEntity.java"
   contains "import org.apache.brooklyn.util.time.Duration;"

from: software
to: utils
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/machine/AddMachineMetrics.java"
   contains "import org.apache.brooklyn.util.time.Duration;"

from: software
to: utils
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/machine/SetLimitsCustomizer.java"
   contains "import org.apache.brooklyn.util.ssh.BashCommands;"

from: software
to: utils
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/machine/pool/ServerPoolImpl.java"
   contains "import org.apache.brooklyn.util.guava.Maybe;"

from: software
to: utils
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/machine/pool/ServerPoolLocationResolver.java"
   contains "import org.apache.brooklyn.util.text.KeyValueParser;"

from: software
to: utils
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/machine/pool/ServerPool.java"
   contains "import org.apache.brooklyn.config.ConfigKey;"

from: software
to: utils
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/machine/pool/ServerPoolLocation.java"
   contains "import org.apache.brooklyn.config.ConfigKey;"

from: software
to: utils
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/feed/jmx/JmxHelper.java"
   contains "import org.apache.brooklyn.util.jmx.jmxmp.JmxmpAgent;"

from: software
to: utils
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/feed/jmx/JmxFeed.java"
   contains "import org.apache.brooklyn.util.time.Duration;"

from: software
to: utils
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/feed/jmx/JmxNotificationSubscriptionConfig.java"
   contains "import org.apache.brooklyn.util.collections.MutableList;"