Merge pull request #2 from caelum/updatingVRaptor4

updating vraptor 4 version to beta 4
caelum · Dec 20, 2013 · 72a6889 · 72a6889
2 parents 5af907f + 2a9e72e
commit 72a6889
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 13 deletions.
diff --git a/pom.xml b/pom.xml
@@ -24,7 +24,7 @@
 		<dependency>
 			<groupId>br.com.caelum</groupId>
 			<artifactId>vraptor</artifactId>
-			<version>4.0.0-beta-3</version>
+			<version>4.0.0-beta-4-SNAPSHOT</version>
 			<exclusions>
 				<exclusion>
 					<groupId>org.hamcrest</groupId>
@@ -111,12 +111,6 @@
 			<groupId>br.com.caelum.vraptor</groupId>
 			<artifactId>vraptor-simplemail</artifactId>
 			<version>1.3.2-SNAPSHOT</version>
-			<exclusions>
-				<exclusion>
-					<groupId>br.com.caelum</groupId>
-					<artifactId>vraptor</artifactId>
-				</exclusion>
-			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>br.com.caelum.vraptor4</groupId>

diff --git a/src/main/java/br/com/caelum/brutal/converters/UploadedFileConverter.java b/src/main/java/br/com/caelum/brutal/converters/UploadedFileConverter.java
@@ -5,7 +5,7 @@
 
 import br.com.caelum.vraptor.Convert;
 import br.com.caelum.vraptor.converter.Converter;
-import br.com.caelum.vraptor.interceptor.multipart.UploadedFile;
+import br.com.caelum.vraptor.observer.upload.UploadedFile;
 
 @Convert(UploadedFile.class)
 public class UploadedFileConverter implements Converter<UploadedFile>{

diff --git a/src/main/java/br/com/caelum/brutal/interceptors/ConversionErrorsInterceptor.java b/src/main/java/br/com/caelum/brutal/interceptors/ConversionErrorsInterceptor.java
@@ -6,13 +6,11 @@
 import br.com.caelum.vraptor.Intercepts;
 import br.com.caelum.vraptor.controller.ControllerMethod;
 import br.com.caelum.vraptor.core.InterceptorStack;
-import br.com.caelum.vraptor.interceptor.ExecuteMethodInterceptor;
 import br.com.caelum.vraptor.interceptor.Interceptor;
-import br.com.caelum.vraptor.interceptor.ParametersInstantiatorInterceptor;
 import br.com.caelum.vraptor.validator.Validator;
 import br.com.caelum.vraptor.view.Results;
 
-@Intercepts(after=ParametersInstantiatorInterceptor.class, before=ExecuteMethodInterceptor.class)
+@Intercepts
 public class ConversionErrorsInterceptor implements Interceptor {
 
 	@Inject private Validator validator;

diff --git a/src/main/java/br/com/caelum/brutal/interceptors/PimpMyControllerInterceptor.java b/src/main/java/br/com/caelum/brutal/interceptors/PimpMyControllerInterceptor.java
@@ -9,10 +9,9 @@
 import br.com.caelum.vraptor.Result;
 import br.com.caelum.vraptor.controller.ControllerMethod;
 import br.com.caelum.vraptor.core.InterceptorStack;
-import br.com.caelum.vraptor.interceptor.ExecuteMethodInterceptor;
 import br.com.caelum.vraptor.interceptor.Interceptor;
 
-@Intercepts(before = ExecuteMethodInterceptor.class)
+@Intercepts
 public class PimpMyControllerInterceptor implements Interceptor {
 
 	@Inject private Result result;