diff -Nru tiles-2.2.2/src/pom.xml tiles-2.2.2-gil/src/pom.xml --- tiles-2.2.2/src/pom.xml 2010-06-17 20:31:47.000000000 +0200 +++ tiles-2.2.2-gil/src/pom.xml 2012-06-13 16:34:08.278243928 +0200 @@ -63,7 +63,7 @@ <module>tiles-compat</module> <module>tiles-extras</module> <module>assembly</module> - <module>tiles-test-pom</module> + <!--module>tiles-test-pom</module--> </modules> <distributionManagement> @@ -85,6 +85,7 @@ </configuration> </plugin> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> <configuration> <archive> @@ -161,9 +162,11 @@ <artifactId>maven-project-info-reports-plugin</artifactId> </plugin> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-report-plugin</artifactId> </plugin> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> <configuration> <configLocation>http://svn.eu.apache.org/repos/asf/tiles/maven/trunk/build/tiles_checks.xml @@ -171,8 +174,8 @@ </configuration> </plugin> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>jxr-maven-plugin</artifactId> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jxr-plugin</artifactId> </plugin> <plugin> <artifactId>maven-pmd-plugin</artifactId> @@ -215,9 +218,9 @@ </reportSets> </plugin> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>rat-maven-plugin</artifactId> - <version>1.0-alpha-3</version> + <groupId>org.apache.rat</groupId> + <artifactId>apache-rat-plugin</artifactId> + <version>0.8-SNAPSHOT</version> <configuration> <includes> <include>pom.xml</include> @@ -233,8 +236,8 @@ </reporting> <properties> - <tiles.osgi.symbolicName>org.apache.${artifactId}</tiles.osgi.symbolicName> - <tiles.osgi.export>org.apache.tiles.*;version=${pom.version}</tiles.osgi.export> + <tiles.osgi.symbolicName>org.apache.${project.artifactId}</tiles.osgi.symbolicName> + <tiles.osgi.export>org.apache.tiles.*;version=${project.version}</tiles.osgi.export> <tiles.osgi.import>*</tiles.osgi.import> <tiles.osgi.dynamicImport /> <tiles.osgi.private /> @@ -255,6 +258,7 @@ <build> <plugins> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-install-plugin</artifactId> <configuration> <createChecksum>true</createChecksum> @@ -298,9 +302,9 @@ </executions> </plugin> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>rat-maven-plugin</artifactId> - <version>1.0-alpha-3</version> + <groupId>org.apache.rat</groupId> + <artifactId>apache-rat-plugin</artifactId> + <version>0.8-SNAPSHOT</version> <executions> <execution> <phase>verify</phase> diff -Nru tiles-2.2.2/src/tiles-api/pom.xml tiles-2.2.2-gil/src/tiles-api/pom.xml --- tiles-2.2.2/src/tiles-api/pom.xml 2010-06-17 20:31:42.000000000 +0200 +++ tiles-2.2.2-gil/src/tiles-api/pom.xml 2012-06-13 16:30:44.536233963 +0200 @@ -77,7 +77,7 @@ <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> - <version>2.5</version> + <version>7.0.27</version> <scope>test</scope> </dependency> diff -Nru tiles-2.2.2/src/tiles-compat/pom.xml tiles-2.2.2-gil/src/tiles-compat/pom.xml --- tiles-2.2.2/src/tiles-compat/pom.xml 2010-06-17 20:31:43.000000000 +0200 +++ tiles-2.2.2-gil/src/tiles-compat/pom.xml 2012-06-13 16:30:44.537233963 +0200 @@ -107,7 +107,7 @@ <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> - <version>2.5</version> + <version>7.0.27</version> <scope>test</scope> </dependency> @@ -125,12 +125,12 @@ <scope>test</scope> </dependency> - <dependency> + <!--dependency> <groupId>org.apache.shale</groupId> <artifactId>shale-test</artifactId> <version>1.0.5</version> <scope>test</scope> - </dependency> + </dependency--> </dependencies> diff -Nru tiles-2.2.2/src/tiles-core/pom.xml tiles-2.2.2-gil/src/tiles-core/pom.xml --- tiles-2.2.2/src/tiles-core/pom.xml 2010-06-17 20:31:46.000000000 +0200 +++ tiles-2.2.2-gil/src/tiles-core/pom.xml 2012-06-13 16:30:44.537233963 +0200 @@ -137,17 +137,17 @@ <scope>test</scope> </dependency> - <dependency> + <!--dependency> <groupId>org.apache.shale</groupId> <artifactId>shale-test</artifactId> <version>1.0.5</version> <scope>test</scope> - </dependency> + </dependency--> <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> - <version>2.5</version> + <version>7.0.27</version> <scope>test</scope> </dependency> diff -Nru tiles-2.2.2/src/tiles-el/pom.xml tiles-2.2.2-gil/src/tiles-el/pom.xml --- tiles-2.2.2/src/tiles-el/pom.xml 2010-06-17 20:31:47.000000000 +0200 +++ tiles-2.2.2-gil/src/tiles-el/pom.xml 2012-06-13 16:30:44.538233963 +0200 @@ -108,28 +108,28 @@ </dependency> <dependency> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - <version>1.0</version> + <groupId>org.apache.tomcat</groupId> + <artifactId>tomcat-el-api</artifactId> + <version>7.0.27</version> <scope>provided</scope> </dependency> <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> - <version>2.5</version> + <version>7.0.27</version> <scope>provided</scope> </dependency> <dependency> - <groupId>javax.servlet.jsp</groupId> - <artifactId>jsp-api</artifactId> - <version>2.1</version> + <groupId>org.apache.tomcat</groupId> + <artifactId>tomcat-jsp-api</artifactId> + <version>7.0.27</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.tomcat</groupId> <artifactId>jasper-el</artifactId> - <version>6.0.20</version> + <version>7.0.27</version> <scope>compile</scope> <optional>true</optional> <exclusions> diff -Nru tiles-2.2.2/src/tiles-extras/pom.xml tiles-2.2.2-gil/src/tiles-extras/pom.xml --- tiles-2.2.2/src/tiles-extras/pom.xml 2010-06-17 20:31:37.000000000 +0200 +++ tiles-2.2.2-gil/src/tiles-extras/pom.xml 2012-06-13 16:30:44.538233963 +0200 @@ -117,14 +117,14 @@ <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> - <version>2.5</version> + <version>7.0.27</version> <scope>provided</scope> </dependency> <dependency> - <groupId>javax.servlet.jsp</groupId> - <artifactId>jsp-api</artifactId> - <version>2.1</version> + <groupId>org.apache.tomcat</groupId> + <artifactId>tomcat-jsp-api</artifactId> + <version>7.0.27</version> <scope>provided</scope> </dependency> diff -Nru tiles-2.2.2/src/tiles-freemarker/pom.xml tiles-2.2.2-gil/src/tiles-freemarker/pom.xml --- tiles-2.2.2/src/tiles-freemarker/pom.xml 2010-06-17 20:31:43.000000000 +0200 +++ tiles-2.2.2-gil/src/tiles-freemarker/pom.xml 2012-06-13 16:30:44.539233963 +0200 @@ -59,7 +59,7 @@ <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> - <version>2.5</version> + <version>7.0.27</version> <scope>provided</scope> </dependency> diff -Nru tiles-2.2.2/src/tiles-jsp/pom.xml tiles-2.2.2-gil/src/tiles-jsp/pom.xml --- tiles-2.2.2/src/tiles-jsp/pom.xml 2010-06-17 20:31:47.000000000 +0200 +++ tiles-2.2.2-gil/src/tiles-jsp/pom.xml 2012-06-13 16:30:44.539233963 +0200 @@ -82,19 +82,6 @@ </build> - <reporting> - <plugins> - <plugin> - <groupId>net.sourceforge.maven-taglib</groupId> - <artifactId>maven-taglib-plugin</artifactId> - <configuration> - <parseHtml>true</parseHtml> - </configuration> - </plugin> - </plugins> - </reporting> - - <dependencies> <dependency> <groupId>org.apache.tiles</groupId> @@ -117,13 +104,13 @@ <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> - <version>2.5</version> + <version>7.0.27</version> <scope>provided</scope> </dependency> <dependency> - <groupId>javax.servlet.jsp</groupId> - <artifactId>jsp-api</artifactId> - <version>2.1</version> + <groupId>org.apache.tomcat</groupId> + <artifactId>tomcat-jsp-api</artifactId> + <version>7.0.27</version> <scope>provided</scope> </dependency> <dependency> @@ -144,12 +131,12 @@ <version>2.4</version> <scope>test</scope> </dependency> - <dependency> + <!--dependency> <groupId>org.apache.shale</groupId> <artifactId>shale-test</artifactId> <version>1.0.5</version> <scope>test</scope> - </dependency> + </dependency--> </dependencies> diff -Nru tiles-2.2.2/src/tiles-portlet/pom.xml tiles-2.2.2-gil/src/tiles-portlet/pom.xml --- tiles-2.2.2/src/tiles-portlet/pom.xml 2010-06-17 20:31:46.000000000 +0200 +++ tiles-2.2.2-gil/src/tiles-portlet/pom.xml 2012-06-13 16:30:44.539233963 +0200 @@ -135,16 +135,16 @@ <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> - <version>2.5</version> + <version>7.0.27</version> <scope>test</scope> </dependency> - <dependency> + <!--dependency> <groupId>org.apache.shale</groupId> <artifactId>shale-test</artifactId> <version>1.0.5</version> <scope>test</scope> - </dependency> + </dependency--> </dependencies> diff -Nru tiles-2.2.2/src/tiles-servlet/pom.xml tiles-2.2.2-gil/src/tiles-servlet/pom.xml --- tiles-2.2.2/src/tiles-servlet/pom.xml 2010-06-17 20:31:44.000000000 +0200 +++ tiles-2.2.2-gil/src/tiles-servlet/pom.xml 2012-06-13 16:30:44.540233963 +0200 @@ -111,7 +111,7 @@ <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> - <version>2.5</version> + <version>7.0.27</version> <scope>provided</scope> </dependency> <dependency> @@ -132,12 +132,12 @@ <version>2.4</version> <scope>test</scope> </dependency> - <dependency> + <!--dependency> <groupId>org.apache.shale</groupId> <artifactId>shale-test</artifactId> <version>1.0.5</version> <scope>test</scope> - </dependency> + </dependency--> </dependencies> diff -Nru tiles-2.2.2/src/tiles-servlet-wildcard/pom.xml tiles-2.2.2-gil/src/tiles-servlet-wildcard/pom.xml --- tiles-2.2.2/src/tiles-servlet-wildcard/pom.xml 2010-06-17 20:31:42.000000000 +0200 +++ tiles-2.2.2-gil/src/tiles-servlet-wildcard/pom.xml 2012-06-13 16:30:44.540233963 +0200 @@ -109,7 +109,7 @@ <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> - <version>2.5</version> + <version>7.0.27</version> <scope>provided</scope> </dependency> diff -Nru tiles-2.2.2/src/tiles-velocity/pom.xml tiles-2.2.2-gil/src/tiles-velocity/pom.xml --- tiles-2.2.2/src/tiles-velocity/pom.xml 2010-06-17 20:31:47.000000000 +0200 +++ tiles-2.2.2-gil/src/tiles-velocity/pom.xml 2012-06-13 16:30:44.541233963 +0200 @@ -55,7 +55,7 @@ <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> - <version>2.5</version> + <version>7.0.27</version> <scope>provided</scope> </dependency> <dependency>