Author: pete.muir(a)jboss.org Date: 2009-11-23 08:39:58 -0500 (Mon, 23 Nov 2009) New Revision: 11649 Removed: modules/trunk/persistence/src/main/java/org/ Modified: modules/trunk/beans/pom.xml modules/trunk/persistence/pom.xml modules/trunk/pom.xml modules/trunk/version-matrix/pom.xml Log: make build work, at least for persistence module, clean up persistence module Modified: modules/trunk/beans/pom.xml =================================================================== --- modules/trunk/beans/pom.xml 2009-11-22 18:31:55 UTC (rev 11648) +++ modules/trunk/beans/pom.xml 2009-11-23 13:39:58 UTC (rev 11649) @@ -18,14 +18,14 @@ <dependencies> <dependency> - <groupId>${webbeans.groupId}</groupId> + <groupId>${weld.groupId}</groupId> <artifactId>jsr299-api</artifactId> <scope>provided</scope> </dependency> <dependency> - <groupId>${webbeans.groupId}</groupId> - <artifactId>webbeans-logger</artifactId> + <groupId>${weld.groupId}</groupId> + <artifactId>weld-logger</artifactId> </dependency> </dependencies> Modified: modules/trunk/persistence/pom.xml =================================================================== --- modules/trunk/persistence/pom.xml 2009-11-22 18:31:55 UTC (rev 11648) +++ modules/trunk/persistence/pom.xml 2009-11-23 13:39:58 UTC (rev 11649) @@ -32,20 +32,10 @@ </dependency> <dependency> - <groupId>${seam.groupId}</groupId> - <artifactId>seam-el</artifactId> - </dependency> - - <dependency> - <groupId>${webbeans.groupId}</groupId> - <artifactId>jsr299-api</artifactId> + <groupId>javax.enterprise</groupId> + <artifactId>cdi-api</artifactId> </dependency> - <dependency> - <groupId>${webbeans.groupId}</groupId> - <artifactId>webbeans-logger</artifactId> - </dependency> - </dependencies> </project> Modified: modules/trunk/pom.xml =================================================================== --- modules/trunk/pom.xml 2009-11-22 18:31:55 UTC (rev 11648) +++ modules/trunk/pom.xml 2009-11-23 13:39:58 UTC (rev 11649) @@ -90,7 +90,7 @@ <modules> <!-- declaring version-matrix (our parent) as a module forces it to be built first --> - <module>version-matrix</module> +<!-- <module>version-matrix</module> <module>mock</module> <module>beans</module> <module>resources</module> @@ -99,7 +99,7 @@ <module>web</module> <module>drools</module> <module>security</module> - <module>faces</module> + <module>faces</module>--> </modules> <dependencies> @@ -124,8 +124,8 @@ </dependency> <dependency> - <groupId>${webbeans.groupId}</groupId> - <artifactId>webbeans-core-test</artifactId> + <groupId>${weld.groupId}</groupId> + <artifactId>weld-core-test</artifactId> <scope>test</scope> </dependency> @@ -210,7 +210,7 @@ <artifactId>maven-release-plugin</artifactId> <version>2.0-beta-8</version> <configuration> - <tagBase>https://svn.jboss.org/repos/webbeans/ri/tags</tagBase> + <tagBase>https://svn.jboss.org/repos/weld/ri/tags</tagBase> <autoVersionSubmodules>true</autoVersionSubmodules> </configuration> </plugin> Modified: modules/trunk/version-matrix/pom.xml =================================================================== --- modules/trunk/version-matrix/pom.xml 2009-11-22 18:31:55 UTC (rev 11648) +++ modules/trunk/version-matrix/pom.xml 2009-11-23 13:39:58 UTC (rev 11649) @@ -53,8 +53,8 @@ <properties> <seam.version>3.0.0-SNAPSHOT</seam.version> <seam.groupId>org.jboss.seam</seam.groupId> - <webbeans.version>1.0.0-SNAPSHOT</webbeans.version> - <webbeans.groupId>org.jboss.webbeans</webbeans.groupId> + <weld.version>1.0.0</weld.version> + <weld.groupId>org.jboss.weld</weld.groupId> </properties> <dependencyManagement> @@ -167,39 +167,39 @@ </dependency> <dependency> - <groupId>${webbeans.groupId}</groupId> - <artifactId>jsr299-api</artifactId> - <version>${webbeans.version}</version> + <groupId>javax.enterprise</groupId> + <artifactId>cdi-api</artifactId> + <version>1.0</version> </dependency> <dependency> - <groupId>${webbeans.groupId}</groupId> - <artifactId>webbeans-core</artifactId> - <version>${webbeans.version}</version> + <groupId>${weld.groupId}</groupId> + <artifactId>weld-core</artifactId> + <version>${weld.version}</version> </dependency> <dependency> - <groupId>${webbeans.groupId}</groupId> - <artifactId>webbeans-core-test</artifactId> - <version>${webbeans.version}</version> + <groupId>${weld.groupId}</groupId> + <artifactId>weld-core-test</artifactId> + <version>${weld.version}</version> </dependency> <dependency> - <groupId>${webbeans.groupId}</groupId> - <artifactId>webbeans-logger</artifactId> - <version>${webbeans.version}</version> + <groupId>${weld.groupId}</groupId> + <artifactId>weld-logger</artifactId> + <version>${weld.version}</version> </dependency> <dependency> - <groupId>${webbeans.groupId}</groupId> - <artifactId>webbeans-logging</artifactId> - <version>${webbeans.version}</version> + <groupId>${weld.groupId}</groupId> + <artifactId>weld-logging</artifactId> + <version>${weld.version}</version> </dependency> <dependency> - <groupId>${webbeans.groupId}.servlet</groupId> - <artifactId>webbeans-servlet</artifactId> - <version>${webbeans.version}</version> + <groupId>${weld.groupId}.servlet</groupId> + <artifactId>weld-servlet</artifactId> + <version>${weld.version}</version> </dependency> <dependency> @@ -238,7 +238,7 @@ <dependency> <groupId>org.jboss.test-harness</groupId> <artifactId>jboss-test-harness</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.1.0-CR3</version> </dependency> <dependency> @@ -327,7 +327,7 @@ <dependency> <groupId>${seam.groupId}</groupId> - <artifactId>seam-webbeans-bridge</artifactId> + <artifactId>seam-weld-bridge</artifactId> <version>${seam.version}</version> </dependency>