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

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

from: software
to: core
evidence:
 - file: "software/winrm/src/main/java/org/apache/brooklyn/util/core/internal/winrm/WinRmTool.java"
   contains "import static org.apache.brooklyn.core.config.ConfigKeys.newConfigKey;"

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

from: software
to: core
evidence:
 - file: "software/winrm/src/main/java/org/apache/brooklyn/location/winrm/WinrmWorkflowStep.java"
   contains "import org.apache.brooklyn.core.mgmt.BrooklynTags;"

from: software
to: core
evidence:
 - file: "software/winrm/src/main/java/org/apache/brooklyn/location/winrm/PlainWinRmExecTaskFactory.java"
   contains "import org.apache.brooklyn.core.mgmt.BrooklynTaskTags;"

from: software
to: core
evidence:
 - file: "software/winrm/src/main/java/org/apache/brooklyn/location/winrm/WinRmMachineLocation.java"
   contains "import org.apache.brooklyn.core.mgmt.BrooklynTaskTags;"

from: software
to: core
evidence:
 - file: "software/winrm/src/main/java/org/apache/brooklyn/location/winrm/AdvertiseWinrmLoginPolicy.java"
   contains "import org.apache.brooklyn.core.entity.AbstractEntity;"

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

from: software
to: core
evidence:
 - file: "software/winrm/src/main/java/org/apache/brooklyn/location/winrm/WinRmPutTaskWrapper.java"
   contains "import org.apache.brooklyn.util.core.config.ConfigBag;"

from: software
to: core
evidence:
 - file: "software/winrm/src/main/java/org/apache/brooklyn/location/winrm/WinRmPutTaskStub.java"
   contains "import org.apache.brooklyn.util.core.config.ConfigBag;"

from: software
to: core
evidence:
 - file: "software/winrm/src/main/java/org/apache/brooklyn/feed/windows/WindowsPerformanceCounterFeed.java"
   contains "import org.apache.brooklyn.core.effector.EffectorTasks;"

from: software
to: core
evidence:
 - file: "software/winrm/src/main/java/org/apache/brooklyn/feed/windows/WindowsPerformanceCounterPollConfig.java"
   contains "import org.apache.brooklyn.core.feed.PollConfig;"

from: software
to: core
evidence:
 - file: "software/winrm/src/main/java/org/apache/brooklyn/feed/windows/CmdFeed.java"
   contains "import org.apache.brooklyn.util.core.config.ConfigBag;"

from: software
to: core
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/tasks/kubectl/ContainerTaskFactory.java"
   contains "import org.apache.brooklyn.core.mgmt.BrooklynTaskTags;"

from: software
to: core
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/tasks/kubectl/ContainerEffector.java"
   contains "import static org.apache.brooklyn.core.mgmt.BrooklynTaskTags.EFFECTOR_TAG;"

from: software
to: core
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/tasks/kubectl/ContainerSensor.java"
   contains "import static org.apache.brooklyn.core.mgmt.BrooklynTaskTags.SENSOR_TAG;"

from: software
to: core
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/tasks/kubectl/KubeJobFileCreator.java"
   contains "import org.apache.brooklyn.core.mgmt.ha.BrooklynBomOsgiArchiveInstaller;"

from: software
to: core
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/tasks/kubectl/ContainerCommons.java"
   contains "import org.apache.brooklyn.core.config.ConfigKeys;"

from: software
to: core
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/tasks/kubectl/ContainerWorkflowStep.java"
   contains "import org.apache.brooklyn.core.config.ConfigKeys;"

from: software
to: core
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/resolve/HardcodedCatalogEntitySpecResolver.java"
   contains "import org.apache.brooklyn.core.resolve.entity.AbstractEntitySpecResolver;"

from: software
to: core
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/java/JavaSoftwareProcessSshDriver.java"
   contains "import org.apache.brooklyn.core.effector.EffectorTasks;"

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

from: software
to: core
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/java/JmxAttributeSensor.java"
   contains "import org.apache.brooklyn.core.config.ConfigKeys;"

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

from: software
to: core
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/java/VanillaJavaApp.java"
   contains "import org.apache.brooklyn.core.config.ConfigKeys;"

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

from: software
to: core
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/java/JavaAppUtils.java"
   contains "import org.apache.brooklyn.core.config.render.RendererHints;"

from: software
to: core
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/java/JmxSupport.java"
   contains "import org.apache.brooklyn.core.entity.EntityInternal;"

from: software
to: core
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/java/JmxmpSslSupport.java"
   contains "import org.apache.brooklyn.util.core.crypto.FluentKeySigner;"

from: software
to: core
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/java/VanillaJavaAppImpl.java"
   contains "import org.apache.brooklyn.util.core.flags.SetFromFlag;"

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

from: software
to: core
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/system_service/SystemServiceEnricher.java"
   contains "import org.apache.brooklyn.core.enricher.AbstractEnricher;"

from: software
to: core
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/system_service/EntityLaunchListener.java"
   contains "import org.apache.brooklyn.core.mgmt.BrooklynTaskTags;"

from: software
to: core
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/system_service/InitdServiceInstaller.java"
   contains "import org.apache.brooklyn.core.effector.EffectorTasks;"

from: software
to: core
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/software/base/SoftwareProcessImpl.java"
   contains "import org.apache.brooklyn.core.enricher.AbstractEnricher;"

from: software
to: core
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/software/base/AbstractSoftwareProcessWinRmDriver.java"
   contains "import org.apache.brooklyn.core.mgmt.BrooklynTaskTags;"

from: software
to: core
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/software/base/AbstractSoftwareProcessSshDriver.java"
   contains "import org.apache.brooklyn.core.mgmt.BrooklynTaskTags;"

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

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

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

from: software
to: core
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/software/base/VanillaWindowsProcess.java"
   contains "import org.apache.brooklyn.core.config.ConfigKeys;"

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

from: software
to: core
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/software/base/SameServerEntity.java"
   contains "import org.apache.brooklyn.core.config.ConfigKeys;"

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

from: software
to: core
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/software/base/SoftwareProcess.java"
   contains "import org.apache.brooklyn.core.config.BasicConfigInheritance;"

from: software
to: core
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/software/base/WorkflowSoftwareProcessImpl.java"
   contains "import org.apache.brooklyn.core.entity.EntityAdjuncts;"

from: software
to: core
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/software/base/VanillaSoftwareProcessSshDriver.java"
   contains "import org.apache.brooklyn.core.entity.Entities;"

from: software
to: core
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/software/base/VanillaSoftwareProcessImpl.java"
   contains "import org.apache.brooklyn.core.entity.EntityAdjuncts;"

from: software
to: core
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/software/base/AbstractSoftwareProcessDriver.java"
   contains "import org.apache.brooklyn.core.entity.BrooklynConfigKeys;"

from: software
to: core
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/software/base/EmptyWindowsProcessWinRmDriver.java"
   contains "import org.apache.brooklyn.core.entity.Attributes;"

from: software
to: core
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/software/base/VanillaWindowsProcessWinRmDriver.java"
   contains "import org.apache.brooklyn.core.entity.Attributes;"

from: software
to: core
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/software/base/SameServerEntityImpl.java"
   contains "import org.apache.brooklyn.core.entity.AbstractEntity;"

from: software
to: core
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/software/base/InboundPortsUtils.java"
   contains "import org.apache.brooklyn.core.entity.EntityInternal;"

from: software
to: core
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/software/base/SoftwareProcessDriverLifecycleEffectorTasks.java"
   contains "import org.apache.brooklyn.core.entity.Attributes;"

from: software
to: core
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/software/base/EmptyWindowsProcessImpl.java"
   contains "import org.apache.brooklyn.core.entity.Attributes;"

from: software
to: core
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/software/base/EmptySoftwareProcessImpl.java"
   contains "import org.apache.brooklyn.core.entity.lifecycle.ServiceStateLogic.ServiceNotUpLogic;"

from: software
to: core
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/software/base/SoftwareProcessDriver.java"
   contains "import org.apache.brooklyn.core.entity.trait.Startable;"

from: software
to: core
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/software/base/SameServerDriverLifecycleEffectorTasks.java"
   contains "import org.apache.brooklyn.core.entity.trait.StartableMethods;"

from: software
to: core
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/software/base/WorkflowSoftwareProcessSshDriver.java"
   contains "import org.apache.brooklyn.core.objs.BrooklynObjectInternal;"

from: software
to: core
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/software/base/EmptySoftwareProcessSshDriver.java"
   contains "import org.apache.brooklyn.location.ssh.SshMachineLocation;"

from: software
to: core
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/software/base/lifecycle/WinRmExecuteHelper.java"
   contains "import org.apache.brooklyn.core.mgmt.BrooklynTaskTags;"

from: software
to: core
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/software/base/lifecycle/MachineLifecycleEffectorTasks.java"
   contains "import org.apache.brooklyn.core.mgmt.BrooklynTaskTags;"

from: software
to: core
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/software/base/lifecycle/ScriptHelper.java"
   contains "import org.apache.brooklyn.core.mgmt.BrooklynTaskTags;"

from: software
to: core
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/software/base/lifecycle/NaiveScriptRunner.java"
   contains "import org.apache.brooklyn.util.core.task.ssh.SshTasks;"

from: software
to: core
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeImpl.java"
   contains "import org.apache.brooklyn.enricher.stock.Enrichers;"

from: software
to: core
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/BrooklynClusterImpl.java"
   contains "import org.apache.brooklyn.enricher.stock.Enrichers;"

from: software
to: core
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/EntityHttpClientImpl.java"
   contains "import org.apache.brooklyn.core.mgmt.BrooklynTaskTags;"

from: software
to: core
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/LocalBrooklynNodeImpl.java"
   contains "import org.apache.brooklyn.core.mgmt.internal.ManagementContextInternal;"

from: software
to: core
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/RemoteEffectorBuilder.java"
   contains "import org.apache.brooklyn.core.effector.Effectors;"

from: software
to: core
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/BrooklynCluster.java"
   contains "import org.apache.brooklyn.core.effector.Effectors;"

from: software
to: core
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNode.java"
   contains "import org.apache.brooklyn.core.effector.Effectors;"

from: software
to: core
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/BrooklynEntityMirrorImpl.java"
   contains "import org.apache.brooklyn.core.effector.EffectorBody;"

from: software
to: core
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeSshDriver.java"
   contains "import org.apache.brooklyn.core.effector.ssh.SshEffectorTasks;"

from: software
to: core
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/BrooklynEntityMirror.java"
   contains "import org.apache.brooklyn.core.config.ConfigKeys;"

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

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

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

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

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

from: software
to: core
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/machine/AddMachineMetrics.java"
   contains "import org.apache.brooklyn.enricher.stock.PercentageEnricher;"

from: software
to: core
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/machine/MachineInitTasks.java"
   contains "import org.apache.brooklyn.core.mgmt.BrooklynTaskTags;"

from: software
to: core
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/machine/MachineEntity.java"
   contains "import org.apache.brooklyn.core.effector.MethodEffector;"

from: software
to: core
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/machine/SetHostnameCustomizer.java"
   contains "import org.apache.brooklyn.core.effector.ssh.SshEffectorTasks;"

from: software
to: core
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/machine/MachineEntityImpl.java"
   contains "import org.apache.brooklyn.core.effector.ssh.SshEffectorTasks;"

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

from: software
to: core
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/machine/MachineAttributes.java"
   contains "import org.apache.brooklyn.core.config.render.RendererHints;"

from: software
to: core
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/machine/ProvidesProvisioningFlags.java"
   contains "import org.apache.brooklyn.util.core.config.ConfigBag;"

from: software
to: core
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/entity/machine/pool/ServerPoolImpl.java"
   contains "import org.apache.brooklyn.core.mgmt.internal.LocalLocationManager;"

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

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

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

from: software
to: core
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/feed/jmx/JmxFeed.java"
   contains "import org.apache.brooklyn.core.config.ConfigKeys;"

from: software
to: core
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/feed/jmx/JmxNotificationSubscriptionConfig.java"
   contains "import org.apache.brooklyn.core.feed.FeedConfig;"

from: software
to: core
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/feed/jmx/JmxOperationPollConfig.java"
   contains "import org.apache.brooklyn.core.feed.PollConfig;"

from: software
to: core
evidence:
 - file: "software/base/src/main/java/org/apache/brooklyn/feed/jmx/JmxAttributePollConfig.java"
   contains "import org.apache.brooklyn.core.feed.PollConfig;"

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