From ac98a2f029014c700fa272f82b7a57bf60e68a35 Mon Sep 17 00:00:00 2001
From: Loredana <lore.crusoveanu@gmail.com>
Date: Thu, 25 Jun 2020 10:03:34 +0300
Subject: [PATCH] BAEL-4088 move code to spring-mvc-java-2 module

---
 spring-framework-web/README.md                |  7 ---
 spring-framework-web/pom.xml                  | 55 -------------------
 spring-mvc-java-2/README.md                   |  3 +-
 spring-mvc-java-2/pom.xml                     |  7 ++-
 .../src/main/resources/targetFile.tmp         |  1 +
 .../file/ConvertMultipartFileUnitTest.java    |  0
 6 files changed, 9 insertions(+), 64 deletions(-)
 delete mode 100644 spring-framework-web/README.md
 delete mode 100644 spring-framework-web/pom.xml
 create mode 100644 spring-mvc-java-2/src/main/resources/targetFile.tmp
 rename {spring-framework-web => spring-mvc-java-2}/src/test/java/com/baeldung/multipart/file/ConvertMultipartFileUnitTest.java (100%)

diff --git a/spring-framework-web/README.md b/spring-framework-web/README.md
deleted file mode 100644
index 9c21e93b83..0000000000
--- a/spring-framework-web/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-## Spring Framework Web
-
-This module contains articles about the Spring Framework for the Web.
-
-### Relevant Articles
-
-- [Converting a Spring MultipartFile to a File](https://www.baeldung.com/converting-spring-multipartfile-to-a-file)
diff --git a/spring-framework-web/pom.xml b/spring-framework-web/pom.xml
deleted file mode 100644
index 50029b4ba8..0000000000
--- a/spring-framework-web/pom.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns="http://maven.apache.org/POM/4.0.0"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>spring-framework-web</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
-    <name>spring-framework-web</name>
-
-    <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>parent-spring-5</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-spring-5</relativePath>
-    </parent>
-
-    <properties>
-        <commons-io.version>2.6</commons-io.version>
-        <junit.version>4.12</junit.version>
-        <org.assertj.assertj-core.version>3.15.0</org.assertj.assertj-core.version>
-        <org.springframework.spring-mock.version>2.0.8</org.springframework.spring-mock.version>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <version>${commons-io.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.assertj</groupId>
-            <artifactId>assertj-core</artifactId>
-            <version>${org.assertj.assertj-core.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-            <version>${spring.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-mock</artifactId>
-            <version>${org.springframework.spring-mock.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>${junit.version}</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-</project>
diff --git a/spring-mvc-java-2/README.md b/spring-mvc-java-2/README.md
index 09c8d8b294..525f5a276f 100644
--- a/spring-mvc-java-2/README.md
+++ b/spring-mvc-java-2/README.md
@@ -3,4 +3,5 @@
 - [Cache Headers in Spring MVC](https://www.baeldung.com/spring-mvc-cache-headers)
 - [Working with Date Parameters in Spring](https://www.baeldung.com/spring-date-parameters)
 - [Spring MVC @PathVariable with a dot (.) gets truncated](https://www.baeldung.com/spring-mvc-pathvariable-dot)
-- [A Quick Guide to Spring MVC Matrix Variables](https://www.baeldung.com/spring-mvc-matrix-variables)
\ No newline at end of file
+- [A Quick Guide to Spring MVC Matrix Variables](https://www.baeldung.com/spring-mvc-matrix-variables)
+- [Converting a Spring MultipartFile to a File](https://www.baeldung.com/converting-spring-multipartfile-to-a-file)
diff --git a/spring-mvc-java-2/pom.xml b/spring-mvc-java-2/pom.xml
index af622321cb..533a24771a 100644
--- a/spring-mvc-java-2/pom.xml
+++ b/spring-mvc-java-2/pom.xml
@@ -31,6 +31,11 @@
             <artifactId>jackson-databind</artifactId>
             <version>${jackson.version}</version>
         </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>${commons-io.version}</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -49,4 +54,4 @@
     </properties>
 
 
-</project>
\ No newline at end of file
+</project>
diff --git a/spring-mvc-java-2/src/main/resources/targetFile.tmp b/spring-mvc-java-2/src/main/resources/targetFile.tmp
new file mode 100644
index 0000000000..5e1c309dae
--- /dev/null
+++ b/spring-mvc-java-2/src/main/resources/targetFile.tmp
@@ -0,0 +1 @@
+Hello World
\ No newline at end of file
diff --git a/spring-framework-web/src/test/java/com/baeldung/multipart/file/ConvertMultipartFileUnitTest.java b/spring-mvc-java-2/src/test/java/com/baeldung/multipart/file/ConvertMultipartFileUnitTest.java
similarity index 100%
rename from spring-framework-web/src/test/java/com/baeldung/multipart/file/ConvertMultipartFileUnitTest.java
rename to spring-mvc-java-2/src/test/java/com/baeldung/multipart/file/ConvertMultipartFileUnitTest.java