[webbeans-commits] Webbeans SVN: r3743 - in ri/branches/1.0.0.PREVIEW4: api and 11 other directories.

Author: rogerk Date: 2009-09-22 13:38:51 -0400 (Tue, 22 Sep 2009) New Revision: 3743 Modified: ri/branches/1.0.0.PREVIEW4/api/pom.xml ri/branches/1.0.0.PREVIEW4/core-api/pom.xml ri/branches/1.0.0.PREVIEW4/embedded-tck-runner/pom.xml ri/branches/1.0.0.PREVIEW4/impl/pom.xml ri/branches/1.0.0.PREVIEW4/jboss-tck-runner/pom.xml ri/branches/1.0.0.PREVIEW4/logging/pom.xml ri/branches/1.0.0.PREVIEW4/osgi-bundle/pom.xml ri/branches/1.0.0.PREVIEW4/parent/pom.xml ri/branches/1.0.0.PREVIEW4/pom.xml ri/branches/1.0.0.PREVIEW4/porting-package/pom.xml ri/branches/1.0.0.PREVIEW4/spi/pom.xml ri/branches/1.0.0.PREVIEW4/tests/pom.xml ri/branches/1.0.0.PREVIEW4/version-matrix/pom.xml Log: 1.0.0.PREVIEW4 staging branch Modified: ri/branches/1.0.0.PREVIEW4/api/pom.xml =================================================================== --- ri/branches/1.0.0.PREVIEW4/api/pom.xml 2009-09-22 16:48:45 UTC (rev 3742) +++ ri/branches/1.0.0.PREVIEW4/api/pom.xml 2009-09-22 17:38:51 UTC (rev 3743) @@ -4,12 +4,12 @@ <parent> <groupId>org.jboss.webbeans</groupId> <artifactId>webbeans-parent</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0.PREVIEW4</version> </parent> <groupId>org.jboss.webbeans</groupId> <artifactId>jsr299-api</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0.PREVIEW4</version> <packaging>jar</packaging> <name>JSR-299 API</name> <url>http://www.seamframework.org/WebBeans</url> Modified: ri/branches/1.0.0.PREVIEW4/core-api/pom.xml =================================================================== --- ri/branches/1.0.0.PREVIEW4/core-api/pom.xml 2009-09-22 16:48:45 UTC (rev 3742) +++ ri/branches/1.0.0.PREVIEW4/core-api/pom.xml 2009-09-22 17:38:51 UTC (rev 3743) @@ -2,12 +2,12 @@ <parent> <artifactId>webbeans-parent</artifactId> <groupId>org.jboss.webbeans</groupId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0.PREVIEW4</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.webbeans</groupId> <artifactId>webbeans-api</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0.PREVIEW4</version> <name>Web Beans Core API</name> <dependencies> Modified: ri/branches/1.0.0.PREVIEW4/embedded-tck-runner/pom.xml =================================================================== --- ri/branches/1.0.0.PREVIEW4/embedded-tck-runner/pom.xml 2009-09-22 16:48:45 UTC (rev 3742) +++ ri/branches/1.0.0.PREVIEW4/embedded-tck-runner/pom.xml 2009-09-22 17:38:51 UTC (rev 3743) @@ -2,7 +2,7 @@ <parent> <artifactId>webbeans-parent</artifactId> <groupId>org.jboss.webbeans</groupId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0.PREVIEW4</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.webbeans</groupId> Modified: ri/branches/1.0.0.PREVIEW4/impl/pom.xml =================================================================== --- ri/branches/1.0.0.PREVIEW4/impl/pom.xml 2009-09-22 16:48:45 UTC (rev 3742) +++ ri/branches/1.0.0.PREVIEW4/impl/pom.xml 2009-09-22 17:38:51 UTC (rev 3743) @@ -2,12 +2,12 @@ <parent> <artifactId>webbeans-parent</artifactId> <groupId>org.jboss.webbeans</groupId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0.PREVIEW4</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.webbeans</groupId> <artifactId>webbeans-core</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0.PREVIEW4</version> <name>Web Beans Core</name> <dependencies> Modified: ri/branches/1.0.0.PREVIEW4/jboss-tck-runner/pom.xml =================================================================== --- ri/branches/1.0.0.PREVIEW4/jboss-tck-runner/pom.xml 2009-09-22 16:48:45 UTC (rev 3742) +++ ri/branches/1.0.0.PREVIEW4/jboss-tck-runner/pom.xml 2009-09-22 17:38:51 UTC (rev 3743) @@ -2,7 +2,7 @@ <parent> <artifactId>webbeans-parent</artifactId> <groupId>org.jboss.webbeans</groupId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0.PREVIEW4</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.webbeans</groupId> Modified: ri/branches/1.0.0.PREVIEW4/logging/pom.xml =================================================================== --- ri/branches/1.0.0.PREVIEW4/logging/pom.xml 2009-09-22 16:48:45 UTC (rev 3742) +++ ri/branches/1.0.0.PREVIEW4/logging/pom.xml 2009-09-22 17:38:51 UTC (rev 3743) @@ -2,12 +2,12 @@ <parent> <artifactId>webbeans-parent</artifactId> <groupId>org.jboss.webbeans</groupId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0.PREVIEW4</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.webbeans</groupId> <artifactId>webbeans-logging</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0.PREVIEW4</version> <name>Web Beans Logging</name> <dependencies> Modified: ri/branches/1.0.0.PREVIEW4/osgi-bundle/pom.xml =================================================================== --- ri/branches/1.0.0.PREVIEW4/osgi-bundle/pom.xml 2009-09-22 16:48:45 UTC (rev 3742) +++ ri/branches/1.0.0.PREVIEW4/osgi-bundle/pom.xml 2009-09-22 17:38:51 UTC (rev 3743) @@ -21,7 +21,7 @@ <parent> <artifactId>webbeans-parent</artifactId> <groupId>org.jboss.webbeans</groupId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0.PREVIEW4</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -60,8 +60,8 @@ <Embed-Dependency>*; scope=compile; inline=true</Embed-Dependency> <_exportcontents>javax.event; javax.context; javax.webbeans; javax.decorator; javax.inject; javax.enterprise.*; version=${osgi.version}, - org.jboss.webbeans.ejb; org.jboss.webbeans.bean.proxy; org.jboss.webbeans.*.api.*; org.jboss.webbeans.*.spi.*; org.jboss.webbeans.conversation; org.jboss.webbeans; org.jboss.webbeans.bootstrap; org.jboss.webbeans.introspector; org.jboss.webbeans.servlet; version=${osgi.version}, - org.jboss.webbeans.el; include:="WebBeansELResolver"; version=${osgi.version}, + org.jboss.webbeans.context; org.jboss.webbeans.ejb; org.jboss.webbeans.bean.proxy; org.jboss.webbeans.*.api.*; org.jboss.webbeans.*.spi.*; org.jboss.webbeans.conversation; org.jboss.webbeans; org.jboss.webbeans.bootstrap; org.jboss.webbeans.introspector; org.jboss.webbeans.servlet; version=${osgi.version}, + org.jboss.webbeans.el; version=${osgi.version}, org.jboss.webbeans.jsf; include:="WebBeansPhaseListener"; version=${osgi.version}, javassist.util.proxy;version="3.8.1.GA" </_exportcontents> @@ -129,7 +129,13 @@ <groupId>com.google.collections</groupId> <artifactId>google-collections</artifactId> </dependency> + <dependency> + <groupId>javax.inject</groupId> + <artifactId>inject-api</artifactId> + <version>1.0.0-PRD</version> + </dependency> + </dependencies> </project> Modified: ri/branches/1.0.0.PREVIEW4/parent/pom.xml =================================================================== --- ri/branches/1.0.0.PREVIEW4/parent/pom.xml 2009-09-22 16:48:45 UTC (rev 3742) +++ ri/branches/1.0.0.PREVIEW4/parent/pom.xml 2009-09-22 17:38:51 UTC (rev 3743) @@ -3,12 +3,12 @@ <groupId>org.jboss.webbeans</groupId> <artifactId>webbeans-parent</artifactId> <packaging>pom</packaging> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0.PREVIEW4</version> <parent> <groupId>org.jboss.webbeans</groupId> <artifactId>webbeans-version-matrix</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0.PREVIEW4</version> </parent> <name>Web Beans, the reference implementation of JSR-299</name> Modified: ri/branches/1.0.0.PREVIEW4/pom.xml =================================================================== --- ri/branches/1.0.0.PREVIEW4/pom.xml 2009-09-22 16:48:45 UTC (rev 3742) +++ ri/branches/1.0.0.PREVIEW4/pom.xml 2009-09-22 17:38:51 UTC (rev 3743) @@ -3,7 +3,7 @@ <groupId>org.jboss.webbeans</groupId> <artifactId>webbeans-build-aggregator</artifactId> <packaging>pom</packaging> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0.PREVIEW4</version> <name>Web Beans Build Aggregator</name> <url>http://www.seamframework.org/WebBeans</url> @@ -56,9 +56,9 @@ <module>core-api</module> <module>logging</module> <module>impl</module> - <module>tests</module> - <module>porting-package</module> - <module>jboss-tck-runner</module> +<!-- <module>tests</module> --> +<!-- <module>porting-package</module> --> +<!-- <module>jboss-tck-runner</module> --> <module>osgi-bundle</module> </modules> </profile> Modified: ri/branches/1.0.0.PREVIEW4/porting-package/pom.xml =================================================================== --- ri/branches/1.0.0.PREVIEW4/porting-package/pom.xml 2009-09-22 16:48:45 UTC (rev 3742) +++ ri/branches/1.0.0.PREVIEW4/porting-package/pom.xml 2009-09-22 17:38:51 UTC (rev 3743) @@ -2,12 +2,12 @@ <parent> <artifactId>webbeans-parent</artifactId> <groupId>org.jboss.webbeans</groupId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0.PREVIEW4</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.webbeans</groupId> <artifactId>webbeans-porting-package</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0.PREVIEW4</version> <name>Web Beans Porting Package for JSR-299 TCK</name> <dependencies> Modified: ri/branches/1.0.0.PREVIEW4/spi/pom.xml =================================================================== --- ri/branches/1.0.0.PREVIEW4/spi/pom.xml 2009-09-22 16:48:45 UTC (rev 3742) +++ ri/branches/1.0.0.PREVIEW4/spi/pom.xml 2009-09-22 17:38:51 UTC (rev 3743) @@ -2,12 +2,12 @@ <parent> <artifactId>webbeans-parent</artifactId> <groupId>org.jboss.webbeans</groupId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0.PREVIEW4</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.webbeans</groupId> <artifactId>webbeans-spi</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0.PREVIEW4</version> <name>Web Beans Service Provider Interfaces</name> <dependencies> Modified: ri/branches/1.0.0.PREVIEW4/tests/pom.xml =================================================================== --- ri/branches/1.0.0.PREVIEW4/tests/pom.xml 2009-09-22 16:48:45 UTC (rev 3742) +++ ri/branches/1.0.0.PREVIEW4/tests/pom.xml 2009-09-22 17:38:51 UTC (rev 3743) @@ -2,12 +2,12 @@ <parent> <artifactId>webbeans-parent</artifactId> <groupId>org.jboss.webbeans</groupId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0.PREVIEW4</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.webbeans</groupId> <artifactId>webbeans-core-test</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0.PREVIEW4</version> <name>Web Beans Core Tests</name> <dependencies> Modified: ri/branches/1.0.0.PREVIEW4/version-matrix/pom.xml =================================================================== --- ri/branches/1.0.0.PREVIEW4/version-matrix/pom.xml 2009-09-22 16:48:45 UTC (rev 3742) +++ ri/branches/1.0.0.PREVIEW4/version-matrix/pom.xml 2009-09-22 17:38:51 UTC (rev 3743) @@ -3,7 +3,7 @@ <groupId>org.jboss.webbeans</groupId> <artifactId>webbeans-version-matrix</artifactId> <packaging>pom</packaging> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0.PREVIEW4</version> <name>Web Beans Version Matrix</name> <url>http://www.seamframework.org/WebBeans</url> @@ -48,10 +48,10 @@ <properties> <jsr299.tck.version>1.0.0-SNAPSHOT</jsr299.tck.version> - <webbeans.version>1.0.0-SNAPSHOT</webbeans.version> - <webbeans.servlet.version>1.0.0-SNAPSHOT</webbeans.servlet.version> - <webbeans.se.version>1.0.0-SNAPSHOT</webbeans.se.version> - <jboss.test.harness.version>1.0.0-SNAPSHOT</jboss.test.harness.version> + <webbeans.version>1.0.0.PREVIEW4</webbeans.version> + <webbeans.servlet.version>1.0.0.CR1</webbeans.servlet.version> + <webbeans.se.version>1.0.0.PREVIEW4</webbeans.se.version> + <jboss.test.harness.version>1.0.0.PREVIEW4</jboss.test.harness.version> </properties> <dependencyManagement> @@ -128,7 +128,7 @@ <groupId>javax.servlet.jsp</groupId> <artifactId>jsp-api</artifactId> <version>2.1</version> - </dependency> + </dependency> <dependency> <groupId>javax.transaction</groupId> @@ -276,11 +276,13 @@ <version>${webbeans.version}</version> </dependency> +<!-- <dependency> <groupId>org.jboss.webbeans</groupId> <artifactId>webbeans-core-test</artifactId> <version>${webbeans.version}</version> </dependency> +--> <dependency> <groupId>org.jboss.webbeans</groupId> @@ -307,11 +309,13 @@ <version>${webbeans.servlet.version}</version> </dependency> +<!-- <dependency> <groupId>org.jboss.jsr299.tck</groupId> <artifactId>jsr299-tck-api</artifactId> <version>${jsr299.tck.version}</version> </dependency> +--> <dependency> <groupId>org.jboss.jsr299.tck</groupId> @@ -339,12 +343,6 @@ <dependency> <groupId>org.jboss.test-harness</groupId> - <artifactId>jboss-test-harness-jboss-embedded</artifactId> - <version>${jboss.test.harness.version}</version> - </dependency> - - <dependency> - <groupId>org.jboss.test-harness</groupId> <artifactId>jboss-test-harness-tomcat</artifactId> <version>${jboss.test.harness.version}</version> </dependency> @@ -352,7 +350,7 @@ <dependency> <groupId>org.apache.tomcat</groupId> <artifactId>catalina</artifactId> - <version>6.0.20</version> + <version>6.0.18</version> </dependency> <dependency> @@ -553,8 +551,8 @@ </distributionManagement> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/webbeans/ri/trunk/ve... - <developerConnection>scm:svn:https://svn.jboss.org/repos/webbeans/ri/tr... + <connection>scm:svn:http://anonsvn.jboss.org/repos/webbeans/ri/tags/1.0... + <developerConnection>scm:svn:https://svn.jboss.org/repos/webbeans/ri/ta... <url>http://fisheye.jboss.org/browse/WebBeans/ri</url> </scm>