Author: amarkhel Date: 2010-04-30 15:10:49 -0400 (Fri, 30 Apr 2010) New Revision: 16863 Modified: branches/community/3.3.X/cdk/maven-archetype-seam-app/src/main/resources/archetype-resources/pom.xml branches/community/3.3.X/docs/cdkguide/pom.xml branches/community/3.3.X/docs/common-resources/en/src/main/archetypes/richfaces_archetype/src/main/resources/archetype-resources/pom.xml branches/community/3.3.X/docs/faq/pom.xml branches/community/3.3.X/docs/migrationguide/pom.xml branches/community/3.3.X/docs/photo_album_app_guide/pom.xml branches/community/3.3.X/docs/pom.xml branches/community/3.3.X/docs/userguide/pom.xml branches/community/3.3.X/examples/photoalbum/source/ejb/pom.xml branches/community/3.3.X/examples/photoalbum/source/pom.xml branches/community/3.3.X/examples/photoalbum/source/web/pom.xml branches/community/3.3.X/framework/jsf-test/pom.xml branches/community/3.3.X/framework/pom.xml branches/community/3.3.X/pom.xml branches/community/3.3.X/samples/richfaces-demo/pom.xml branches/community/3.3.X/test-applications/ajaxTest/pom.xml branches/community/3.3.X/test-applications/pom.xml branches/community/3.3.X/test-applications/regressionArea/pom.xml branches/community/3.3.X/test-applications/richfaces-docs/pom.xml branches/community/3.3.X/test-applications/seleniumTest/pom.xml branches/community/3.3.X/ui/pom.xml Log: Adjust project to use new Jboss repo Modified: branches/community/3.3.X/cdk/maven-archetype-seam-app/src/main/resources/archetype-resources/pom.xml =================================================================== --- branches/community/3.3.X/cdk/maven-archetype-seam-app/src/main/resources/archetype-resources/pom.xml 2010-04-30 19:07:26 UTC (rev 16862) +++ branches/community/3.3.X/cdk/maven-archetype-seam-app/src/main/resources/archetype-resources/pom.xml 2010-04-30 19:10:49 UTC (rev 16863) @@ -20,13 +20,8 @@ <repository> <id>repository.jboss.com</id> <name>Jboss Repository for Maven</name> - <url>http://repository.jboss.com/maven2/</url> + <url>https://repository.jboss.org/nexus/content/groups/public/</url> </repository> - <repository> - <id>repository.exadel.com</id> - <name>Exadel Maven 2 Repository</name> - <url>http://repository.exadel.com/</url> - </repository> </repositories> <modules> Modified: branches/community/3.3.X/docs/cdkguide/pom.xml =================================================================== --- branches/community/3.3.X/docs/cdkguide/pom.xml 2010-04-30 19:07:26 UTC (rev 16862) +++ branches/community/3.3.X/docs/cdkguide/pom.xml 2010-04-30 19:10:49 UTC (rev 16863) @@ -22,7 +22,7 @@ </snapshots> <id>repository.jboss.com</id> <name>Jboss Repository for Maven</name> - <url>http://repository.jboss.com/maven2/</url> + <url>https://repository.jboss.org/nexus/content/groups/public/</url> <layout>default</layout> </pluginRepository> </pluginRepositories> Modified: branches/community/3.3.X/docs/common-resources/en/src/main/archetypes/richfaces_archetype/src/main/resources/archetype-resources/pom.xml =================================================================== --- branches/community/3.3.X/docs/common-resources/en/src/main/archetypes/richfaces_archetype/src/main/resources/archetype-resources/pom.xml 2010-04-30 19:07:26 UTC (rev 16862) +++ branches/community/3.3.X/docs/common-resources/en/src/main/archetypes/richfaces_archetype/src/main/resources/archetype-resources/pom.xml 2010-04-30 19:10:49 UTC (rev 16863) @@ -22,11 +22,12 @@ </snapshots> <id>repository.jboss.com</id> <name>Jboss Repository for Maven</name> - <url>http://repository.jboss.com/maven2/</url> + <url>https://repository.jboss.org/nexus/content/groups/public/</url> <layout>default</layout> </pluginRepository> </pluginRepositories> + <build> <pluginManagement> <plugins> Modified: branches/community/3.3.X/docs/faq/pom.xml =================================================================== --- branches/community/3.3.X/docs/faq/pom.xml 2010-04-30 19:07:26 UTC (rev 16862) +++ branches/community/3.3.X/docs/faq/pom.xml 2010-04-30 19:10:49 UTC (rev 16863) @@ -11,42 +11,10 @@ <version>3.3.4-SNAPSHOT</version> <name>FAQ</name> <description>Frequently asked questions</description> - <!--repositories> - <repository> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>false</enabled> - <updatePolicy>never</updatePolicy> - </snapshots> - <id>repository.jboss.com</id> - <name>Jboss Repository for Maven</name> - <url>http://repository.jboss.com/maven2/</url> - <layout>default</layout> - </repository> - <repository> - <id>eclipse</id> - <url>http://repo1.maven.org/eclipse/</url> - </repository> - </repositories--> <pluginRepositories> <pluginRepository> <releases> - <enabled>false</enabled> - </releases> - <snapshots> <enabled>true</enabled> - <updatePolicy>never</updatePolicy> - </snapshots> - <id>snapshots.jboss.com</id> - <name>Jboss Repository for Maven</name> - <url>http://snapshots.jboss.com/maven2/</url> - <layout>default</layout> - </pluginRepository> - <pluginRepository> - <releases> - <enabled>true</enabled> </releases> <snapshots> <enabled>false</enabled> @@ -54,7 +22,7 @@ </snapshots> <id>repository.jboss.com</id> <name>Jboss Repository for Maven</name> - <url>http://repository.jboss.com/maven2/</url> + <url>https://repository.jboss.org/nexus/content/groups/public/</url> <layout>default</layout> </pluginRepository> </pluginRepositories> Modified: branches/community/3.3.X/docs/migrationguide/pom.xml =================================================================== --- branches/community/3.3.X/docs/migrationguide/pom.xml 2010-04-30 19:07:26 UTC (rev 16862) +++ branches/community/3.3.X/docs/migrationguide/pom.xml 2010-04-30 19:10:49 UTC (rev 16863) @@ -10,7 +10,7 @@ <packaging>pom</packaging> <version>3.3.4-SNAPSHOT</version> <name>Migration Guide</name> - <description>RichFaces Migration Guide from 3.1.* to 3.2.0 version</description> + <description>RichFaces Migration Guide from 3.1.* to 3.2.0 version</description> <pluginRepositories> <pluginRepository> <releases> @@ -22,10 +22,10 @@ </snapshots> <id>repository.jboss.com</id> <name>Jboss Repository for Maven</name> - <url>http://repository.jboss.com/maven2/</url> + <url>https://repository.jboss.org/nexus/content/groups/public/</url> <layout>default</layout> </pluginRepository> - </pluginRepositories> + </pluginRepositories> <profiles> <profile> <id>html</id> Modified: branches/community/3.3.X/docs/photo_album_app_guide/pom.xml =================================================================== --- branches/community/3.3.X/docs/photo_album_app_guide/pom.xml 2010-04-30 19:07:26 UTC (rev 16862) +++ branches/community/3.3.X/docs/photo_album_app_guide/pom.xml 2010-04-30 19:10:49 UTC (rev 16863) @@ -12,7 +12,7 @@ <packaging>pom</packaging> <version>3.3.4-SNAPSHOT</version> <name>RichFaces Photo Album Application Guide</name> - <description>RichFaces Photo Album Application Guide</description> + <description>RichFaces Photo Album Application Guide</description> <pluginRepositories> <pluginRepository> <releases> @@ -24,10 +24,10 @@ </snapshots> <id>repository.jboss.com</id> <name>Jboss Repository for Maven</name> - <url>http://repository.jboss.com/maven2/</url> + <url>https://repository.jboss.org/nexus/content/groups/public/</url> <layout>default</layout> </pluginRepository> - </pluginRepositories> + </pluginRepositories> <profiles> <profile> <id>html</id> Modified: branches/community/3.3.X/docs/pom.xml =================================================================== --- branches/community/3.3.X/docs/pom.xml 2010-04-30 19:07:26 UTC (rev 16862) +++ branches/community/3.3.X/docs/pom.xml 2010-04-30 19:10:49 UTC (rev 16863) @@ -22,13 +22,9 @@ </snapshots> <id>repository.jboss.com</id> <name>Jboss Repository for Maven</name> - <url>http://repository.jboss.com/maven2/</url> + <url>https://repository.jboss.org/nexus/content/groups/public/</url> <layout>default</layout> </repository> - <repository> - <id>eclipse</id> - <url>http://repo1.maven.org/eclipse/</url> - </repository> </repositories> <pluginRepositories> <pluginRepository> @@ -41,7 +37,7 @@ </snapshots> <id>repository.jboss.com</id> <name>Jboss Repository for Maven</name> - <url>http://repository.jboss.com/maven2/</url> + <url>https://repository.jboss.org/nexus/content/groups/public/</url> <layout>default</layout> </pluginRepository> </pluginRepositories> Modified: branches/community/3.3.X/docs/userguide/pom.xml =================================================================== --- branches/community/3.3.X/docs/userguide/pom.xml 2010-04-30 19:07:26 UTC (rev 16862) +++ branches/community/3.3.X/docs/userguide/pom.xml 2010-04-30 19:10:49 UTC (rev 16863) @@ -22,21 +22,9 @@ </snapshots> <id>repository.jboss.com</id> <name>Jboss Repository for Maven</name> - <url>http://repository.jboss.com/maven2/</url> + <url>https://repository.jboss.org/nexus/content/groups/public/</url> <layout>default</layout> </pluginRepository> - <pluginRepository> - <releases> - <enabled>false</enabled> - </releases> - <snapshots> - <enabled>true</enabled> - </snapshots> - <id>snapshots.jboss.org</id> - <name>Jboss Snapshots Repository for Maven</name> - <url>http://snapshots.jboss.org/maven2/</url> - <layout>default</layout> - </pluginRepository> </pluginRepositories> <profiles> <profile> Modified: branches/community/3.3.X/examples/photoalbum/source/ejb/pom.xml =================================================================== --- branches/community/3.3.X/examples/photoalbum/source/ejb/pom.xml 2010-04-30 19:07:26 UTC (rev 16862) +++ branches/community/3.3.X/examples/photoalbum/source/ejb/pom.xml 2010-04-30 19:10:49 UTC (rev 16863) @@ -67,8 +67,7 @@ <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-annotations</artifactId> - <version>3.3.0.ga</version> - <!--<version>3.4.0.GA</version>--> + <version>3.4.0.GA</version> <scope>provided</scope> </dependency> </dependencies> Modified: branches/community/3.3.X/examples/photoalbum/source/pom.xml =================================================================== --- branches/community/3.3.X/examples/photoalbum/source/pom.xml 2010-04-30 19:07:26 UTC (rev 16862) +++ branches/community/3.3.X/examples/photoalbum/source/pom.xml 2010-04-30 19:10:49 UTC (rev 16863) @@ -44,14 +44,8 @@ <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> </repositories> <modules> <module>ejb</module> Modified: branches/community/3.3.X/examples/photoalbum/source/web/pom.xml =================================================================== --- branches/community/3.3.X/examples/photoalbum/source/web/pom.xml 2010-04-30 19:07:26 UTC (rev 16862) +++ branches/community/3.3.X/examples/photoalbum/source/web/pom.xml 2010-04-30 19:10:49 UTC (rev 16863) @@ -24,7 +24,7 @@ <dependency> <groupId>com.drewnoakes</groupId> <artifactId>metadata-extractor</artifactId> - <version>2.4.0-beta1</version> + <version>2.4.0-beta-1</version> </dependency> <dependency> <groupId>junit</groupId> @@ -63,10 +63,16 @@ <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-annotations</artifactId> - <version>3.3.0.ga</version> + <version>3.4.0.GA</version> <scope>provided</scope> </dependency> <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + <version>3.3.2.GA</version> + <scope>provided</scope> + </dependency> + <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-commons-annotations</artifactId> <version>3.3.0.ga</version> Modified: branches/community/3.3.X/framework/jsf-test/pom.xml =================================================================== --- branches/community/3.3.X/framework/jsf-test/pom.xml 2010-04-30 19:07:26 UTC (rev 16862) +++ branches/community/3.3.X/framework/jsf-test/pom.xml 2010-04-30 19:10:49 UTC (rev 16863) @@ -86,7 +86,7 @@ <dependency> <groupId>javax.el</groupId> <artifactId>el-api</artifactId> - <version>1.0</version> + <version>2.2</version> </dependency> <dependency> <groupId>javax.servlet</groupId> @@ -99,7 +99,7 @@ <version>2.1</version> </dependency> <dependency> - <groupId>jstl</groupId> + <groupId>javax.servlet</groupId> <artifactId>jstl</artifactId> <version>1.2</version> </dependency> Modified: branches/community/3.3.X/framework/pom.xml =================================================================== --- branches/community/3.3.X/framework/pom.xml 2010-04-30 19:07:26 UTC (rev 16862) +++ branches/community/3.3.X/framework/pom.xml 2010-04-30 19:10:49 UTC (rev 16863) @@ -96,7 +96,7 @@ <dependency> <groupId>javax.el</groupId> <artifactId>el-api</artifactId> - <version>1.0</version> + <version>2.2</version> <scope>provided</scope> </dependency> <dependency> @@ -117,7 +117,7 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>jstl</groupId> + <groupId>javax.servlet</groupId> <artifactId>jstl</artifactId> <version>1.2</version> <scope>provided</scope> Modified: branches/community/3.3.X/pom.xml =================================================================== --- branches/community/3.3.X/pom.xml 2010-04-30 19:07:26 UTC (rev 16862) +++ branches/community/3.3.X/pom.xml 2010-04-30 19:10:49 UTC (rev 16863) @@ -6,11 +6,6 @@ <name>RichFaces project</name> <version>3.3.4-SNAPSHOT</version> <url>http://labs.jboss.com/jbossrichfaces</url> - <properties> - <snapshotRepository> - dav:https://snapshots.jboss.org/maven2 - </snapshotRepository> - </properties> <dependencies /> <build> <extensions> @@ -108,39 +103,17 @@ <enabled>false</enabled> <updatePolicy>never</updatePolicy> </snapshots> - <id>maven-repository.dev.java.net</id> - <name>Java.net Repository for Maven</name> - <url>http://download.java.net/maven/1</url> - <layout>legacy</layout> + + <id>repository.jboss.org</id> + <url>https://repository.jboss.org/nexus/content/groups/public/</url> </repository> <repository> - <releases /> - <snapshots> - <enabled>false</enabled> - <updatePolicy>never</updatePolicy> - </snapshots> <id>maven2-repository.dev.java.net</id> <name>Java.net Repository for Maven</name> <url>http://download.java.net/maven/2/</url> <layout>default</layout> </repository> - <repository> - <releases /> - <snapshots> - <enabled>false</enabled> - <updatePolicy>never</updatePolicy> - </snapshots> - <id>repository.jboss.org</id> - <url>http://repository.jboss.org/maven2</url> - </repository> </repositories> - <pluginRepositories> - <pluginRepository> - <id>atlassian-m2-repository</id> - <name>Atlassian Maven 2.x Repository</name> - <url>http://repository.atlassian.com/maven2</url> - </pluginRepository> - </pluginRepositories> <distributionManagement> <downloadUrl> http://www.jboss.org/richfaces/download Modified: branches/community/3.3.X/samples/richfaces-demo/pom.xml =================================================================== --- branches/community/3.3.X/samples/richfaces-demo/pom.xml 2010-04-30 19:07:26 UTC (rev 16862) +++ branches/community/3.3.X/samples/richfaces-demo/pom.xml 2010-04-30 19:10:49 UTC (rev 16863) @@ -14,7 +14,6 @@ <properties> <classifiedArtifactId>richfaces-demo</classifiedArtifactId> </properties> - <repositories> <repository> <releases> @@ -26,11 +25,10 @@ <id>repository.jboss.com</id> <name>Jboss Repository for Maven</name> <url> - http://repository.jboss.com/maven2/ + https://repository.jboss.org/nexus/content/groups/public/ </url> </repository> </repositories> - <build> <finalName>${classifiedArtifactId}</finalName> <plugins> Modified: branches/community/3.3.X/test-applications/ajaxTest/pom.xml =================================================================== --- branches/community/3.3.X/test-applications/ajaxTest/pom.xml 2010-04-30 19:07:26 UTC (rev 16862) +++ branches/community/3.3.X/test-applications/ajaxTest/pom.xml 2010-04-30 19:10:49 UTC (rev 16863) @@ -87,7 +87,7 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>jstl</groupId> + <groupId>javax.servlet</groupId> <artifactId>jstl</artifactId> <version>1.2</version> </dependency> Modified: branches/community/3.3.X/test-applications/pom.xml =================================================================== --- branches/community/3.3.X/test-applications/pom.xml 2010-04-30 19:07:26 UTC (rev 16862) +++ branches/community/3.3.X/test-applications/pom.xml 2010-04-30 19:10:49 UTC (rev 16863) @@ -5,34 +5,7 @@ <version>3.3.4-SNAPSHOT</version> <relativePath>../samples</relativePath> </parent> - <repositories> - <!--repository> - <releases> - <enabled>true</enabled> - </releases> - - <snapshots> - <enabled>true</enabled> - <updatePolicy>always</updatePolicy> - </snapshots> - - <id>maven2-snapshots.exadel.com</id> - <name>Exadel Repository for Maven Snapshots</name> - <url>http://maven.exadel.com/</url> - <layout>default</layout> - </repository--> - <repository> - <snapshots> - <enabled>true</enabled> - <updatePolicy>always</updatePolicy> - </snapshots> - - <id>snapshots.jboss.org</id> - <name>JBoss snapshots repository</name> - <url>http://snapshots.jboss.org/maven2/</url> - <layout>default</layout> - </repository> <repository> <releases> @@ -41,7 +14,7 @@ <id>jboss.org</id> <name>JBoss repository</name> - <url>http://repository.jboss.org/maven2/</url> + <url>https://repository.jboss.org/nexus/content/groups/public/</url> <layout>default</layout> </repository> </repositories> Modified: branches/community/3.3.X/test-applications/regressionArea/pom.xml =================================================================== --- branches/community/3.3.X/test-applications/regressionArea/pom.xml 2010-04-30 19:07:26 UTC (rev 16862) +++ branches/community/3.3.X/test-applications/regressionArea/pom.xml 2010-04-30 19:10:49 UTC (rev 16863) @@ -13,24 +13,13 @@ <name>Regresion Area:Seam Application</name> <repositories> <repository> - <releases/> + <releases /> <snapshots> <enabled>false</enabled> <updatePolicy>never</updatePolicy> </snapshots> - <id>maven-repository.dev.java.net</id> - <name>Java.net Repository for Maven</name> - <url>http://download.java.net/maven/1</url> - <layout>legacy</layout> - </repository> - <repository> - <releases/> - <snapshots> - <enabled>false</enabled> - <updatePolicy>never</updatePolicy> - </snapshots> <id>repository.jboss.org</id> - <url>http://repository.jboss.org/maven2</url> + <url>https://repository.jboss.org/nexus/content/groups/public/</url> </repository> </repositories> <properties> Modified: branches/community/3.3.X/test-applications/richfaces-docs/pom.xml =================================================================== --- branches/community/3.3.X/test-applications/richfaces-docs/pom.xml 2010-04-30 19:07:26 UTC (rev 16862) +++ branches/community/3.3.X/test-applications/richfaces-docs/pom.xml 2010-04-30 19:10:49 UTC (rev 16863) @@ -31,21 +31,9 @@ </snapshots> <id>repository.jboss.com</id> <name>Jboss Repository for Maven</name> - <url>http://repository.jboss.com/maven2/</url> + <url>https://repository.jboss.org/nexus/content/groups/public/</url> <layout>default</layout> </pluginRepository> - <pluginRepository> - <releases> - <enabled>false</enabled> - </releases> - <snapshots> - <enabled>true</enabled> - </snapshots> - <id>snapshots.jboss.org</id> - <name>Jboss Snapshots Repository for Maven</name> - <url>http://snapshots.jboss.org/maven2/</url> - <layout>default</layout> - </pluginRepository> </pluginRepositories> <repositories> <repository> @@ -56,22 +44,9 @@ <enabled>true</enabled> <updatePolicy>always</updatePolicy> </snapshots> - <id>snapshots.jboss.org</id> - <name>Snapshot Jboss Repository for Maven</name> - <url>http://snapshots.jboss.org/maven2/</url> - <layout>default</layout> - </repository> - <repository> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>true</enabled> - <updatePolicy>always</updatePolicy> - </snapshots> <id>repository.jboss.com</id> <name>Jboss Repository for Maven</name> - <url>http://repository.jboss.com/maven2/</url> + <url>https://repository.jboss.org/nexus/content/groups/public/</url> <layout>default</layout> </repository> </repositories> @@ -115,7 +90,7 @@ <dependency> - <groupId>jstl</groupId> + <groupId>javax.servlet</groupId> <artifactId>jstl</artifactId> Modified: branches/community/3.3.X/test-applications/seleniumTest/pom.xml =================================================================== --- branches/community/3.3.X/test-applications/seleniumTest/pom.xml 2010-04-30 19:07:26 UTC (rev 16862) +++ branches/community/3.3.X/test-applications/seleniumTest/pom.xml 2010-04-30 19:10:49 UTC (rev 16863) @@ -17,36 +17,6 @@ <properties> <http.port>8085</http.port> </properties> - <repositories> - <repository> - <id>nexus-openqa</id> - <name>OpenQA Repository</name> - <url>http://nexus.openqa.org/content/repositories/releases</url> - <layout>default</layout> - <snapshots> - <enabled>false</enabled> - </snapshots> - <releases> - <enabled>true</enabled> - </releases> - </repository> - <repository> - <id>nexus-openqa-snapshots</id> - <name>OpenQA Snapshots Repository</name> - <url>http://nexus.openqa.org/content/repositories/snapshots</url> - <layout>default</layout> - <snapshots> - <enabled>true</enabled> - </snapshots> - <releases> - <enabled>false</enabled> - </releases> - </repository> - <repository> - <id>maven-2-repository.dev.java.net</id> - <url>http://download.java.net/maven/2</url> - </repository> - </repositories> <build> <plugins> <plugin> Modified: branches/community/3.3.X/ui/pom.xml =================================================================== --- branches/community/3.3.X/ui/pom.xml 2010-04-30 19:07:26 UTC (rev 16862) +++ branches/community/3.3.X/ui/pom.xml 2010-04-30 19:10:49 UTC (rev 16863) @@ -261,7 +261,7 @@ <dependency> <groupId>javax.el</groupId> <artifactId>el-api</artifactId> - <version>1.0</version> + <version>2.2</version> <scope>provided</scope> </dependency> <dependency> @@ -285,7 +285,7 @@ <dependency> <groupId>javax.servlet</groupId> <artifactId>jstl</artifactId> - <version>1.1.2</version> + <version>1.2</version> <scope>provided</scope> </dependency> </dependencies>