Merge pull request #299 from caelum/ot-mavenfixes

Disconnecting blank-project and musicjungle from parent
caelum · Jan 7, 2014 · a428d51 · a428d51
2 parents c7a7263 + be9bf1c
commit a428d51
Show file tree

Hide file tree

Showing 4 changed files with 68 additions and 42 deletions.
diff --git a/pom.xml b/pom.xml
@@ -10,12 +10,16 @@
 	<parent>
 		<groupId>org.sonatype.oss</groupId>
 		<artifactId>oss-parent</artifactId>
-		<version>3</version>
+		<version>7</version>
 	</parent>
 
 	<description>Java web MVC framework for fast and maintainable development</description>
 	<url>http://vraptor.caelum.com.br</url>
 
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	</properties>
+
 	<developers>
 		<developer>
 			<id>Turini</id>
@@ -95,30 +99,14 @@
 
 	<modules>
 		<module>vraptor-core</module>
-		<module>vraptor-musicjungle</module>
-		<module>vraptor-blank-project</module>
 	</modules>
 
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-	</properties>
-
 	<build>
 		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.1</version>
-				<configuration>
-					<source>1.7</source>
-					<target>1.7</target>
-				</configuration>
-			</plugin>
-
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-release-plugin</artifactId>
-				<version>2.0-beta-9</version>
+				<version>2.4.2</version>
 			</plugin>
 		</plugins>
 	</build>

diff --git a/vraptor-blank-project/pom.xml b/vraptor-blank-project/pom.xml
@@ -1,17 +1,18 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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>
 
+	<groupId>br.com.caelum</groupId>
 	<artifactId>vraptor-blank-project</artifactId>
+	<version>4.0.0-beta-4-SNAPSHOT</version>
 	<packaging>war</packaging>
 
-	<parent>
-		<groupId>br.com.caelum</groupId>
-		<artifactId>vraptor-parent</artifactId>
-		<version>4.0.0-beta-4-SNAPSHOT</version>
-	</parent>
+	<description>A blank project to start using VRaptor 4</description>
 
-	<dependencies>
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	</properties>
 
+	<dependencies>
 		<dependency>
 			<groupId>br.com.caelum</groupId>
 			<artifactId>vraptor</artifactId>
@@ -41,6 +42,16 @@
 		<finalName>vraptor-blank-project</finalName>
 		<outputDirectory>${basedir}/src/main/webapp/WEB-INF/classes</outputDirectory>
 		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.1</version>
+				<configuration>
+					<source>1.7</source>
+					<target>1.7</target>
+				</configuration>
+			</plugin>
+
 			<plugin>
 				<artifactId>maven-eclipse-plugin</artifactId>
 				<version>2.8</version>

diff --git a/vraptor-core/pom.xml b/vraptor-core/pom.xml
@@ -10,6 +10,10 @@
 		<version>4.0.0-beta-4-SNAPSHOT</version>
 	</parent>
 
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	</properties>
+
 	<dependencies>
 		<!-- mandatory -->
 		<dependency>
@@ -36,13 +40,6 @@
 			<version>1.7.5</version>
 		</dependency>
 
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-simple</artifactId>
-			<version>1.7.5</version>
-			<scope>test</scope>
-		</dependency>
-
 		<dependency>
 			<groupId>net.vidageek</groupId>
 			<artifactId>mirror</artifactId>
@@ -66,6 +63,12 @@
 			<artifactId>xstream</artifactId>
 			<version>1.4.4</version>
 		</dependency>
+
+		<dependency>
+			<groupId>com.headius</groupId>
+			<artifactId>invokebinder</artifactId>
+			<version>1.2</version>
+		</dependency>
 		<!-- /mandatory -->
 
 		<!-- [cdi] -->		
@@ -156,6 +159,7 @@
 			<optional>true</optional>
 		</dependency>
 
+		<!-- provided by servlet containers -->
 		<dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>jstl</artifactId>
@@ -178,6 +182,13 @@
 		</dependency>
 
 		<!-- test libs -->
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-simple</artifactId>
+			<version>1.7.5</version>
+			<scope>test</scope>
+		</dependency>
+
 		<dependency>
 			<groupId>org.hamcrest</groupId>
 			<artifactId>hamcrest-core</artifactId>
@@ -223,16 +234,20 @@
 			<scope>test</scope>
 		</dependency>
 
-		<dependency>
-			<groupId>com.headius</groupId>
-			<artifactId>invokebinder</artifactId>
-			<version>1.2</version>
-		</dependency>
-
 	</dependencies>
 
 	<build>
 		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.1</version>
+				<configuration>
+					<source>1.7</source>
+					<target>1.7</target>
+				</configuration>
+			</plugin>
+
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>

diff --git a/vraptor-musicjungle/pom.xml b/vraptor-musicjungle/pom.xml
@@ -1,14 +1,16 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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>
 
+	<groupId>br.com.caelum</groupId>
 	<artifactId>vraptor-musicjungle</artifactId>
+	<version>4.0.0-beta-4-SNAPSHOT</version>
 	<packaging>war</packaging>
 
-	<parent>
-		<groupId>br.com.caelum</groupId>
-		<artifactId>vraptor-parent</artifactId>
-		<version>4.0.0-beta-4-SNAPSHOT</version>
-	</parent>
+	<description>Example application to use with VRaptor 4</description>
+
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	</properties>
 
 	<dependencies>
 		<dependency>
@@ -116,6 +118,16 @@
 		<finalName>vraptor-musicjungle</finalName>
 		<outputDirectory>${basedir}/src/main/webapp/WEB-INF/classes</outputDirectory>
 		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.1</version>
+				<configuration>
+					<source>1.7</source>
+					<target>1.7</target>
+				</configuration>
+			</plugin>
+
 			<plugin>
 				<artifactId>maven-eclipse-plugin</artifactId>
 				<version>2.8</version>