Commit 678a1e96 authored by Matija Obreza's avatar Matija Obreza

Removed commons-fileupload for conflicts with MVC

parent 2154bd1c
......@@ -61,7 +61,6 @@
<application.blocks.version>1.4-SNAPSHOT</application.blocks.version>
<commons.beanutils.version>1.9.2</commons.beanutils.version>
<commons.collections.version>3.2.1</commons.collections.version>
<commons.fileupload.version>1.3.1</commons.fileupload.version>
<commons.io.version>2.4</commons.io.version>
<commons.lang.version>3.7</commons.lang.version>
<commons.logging.version>1.2</commons.logging.version>
......@@ -113,13 +112,6 @@
<version>${commons.beanutils.version}</version>
</dependency>
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<version>${commons.fileupload.version}</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
......
......@@ -58,7 +58,6 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Primary;
import org.springframework.web.multipart.commons.CommonsMultipartResolver;
/**
* Instatiates and configures the storage mechanism for the FileRepository.
......@@ -130,13 +129,6 @@ public class FileRepositoryConfig implements InitializingBean {
return storageService;
}
@Bean
public CommonsMultipartResolver multipartResolver() {
final CommonsMultipartResolver resolver = new CommonsMultipartResolver();
resolver.setDefaultEncoding("utf-8");
return resolver;
}
/**
* ImageGallery service.
*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment