Author: konstantin.mishin Date: 2010-04-30 12:52:02 -0400 (Fri, 30 Apr 2010) New Revision: 16856 Modified: root/cdk/trunk/bom/pom.xml root/cdk/trunk/plugins/maven-cdk-plugin/src/it/annotated-component/pom.xml root/cdk/trunk/plugins/maven-cdk-plugin/src/it/renderer-template-test/pom.xml root/cdk/trunk/plugins/maven-cdk-plugin/src/it/xml-configured-component/pom.xml root/cdk/trunk/plugins/xinclude/pom.xml root/cdk/trunk/root/pom.xml root/docs/trunk/Component_Development_Kit_Guide/pom.xml root/docs/trunk/Component_Reference/pom.xml root/docs/trunk/Developer_Guide/pom.xml root/docs/trunk/Migration_Guide/pom.xml root/examples-sandbox/trunk/components/ajax/pom.xml root/examples-sandbox/trunk/components/tables/pom.xml root/examples-sandbox/trunk/pom.xml root/examples/trunk/components/core-demo/pom.xml root/examples/trunk/pom.xml root/examples/trunk/richfaces-demo/pom.xml root/framework/trunk/pom.xml root/framework/trunk/test-base/pom.xml root/framework/trunk/version-matrix/pom.xml root/pom.xml root/ui-sandbox/trunk/pom.xml root/ui/trunk/pom.xml root/ui/trunk/version-matrix/pom.xml Log: RFPL-533 Modified: root/cdk/trunk/bom/pom.xml =================================================================== --- root/cdk/trunk/bom/pom.xml 2010-04-30 16:42:51 UTC (rev 16855) +++ root/cdk/trunk/bom/pom.xml 2010-04-30 16:52:02 UTC (rev 16856) @@ -52,7 +52,7 @@ <dependency> <groupId>javax.el</groupId> <artifactId>el-api</artifactId> - <version>1.2</version> + <version>1.0</version> </dependency> <dependency> <groupId>org.jboss.el</groupId> Modified: root/cdk/trunk/plugins/maven-cdk-plugin/src/it/annotated-component/pom.xml =================================================================== --- root/cdk/trunk/plugins/maven-cdk-plugin/src/it/annotated-component/pom.xml 2010-04-30 16:42:51 UTC (rev 16855) +++ root/cdk/trunk/plugins/maven-cdk-plugin/src/it/annotated-component/pom.xml 2010-04-30 16:52:02 UTC (rev 16856) @@ -56,7 +56,7 @@ <dependency> <groupId>javax.el</groupId> <artifactId>el-api</artifactId> - <version>1.2</version> + <version>1.0</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: root/cdk/trunk/plugins/maven-cdk-plugin/src/it/renderer-template-test/pom.xml =================================================================== --- root/cdk/trunk/plugins/maven-cdk-plugin/src/it/renderer-template-test/pom.xml 2010-04-30 16:42:51 UTC (rev 16855) +++ root/cdk/trunk/plugins/maven-cdk-plugin/src/it/renderer-template-test/pom.xml 2010-04-30 16:52:02 UTC (rev 16856) @@ -54,7 +54,7 @@ <dependency> <groupId>org.jboss.test-jsf</groupId> <artifactId>jsf-mock</artifactId> - <version>1.0.0</version> + <version>1.0.2</version> <scope>test</scope> </dependency> <dependency> @@ -82,7 +82,7 @@ <dependency> <groupId>javax.el</groupId> <artifactId>el-api</artifactId> - <version>1.2</version> + <version>1.0</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: root/cdk/trunk/plugins/maven-cdk-plugin/src/it/xml-configured-component/pom.xml =================================================================== --- root/cdk/trunk/plugins/maven-cdk-plugin/src/it/xml-configured-component/pom.xml 2010-04-30 16:42:51 UTC (rev 16855) +++ root/cdk/trunk/plugins/maven-cdk-plugin/src/it/xml-configured-component/pom.xml 2010-04-30 16:52:02 UTC (rev 16856) @@ -57,7 +57,7 @@ <dependency> <groupId>javax.el</groupId> <artifactId>el-api</artifactId> - <version>1.2</version> + <version>1.0</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: root/cdk/trunk/plugins/xinclude/pom.xml =================================================================== --- root/cdk/trunk/plugins/xinclude/pom.xml 2010-04-30 16:42:51 UTC (rev 16855) +++ root/cdk/trunk/plugins/xinclude/pom.xml 2010-04-30 16:52:02 UTC (rev 16856) @@ -66,6 +66,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>javacc-maven-plugin</artifactId> + <version>2.4</version> <executions> <execution> <id>javacc</id> Modified: root/cdk/trunk/root/pom.xml =================================================================== --- root/cdk/trunk/root/pom.xml 2010-04-30 16:42:51 UTC (rev 16855) +++ root/cdk/trunk/root/pom.xml 2010-04-30 16:52:02 UTC (rev 16856) @@ -65,47 +65,15 @@ <repository> <id>repository.jboss.org</id> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>false</enabled> - </snapshots> - <url>http://repository.jboss.org/maven2</url> + <url>https://repository.jboss.org/nexus/content/groups/public</url> </repository> - <repository> - <id>snapshots.jboss.org</id> - <releases> - <enabled>false</enabled> - </releases> - <snapshots> - <enabled>true</enabled> - </snapshots> - <url>http://snapshots.jboss.org/maven2</url> - </repository> </repositories> <pluginRepositories> <pluginRepository> <id>repository.jboss.org</id> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>false</enabled> - </snapshots> - <url>http://repository.jboss.org/maven2</url> + <url>https://repository.jboss.org/nexus/content/groups/public</url> </pluginRepository> - <pluginRepository> - <id>snapshots.jboss.org</id> - <releases> - <enabled>false</enabled> - </releases> - <snapshots> - <enabled>true</enabled> - </snapshots> - <url>http://snapshots.jboss.org/maven2</url> - </pluginRepository> </pluginRepositories> <build> Modified: root/docs/trunk/Component_Development_Kit_Guide/pom.xml =================================================================== --- root/docs/trunk/Component_Development_Kit_Guide/pom.xml 2010-04-30 16:42:51 UTC (rev 16855) +++ root/docs/trunk/Component_Development_Kit_Guide/pom.xml 2010-04-30 16:52:02 UTC (rev 16856) @@ -26,7 +26,7 @@ <id>repository.jboss.org</id> <name>JBoss Repository</name> <layout>default</layout> - <url>http://repository.jboss.org/maven2/</url> + <url>https://repository.jboss.org/nexus/content/groups/public</url> <snapshots> <enabled>false</enabled> </snapshots> @@ -38,7 +38,7 @@ <id>repository.jboss.org</id> <name>JBoss Repository</name> <layout>default</layout> - <url>http://repository.jboss.org/maven2/</url> + <url>https://repository.jboss.org/nexus/content/groups/public</url> <snapshots> <enabled>false</enabled> </snapshots> Modified: root/docs/trunk/Component_Reference/pom.xml =================================================================== --- root/docs/trunk/Component_Reference/pom.xml 2010-04-30 16:42:51 UTC (rev 16855) +++ root/docs/trunk/Component_Reference/pom.xml 2010-04-30 16:52:02 UTC (rev 16856) @@ -26,7 +26,7 @@ <id>repository.jboss.org</id> <name>JBoss Repository</name> <layout>default</layout> - <url>http://repository.jboss.org/maven2/</url> + <url>https://repository.jboss.org/nexus/content/groups/public</url> <snapshots> <enabled>false</enabled> </snapshots> @@ -38,7 +38,7 @@ <id>repository.jboss.org</id> <name>JBoss Repository</name> <layout>default</layout> - <url>http://repository.jboss.org/maven2/</url> + <url>https://repository.jboss.org/nexus/content/groups/public</url> <snapshots> <enabled>false</enabled> </snapshots> Modified: root/docs/trunk/Developer_Guide/pom.xml =================================================================== --- root/docs/trunk/Developer_Guide/pom.xml 2010-04-30 16:42:51 UTC (rev 16855) +++ root/docs/trunk/Developer_Guide/pom.xml 2010-04-30 16:52:02 UTC (rev 16856) @@ -26,7 +26,7 @@ <id>repository.jboss.org</id> <name>JBoss Repository</name> <layout>default</layout> - <url>http://repository.jboss.org/maven2/</url> + <url>https://repository.jboss.org/nexus/content/groups/public</url> <snapshots> <enabled>false</enabled> </snapshots> @@ -38,7 +38,7 @@ <id>repository.jboss.org</id> <name>JBoss Repository</name> <layout>default</layout> - <url>http://repository.jboss.org/maven2/</url> + <url>https://repository.jboss.org/nexus/content/groups/public</url> <snapshots> <enabled>false</enabled> </snapshots> Modified: root/docs/trunk/Migration_Guide/pom.xml =================================================================== --- root/docs/trunk/Migration_Guide/pom.xml 2010-04-30 16:42:51 UTC (rev 16855) +++ root/docs/trunk/Migration_Guide/pom.xml 2010-04-30 16:52:02 UTC (rev 16856) @@ -26,7 +26,7 @@ <id>repository.jboss.org</id> <name>JBoss Repository</name> <layout>default</layout> - <url>http://repository.jboss.org/maven2/</url> + <url>https://repository.jboss.org/nexus/content/groups/public</url> <snapshots> <enabled>false</enabled> </snapshots> @@ -38,7 +38,7 @@ <id>repository.jboss.org</id> <name>JBoss Repository</name> <layout>default</layout> - <url>http://repository.jboss.org/maven2/</url> + <url>https://repository.jboss.org/nexus/content/groups/public</url> <snapshots> <enabled>false</enabled> </snapshots> Modified: root/examples/trunk/components/core-demo/pom.xml =================================================================== --- root/examples/trunk/components/core-demo/pom.xml 2010-04-30 16:42:51 UTC (rev 16855) +++ root/examples/trunk/components/core-demo/pom.xml 2010-04-30 16:52:02 UTC (rev 16856) @@ -18,20 +18,12 @@ <repository> <id>repository.jboss.org</id> <name>Jboss Repository for Maven</name> - <url>http://repository.jboss.org/maven2/</url> + <url>https://repository.jboss.org/nexus/content/groups/public</url> </repository> <repository> - <id>snapshots.jboss.org</id> - <name>Jboss Snapshots Repository for Maven</name> - <url>http://snapshots.jboss.org/maven2/</url> <snapshots> <enabled>true</enabled> </snapshots> - </repository> - <repository> - <snapshots> - <enabled>true</enabled> - </snapshots> <id>maven-repository2.dev.java.net</id> <name>Java.net Repository for Maven 2</name> <url>http://download.java.net/maven/2</url> Modified: root/examples/trunk/pom.xml =================================================================== --- root/examples/trunk/pom.xml 2010-04-30 16:42:51 UTC (rev 16855) +++ root/examples/trunk/pom.xml 2010-04-30 16:52:02 UTC (rev 16856) @@ -80,7 +80,7 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>jstl</groupId> + <groupId>javax.servlet</groupId> <artifactId>jstl</artifactId> <version>1.2</version> </dependency> Modified: root/examples/trunk/richfaces-demo/pom.xml =================================================================== --- root/examples/trunk/richfaces-demo/pom.xml 2010-04-30 16:42:51 UTC (rev 16855) +++ root/examples/trunk/richfaces-demo/pom.xml 2010-04-30 16:52:02 UTC (rev 16856) @@ -20,20 +20,12 @@ <repository> <id>repository.jboss.org</id> <name>Jboss Repository for Maven</name> - <url>http://repository.jboss.org/maven2/</url> + <url>https://repository.jboss.org/nexus/content/groups/public</url> </repository> <repository> - <id>snapshots.jboss.org</id> - <name>Jboss Snapshots Repository for Maven</name> - <url>http://snapshots.jboss.org/maven2/</url> <snapshots> <enabled>true</enabled> </snapshots> - </repository> - <repository> - <snapshots> - <enabled>true</enabled> - </snapshots> <id>maven-repository2.dev.java.net</id> <name>Java.net Repository for Maven 2</name> <url>http://download.java.net/maven/2</url> Modified: root/examples-sandbox/trunk/components/ajax/pom.xml =================================================================== --- root/examples-sandbox/trunk/components/ajax/pom.xml 2010-04-30 16:42:51 UTC (rev 16855) +++ root/examples-sandbox/trunk/components/ajax/pom.xml 2010-04-30 16:52:02 UTC (rev 16856) @@ -74,7 +74,7 @@ <scope>runtime</scope> </dependency> <dependency> - <groupId>jstl</groupId> + <groupId>javax.servlet</groupId> <artifactId>jstl</artifactId> <version>1.2</version> <scope>runtime</scope> Modified: root/examples-sandbox/trunk/components/tables/pom.xml =================================================================== --- root/examples-sandbox/trunk/components/tables/pom.xml 2010-04-30 16:42:51 UTC (rev 16855) +++ root/examples-sandbox/trunk/components/tables/pom.xml 2010-04-30 16:52:02 UTC (rev 16856) @@ -18,20 +18,12 @@ <repository> <id>repository.jboss.org</id> <name>Jboss Repository for Maven</name> - <url>http://repository.jboss.org/maven2/</url> + <url>https://repository.jboss.org/nexus/content/groups/public</url> </repository> <repository> - <id>snapshots.jboss.org</id> - <name>Jboss Snapshots Repository for Maven</name> - <url>http://snapshots.jboss.org/maven2/</url> <snapshots> <enabled>true</enabled> </snapshots> - </repository> - <repository> - <snapshots> - <enabled>true</enabled> - </snapshots> <id>maven-repository2.dev.java.net</id> <name>Java.net Repository for Maven 2</name> <url>http://download.java.net/maven/2</url> @@ -78,7 +70,7 @@ <version>1.5.8</version> </dependency> <dependency> - <groupId>jstl</groupId> + <groupId>javax.servlet</groupId> <artifactId>jstl</artifactId> <version>1.2</version> </dependency> Modified: root/examples-sandbox/trunk/pom.xml =================================================================== --- root/examples-sandbox/trunk/pom.xml 2010-04-30 16:42:51 UTC (rev 16855) +++ root/examples-sandbox/trunk/pom.xml 2010-04-30 16:52:02 UTC (rev 16856) @@ -80,7 +80,7 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>jstl</groupId> + <groupId>javax.servlet</groupId> <artifactId>jstl</artifactId> <version>1.2</version> <scope>provided</scope> Modified: root/framework/trunk/pom.xml =================================================================== --- root/framework/trunk/pom.xml 2010-04-30 16:42:51 UTC (rev 16855) +++ root/framework/trunk/pom.xml 2010-04-30 16:52:02 UTC (rev 16856) @@ -89,7 +89,7 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>jstl</groupId> + <groupId>javax.servlet</groupId> <artifactId>jstl</artifactId> <scope>provided</scope> </dependency> Modified: root/framework/trunk/test-base/pom.xml =================================================================== --- root/framework/trunk/test-base/pom.xml 2010-04-30 16:42:51 UTC (rev 16855) +++ root/framework/trunk/test-base/pom.xml 2010-04-30 16:52:02 UTC (rev 16856) @@ -76,7 +76,7 @@ <artifactId>el-api</artifactId> </dependency> <dependency> - <groupId>javax.el</groupId> + <groupId>com.sun.el</groupId> <artifactId>el-ri</artifactId> </dependency> <dependency> @@ -88,7 +88,7 @@ <artifactId>jsp-api</artifactId> </dependency> <dependency> - <groupId>jstl</groupId> + <groupId>javax.servlet</groupId> <artifactId>jstl</artifactId> </dependency> <dependency> Modified: root/framework/trunk/version-matrix/pom.xml =================================================================== --- root/framework/trunk/version-matrix/pom.xml 2010-04-30 16:42:51 UTC (rev 16855) +++ root/framework/trunk/version-matrix/pom.xml 2010-04-30 16:52:02 UTC (rev 16856) @@ -49,47 +49,15 @@ <repository> <id>repository.jboss.org</id> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>false</enabled> - </snapshots> - <url>http://repository.jboss.org/maven2</url> + <url>https://repository.jboss.org/nexus/content/groups/public</url> </repository> - <repository> - <id>snapshots.jboss.org</id> - <releases> - <enabled>false</enabled> - </releases> - <snapshots> - <enabled>true</enabled> - </snapshots> - <url>http://snapshots.jboss.org/maven2</url> - </repository> </repositories> <pluginRepositories> <pluginRepository> <id>repository.jboss.org</id> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>false</enabled> - </snapshots> - <url>http://repository.jboss.org/maven2</url> + <url>https://repository.jboss.org/nexus/content/groups/public</url> </pluginRepository> - <pluginRepository> - <id>snapshots.jboss.org</id> - <releases> - <enabled>false</enabled> - </releases> - <snapshots> - <enabled>true</enabled> - </snapshots> - <url>http://snapshots.jboss.org/maven2</url> - </pluginRepository> </pluginRepositories> <dependencyManagement> @@ -202,20 +170,20 @@ <version>2.1</version> </dependency> <dependency> - <groupId>jstl</groupId> + <groupId>javax.servlet</groupId> <artifactId>jstl</artifactId> <version>1.2</version> </dependency> <dependency> <groupId>javax.el</groupId> <artifactId>el-api</artifactId> - <version>1.2</version> + <version>1.0</version> </dependency> <!-- end --> <dependency> - <groupId>javax.el</groupId> + <groupId>com.sun.el</groupId> <artifactId>el-ri</artifactId> - <version>1.2</version> + <version>1.0</version> </dependency> <dependency> <groupId>javax.annotation</groupId> Modified: root/pom.xml =================================================================== --- root/pom.xml 2010-04-30 16:42:51 UTC (rev 16855) +++ root/pom.xml 2010-04-30 16:52:02 UTC (rev 16856) @@ -43,7 +43,7 @@ <properties> <snapshotRepository> - dav:https://snapshots.jboss.org/maven2 + dav:https://repository.jboss.org/nexus/content/repositories/snapshots/ </snapshotRepository> </properties> Modified: root/ui/trunk/pom.xml =================================================================== --- root/ui/trunk/pom.xml 2010-04-30 16:42:51 UTC (rev 16855) +++ root/ui/trunk/pom.xml 2010-04-30 16:52:02 UTC (rev 16856) @@ -113,7 +113,7 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>jstl</groupId> + <groupId>javax.servlet</groupId> <artifactId>jstl</artifactId> <scope>provided</scope> </dependency> Modified: root/ui/trunk/version-matrix/pom.xml =================================================================== --- root/ui/trunk/version-matrix/pom.xml 2010-04-30 16:42:51 UTC (rev 16855) +++ root/ui/trunk/version-matrix/pom.xml 2010-04-30 16:52:02 UTC (rev 16856) @@ -37,47 +37,15 @@ <repositories> <repository> <id>repository.jboss.org</id> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>false</enabled> - </snapshots> - <url>http://repository.jboss.org/maven2</url> + <url>https://repository.jboss.org/nexus/content/groups/public</url> </repository> - <repository> - <id>snapshots.jboss.org</id> - <releases> - <enabled>false</enabled> - </releases> - <snapshots> - <enabled>true</enabled> - </snapshots> - <url>http://snapshots.jboss.org/maven2</url> - </repository> </repositories> <pluginRepositories> <pluginRepository> <id>repository.jboss.org</id> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>false</enabled> - </snapshots> - <url>http://repository.jboss.org/maven2</url> + <url>https://repository.jboss.org/nexus/content/groups/public</url> </pluginRepository> - <pluginRepository> - <id>snapshots.jboss.org</id> - <releases> - <enabled>false</enabled> - </releases> - <snapshots> - <enabled>true</enabled> - </snapshots> - <url>http://snapshots.jboss.org/maven2</url> - </pluginRepository> </pluginRepositories> <dependencyManagement> @@ -152,7 +120,7 @@ <version>1.0</version> </dependency> <dependency> - <groupId>jstl</groupId> + <groupId>javax.servlet</groupId> <artifactId>jstl</artifactId> <version>1.2</version> </dependency> Modified: root/ui-sandbox/trunk/pom.xml =================================================================== --- root/ui-sandbox/trunk/pom.xml 2010-04-30 16:42:51 UTC (rev 16855) +++ root/ui-sandbox/trunk/pom.xml 2010-04-30 16:52:02 UTC (rev 16856) @@ -72,7 +72,7 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>jstl</groupId> + <groupId>javax.servlet</groupId> <artifactId>jstl</artifactId> <scope>provided</scope> </dependency>