lib/generators/app_generator/templates/pom.erb in vraptor-scaffold-0.0.1.rc vs lib/generators/app_generator/templates/pom.erb in vraptor-scaffold-0.0.1

- old
+ new

@@ -10,10 +10,11 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> </properties> <build> + <outputDirectory>${basedir}/<%= Configuration::WEB_INF %>/classes</outputDirectory> <plugins> <plugin> <artifactId>maven-compiler-plugin</artifactId> <version>2.0.2</version> <configuration> @@ -22,10 +23,11 @@ <encoding>UTF-8</encoding> </configuration> </plugin> <plugin> <artifactId>maven-eclipse-plugin</artifactId> + <version>2.8</version> <configuration> <downloadSources>true</downloadSources> <downloadJavadocs>true</downloadJavadocs> <wtpversion>2.0</wtpversion> </configuration> @@ -81,13 +83,13 @@ <groupId>opensymphony</groupId> <artifactId>sitemesh</artifactId> <version>2.4.2</version> </dependency> <dependency> - <groupId>org.freemarker</groupId> - <artifactId>freemarker</artifactId> - <version>2.3.16</version> + <groupId>javax.servlet</groupId> + <artifactId>jstl</artifactId> + <version>1.2</version> </dependency> <dependency> <groupId>javax.persistence</groupId> <artifactId>persistence-api</artifactId> <version>1.0</version> @@ -99,19 +101,38 @@ <exclusions> <exclusion> <artifactId>slf4j-api</artifactId> <groupId>org.slf4j</groupId> </exclusion> + <exclusion> + <artifactId>org.hibernate</artifactId> + <groupId>hibernate-core</groupId> + </exclusion> </exclusions> </dependency> <dependency> <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + <version>3.3.2.GA</version> + <exclusions> + <exclusion> + <artifactId>slf4j-api</artifactId> + <groupId>org.slf4j</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> <artifactId>hibernate-validator</artifactId> <version>3.1.0.GA</version> <exclusions> <exclusion> <artifactId>slf4j-api</artifactId> <groupId>org.slf4j</groupId> + </exclusion> + <exclusion> + <artifactId>org.hibernate</artifactId> + <groupId>hibernate-core</groupId> </exclusion> </exclusions> </dependency> <dependency> <groupId>joda-time</groupId>