Fix CLI package tangles

spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/DependencyAutoConfigurationTransformation.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cli.compiler.transformation;
+package org.springframework.boot.cli.compiler;
 
 import groovy.lang.GroovyClassLoader;
 
@@ -23,9 +23,7 @@ import org.codehaus.groovy.ast.ClassNode;
 import org.codehaus.groovy.ast.ModuleNode;
 import org.codehaus.groovy.control.SourceUnit;
 import org.codehaus.groovy.transform.ASTTransformation;
-import org.springframework.boot.cli.compiler.ArtifactCoordinatesResolver;
-import org.springframework.boot.cli.compiler.CompilerAutoConfiguration;
-import org.springframework.boot.cli.compiler.DependencyCustomizer;
+import org.springframework.boot.cli.compiler.dependencies.ArtifactCoordinatesResolver;
 
 /**
  * {@link ASTTransformation} to apply

spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/DependencyCustomizer.java

@@ -23,6 +23,7 @@ import org.codehaus.groovy.ast.AnnotationNode;
 import org.codehaus.groovy.ast.ClassNode;
 import org.codehaus.groovy.ast.ModuleNode;
 import org.codehaus.groovy.ast.expr.ConstantExpression;
+import org.springframework.boot.cli.compiler.dependencies.ArtifactCoordinatesResolver;
 
 /**
  * Customizer that allows dependencies to be added during compilation. Adding a dependency

spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/GroovyBeansTransformation.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cli.compiler.transformation;
+package org.springframework.boot.cli.compiler;
 
 import java.lang.reflect.Modifier;
 import java.util.ArrayList;

spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/GroovyCompiler.java

@@ -42,12 +42,11 @@ import org.codehaus.groovy.control.customizers.CompilationCustomizer;
 import org.codehaus.groovy.control.customizers.ImportCustomizer;
 import org.codehaus.groovy.transform.ASTTransformation;
 import org.codehaus.groovy.transform.ASTTransformationVisitor;
+import org.springframework.boot.cli.compiler.dependencies.ArtifactCoordinatesResolver;
+import org.springframework.boot.cli.compiler.dependencies.ManagedDependenciesArtifactCoordinatesResolver;
 import org.springframework.boot.cli.compiler.grape.AetherGrapeEngine;
 import org.springframework.boot.cli.compiler.grape.AetherGrapeEngineFactory;
 import org.springframework.boot.cli.compiler.grape.GrapeEngineInstaller;
-import org.springframework.boot.cli.compiler.transformation.DependencyAutoConfigurationTransformation;
-import org.springframework.boot.cli.compiler.transformation.GroovyBeansTransformation;
-import org.springframework.boot.cli.compiler.transformation.ResolveDependencyCoordinatesTransformation;
 import org.springframework.boot.cli.util.ResourceUtils;
 
 /**

spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/ResolveDependencyCoordinatesTransformation.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cli.compiler.transformation;
+package org.springframework.boot.cli.compiler;
 
 import groovy.lang.Grab;
 
@@ -35,10 +35,11 @@ import org.codehaus.groovy.ast.expr.ConstantExpression;
 import org.codehaus.groovy.ast.expr.Expression;
 import org.codehaus.groovy.control.SourceUnit;
 import org.codehaus.groovy.transform.ASTTransformation;
-import org.springframework.boot.cli.compiler.ArtifactCoordinatesResolver;
+import org.springframework.boot.cli.compiler.dependencies.ArtifactCoordinatesResolver;
 
 /**
  * {@link ASTTransformation} to resolve {@link Grab} artifact coordinates.
+ * 
  * @author Andy Wilkinson
  * @author Phillip Webb
  */

spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/dependencies/ArtifactCoordinatesResolver.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cli.compiler;
+package org.springframework.boot.cli.compiler.dependencies;
 
 /**
  * A resolver for artifacts' Maven coordinates, allowing a group id or version to be

spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/dependencies/ManagedDependenciesArtifactCoordinatesResolver.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cli.compiler;
+package org.springframework.boot.cli.compiler.dependencies;
 
 import org.springframework.boot.dependency.tools.Dependency;
 import org.springframework.boot.dependency.tools.ManagedDependencies;

spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/ResolveDependencyCoordinatesTransformationTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cli.compiler.transformation;
+package org.springframework.boot.cli.compiler;
 
 import groovy.lang.Grab;
 
@@ -42,7 +42,8 @@ import org.codehaus.groovy.control.io.ReaderSource;
 import org.codehaus.groovy.transform.ASTTransformation;
 import org.junit.Before;
 import org.junit.Test;
-import org.springframework.boot.cli.compiler.ArtifactCoordinatesResolver;
+import org.springframework.boot.cli.compiler.ResolveDependencyCoordinatesTransformation;
+import org.springframework.boot.cli.compiler.dependencies.ArtifactCoordinatesResolver;
 
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.mock;

spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/dependencies/ManagedDependenciesArtifactCoordinatesResolverTests.java

@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cli.compiler;
+package org.springframework.boot.cli.compiler.dependencies;
 
 import org.junit.Before;
 import org.junit.Test;
+import org.springframework.boot.cli.compiler.dependencies.ManagedDependenciesArtifactCoordinatesResolver;
 import org.springframework.boot.dependency.tools.Dependency;
 import org.springframework.boot.dependency.tools.ManagedDependencies;