4:07 p.m.
Author: pete.muir(a)jboss.org
Date: 2010-06-02 17:07:31 -0400 (Wed, 02 Jun 2010)
New Revision: 12998
Modified:
modules/xml/trunk/examples/princess-rescue/pom.xml
modules/xml/trunk/impl/pom.xml
modules/xml/trunk/pom.xml
Log:
new build
Modified: modules/xml/trunk/examples/princess-rescue/pom.xml
===================================================================
--- modules/xml/trunk/examples/princess-rescue/pom.xml 2010-06-02 20:14:19 UTC (rev
12997)
+++ modules/xml/trunk/examples/princess-rescue/pom.xml 2010-06-02 21:07:31 UTC (rev
12998)
@@ -11,7 +11,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.seam.xml</groupId>
- <artifactId>princess-rescue</artifactId>
+ <artifactId>seam-xml-examples-princess-rescue</artifactId>
<packaging>war</packaging>
<name>Seam XML Config Example: Princess Rescue</name>
<version>3.0.0-SNAPSHOT</version>
@@ -46,7 +46,7 @@
<dependency>
<groupId>org.jboss.seam.xml</groupId>
<artifactId>seam-xml-config</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
@@ -85,32 +85,22 @@
<!-- Jetty/Tomcat-specific scopes and artifacts -->
- <!-- JSF 2.0 -->
+ <!-- Mojarra -->
<dependency>
- <groupId>javax.faces</groupId>
+ <groupId>com.sun.faces</groupId>
<artifactId>jsf-impl</artifactId>
- <version>2.0.1-FCS</version>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <version>2.0.1-FCS</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
<groupId>org.jboss.weld.servlet</groupId>
<artifactId>weld-servlet</artifactId>
- <version>1.0.1-Final</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.glassfish.web</groupId>
<artifactId>el-impl</artifactId>
- <version>2.1.2-b04</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
Modified: modules/xml/trunk/impl/pom.xml
===================================================================
--- modules/xml/trunk/impl/pom.xml 2010-06-02 20:14:19 UTC (rev 12997)
+++ modules/xml/trunk/impl/pom.xml 2010-06-02 21:07:31 UTC (rev 12998)
@@ -15,22 +15,7 @@
<packaging>jar</packaging>
<name>Seam XML Config Module</name>
- <repositories>
- <repository>
- <id>oss.sonatype.org/jboss-snapshots</id>
- <name>JBoss (Nexus) Snapshots Repository</name>
-
<url>http://oss.sonatype.org/content/repositories/jboss-snapshots</u...
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- </snapshots>
- </repository>
- </repositories>
-
<dependencies>
<dependency>
<groupId>javax.enterprise</groupId>
@@ -38,6 +23,11 @@
</dependency>
<dependency>
+ <groupId>org.jboss.spec.javax.interceptor</groupId>
+ <artifactId>jboss-interceptors-api_1.1_spec</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-core</artifactId>
<scope>test</scope>
@@ -64,7 +54,6 @@
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<scope>test</scope>
- <version>5.10</version>
<classifier>jdk15</classifier>
</dependency>
</dependencies>
Modified: modules/xml/trunk/pom.xml
===================================================================
--- modules/xml/trunk/pom.xml 2010-06-02 20:14:19 UTC (rev 12997)
+++ modules/xml/trunk/pom.xml 2010-06-02 21:07:31 UTC (rev 12998)
@@ -3,9 +3,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>weld-parent</artifactId>
- <groupId>org.jboss.weld</groupId>
- <version>10</version>
+ <artifactId>seam-parent</artifactId>
+ <groupId>org.jboss.seam</groupId>
+ <version>1</version>
</parent>
<groupId>org.jboss.seam.xml</groupId>
@@ -14,68 +14,36 @@
<version>3.0.0-SNAPSHOT</version>
<name>Seam XML Config Parent</name>
+ <properties>
+ <seam.version>3.0.0.b01</seam.version>
+ </properties>
+
<modules>
<module>impl</module>
<module>docs</module>
<module>examples/princess-rescue</module>
</modules>
- <build>
- <finalName>seam-xml-config-${pom.version}</finalName>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- <version>2.2</version>
- <scope>provided</scope>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>seam</artifactId>
+ <version>${seam.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
</dependency>
+
+ <!-- Override submodule versions from org.jboss.seam:seam -->
<dependency>
- <groupId>javax.enterprise</groupId>
- <artifactId>cdi-api</artifactId>
- <version>1.0-SP1</version>
+ <groupId>org.jboss.seam.xml</groupId>
+ <artifactId>seam-xml-config</artifactId>
+ <version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-extensions</artifactId>
- <version>1.0.0.Alpha2</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-core</artifactId>
- <version>1.0.1-Final</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-se</artifactId>
- <version>1.0.1-Final</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.5.10</version>
- </dependency>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>5.10</version>
- <classifier>jdk15</classifier>
- </dependency>
+
</dependencies>
</dependencyManagement>
+
<scm>
<connection>scm:svn:http://anonsvn.jboss.org/repos/seam/modules/xml/tru...
<developerConnection>scm:svn:https://svn.jboss.org/repos/seam/modules/x...