diff -Nru myfaces-core-1.1.5/api/pom.xml myfaces-core-1.1.5-gil/api/pom.xml --- myfaces-core-1.1.5/api/pom.xml 2007-02-14 03:26:33.000000000 +0100 +++ myfaces-core-1.1.5-gil/api/pom.xml 2011-09-10 13:41:58.598614026 +0200 @@ -105,12 +105,12 @@ <version>2.1</version> <scope>compile</scope> </dependency> - <dependency> + <!-- dependency> <groupId>easymock</groupId> <artifactId>easymockclassextension</artifactId> - <version>1.1</version> + <version>1.2</version> <scope>test</scope> - </dependency> + </dependency --> <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> @@ -129,16 +129,16 @@ <version>1.7.0</version> <scope>compile</scope> </dependency> - <dependency> + <!-- dependency> <groupId>org.apache.struts.shale</groupId> <artifactId>shale-test</artifactId> <version>1.0.2</version> <scope>test</scope> - </dependency> + </dependency --> <dependency> - <groupId>javax.servlet</groupId> + <groupId>jstl</groupId> <artifactId>jstl</artifactId> - <version>1.1.0</version> + <version>1.2.0</version> <scope>compile</scope> <exclusions> <exclusion> @@ -171,12 +171,12 @@ </exclusion> </exclusions> </dependency> - <dependency> + <!-- dependency> <groupId>aspectj</groupId> <artifactId>aspectjrt</artifactId> <version>1.2.1</version> <scope>test</scope> - </dependency> + </dependency --> </dependencies> <reporting> <plugins> diff -Nru myfaces-core-1.1.5/impl/pom.xml myfaces-core-1.1.5-gil/impl/pom.xml --- myfaces-core-1.1.5/impl/pom.xml 2007-02-14 03:26:33.000000000 +0100 +++ myfaces-core-1.1.5-gil/impl/pom.xml 2011-09-10 13:41:58.598614026 +0200 @@ -28,7 +28,7 @@ <plugins> <plugin> <groupId>org.codehaus.mojo</groupId> - <artifactId>xslt-maven-plugin</artifactId> + <artifactId>xml-maven-plugin</artifactId> <version>1.0</version> <executions> <execution> @@ -45,8 +45,8 @@ </configuration> </plugin> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>dependency-maven-plugin</artifactId> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> <executions> <execution> <id>unpack-shared-impl</id> @@ -115,7 +115,7 @@ <plugins> <plugin> <groupId>org.codehaus.mojo</groupId> - <artifactId>xslt-maven-plugin</artifactId> + <artifactId>xml-maven-plugin</artifactId> <version>1.0</version> <executions> <execution> @@ -274,24 +274,24 @@ <version>2.0</version> <scope>provided</scope> </dependency> - <dependency> + <!-- dependency> <groupId>org.apache.struts.shale</groupId> <artifactId>shale-test</artifactId> <version>1.0.2</version> <scope>test</scope> - </dependency> + </dependency --> <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> <version>1.0.4</version> <scope>compile</scope> </dependency> - <dependency> + <!-- dependency> <groupId>cactus</groupId> <artifactId>cactus</artifactId> <version>13-1.7.1</version> <scope>test</scope> - </dependency> + </dependency --> <dependency> <groupId>org.apache.myfaces.shared</groupId> <artifactId>myfaces-shared-impl</artifactId> @@ -305,7 +305,7 @@ <scope>compile</scope> </dependency> <dependency> - <groupId>portlet-api</groupId> + <groupId>javax.portlet</groupId> <artifactId>portlet-api</artifactId> <version>1.0</version> <scope>provided</scope> diff -Nru myfaces-core-1.1.5/pom.xml myfaces-core-1.1.5-gil/pom.xml --- myfaces-core-1.1.5/pom.xml 2007-02-06 18:51:53.000000000 +0100 +++ myfaces-core-1.1.5-gil/pom.xml 2011-09-10 13:41:58.609614024 +0200 @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?><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/maven-v4_0_0.xsd"> <parent> - <artifactId>myfaces-master</artifactId> - <groupId>org.apache.myfaces.maven</groupId> - <version>1.0.5</version> + <artifactId>myfaces</artifactId> + <groupId>org.apache.myfaces</groupId> + <version>10</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.apache.myfaces.core</groupId> @@ -22,7 +22,7 @@ </scm> <modules> <module>api</module> - <module>impl</module> + <!-- module>impl</module --> </modules> <repositories> <repository>