<<<<<<< HEAD 4.0.0 javax-servlets 1.0-SNAPSHOT com.baeldung parent-modules 1.0.0-SNAPSHOT commons-fileupload commons-fileupload 1.3.3 commons-io commons-io 2.6 javax.servlet javax.servlet-api 4.0.1 javax.servlet.jsp.jstl jstl-api 1.2 javax.servlet.jsp javax.servlet.jsp-api 2.3.1 javax.servlet jstl 1.2 org.apache.httpcomponents httpclient ${org.apache.httpcomponents.version} test commons-logging commons-logging com.google.code.gson gson ${gson.version} org.springframework spring-test ${spring-test.version} test 4.5.3 5.0.5.RELEASE ======= 4.0.0 javax-servlets 1.0-SNAPSHOT com.baeldung parent-modules 1.0.0-SNAPSHOT commons-fileupload commons-fileupload 1.3.3 commons-io commons-io 2.6 javax.servlet javax.servlet-api 4.0.1 javax.servlet.jsp.jstl jstl-api 1.2 javax.servlet.jsp javax.servlet.jsp-api 2.3.1 javax.servlet jstl 1.2 org.apache.httpcomponents httpclient ${org.apache.httpcomponents.version} test commons-logging commons-logging org.springframework spring-test ${spring-test.version} test 4.5.3 5.0.5.RELEASE >>>>>>> c2590b9d7ed2068984a248e213046f0cf34bdc30