Author: amarkhel Date: 2010-04-30 15:07:26 -0400 (Fri, 30 Apr 2010) New Revision: 16862 Modified: branches/enterprise/3.3.X/cdk/maven-archetype-seam-app/src/main/resources/archetype-resources/pom.xml branches/enterprise/3.3.X/docs/cdkguide/pom.xml branches/enterprise/3.3.X/docs/common-resources/en/src/main/archetypes/richfaces_archetype/src/main/resources/archetype-resources/pom.xml branches/enterprise/3.3.X/docs/faq/pom.xml branches/enterprise/3.3.X/docs/migrationguide/pom.xml branches/enterprise/3.3.X/docs/photo_album_app_guide/pom.xml branches/enterprise/3.3.X/docs/pom.xml branches/enterprise/3.3.X/docs/userguide/pom.xml branches/enterprise/3.3.X/examples/photoalbum/source/ejb/pom.xml branches/enterprise/3.3.X/examples/photoalbum/source/pom.xml branches/enterprise/3.3.X/examples/photoalbum/source/web/pom.xml branches/enterprise/3.3.X/framework/jsf-test/pom.xml branches/enterprise/3.3.X/framework/pom.xml branches/enterprise/3.3.X/pom.xml branches/enterprise/3.3.X/samples/richfaces-demo/pom.xml branches/enterprise/3.3.X/samples/seamEAR/pom.xml branches/enterprise/3.3.X/test-applications/ajaxTest/pom.xml branches/enterprise/3.3.X/test-applications/pom.xml branches/enterprise/3.3.X/test-applications/regressionArea/pom.xml branches/enterprise/3.3.X/test-applications/regressionArea/regressionArea-ejb/pom.xml branches/enterprise/3.3.X/test-applications/richfaces-docs/pom.xml branches/enterprise/3.3.X/test-applications/seamApp/pom.xml branches/enterprise/3.3.X/test-applications/seleniumTest/pom.xml branches/enterprise/3.3.X/ui/pom.xml Log: AdAdjust project to use new Jboss repo Modified: branches/enterprise/3.3.X/cdk/maven-archetype-seam-app/src/main/resources/archetype-resources/pom.xml =================================================================== --- branches/enterprise/3.3.X/cdk/maven-archetype-seam-app/src/main/resources/archetype-resources/pom.xml 2010-04-30 18:59:59 UTC (rev 16861) +++ branches/enterprise/3.3.X/cdk/maven-archetype-seam-app/src/main/resources/archetype-resources/pom.xml 2010-04-30 19:07:26 UTC (rev 16862) @@ -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/enterprise/3.3.X/docs/cdkguide/pom.xml =================================================================== --- branches/enterprise/3.3.X/docs/cdkguide/pom.xml 2010-04-30 18:59:59 UTC (rev 16861) +++ branches/enterprise/3.3.X/docs/cdkguide/pom.xml 2010-04-30 19:07:26 UTC (rev 16862) @@ -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/enterprise/3.3.X/docs/common-resources/en/src/main/archetypes/richfaces_archetype/src/main/resources/archetype-resources/pom.xml =================================================================== --- branches/enterprise/3.3.X/docs/common-resources/en/src/main/archetypes/richfaces_archetype/src/main/resources/archetype-resources/pom.xml 2010-04-30 18:59:59 UTC (rev 16861) +++ branches/enterprise/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) @@ -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/enterprise/3.3.X/docs/faq/pom.xml =================================================================== --- branches/enterprise/3.3.X/docs/faq/pom.xml 2010-04-30 18:59:59 UTC (rev 16861) +++ branches/enterprise/3.3.X/docs/faq/pom.xml 2010-04-30 19:07:26 UTC (rev 16862) @@ -11,42 +11,10 @@ <version>3.3.1.SP1-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/enterprise/3.3.X/docs/migrationguide/pom.xml =================================================================== --- branches/enterprise/3.3.X/docs/migrationguide/pom.xml 2010-04-30 18:59:59 UTC (rev 16861) +++ branches/enterprise/3.3.X/docs/migrationguide/pom.xml 2010-04-30 19:07:26 UTC (rev 16862) @@ -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/enterprise/3.3.X/docs/photo_album_app_guide/pom.xml =================================================================== --- branches/enterprise/3.3.X/docs/photo_album_app_guide/pom.xml 2010-04-30 18:59:59 UTC (rev 16861) +++ branches/enterprise/3.3.X/docs/photo_album_app_guide/pom.xml 2010-04-30 19:07:26 UTC (rev 16862) @@ -24,7 +24,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/enterprise/3.3.X/docs/pom.xml =================================================================== --- branches/enterprise/3.3.X/docs/pom.xml 2010-04-30 18:59:59 UTC (rev 16861) +++ branches/enterprise/3.3.X/docs/pom.xml 2010-04-30 19:07:26 UTC (rev 16862) @@ -22,13 +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> </repository> - <repository> - <id>eclipse</id> - <url>http://repo1.maven.org/eclipse/</url> - </repository> + </repositories> <pluginRepositories> <pluginRepository> @@ -41,7 +38,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/enterprise/3.3.X/docs/userguide/pom.xml =================================================================== --- branches/enterprise/3.3.X/docs/userguide/pom.xml 2010-04-30 18:59:59 UTC (rev 16861) +++ branches/enterprise/3.3.X/docs/userguide/pom.xml 2010-04-30 19:07:26 UTC (rev 16862) @@ -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> <build> Modified: branches/enterprise/3.3.X/examples/photoalbum/source/ejb/pom.xml =================================================================== --- branches/enterprise/3.3.X/examples/photoalbum/source/ejb/pom.xml 2010-04-30 18:59:59 UTC (rev 16861) +++ branches/enterprise/3.3.X/examples/photoalbum/source/ejb/pom.xml 2010-04-30 19:07:26 UTC (rev 16862) @@ -67,7 +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> Modified: branches/enterprise/3.3.X/examples/photoalbum/source/pom.xml =================================================================== --- branches/enterprise/3.3.X/examples/photoalbum/source/pom.xml 2010-04-30 18:59:59 UTC (rev 16861) +++ branches/enterprise/3.3.X/examples/photoalbum/source/pom.xml 2010-04-30 19:07:26 UTC (rev 16862) @@ -42,7 +42,7 @@ <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> </repositories> <modules> Modified: branches/enterprise/3.3.X/examples/photoalbum/source/web/pom.xml =================================================================== --- branches/enterprise/3.3.X/examples/photoalbum/source/web/pom.xml 2010-04-30 18:59:59 UTC (rev 16861) +++ branches/enterprise/3.3.X/examples/photoalbum/source/web/pom.xml 2010-04-30 19:07:26 UTC (rev 16862) @@ -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> @@ -62,6 +62,12 @@ </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-annotations</artifactId> <version>3.3.0.ga</version> <scope>provided</scope> Modified: branches/enterprise/3.3.X/framework/jsf-test/pom.xml =================================================================== --- branches/enterprise/3.3.X/framework/jsf-test/pom.xml 2010-04-30 18:59:59 UTC (rev 16861) +++ branches/enterprise/3.3.X/framework/jsf-test/pom.xml 2010-04-30 19:07:26 UTC (rev 16862) @@ -81,7 +81,7 @@ <dependency> <groupId>javax.el</groupId> <artifactId>el-api</artifactId> - <version>1.0</version> + <version>2.2</version> </dependency> <dependency> <groupId>javax.servlet</groupId> @@ -94,7 +94,7 @@ <version>2.1</version> </dependency> <dependency> - <groupId>jstl</groupId> + <groupId>javax.servlet</groupId> <artifactId>jstl</artifactId> <version>1.2</version> </dependency> Modified: branches/enterprise/3.3.X/framework/pom.xml =================================================================== --- branches/enterprise/3.3.X/framework/pom.xml 2010-04-30 18:59:59 UTC (rev 16861) +++ branches/enterprise/3.3.X/framework/pom.xml 2010-04-30 19:07:26 UTC (rev 16862) @@ -70,7 +70,7 @@ <dependency> <groupId>javax.el</groupId> <artifactId>el-api</artifactId> - <version>1.0</version> + <version>2.2</version> <scope>provided</scope> </dependency> <dependency> @@ -91,7 +91,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/enterprise/3.3.X/pom.xml =================================================================== --- branches/enterprise/3.3.X/pom.xml 2010-04-30 18:59:59 UTC (rev 16861) +++ branches/enterprise/3.3.X/pom.xml 2010-04-30 19:07:26 UTC (rev 16862) @@ -6,11 +6,6 @@ <name>Jboss RichFaces project</name> <version>3.3.1.SP1-SNAPSHOT</version> <url>http://labs.jboss.com/jbossrichfaces</url> - <properties> - <snapshotRepository> - dav:https://snapshots.jboss.org/maven2 - </snapshotRepository> - </properties> <dependencies /> <build> <extensions> @@ -102,17 +97,6 @@ --> </modules> <repositories> - <repository> - <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 /> @@ -121,16 +105,9 @@ <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> - <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://labs.jboss.com/portal/jbossrichfaces/downloads Modified: branches/enterprise/3.3.X/samples/richfaces-demo/pom.xml =================================================================== --- branches/enterprise/3.3.X/samples/richfaces-demo/pom.xml 2010-04-30 18:59:59 UTC (rev 16861) +++ branches/enterprise/3.3.X/samples/richfaces-demo/pom.xml 2010-04-30 19:07:26 UTC (rev 16862) @@ -22,9 +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> </repository> </repositories> @@ -199,7 +197,7 @@ <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-validator</artifactId> - <version>3.1.0.CR1</version> + <version>3.1.0.GA</version> </dependency> <dependency> <groupId>org.slf4j</groupId> @@ -390,15 +388,13 @@ </dependency> <dependency> <groupId>org.hibernate</groupId> - <artifactId>hibernate</artifactId> - <version>3.2.6.ga</version> - - <exclusions> - <exclusion> - <artifactId>commons-collections</artifactId> - <groupId>commons-collections</groupId> - </exclusion> - </exclusions> + <artifactId>hibernate-annotations</artifactId> + <version>3.4.0.GA</version> </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + <version>3.3.2.GA</version> + </dependency> </dependencies> </project> Modified: branches/enterprise/3.3.X/samples/seamEAR/pom.xml =================================================================== --- branches/enterprise/3.3.X/samples/seamEAR/pom.xml 2010-04-30 18:59:59 UTC (rev 16861) +++ branches/enterprise/3.3.X/samples/seamEAR/pom.xml 2010-04-30 19:07:26 UTC (rev 16862) @@ -44,7 +44,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> </repository> <repository> @@ -56,7 +56,7 @@ </snapshots> <id>snapshots.jboss.org</id> <name>Jboss Snapshot Repository for Maven</name> - <url>http://snapshots.jboss.org/maven2/</url> + <url>https://repository.jboss.org/nexus/content/groups/public/</url> <layout>default</layout> </repository> </repositories> Modified: branches/enterprise/3.3.X/test-applications/ajaxTest/pom.xml =================================================================== --- branches/enterprise/3.3.X/test-applications/ajaxTest/pom.xml 2010-04-30 18:59:59 UTC (rev 16861) +++ branches/enterprise/3.3.X/test-applications/ajaxTest/pom.xml 2010-04-30 19:07:26 UTC (rev 16862) @@ -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/enterprise/3.3.X/test-applications/pom.xml =================================================================== --- branches/enterprise/3.3.X/test-applications/pom.xml 2010-04-30 18:59:59 UTC (rev 16861) +++ branches/enterprise/3.3.X/test-applications/pom.xml 2010-04-30 19:07:26 UTC (rev 16862) @@ -7,32 +7,6 @@ </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 +15,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/enterprise/3.3.X/test-applications/regressionArea/pom.xml =================================================================== --- branches/enterprise/3.3.X/test-applications/regressionArea/pom.xml 2010-04-30 18:59:59 UTC (rev 16861) +++ branches/enterprise/3.3.X/test-applications/regressionArea/pom.xml 2010-04-30 19:07:26 UTC (rev 16862) @@ -12,50 +12,16 @@ <version>3.3.1.SP1-SNAPSHOT</version> <name>Regresion Area:Seam Application</name> <repositories> + <repository> <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> - <repository> - <id>openqa</id> - <name>OpenQA Repository</name> - <url>http://archiva.openqa.org/repository/releases</url> - <layout>default</layout> - <snapshots> - <enabled>false</enabled> - </snapshots> - <releases> - <enabled>true</enabled> - </releases> - </repository> - <repository> - <id>openqa-snapshots</id> - <name>OpenQA Snapshots Repository</name> - <url>http://archiva.openqa.org/repository/snapshots</url> - <layout>default</layout> - <snapshots> - <enabled>true</enabled> - </snapshots> - <releases> - <enabled>false</enabled> - </releases> - </repository> </repositories> <properties> <contextroot>regressionArea</contextroot> Modified: branches/enterprise/3.3.X/test-applications/regressionArea/regressionArea-ejb/pom.xml =================================================================== --- branches/enterprise/3.3.X/test-applications/regressionArea/regressionArea-ejb/pom.xml 2010-04-30 18:59:59 UTC (rev 16861) +++ branches/enterprise/3.3.X/test-applications/regressionArea/regressionArea-ejb/pom.xml 2010-04-30 19:07:26 UTC (rev 16862) @@ -146,17 +146,4 @@ </plugin> </plugins> </build> - - <!--pluginRepositories> - <pluginRepository> - <id>exadel-repository</id> - <name>Exadel Maven Repository Manager</name> - <url>http://maven.eltegra.by:8099/repository</url> - </pluginRepository> - <pluginRepository> - <id>eltegra-maven-proxy</id> - <name>Exadel Maven Repository Manager</name> - <url>http://maven.eltegra.by:8099/repository</url> - </pluginRepository> - </pluginRepositories--> </project> Modified: branches/enterprise/3.3.X/test-applications/richfaces-docs/pom.xml =================================================================== --- branches/enterprise/3.3.X/test-applications/richfaces-docs/pom.xml 2010-04-30 18:59:59 UTC (rev 16861) +++ branches/enterprise/3.3.X/test-applications/richfaces-docs/pom.xml 2010-04-30 19:07:26 UTC (rev 16862) @@ -17,28 +17,18 @@ </properties> <repositories> - <repository> - <id>snapshots.jboss.org</id> - <name>Snapshot Jboss Repository for Maven</name> - <url>http://snapshots.jboss.org/maven2/</url> - </repository> <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> Modified: branches/enterprise/3.3.X/test-applications/seamApp/pom.xml =================================================================== --- branches/enterprise/3.3.X/test-applications/seamApp/pom.xml 2010-04-30 18:59:59 UTC (rev 16861) +++ branches/enterprise/3.3.X/test-applications/seamApp/pom.xml 2010-04-30 19:07:26 UTC (rev 16862) @@ -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/enterprise/3.3.X/test-applications/seleniumTest/pom.xml =================================================================== --- branches/enterprise/3.3.X/test-applications/seleniumTest/pom.xml 2010-04-30 18:59:59 UTC (rev 16861) +++ branches/enterprise/3.3.X/test-applications/seleniumTest/pom.xml 2010-04-30 19:07:26 UTC (rev 16862) @@ -17,36 +17,6 @@ <properties> <http.port>8085</http.port> </properties> - <repositories> - <repository> - <id>openqa</id> - <name>OpenQA Repository</name> - <url>http://archiva.openqa.org/repository/releases</url> - <layout>default</layout> - <snapshots> - <enabled>false</enabled> - </snapshots> - <releases> - <enabled>true</enabled> - </releases> - </repository> - <repository> - <id>openqa-snapshots</id> - <name>OpenQA Snapshots Repository</name> - <url>http://archiva.openqa.org/repository/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/enterprise/3.3.X/ui/pom.xml =================================================================== --- branches/enterprise/3.3.X/ui/pom.xml 2010-04-30 18:59:59 UTC (rev 16861) +++ branches/enterprise/3.3.X/ui/pom.xml 2010-04-30 19:07:26 UTC (rev 16862) @@ -155,7 +155,7 @@ <dependency> <groupId>javax.el</groupId> <artifactId>el-api</artifactId> - <version>1.0</version> + <version>2.2</version> <scope>provided</scope> </dependency> <dependency> @@ -179,7 +179,7 @@ <dependency> <groupId>javax.servlet</groupId> <artifactId>jstl</artifactId> - <version>1.1.2</version> + <version>1.2</version> <scope>provided</scope> </dependency> <dependency>