From ae877b507c80eff0c1b29c5628794c8d60d6db6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ot=C3=A1vio=20Garcia?= Date: Tue, 7 Jan 2014 16:48:27 -0200 Subject: [PATCH 1/4] Updating dependencies --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 07266dc18..dc9f48215 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ org.sonatype.oss oss-parent - 3 + 7 Java web MVC framework for fast and maintainable development @@ -118,7 +118,7 @@ org.apache.maven.plugins maven-release-plugin - 2.0-beta-9 + 2.4.2 From 572b680ca1c5bccfcf4c83b2ee6c820b2b42328e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ot=C3=A1vio=20Garcia?= Date: Tue, 7 Jan 2014 16:58:52 -0200 Subject: [PATCH 2/4] Disconnecting blank-project and musicjungle from parent --- pom.xml | 20 ++++---------------- vraptor-blank-project/pom.xml | 24 +++++++++++++++++------- vraptor-core/pom.xml | 14 ++++++++++++++ vraptor-musicjungle/pom.xml | 22 +++++++++++++++++----- 4 files changed, 52 insertions(+), 28 deletions(-) diff --git a/pom.xml b/pom.xml index dc9f48215..197dbfcb6 100644 --- a/pom.xml +++ b/pom.xml @@ -16,6 +16,10 @@ Java web MVC framework for fast and maintainable development http://vraptor.caelum.com.br + + UTF-8 + + Turini @@ -95,26 +99,10 @@ vraptor-core - vraptor-musicjungle - vraptor-blank-project - - UTF-8 - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.1 - - 1.7 - 1.7 - - - org.apache.maven.plugins maven-release-plugin diff --git a/vraptor-blank-project/pom.xml b/vraptor-blank-project/pom.xml index dd8e8b489..ec4237a51 100644 --- a/vraptor-blank-project/pom.xml +++ b/vraptor-blank-project/pom.xml @@ -1,17 +1,17 @@ 4.0.0 + br.com.caelum vraptor-blank-project - war + 4.0.0-beta-4-SNAPSHOT - - br.com.caelum - vraptor-parent - 4.0.0-beta-4-SNAPSHOT - + A blank project to start using VRaptor 4 - + + UTF-8 + + br.com.caelum vraptor @@ -41,6 +41,16 @@ vraptor-blank-project ${basedir}/src/main/webapp/WEB-INF/classes + + org.apache.maven.plugins + maven-compiler-plugin + 3.1 + + 1.7 + 1.7 + + + maven-eclipse-plugin 2.8 diff --git a/vraptor-core/pom.xml b/vraptor-core/pom.xml index 03c46289f..d35561eca 100644 --- a/vraptor-core/pom.xml +++ b/vraptor-core/pom.xml @@ -10,6 +10,10 @@ 4.0.0-beta-4-SNAPSHOT + + UTF-8 + + @@ -233,6 +237,16 @@ + + org.apache.maven.plugins + maven-compiler-plugin + 3.1 + + 1.7 + 1.7 + + + org.apache.maven.plugins maven-javadoc-plugin diff --git a/vraptor-musicjungle/pom.xml b/vraptor-musicjungle/pom.xml index e24db4942..e0c1c45a1 100644 --- a/vraptor-musicjungle/pom.xml +++ b/vraptor-musicjungle/pom.xml @@ -1,14 +1,16 @@ 4.0.0 + br.com.caelum vraptor-musicjungle + 4.0.0-beta-4-SNAPSHOT war - - br.com.caelum - vraptor-parent - 4.0.0-beta-4-SNAPSHOT - + Example application to use with VRaptor 4 + + + UTF-8 + @@ -116,6 +118,16 @@ vraptor-musicjungle ${basedir}/src/main/webapp/WEB-INF/classes + + org.apache.maven.plugins + maven-compiler-plugin + 3.1 + + 1.7 + 1.7 + + + maven-eclipse-plugin 2.8 From 85c4b5c53bc4bef1496ecfb18bb8f0bc1372f140 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ot=C3=A1vio=20Garcia?= Date: Tue, 7 Jan 2014 17:15:19 -0200 Subject: [PATCH 3/4] Adding packaging to blank project --- vraptor-blank-project/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/vraptor-blank-project/pom.xml b/vraptor-blank-project/pom.xml index ec4237a51..03c31c7c5 100644 --- a/vraptor-blank-project/pom.xml +++ b/vraptor-blank-project/pom.xml @@ -4,6 +4,7 @@ br.com.caelum vraptor-blank-project 4.0.0-beta-4-SNAPSHOT + war A blank project to start using VRaptor 4 From be9bf1c50341eb7f23ec242997429cd2e3711aef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ot=C3=A1vio=20Garcia?= Date: Tue, 7 Jan 2014 18:05:45 -0200 Subject: [PATCH 4/4] Organizing dependencies --- vraptor-core/pom.xml | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/vraptor-core/pom.xml b/vraptor-core/pom.xml index d35561eca..eef15084c 100644 --- a/vraptor-core/pom.xml +++ b/vraptor-core/pom.xml @@ -40,13 +40,6 @@ 1.7.5 - - org.slf4j - slf4j-simple - 1.7.5 - test - - net.vidageek mirror @@ -70,6 +63,12 @@ xstream 1.4.4 + + + com.headius + invokebinder + 1.2 + @@ -160,6 +159,7 @@ true + javax.servlet jstl @@ -182,6 +182,13 @@ + + org.slf4j + slf4j-simple + 1.7.5 + test + + org.hamcrest hamcrest-core @@ -227,12 +234,6 @@ test - - com.headius - invokebinder - 1.2 - -