Remove conflicting deps and add missing ones

* Adjust code to missing dependencies previously transitively available
spring-projects-experimental · Sep 28, 2023 · a10cc18 · a10cc18
1 parent 8d98337
commit a10cc18
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 3 deletions.
diff --git a/components/recipe-test-support/pom.xml b/components/recipe-test-support/pom.xml
@@ -66,6 +66,11 @@
             <type>test-jar</type>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.13.0</version>
+        </dependency>
     </dependencies>
 
 </project>
diff --git a/...pport/src/main/java/org/springframework/sbm/test/ProjectContextFileSystemTestSupport.java b/...pport/src/main/java/org/springframework/sbm/test/ProjectContextFileSystemTestSupport.java
@@ -21,7 +21,6 @@
 import org.springframework.core.io.Resource;
 import org.springframework.sbm.engine.commands.ScanCommand;
 import org.springframework.sbm.engine.context.ProjectContext;
-import org.springframework.sbm.parsers.RewriteExecutionContext;
 import org.springframework.sbm.project.parser.ProjectContextInitializer;
 
 import java.io.IOException;

diff --git a/...test-support/src/main/java/org/springframework/sbm/test/RecipeIntegrationTestSupport.java b/...test-support/src/main/java/org/springframework/sbm/test/RecipeIntegrationTestSupport.java
@@ -15,6 +15,7 @@
  */
 package org.springframework.sbm.test;
 
+import org.apache.commons.io.FileUtils;
 import org.springframework.sbm.engine.commands.ApplicableRecipeListCommand;
 import org.springframework.sbm.engine.commands.ApplyCommand;
 import org.springframework.sbm.engine.commands.ScanCommand;
@@ -26,7 +27,6 @@
 import freemarker.template.Configuration;
 import lombok.AccessLevel;
 import lombok.Setter;
-import org.apache.commons.io.FileUtils;
 import org.springframework.core.io.FileSystemResource;
 import org.springframework.core.io.Resource;
 

diff --git a/components/sbm-core/pom.xml b/components/sbm-core/pom.xml
@@ -173,7 +173,13 @@
             <classifier>tests</classifier>
             <scope>test</scope>
         </dependency>
-		<dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.13.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
 			<groupId>com.fasterxml.jackson.dataformat</groupId>
 			<artifactId>jackson-dataformat-xml</artifactId>
 			<version>2.14.1</version>

diff --git a/components/sbm-recipes-jee-to-boot/pom.xml b/components/sbm-recipes-jee-to-boot/pom.xml
@@ -44,6 +44,11 @@
             <artifactId>sbm-support-jee</artifactId>
             <version>0.15.2-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.13.0</version>
+        </dependency>
 
         <!-- Override Jackson coming from spring boot -->
         <!--        <dependency>-->