Author: pete.muir(a)jboss.org Date: 2010-06-02 10:43:57 -0400 (Wed, 02 Jun 2010) New Revision: 12957 Modified: modules/faces/trunk/api/pom.xml modules/faces/trunk/dist/pom.xml modules/faces/trunk/examples/short-ly/pom.xml modules/faces/trunk/impl/pom.xml modules/faces/trunk/pom.xml Log: use new build Modified: modules/faces/trunk/api/pom.xml =================================================================== --- modules/faces/trunk/api/pom.xml 2010-06-02 14:43:09 UTC (rev 12956) +++ modules/faces/trunk/api/pom.xml 2010-06-02 14:43:57 UTC (rev 12957) @@ -5,6 +5,7 @@ <artifactId>seam-faces-parent</artifactId> <groupId>org.jboss.seam.faces</groupId> <version>3.0.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> </parent> <artifactId>seam-faces-api</artifactId> @@ -12,23 +13,6 @@ <packaging>jar</packaging> <name>Seam Faces Module API</name> - - <!-- Snapshots repo to get parent --> - <repositories> - <repository> - <id>oss.sonatype.org/jboss-snapshots</id> - <name>JBoss (Nexus) Snapshots Repository</name> - <url>http://oss.sonatype.org/content/repositories/jboss-snapshots - </url> - <releases> - <enabled>false</enabled> - </releases> - <snapshots> - <enabled>true</enabled> - <updatePolicy>never</updatePolicy> - </snapshots> - </repository> - </repositories> <profiles> <profile> Modified: modules/faces/trunk/dist/pom.xml =================================================================== --- modules/faces/trunk/dist/pom.xml 2010-06-02 14:43:09 UTC (rev 12956) +++ modules/faces/trunk/dist/pom.xml 2010-06-02 14:43:57 UTC (rev 12957) @@ -15,24 +15,6 @@ <description>Builds a Seam Faces release distribution</description> <packaging>pom</packaging> - <!-- TODO Remove --> - <!-- Snapshots repo to get parent --> - <repositories> - <repository> - <id>oss.sonatype.org/jboss-snapshots</id> - <name>JBoss (Nexus) Snapshots Repository</name> - <url>http://oss.sonatype.org/content/repositories/jboss-snapshots - </url> - <releases> - <enabled>false</enabled> - </releases> - <snapshots> - <enabled>true</enabled> - <updatePolicy>never</updatePolicy> - </snapshots> - </repository> - </repositories> - <properties> <maven.deploy.skip>true</maven.deploy.skip> </properties> @@ -42,6 +24,7 @@ <groupId>org.jboss.seam.faces</groupId> <artifactId>seam-faces-api</artifactId> <version>${project.version}</version> + <scope>provided</scope> </dependency> <dependency> @@ -49,6 +32,7 @@ <artifactId>seam-faces-api</artifactId> <version>${project.version}</version> <classifier>sources</classifier> + <scope>provided</scope> </dependency> <dependency> @@ -56,12 +40,14 @@ <artifactId>seam-faces-api</artifactId> <version>${project.version}</version> <classifier>javadoc</classifier> + <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.seam.faces</groupId> <artifactId>seam-faces</artifactId> <version>${project.version}</version> + <scope>provided</scope> </dependency> <dependency> @@ -69,6 +55,7 @@ <artifactId>seam-faces</artifactId> <version>${project.version}</version> <classifier>sources</classifier> + <scope>provided</scope> </dependency> <dependency> @@ -76,20 +63,23 @@ <artifactId>seam-faces</artifactId> <version>${project.version}</version> <classifier>javadoc</classifier> + <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.seam.faces</groupId> <artifactId>seam-faces-reference-guide</artifactId> <version>${project.version}</version> - <type>war</type> + <type>war</type> + <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.seam.faces</groupId> <artifactId>seam-faces-examples-short-ly</artifactId> <version>${project.version}</version> - <type>zip</type> + <type>zip</type> + <scope>provided</scope> </dependency> </dependencies> Modified: modules/faces/trunk/examples/short-ly/pom.xml =================================================================== --- modules/faces/trunk/examples/short-ly/pom.xml 2010-06-02 14:43:09 UTC (rev 12956) +++ modules/faces/trunk/examples/short-ly/pom.xml 2010-06-02 14:43:57 UTC (rev 12957) @@ -6,6 +6,7 @@ <groupId>org.jboss.seam.faces</groupId> <artifactId>seam-faces-parent</artifactId> <version>3.0.0-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> </parent> <groupId>org.jboss.seam.faces</groupId> @@ -16,24 +17,6 @@ <url>http://seamframework.org</url> - <!-- TODO Remove --> - <!-- Snapshots repo to get parent --> - <repositories> - <repository> - <id>oss.sonatype.org/jboss-snapshots</id> - <name>JBoss (Nexus) Snapshots Repository</name> - <url>http://oss.sonatype.org/content/repositories/jboss-snapshots - </url> - <releases> - <enabled>false</enabled> - </releases> - <snapshots> - <enabled>true</enabled> - <updatePolicy>never</updatePolicy> - </snapshots> - </repository> - </repositories> - <properties> <hibernate.version>3.5.1-Final</hibernate.version> </properties> @@ -42,9 +25,10 @@ <dependency> <groupId>org.jboss.seam.faces</groupId> <artifactId>seam-faces</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>${project.version}</version> </dependency> + <!-- TODO Replace this with the JBoss Java EE BOM stuff, not sure exactly what is needed (PLM) --> <dependency> <groupId>javax</groupId> <artifactId>javaee-web-api</artifactId> @@ -55,40 +39,36 @@ <dependency> <groupId>com.ocpsoft</groupId> <artifactId>ocpsoft-pretty-faces</artifactId> - <version>2.0.4</version> </dependency> <dependency> <groupId>com.ocpsoft</groupId> <artifactId>ocpsoft-pretty-time</artifactId> - <version>1.0.5</version> </dependency> <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> - <version>${hibernate.version}</version> </dependency> + <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-annotations</artifactId> - <version>${hibernate.version}</version> </dependency> + <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-entitymanager</artifactId> - <version>${hibernate.version}</version> </dependency> + <dependency> <groupId>org.hsqldb</groupId> <artifactId>hsqldb</artifactId> - <version>1.8.0.10</version> </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.8.1</version> <scope>test</scope> </dependency> </dependencies> Modified: modules/faces/trunk/impl/pom.xml =================================================================== --- modules/faces/trunk/impl/pom.xml 2010-06-02 14:43:09 UTC (rev 12956) +++ modules/faces/trunk/impl/pom.xml 2010-06-02 14:43:57 UTC (rev 12957) @@ -6,6 +6,7 @@ <artifactId>seam-faces-parent</artifactId> <groupId>org.jboss.seam.faces</groupId> <version>3.0.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> </parent> <artifactId>seam-faces</artifactId> @@ -14,29 +15,13 @@ <packaging>jar</packaging> <name>Seam Faces Module Core Implementation</name> - <!-- Snapshots repo to get parent --> - <repositories> - <repository> - <id>oss.sonatype.org/jboss-snapshots</id> - <name>JBoss (Nexus) Snapshots Repository</name> - <url>http://oss.sonatype.org/content/repositories/jboss-snapshots - </url> - <releases> - <enabled>false</enabled> - </releases> - <snapshots> - <enabled>true</enabled> - <updatePolicy>never</updatePolicy> - </snapshots> - </repository> - </repositories> - <dependencies> <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <scope>provided</scope> - </dependency> + <!-- Required until the Servlet 3.0 API can be resolved in Central --> + <groupId>org.jboss.spec.javax.servlet</groupId> + <artifactId>jboss-servlet-api_3.0_spec</artifactId> + <scope>provided</scope> + </dependency> <dependency> <artifactId>seam-faces-api</artifactId> <groupId>org.jboss.seam.faces</groupId> Modified: modules/faces/trunk/pom.xml =================================================================== --- modules/faces/trunk/pom.xml 2010-06-02 14:43:09 UTC (rev 12956) +++ modules/faces/trunk/pom.xml 2010-06-02 14:43:57 UTC (rev 12957) @@ -3,9 +3,9 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-parent</artifactId> - <version>11-SNAPSHOT</version> + <groupId>org.jboss.seam</groupId> + <artifactId>seam-parent</artifactId> + <version>1</version> </parent> <artifactId>seam-faces-parent</artifactId> @@ -45,48 +45,53 @@ </modules> <properties> + <seam.version>3.0.0.b01</seam.version> + <!-- Seam i8ln doesn't have a release yet --> <seam.i18n.version>3.0.0-SNAPSHOT</seam.i18n.version> - <weldx.version>1.0.0.Alpha2</weldx.version> - - <arquillian.version>1.0.0.Alpha2</arquillian.version> - <jsfunit.version>1.2.0.Final</jsfunit.version> - <jsfmock.version>1.0.0</jsfmock.version> - <weld.api.version>1.0-SP1</weld.api.version> - <weld.core.version>1.0.1-Final</weld.core.version> - <junit.version>4.8.1</junit.version> - <slf4j.version>1.5.10</slf4j.version> - <emma.maven.plugin.version>1.0-alpha-2</emma.maven.plugin.version> - <emma4it.maven.plugin.version>1.3</emma4it.maven.plugin.version> + <minimum.maven.version>3.0</minimum.maven.version> </properties> <dependencyManagement> <dependencies> + <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-api-bom</artifactId> - <version>${weld.api.version}</version> + <groupId>org.jboss.seam</groupId> + <artifactId>seam</artifactId> + <version>${seam.version}</version> <scope>import</scope> <type>pom</type> </dependency> + + <dependency> + <groupId>org.jboss.seam.international</groupId> + <artifactId>seam-international-api</artifactId> + <version>${seam.i18n.version}</version> + </dependency> + </dependencies> </dependencyManagement> + <!-- TODO Move these to the correct sub-module --> <dependencies> + <dependency> <groupId>org.jboss.seam.international</groupId> <artifactId>seam-international-api</artifactId> - <version>${seam.i18n.version}</version> </dependency> <!-- Environment Dependencies --> <dependency> <!-- This is necessary until a new JSF-API is published to central --> - <groupId>org.apache.myfaces.core</groupId> - <artifactId>myfaces-api</artifactId> - <version>2.0.0</version> + <groupId>javax.faces</groupId> + <artifactId>jsf-api</artifactId> <scope>provided</scope> </dependency> <dependency> + <groupId>org.jboss.spec.javax.interceptor</groupId> + <artifactId>jboss-interceptors-api_1.1_spec</artifactId> + <scope>provided</scope> + </dependency> + <dependency> <groupId>javax.el</groupId> <artifactId>el-api</artifactId> <scope>provided</scope> @@ -109,12 +114,10 @@ <dependency> <groupId>org.jboss.weld</groupId> <artifactId>weld-extensions</artifactId> - <version>${weldx.version}</version> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>${slf4j.version}</version> <scope>provided</scope> </dependency> @@ -122,38 +125,32 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>${junit.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.jboss.arquillian</groupId> <artifactId>arquillian-junit</artifactId> - <version>${arquillian.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.jboss.arquillian.container</groupId> <artifactId>arquillian-weld-embedded</artifactId> - <version>${arquillian.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.jboss.weld</groupId> <artifactId>weld-core</artifactId> - <version>${weld.core.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-simple</artifactId> - <version>${slf4j.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.jboss.test-jsf</groupId> <artifactId>jsf-mock</artifactId> - <version>${jsfmock.version}</version> <scope>test</scope> </dependency> </dependencies> @@ -178,7 +175,6 @@ <dependency> <groupId>org.jboss.arquillian.container</groupId> <artifactId>arquillian-glassfish-embedded-30</artifactId> - <version>${arquillian.version}</version> </dependency> </dependencies> </profile>