Author: pete.muir(a)jboss.org Date: 2010-07-14 18:54:19 -0400 (Wed, 14 Jul 2010) New Revision: 6652 Removed: api/trunk/cdi/ Modified: api/trunk/bom/pom.xml api/trunk/parent/pom.xml api/trunk/pom.xml api/trunk/weld-spi/pom.xml api/trunk/weld/pom.xml Log: remove CDI API from Weld APIs, and bump version to 1.1 Modified: api/trunk/bom/pom.xml =================================================================== --- api/trunk/bom/pom.xml 2010-07-14 22:44:37 UTC (rev 6651) +++ api/trunk/bom/pom.xml 2010-07-14 22:54:19 UTC (rev 6652) @@ -3,7 +3,7 @@ <groupId>org.jboss.weld</groupId> <artifactId>weld-api-bom</artifactId> <packaging>pom</packaging> - <version>1.0-SNAPSHOT</version> + <version>1.1-SNAPSHOT</version> <parent> <groupId>org.jboss.weld</groupId> @@ -11,11 +11,11 @@ <version>12</version> </parent> - <name>Weld and CDI APIs BOM</name> + <name>Weld APIs BOM</name> <!-- Minimal project metadata, for more see parent/pom.xml --> - <description>Weld and CDI APIs "bill of materials" which can be imported by any project using the Weld implementation of CDI. It provides dependency management for the developer APIs and SPIs, as well as container integrator SPIs</description> + <description>Weld APIs "bill of materials" which can be imported by any project using the Weld implementation of CDI. It provides dependency management for the developer APIs and SPIs, as well as container integrator SPIs</description> <url>http://www.seamframework.org/Weld</url> <licenses> @@ -73,6 +73,7 @@ <properties> <atinject.api.version>1</atinject.api.version> + <cdi.api.version>1.0-SP1</cdi.api.version> <ejb.api.version>3.1.0</ejb.api.version> <jsr250.api.version>1.0</jsr250.api.version> <jpa.api.version>1.0</jpa.api.version> @@ -195,7 +196,7 @@ <dependency> <groupId>javax.enterprise</groupId> <artifactId>cdi-api</artifactId> - <version>${project.version}</version> + <version>${cdi.api.version}</version> </dependency> <dependency> Modified: api/trunk/parent/pom.xml =================================================================== --- api/trunk/parent/pom.xml 2010-07-14 22:44:37 UTC (rev 6651) +++ api/trunk/parent/pom.xml 2010-07-14 22:54:19 UTC (rev 6652) @@ -3,21 +3,21 @@ <parent> <groupId>org.jboss.weld</groupId> <artifactId>weld-api-bom</artifactId> - <version>1.0-SNAPSHOT</version> + <version>1.1-SNAPSHOT</version> <relativePath>../bom/pom.xml</relativePath> </parent> <groupId>org.jboss.weld</groupId> <artifactId>weld-api-parent</artifactId> <packaging>pom</packaging> - <name>Weld and CDI APIs Parent</name> + <name>Weld APIs Parent</name> <!-- Full project metadata --> <url>http://www.seamframework.org/Weld</url> <description> - APIs for CDI and Weld, the reference implementation of JSR 299: Contexts and Dependency Injection for Java EE + APIs for Weld, the reference implementation of JSR 299: Contexts and Dependency Injection for Java EE </description> <ciManagement> Modified: api/trunk/pom.xml =================================================================== --- api/trunk/pom.xml 2010-07-14 22:44:37 UTC (rev 6651) +++ api/trunk/pom.xml 2010-07-14 22:54:19 UTC (rev 6652) @@ -3,7 +3,7 @@ <groupId>org.jboss.weld</groupId> <artifactId>weld-api-build-aggregator</artifactId> <packaging>pom</packaging> - <version>1.0-SNAPSHOT</version> + <version>1.1-SNAPSHOT</version> <parent> <groupId>org.jboss.weld</groupId> @@ -11,10 +11,10 @@ <version>12</version> </parent> - <name>Weld and CDI APIs Build Aggregator</name> + <name>Weld APIs Build Aggregator</name> <!-- Minimal project metadata, for more see parent/pom.xml --> - <description>The build aggregator for Weld and the CDI APIs, which takes care of calling the modules which make up Weld and CDI APIs</description> + <description>The build aggregator for Weld APIs, which takes care of calling the modules which make up Weld APIs</description> <!-- SCM and Distribution management --> <scm> @@ -26,7 +26,6 @@ <modules> <module>bom</module> <module>parent</module> - <module>cdi</module> <module>weld</module> <module>weld-spi</module> </modules> Modified: api/trunk/weld/pom.xml =================================================================== --- api/trunk/weld/pom.xml 2010-07-14 22:44:37 UTC (rev 6651) +++ api/trunk/weld/pom.xml 2010-07-14 22:54:19 UTC (rev 6652) @@ -2,7 +2,7 @@ <parent> <artifactId>weld-api-parent</artifactId> <groupId>org.jboss.weld</groupId> - <version>1.0-SNAPSHOT</version> + <version>1.1-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: api/trunk/weld-spi/pom.xml =================================================================== --- api/trunk/weld-spi/pom.xml 2010-07-14 22:44:37 UTC (rev 6651) +++ api/trunk/weld-spi/pom.xml 2010-07-14 22:54:19 UTC (rev 6652) @@ -2,7 +2,7 @@ <parent> <artifactId>weld-api-parent</artifactId> <groupId>org.jboss.weld</groupId> - <version>1.0-SNAPSHOT</version> + <version>1.1-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion>